Ryzom
/
ryzom-core
1
1
Fork 0
Code Issues 38 Pull Requests Projects 1 Releases 1 Activity

Changed: Removed propagation of dependencies to other projects (fix lintian warnings)

Browse Source
hg/feature/sound
kervala 15 years ago
parent 6781fcf098
commit 1d5f2e8df9
8 changed files with 25 additions and 12 deletions
Show Stats Download Patch File Download Diff File

7
code/nel/src/3d/CMakeLists.txt
Unescape Escape View File

@ -664,10 +664,13 @@ SOURCE_GROUP(Shadows FILES
NL_TARGET_LIB(nel3d ${SRC}) NL_TARGET_LIB(nel3d ${SRC})
INCLUDE_DIRECTORIES(${LIBXML2_INCLUDE_DIR} ${FREETYPE_INCLUDE_DIRS} ${JPEG_INCLUDE_DIR}) INCLUDE_DIRECTORIES(${LIBXML2_INCLUDE_DIR} ${FREETYPE_INCLUDE_DIRS})
TARGET_LINK_LIBRARIES(nel3d nelmisc ${FREETYPE_LIBRARY} ${JPEG_LIBRARY})
TARGET_LINK_LIBRARIES(nel3d nelmisc ${FREETYPE_LIBRARY})
SET_TARGET_PROPERTIES(nel3d PROPERTIES LINK_INTERFACE_LIBRARIES "")
NL_DEFAULT_PROPS(nel3d "Library: NeL 3D") NL_DEFAULT_PROPS(nel3d "Library: NeL 3D")
NL_ADD_STATIC_VID_DRIVERS(nel3d) NL_ADD_STATIC_VID_DRIVERS(nel3d)
NL_ADD_LIB_SUFFIX(nel3d) NL_ADD_LIB_SUFFIX(nel3d)
ADD_DEFINITIONS(${LIBXML2_DEFINITIONS}) ADD_DEFINITIONS(${LIBXML2_DEFINITIONS})

4
code/nel/src/georges/CMakeLists.txt
Unescape Escape View File

@ -7,7 +7,9 @@ SOURCE_GROUP(headers FILES ${PRIV_H} ${PUB_H})
NL_TARGET_LIB(nelgeorges ${SRC}) NL_TARGET_LIB(nelgeorges ${SRC})
INCLUDE_DIRECTORIES(${LIBXML2_INCLUDE_DIR}) INCLUDE_DIRECTORIES(${LIBXML2_INCLUDE_DIR})
TARGET_LINK_LIBRARIES(nelgeorges nelmisc)
TARGET_LINK_LIBRARIES(nelgeorges ${LIBXML2_LIBRARIES} nelmisc)
SET_TARGET_PROPERTIES(nelgeorges PROPERTIES LINK_INTERFACE_LIBRARIES "")
NL_DEFAULT_PROPS(nelgeorges "Library: NeL Georges") NL_DEFAULT_PROPS(nelgeorges "Library: NeL Georges")
NL_ADD_LIB_SUFFIX(nelgeorges) NL_ADD_LIB_SUFFIX(nelgeorges)

2
code/nel/src/ligo/CMakeLists.txt
Unescape Escape View File

@ -3,7 +3,9 @@ FILE(GLOB SRC *.cpp *.h)
NL_TARGET_LIB(nelligo ${SRC}) NL_TARGET_LIB(nelligo ${SRC})
INCLUDE_DIRECTORIES(${LIBXML2_INCLUDE_DIR}) INCLUDE_DIRECTORIES(${LIBXML2_INCLUDE_DIR})
TARGET_LINK_LIBRARIES(nelligo ${LIBXML2_LIBRARIES} nelmisc) TARGET_LINK_LIBRARIES(nelligo ${LIBXML2_LIBRARIES} nelmisc)
SET_TARGET_PROPERTIES(nelligo PROPERTIES LINK_INTERFACE_LIBRARIES "")
NL_DEFAULT_PROPS(nelligo "Library: NeL Ligo") NL_DEFAULT_PROPS(nelligo "Library: NeL Ligo")
NL_ADD_LIB_SUFFIX(nelligo) NL_ADD_LIB_SUFFIX(nelligo)

2
code/nel/src/logic/CMakeLists.txt
Unescape Escape View File

@ -3,7 +3,9 @@ FILE(GLOB SRC *.cpp *.h)
NL_TARGET_LIB(nellogic ${SRC}) NL_TARGET_LIB(nellogic ${SRC})
INCLUDE_DIRECTORIES(${LIBXML2_INCLUDE_DIR}) INCLUDE_DIRECTORIES(${LIBXML2_INCLUDE_DIR})
TARGET_LINK_LIBRARIES(nellogic ${LIBXML2_LIBRARIES} nelmisc nelnet) TARGET_LINK_LIBRARIES(nellogic ${LIBXML2_LIBRARIES} nelmisc nelnet)
SET_TARGET_PROPERTIES(nellogic PROPERTIES LINK_INTERFACE_LIBRARIES "")
NL_DEFAULT_PROPS(nellogic "Library: NeL Logic") NL_DEFAULT_PROPS(nellogic "Library: NeL Logic")
NL_ADD_LIB_SUFFIX(nellogic) NL_ADD_LIB_SUFFIX(nellogic)

2
code/nel/src/misc/CMakeLists.txt
Unescape Escape View File

@ -22,7 +22,9 @@ IF(WIN32)
ENDIF(WIN32) ENDIF(WIN32)
INCLUDE_DIRECTORIES(${LIBXML2_INCLUDE_DIR} ${PNG_INCLUDE_DIR} config_file) INCLUDE_DIRECTORIES(${LIBXML2_INCLUDE_DIR} ${PNG_INCLUDE_DIR} config_file)
TARGET_LINK_LIBRARIES(nelmisc ${LIBXML2_LIBRARIES} ${PNG_LIBRARIES} ${WINSOCK2_LIB}) TARGET_LINK_LIBRARIES(nelmisc ${LIBXML2_LIBRARIES} ${PNG_LIBRARIES} ${WINSOCK2_LIB})
SET_TARGET_PROPERTIES(nelmisc PROPERTIES LINK_INTERFACE_LIBRARIES "")
NL_DEFAULT_PROPS(nelmisc "Library: NeL Misc") NL_DEFAULT_PROPS(nelmisc "Library: NeL Misc")
NL_ADD_LIB_SUFFIX(nelmisc) NL_ADD_LIB_SUFFIX(nelmisc)

7
code/nel/src/net/CMakeLists.txt
Unescape Escape View File

@ -11,15 +11,12 @@ IF(WITH_GTK)
ENDIF(GTK2_FOUND) ENDIF(GTK2_FOUND)
ENDIF(WITH_GTK) ENDIF(WITH_GTK)
TARGET_LINK_LIBRARIES(nelnet nelmisc)
INCLUDE_DIRECTORIES(${LIBXML2_INCLUDE_DIR}) SET_TARGET_PROPERTIES(nelnet PROPERTIES LINK_INTERFACE_LIBRARIES "")
TARGET_LINK_LIBRARIES(nelnet ${LIBXML2_LIBRARIES} nelmisc)
NL_DEFAULT_PROPS(nelnet "Library: NeL Net") NL_DEFAULT_PROPS(nelnet "Library: NeL Net")
NL_ADD_LIB_SUFFIX(nelnet) NL_ADD_LIB_SUFFIX(nelnet)
ADD_DEFINITIONS(${LIBXML2_DEFINITIONS})
IF(WITH_PCH) IF(WITH_PCH)
ADD_NATIVE_PRECOMPILED_HEADER(nelnet ${CMAKE_CURRENT_SOURCE_DIR}/stdnet.h ${CMAKE_CURRENT_SOURCE_DIR}/stdnet.cpp) ADD_NATIVE_PRECOMPILED_HEADER(nelnet ${CMAKE_CURRENT_SOURCE_DIR}/stdnet.h ${CMAKE_CURRENT_SOURCE_DIR}/stdnet.cpp)
ENDIF(WITH_PCH) ENDIF(WITH_PCH)

7
code/nel/src/pacs/CMakeLists.txt
Unescape Escape View File

@ -3,12 +3,15 @@ FILE(GLOB SRC *.cpp *.h)
NL_TARGET_LIB(nelpacs ${SRC}) NL_TARGET_LIB(nelpacs ${SRC})
INCLUDE_DIRECTORIES(${LIBXML2_INCLUDE_DIR}) INCLUDE_DIRECTORIES(${LIBXML2_INCLUDE_DIR})
TARGET_LINK_LIBRARIES(nelpacs ${LIBXML2_LIBRARIES} nelmisc)
TARGET_LINK_LIBRARIES(nelpacs nelmisc)
SET_TARGET_PROPERTIES(nelpacs PROPERTIES LINK_INTERFACE_LIBRARIES "")
NL_DEFAULT_PROPS(nelpacs "Library: NeL PACS") NL_DEFAULT_PROPS(nelpacs "Library: NeL PACS")
ADD_DEFINITIONS(${LIBXML2_DEFINITIONS})
NL_ADD_LIB_SUFFIX(nelpacs) NL_ADD_LIB_SUFFIX(nelpacs)
ADD_DEFINITIONS(${LIBXML2_DEFINITIONS})
IF(WITH_PCH) IF(WITH_PCH)
ADD_NATIVE_PRECOMPILED_HEADER(nelpacs ${CMAKE_CURRENT_SOURCE_DIR}/stdpacs.h ${CMAKE_CURRENT_SOURCE_DIR}/stdpacs.cpp) ADD_NATIVE_PRECOMPILED_HEADER(nelpacs ${CMAKE_CURRENT_SOURCE_DIR}/stdpacs.h ${CMAKE_CURRENT_SOURCE_DIR}/stdpacs.cpp)
ENDIF(WITH_PCH) ENDIF(WITH_PCH)

6
code/nel/src/sound/CMakeLists.txt
Unescape Escape View File

@ -3,13 +3,15 @@ FILE(GLOB SRC *.cpp *.h)
NL_TARGET_LIB(nelsound ${SRC}) NL_TARGET_LIB(nelsound ${SRC})
INCLUDE_DIRECTORIES(${LIBXML2_INCLUDE_DIR}) INCLUDE_DIRECTORIES(${LIBXML2_INCLUDE_DIR})
TARGET_LINK_LIBRARIES(nelsound ${LIBXML2_LIBRARIES} nelmisc nelligo nelgeorges nel3d nelsnd_lowlevel) TARGET_LINK_LIBRARIES(nelsound ${LIBXML2_LIBRARIES} nelmisc nelligo nelgeorges nel3d nelsnd_lowlevel)
SET_TARGET_PROPERTIES(nelsound PROPERTIES LINK_INTERFACE_LIBRARIES "")
NL_DEFAULT_PROPS(nelsound "Library: NeL Sound") NL_DEFAULT_PROPS(nelsound "Library: NeL Sound")
ADD_DEFINITIONS(${LIBXML2_DEFINITIONS})
NL_ADD_LIB_SUFFIX(nelsound) NL_ADD_LIB_SUFFIX(nelsound)
ADD_DEFINITIONS(${LIBXML2_DEFINITIONS})
IF(WITH_PCH) IF(WITH_PCH)
ADD_NATIVE_PRECOMPILED_HEADER(nelsound ${CMAKE_CURRENT_SOURCE_DIR}/stdsound.h ${CMAKE_CURRENT_SOURCE_DIR}/stdsound.cpp) ADD_NATIVE_PRECOMPILED_HEADER(nelsound ${CMAKE_CURRENT_SOURCE_DIR}/stdsound.h ${CMAKE_CURRENT_SOURCE_DIR}/stdsound.cpp)
ENDIF(WITH_PCH) ENDIF(WITH_PCH)

Write Preview
Loading…
Cancel
Save