Changed: Removed useless dependencies

code/nel/include/nel/3d/vegetable.h

@@ -19,6 +19,7 @@
 
 #include "nel/misc/types_nl.h"
 #include "nel/misc/noise_value.h"
+#include "nel/misc/vector.h"
 #include "nel/misc/vector_2f.h"
 #include "nel/misc/matrix.h"
 #include "nel/3d/vegetable_uv8.h"

code/nel/samples/misc/command/CMakeLists.txt

@@ -2,11 +2,8 @@ FILE(GLOB SRC *.cpp)
 
 ADD_EXECUTABLE(nl_sample_command ${SRC})
 
-INCLUDE_DIRECTORIES(${LIBXML2_INCLUDE_DIR})
 TARGET_LINK_LIBRARIES(nl_sample_command ${PLATFORM_LINKFLAGS} nelmisc)
 NL_DEFAULT_PROPS(nl_sample_command "Samples, Misc: Commands")
 NL_ADD_RUNTIME_FLAGS(nl_sample_command)
 
-ADD_DEFINITIONS(${LIBXML2_DEFINITIONS})
-
 INSTALL(TARGETS nl_sample_command RUNTIME DESTINATION bin COMPONENT samplesmisc)

code/nel/samples/misc/configfile/CMakeLists.txt

@@ -4,12 +4,9 @@ ADD_EXECUTABLE(nl_sample_configfile ${SRC})
 
 ADD_DEFINITIONS(-DNL_SAMPLE_CFG="\\"${NL_SHARE_PREFIX}/nl_sample_configfile/\\"")
 
-INCLUDE_DIRECTORIES(${LIBXML2_INCLUDE_DIR})
+TARGET_LINK_LIBRARIES(nl_sample_configfile ${PLATFORM_LINKFLAGS} nelmisc)
-TARGET_LINK_LIBRARIES(nl_sample_configfile ${LIBXML2_LIBRARIES} ${PLATFORM_LINKFLAGS} nelmisc)
 NL_DEFAULT_PROPS(nl_sample_configfile "Samples, Misc: Config Files")
 NL_ADD_RUNTIME_FLAGS(nl_sample_configfile)
 
-ADD_DEFINITIONS(${LIBXML2_DEFINITIONS})
-
 INSTALL(TARGETS nl_sample_configfile RUNTIME DESTINATION bin COMPONENT samplesmisc)
 INSTALL(FILES simpletest.txt DESTINATION share/nel/nl_sample_configfile COMPONENT samplesmisc)

code/nel/src/sound/driver/openal/CMakeLists.txt

@@ -9,6 +9,8 @@ SOURCE_GROUP(sfx FILES
         buffer_al.h
         listener_al.cpp
         listener_al.h
+        music_channel_al.cpp
+        music_channel_al.h
         source_al.cpp
         source_al.h)
 
@@ -18,12 +20,11 @@ SOURCE_GROUP(util FILES
 
 NL_TARGET_DRIVER(nel_drv_openal ${SRC})
 
-INCLUDE_DIRECTORIES(${LIBXML2_INCLUDE_DIR} ${OPENAL_INCLUDE_DIR})
+INCLUDE_DIRECTORIES(${OPENAL_INCLUDE_DIR})
-TARGET_LINK_LIBRARIES(nel_drv_openal ${LIBXML2_LIBRARIES} ${OPENAL_LIBRARY} nelsnd_lowlevel)
+TARGET_LINK_LIBRARIES(nel_drv_openal ${OPENAL_LIBRARY} nelmisc nelsnd_lowlevel)
 NL_DEFAULT_PROPS(nel_drv_openal "Driver, Sound: OpenAL")
 NL_ADD_LIB_SUFFIX(nel_drv_openal)
 NL_ADD_RUNTIME_FLAGS(nel_drv_openal)
-ADD_DEFINITIONS(${LIBXML2_DEFINITIONS})
 
 IF(WIN32)
   # Find and include EFX-Util on Windows.

code/nel/tools/3d/get_neighbors/CMakeLists.txt

@@ -2,14 +2,8 @@ FILE(GLOB SRC *.cpp *.h)
 
 ADD_EXECUTABLE(get_neighbors ${SRC})
 
-INCLUDE_DIRECTORIES(${LIBXML2_INCLUDE_DIR})
+TARGET_LINK_LIBRARIES(get_neighbors ${PLATFORM_LINKFLAGS})
-TARGET_LINK_LIBRARIES(get_neighbors ${LIBXML2_LIBRARIES} ${PLATFORM_LINKFLAGS})
+NL_DEFAULT_PROPS(get_neighbors "Tools, 3D: get_neighbors")
-IF(WIN32)
+NL_ADD_RUNTIME_FLAGS(get_neighbors)
-  SET_TARGET_PROPERTIES(get_neighbors PROPERTIES 
-    LINK_FLAGS_DEBUG "${CMAKE_LINK_FLAGS_DEBUG}"
-    LINK_FLAGS_RELEASE "${CMAKE_LINK_FLAGS_RELEASE}"
-    PROJECT_LABEL "Tools, 3D: get_neighbors")
-ENDIF(WIN32)
-ADD_DEFINITIONS(${LIBXML2_DEFINITIONS})
 
 INSTALL(TARGETS get_neighbors RUNTIME DESTINATION bin COMPONENT tools3d)

code/nel/tools/3d/zviewer/CMakeLists.txt

@@ -8,15 +8,9 @@ ENDIF(WIN32)
 
 ADD_DEFINITIONS(-DNL_ZVIEWER_CFG="\\"${NL_ETC_PREFIX}/\\"")
 
-INCLUDE_DIRECTORIES(${LIBXML2_INCLUDE_DIR})
+TARGET_LINK_LIBRARIES(zviewer ${PLATFORM_LINKFLAGS} nel3d)
-TARGET_LINK_LIBRARIES(zviewer ${LIBXML2_LIBRARIES} ${PLATFORM_LINKFLAGS} nel3d)
+NL_DEFAULT_PROPS(zviewer "Tools, 3D: Zone Viewer")
-IF(WIN32)
+NL_ADD_RUNTIME_FLAGS(zviewer)
-  SET_TARGET_PROPERTIES(zviewer PROPERTIES 
-    LINK_FLAGS_DEBUG "${CMAKE_LINK_FLAGS_DEBUG}"
-    LINK_FLAGS_RELEASE "${CMAKE_LINK_FLAGS_RELEASE}"
-    PROJECT_LABEL "Tools, 3D: Zone Viewer")
-ENDIF(WIN32)
-ADD_DEFINITIONS(${LIBXML2_DEFINITIONS})
 
 INSTALL(TARGETS zviewer RUNTIME DESTINATION bin COMPONENT tools3d)
 INSTALL(FILES zviewer.cfg DESTINATION etc/nel COMPONENT tools3d)