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

Changed: Dependencies definitions

Browse source
This commit is contained in:
kervala 2010-09-11 19:44:22 +02:00
parent 8948fa73c9
commit 0616ce2c0d
3 changed files with 10 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
code/nel/src/misc/CMakeLists.txt
View file

@ -30,15 +30,15 @@ IF(WIN32)
ENDIF(WIN32) ENDIF(WIN32)
IF(UNIX) IF(UNIX)
SET(LIBC_LIBRARY -lc) TARGET_LINK_LIBRARIES(nelmisc -lc)
IF(NOT APPLE) IF(NOT APPLE)
SET(LIBRT_LIBRARY -lrt) TARGET_LINK_LIBRARIES(nelmisc -lrt)
ENDIF(NOT APPLE) ENDIF(NOT APPLE)
ENDIF(UNIX) ENDIF(UNIX)
INCLUDE_DIRECTORIES(${LIBXML2_INCLUDE_DIR} ${PNG_INCLUDE_DIR} config_file) INCLUDE_DIRECTORIES(${LIBXML2_INCLUDE_DIR} ${PNG_INCLUDE_DIR} config_file)
TARGET_LINK_LIBRARIES(nelmisc ${CMAKE_THREAD_LIBS_INIT} ${LIBC_LIBRARY} ${LIBRT_LIBRARY} ${LIBXML2_LIBRARIES}) TARGET_LINK_LIBRARIES(nelmisc ${CMAKE_THREAD_LIBS_INIT} ${LIBXML2_LIBRARIES})
SET_TARGET_PROPERTIES(nelmisc PROPERTIES LINK_INTERFACE_LIBRARIES "") SET_TARGET_PROPERTIES(nelmisc PROPERTIES LINK_INTERFACE_LIBRARIES "")
NL_DEFAULT_PROPS(nelmisc "NeL, Library: NeL Misc") NL_DEFAULT_PROPS(nelmisc "NeL, Library: NeL Misc")

2
code/nel/src/net/CMakeLists.txt
View file

@ -13,7 +13,7 @@ ENDIF(WITH_GTK)
TARGET_LINK_LIBRARIES(nelnet nelmisc) TARGET_LINK_LIBRARIES(nelnet nelmisc)
SET_TARGET_PROPERTIES(nelnet PROPERTIES LINK_INTERFACE_LIBRARIES "") SET_TARGET_PROPERTIES(nelnet PROPERTIES LINK_INTERFACE_LIBRARIES "")
NL_DEFAULT_PROPS(nelnet "NeL, Library: Net") NL_DEFAULT_PROPS(nelnet "NeL, Library: NeL Net")
NL_ADD_LIB_SUFFIX(nelnet) NL_ADD_LIB_SUFFIX(nelnet)

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

@ -2,9 +2,14 @@ FILE(GLOB SRC *.cpp *.h)
NL_TARGET_LIB(nelsnd_lowlevel ${SRC}) NL_TARGET_LIB(nelsnd_lowlevel ${SRC})
IF(WITH_STATIC)
# Add libogg dependency only if target is static because to libvorbisfile
TARGET_LINK_LIBRARIES(nelsnd_lowlevel ${OGG_LIBRARY})
ENDIF(WITH_STATIC)
INCLUDE_DIRECTORIES(${OGG_INCLUDE_DIR} ${VORBIS_INCLUDE_DIR}) INCLUDE_DIRECTORIES(${OGG_INCLUDE_DIR} ${VORBIS_INCLUDE_DIR})
TARGET_LINK_LIBRARIES(nelsnd_lowlevel nelmisc ${VORBIS_LIBRARY} ${VORBISFILE_LIBRARY} ${OGG_LIBRARY}) TARGET_LINK_LIBRARIES(nelsnd_lowlevel nelmisc ${VORBIS_LIBRARY} ${VORBISFILE_LIBRARY})
SET_TARGET_PROPERTIES(nelsnd_lowlevel PROPERTIES LINK_INTERFACE_LIBRARIES "") SET_TARGET_PROPERTIES(nelsnd_lowlevel PROPERTIES LINK_INTERFACE_LIBRARIES "")
NL_DEFAULT_PROPS(nelsnd_lowlevel "NeL, Library: Sound Lowlevel") NL_DEFAULT_PROPS(nelsnd_lowlevel "NeL, Library: Sound Lowlevel")
NL_ADD_STATIC_VID_DRIVERS(nelsnd_lowlevel) NL_ADD_STATIC_VID_DRIVERS(nelsnd_lowlevel)