diff --git a/code/nel/CMakeLists.txt b/code/nel/CMakeLists.txt index d4d860438..d2735baf7 100644 --- a/code/nel/CMakeLists.txt +++ b/code/nel/CMakeLists.txt @@ -126,6 +126,9 @@ IF(WITH_3D) ENDIF(WITH_3D) IF(WITH_SOUND) + FIND_PACKAGE(Ogg) + FIND_PACKAGE(Vorbis) + IF(WITH_DRIVER_OPENAL) FIND_PACKAGE(OpenAL) ENDIF(WITH_DRIVER_OPENAL) @@ -133,11 +136,6 @@ IF(WITH_SOUND) IF(WITH_DRIVER_FMOD) FIND_PACKAGE(FMOD) ENDIF(WITH_DRIVER_FMOD) - - IF(WITH_DRIVER_XAUDIO2) - FIND_PACKAGE(Ogg) - FIND_PACKAGE(Vorbis) - ENDIF(WITH_DRIVER_XAUDIO2) ENDIF(WITH_SOUND) IF(WITH_GTK) diff --git a/code/nel/src/sound/driver/CMakeLists.txt b/code/nel/src/sound/driver/CMakeLists.txt index db082072f..88f238e4e 100644 --- a/code/nel/src/sound/driver/CMakeLists.txt +++ b/code/nel/src/sound/driver/CMakeLists.txt @@ -2,10 +2,9 @@ FILE(GLOB SRC *.cpp *.h) nl_target_lib(nelsnd_lowlevel ${SRC}) -INCLUDE_DIRECTORIES(${LIBXML2_INCLUDE_DIR}) -TARGET_LINK_LIBRARIES(nelsnd_lowlevel ${LIBXML2_LIBRARIES} nelsound) +INCLUDE_DIRECTORIES(${OGG_INCLUDE_DIR} ${VORBIS_INCLUDE_DIR}) +TARGET_LINK_LIBRARIES(nelsnd_lowlevel ${VORBIS_LIBRARY} ${VORBISFILE_LIBRARY} ${OGG_LIBRARY}) nl_default_props(nelsnd_lowlevel "Library: NeL Sound Lowlevel") -ADD_DEFINITIONS(${LIBXML2_DEFINITIONS}) NL_ADD_STATIC_VID_DRIVERS(nelsnd_lowlevel) nl_add_lib_suffix(nelsnd_lowlevel)