aleajactaest/khanat-code-old
1
0
Fork 0
mirror of https://port.numenaute.org/aleajactaest/khanat-code-old.git synced 2024-12-26 10:30:54 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Changed: #1030 Implement music streaming in OpenAL driver

Browse source
This commit is contained in:
kervala 2010-07-27 20:23:39 +02:00
parent fd41d63b2a
commit ff02f35b70
2 changed files with 5 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
code/nel/CMakeLists.txt
View file

@ -126,6 +126,9 @@ IF(WITH_3D)
ENDIF(WITH_3D) ENDIF(WITH_3D)
IF(WITH_SOUND) IF(WITH_SOUND)
FIND_PACKAGE(Ogg)
FIND_PACKAGE(Vorbis)
IF(WITH_DRIVER_OPENAL) IF(WITH_DRIVER_OPENAL)
FIND_PACKAGE(OpenAL) FIND_PACKAGE(OpenAL)
ENDIF(WITH_DRIVER_OPENAL) ENDIF(WITH_DRIVER_OPENAL)
@ -133,11 +136,6 @@ IF(WITH_SOUND)
IF(WITH_DRIVER_FMOD) IF(WITH_DRIVER_FMOD)
FIND_PACKAGE(FMOD) FIND_PACKAGE(FMOD)
ENDIF(WITH_DRIVER_FMOD) ENDIF(WITH_DRIVER_FMOD)
IF(WITH_DRIVER_XAUDIO2)
FIND_PACKAGE(Ogg)
FIND_PACKAGE(Vorbis)
ENDIF(WITH_DRIVER_XAUDIO2)
ENDIF(WITH_SOUND) ENDIF(WITH_SOUND)
IF(WITH_GTK) IF(WITH_GTK)

5
code/nel/src/sound/driver/CMakeLists.txt
View file

@ -2,10 +2,9 @@ FILE(GLOB SRC *.cpp *.h)
nl_target_lib(nelsnd_lowlevel ${SRC}) nl_target_lib(nelsnd_lowlevel ${SRC})
INCLUDE_DIRECTORIES(${LIBXML2_INCLUDE_DIR}) INCLUDE_DIRECTORIES(${OGG_INCLUDE_DIR} ${VORBIS_INCLUDE_DIR})
TARGET_LINK_LIBRARIES(nelsnd_lowlevel ${LIBXML2_LIBRARIES} nelsound) TARGET_LINK_LIBRARIES(nelsnd_lowlevel ${VORBIS_LIBRARY} ${VORBISFILE_LIBRARY} ${OGG_LIBRARY})
nl_default_props(nelsnd_lowlevel "Library: NeL Sound Lowlevel") nl_default_props(nelsnd_lowlevel "Library: NeL Sound Lowlevel")
ADD_DEFINITIONS(${LIBXML2_DEFINITIONS})
NL_ADD_STATIC_VID_DRIVERS(nelsnd_lowlevel) NL_ADD_STATIC_VID_DRIVERS(nelsnd_lowlevel)
nl_add_lib_suffix(nelsnd_lowlevel) nl_add_lib_suffix(nelsnd_lowlevel)