Khaganat-NeL/khanat-opennel-code
2
0
Fork 0
Code Issues 21 Pull requests Projects Releases 1 Packages Wiki Activity

Fixed: minor compile and link errors related to Ogg/Vorbis and nelsnd_lowlevel

Browse source
This commit is contained in:
rti 2010-08-04 16:31:28 +02:00
parent 5e8c8d80c5
commit 339c99918c
3 changed files with 3 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
code/nel/CMakeModules/FindOgg.cmake
View file

@ -11,7 +11,7 @@ ENDIF(OGG_LIBRARY AND OGG_INCLUDE_DIR)
FIND_PATH(OGG_INCLUDE_DIR FIND_PATH(OGG_INCLUDE_DIR
ogg.h ogg/ogg.h
PATHS PATHS
$ENV{OGG_DIR}/include $ENV{OGG_DIR}/include
/usr/local/include /usr/local/include
@ -20,7 +20,6 @@ FIND_PATH(OGG_INCLUDE_DIR
/opt/local/include /opt/local/include
/opt/csw/include /opt/csw/include
/opt/include /opt/include
PATH_SUFFIXES ogg
) )
FIND_LIBRARY(OGG_LIBRARY FIND_LIBRARY(OGG_LIBRARY

3
code/nel/CMakeModules/FindVorbis.cmake
View file

@ -11,7 +11,7 @@ ENDIF(VORBIS_LIBRARY AND VORBIS_INCLUDE_DIR)
FIND_PATH(VORBIS_INCLUDE_DIR FIND_PATH(VORBIS_INCLUDE_DIR
vorbisfile.h vorbis/vorbisfile.h
PATHS PATHS
$ENV{VORBIS_DIR}/include $ENV{VORBIS_DIR}/include
/usr/local/include /usr/local/include
@ -20,7 +20,6 @@ FIND_PATH(VORBIS_INCLUDE_DIR
/opt/local/include /opt/local/include
/opt/csw/include /opt/csw/include
/opt/include /opt/include
PATH_SUFFIXES vorbis
) )
FIND_LIBRARY(VORBIS_LIBRARY FIND_LIBRARY(VORBIS_LIBRARY

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

@ -3,7 +3,7 @@ FILE(GLOB SRC *.cpp *.h)
nl_target_lib(nelsnd_lowlevel ${SRC}) nl_target_lib(nelsnd_lowlevel ${SRC})
INCLUDE_DIRECTORIES(${OGG_INCLUDE_DIR} ${VORBIS_INCLUDE_DIR}) INCLUDE_DIRECTORIES(${OGG_INCLUDE_DIR} ${VORBIS_INCLUDE_DIR})
TARGET_LINK_LIBRARIES(nelsnd_lowlevel ${VORBIS_LIBRARY} ${VORBISFILE_LIBRARY} ${OGG_LIBRARY}) TARGET_LINK_LIBRARIES(nelsnd_lowlevel nelmisc ${VORBIS_LIBRARY} ${VORBISFILE_LIBRARY} ${OGG_LIBRARY})
nl_default_props(nelsnd_lowlevel "Library: NeL Sound Lowlevel") nl_default_props(nelsnd_lowlevel "Library: NeL Sound Lowlevel")
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)