From edeec1cb70baa4ba2fb56a0178265e0feddc18ab Mon Sep 17 00:00:00 2001 From: "\"Matt Raykowski\"" Date: Wed, 9 Jun 2010 07:18:33 -0500 Subject: [PATCH 1/6] Changed: #842 panolpy_maker finds libsquish, OpenAL driver finds EFX-Util on Windows. --- code/nel/CMakeModules/FindEFXUtil.cmake | 50 ++++++++++++++++++ code/nel/CMakeModules/FindSquish.cmake | 51 +++++++++++++++++++ .../src/sound/driver/openal/CMakeLists.txt | 5 ++ .../nel/tools/3d/panoply_maker/CMakeLists.txt | 6 ++- 4 files changed, 110 insertions(+), 2 deletions(-) create mode 100644 code/nel/CMakeModules/FindEFXUtil.cmake create mode 100644 code/nel/CMakeModules/FindSquish.cmake diff --git a/code/nel/CMakeModules/FindEFXUtil.cmake b/code/nel/CMakeModules/FindEFXUtil.cmake new file mode 100644 index 000000000..5e2f410b0 --- /dev/null +++ b/code/nel/CMakeModules/FindEFXUtil.cmake @@ -0,0 +1,50 @@ +# - Locate EFX-Util library +# This module defines +# EFXUTIL_LIBRARY, the library to link against +# EFXUTIL_FOUND, if false, do not try to link to EFX-Util +# EFXUTIL_INCLUDE_DIR, where to find headers. + +IF(EFXUTIL_LIBRARY AND EFXUTIL_INCLUDE_DIR) + # in cache already + SET(EFXUTIL_FIND_QUIETLY TRUE) +ENDIF(EFXUTIL_LIBRARY AND EFXUTIL_INCLUDE_DIR) + + +FIND_PATH(EFXUTIL_INCLUDE_DIR + EFX-Util.h + PATHS + $ENV{EFXUTIL_DIR}/include + /usr/local/include + /usr/include + /sw/include + /opt/local/include + /opt/csw/include + /opt/include + PATH_SUFFIXES AL +) + +FIND_LIBRARY(EFXUTIL_LIBRARY + NAMES EFX-Util efxutil libefxutil + PATHS + $ENV{EFXUTIL_DIR}/lib + /usr/local/lib + /usr/lib + /usr/local/X11R6/lib + /usr/X11R6/lib + /sw/lib + /opt/local/lib + /opt/csw/lib + /opt/lib + /usr/freeware/lib64 +) + +IF(EFXUTIL_LIBRARY AND EFXUTIL_INCLUDE_DIR) + SET(EFXUTIL_FOUND "YES") + IF(NOT EFXUTIL_FIND_QUIETLY) + MESSAGE(STATUS "Found EFX-Util: ${EFXUTIL_LIBRARY}") + ENDIF(NOT EFXUTIL_FIND_QUIETLY) +ELSE(EFXUTIL_LIBRARY AND EFXUTIL_INCLUDE_DIR) + IF(NOT EFXUTIL_FIND_QUIETLY) + MESSAGE(STATUS "Warning: Unable to find EFX-Util!") + ENDIF(NOT EFXUTIL_FIND_QUIETLY) +ENDIF(EFXUTIL_LIBRARY AND EFXUTIL_INCLUDE_DIR) diff --git a/code/nel/CMakeModules/FindSquish.cmake b/code/nel/CMakeModules/FindSquish.cmake new file mode 100644 index 000000000..2fcbc1a1a --- /dev/null +++ b/code/nel/CMakeModules/FindSquish.cmake @@ -0,0 +1,51 @@ +# +# Find the LibSquish includes and library +# +# This module defines +# SQUISH_INCLUDE_DIR, where to find squish.h +# SQUISH_LIBRARY, where to find the Squish library. +# SQUISH_FOUND, If false, do not try to use Squish. + +# also defined, but not for general use are +IF(SQUISH_LIBRARY AND SQUISH_INCLUDE_DIR) + # in cache already + SET(SQUISH_FIND_QUIETLY TRUE) +ENDIF(SQUISH_LIBRARY AND SQUISH_INCLUDE_DIR) + +FIND_PATH(SQUISH_INCLUDE_DIR + squish.h + PATHS + /usr/local/include + /usr/include + /sw/include + /opt/local/include + /opt/csw/include + /opt/include + PATH_SUFFIXES cppunit +) + +FIND_LIBRARY(SQUISH_LIBRARY + squish + PATHS + /usr/local/lib + /usr/lib + /usr/local/X11R6/lib + /usr/X11R6/lib + /sw/lib + /opt/local/lib + /opt/csw/lib + /opt/lib + /usr/freeware/lib64 +) + +IF(SQUISH_LIBRARY AND SQUISH_INCLUDE_DIR) + SET(SQUISH_FOUND "YES") + IF(NOT SQUISH_FIND_QUIETLY) + MESSAGE(STATUS "Found Squish: ${SQUISH_LIBRARY}") + ENDIF(NOT SQUISH_FIND_QUIETLY) +ELSE(SQUISH_LIBRARY AND SQUISH_INCLUDE_DIR) + IF(NOT SQUISH_FIND_QUIETLY) + MESSAGE(STATUS "Warning: Unable to find Squish!") + ENDIF(NOT SQUISH_FIND_QUIETLY) +ENDIF(SQUISH_LIBRARY AND SQUISH_INCLUDE_DIR) + diff --git a/code/nel/src/sound/driver/openal/CMakeLists.txt b/code/nel/src/sound/driver/openal/CMakeLists.txt index edc428acc..7dbacd820 100644 --- a/code/nel/src/sound/driver/openal/CMakeLists.txt +++ b/code/nel/src/sound/driver/openal/CMakeLists.txt @@ -8,6 +8,11 @@ SET_TARGET_PROPERTIES(nel_drv_openal PROPERTIES VERSION ${NL_VERSION}) ADD_DEFINITIONS(${LIBXML2_DEFINITIONS}) IF(WIN32) + # Find and include EFX-Util on Windows. + FIND_PACKAGE(EFXUtil) + INCLUDE_DIRECTORIES(${EFXUTIL_INCLUDE_DIR}) + TARGET_LINK_LIBRARIES(nel_drv_openal ${EFXUTIL_LIBRARY}) + SET_TARGET_PROPERTIES(nel_drv_openal PROPERTIES COMPILE_FLAGS "/Yustdopenal.h") SET_SOURCE_FILES_PROPERTIES(stdopenal.cpp PROPERTIES COMPILE_FLAGS "/Ycstdopenal.h") SET_TARGET_PROPERTIES(nel_drv_openal PROPERTIES diff --git a/code/nel/tools/3d/panoply_maker/CMakeLists.txt b/code/nel/tools/3d/panoply_maker/CMakeLists.txt index 8bdc5fea8..62b644c86 100644 --- a/code/nel/tools/3d/panoply_maker/CMakeLists.txt +++ b/code/nel/tools/3d/panoply_maker/CMakeLists.txt @@ -2,8 +2,10 @@ FILE(GLOB SRC *.cpp *.h ../s3tc_compressor_lib/*.h ../s3tc_compressor_lib/*.cpp) ADD_EXECUTABLE(panoply_maker ${SRC}) -INCLUDE_DIRECTORIES(${LIBXML2_INCLUDE_DIR} ${S3TC_INCLUDE_DIR}) -TARGET_LINK_LIBRARIES(panoply_maker ${LIBXML2_LIBRARIES} ${PLATFORM_LINKFLAGS} ${S3TC_LIBRARY} nelmisc nel3d) +FIND_PACKAGE(Squish REQUIRED) + +INCLUDE_DIRECTORIES(${LIBXML2_INCLUDE_DIR} ${SQUISH_INCLUDE_DIR}) +TARGET_LINK_LIBRARIES(panoply_maker ${LIBXML2_LIBRARIES} ${PLATFORM_LINKFLAGS} ${SQUISH_LIBRARY} nelmisc nel3d) IF(WIN32) SET_TARGET_PROPERTIES(panoply_maker PROPERTIES LINK_FLAGS "/NODEFAULTLIB:libcmt /NODEFAULTLIB:libc" From ede3c5755357c32289742e2482c3ff2114158ec3 Mon Sep 17 00:00:00 2001 From: "\"Matt Raykowski\"" Date: Wed, 9 Jun 2010 07:23:30 -0500 Subject: [PATCH 2/6] Changed: #842 panolpy_maker finds libsquish, OpenAL driver finds EFX-Util on Windows. --- code/nel/src/sound/driver/openal/CMakeLists.txt | 5 +++++ code/nel/tools/3d/panoply_maker/CMakeLists.txt | 6 ++++-- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/code/nel/src/sound/driver/openal/CMakeLists.txt b/code/nel/src/sound/driver/openal/CMakeLists.txt index edc428acc..7dbacd820 100644 --- a/code/nel/src/sound/driver/openal/CMakeLists.txt +++ b/code/nel/src/sound/driver/openal/CMakeLists.txt @@ -8,6 +8,11 @@ SET_TARGET_PROPERTIES(nel_drv_openal PROPERTIES VERSION ${NL_VERSION}) ADD_DEFINITIONS(${LIBXML2_DEFINITIONS}) IF(WIN32) + # Find and include EFX-Util on Windows. + FIND_PACKAGE(EFXUtil) + INCLUDE_DIRECTORIES(${EFXUTIL_INCLUDE_DIR}) + TARGET_LINK_LIBRARIES(nel_drv_openal ${EFXUTIL_LIBRARY}) + SET_TARGET_PROPERTIES(nel_drv_openal PROPERTIES COMPILE_FLAGS "/Yustdopenal.h") SET_SOURCE_FILES_PROPERTIES(stdopenal.cpp PROPERTIES COMPILE_FLAGS "/Ycstdopenal.h") SET_TARGET_PROPERTIES(nel_drv_openal PROPERTIES diff --git a/code/nel/tools/3d/panoply_maker/CMakeLists.txt b/code/nel/tools/3d/panoply_maker/CMakeLists.txt index 8bdc5fea8..62b644c86 100644 --- a/code/nel/tools/3d/panoply_maker/CMakeLists.txt +++ b/code/nel/tools/3d/panoply_maker/CMakeLists.txt @@ -2,8 +2,10 @@ FILE(GLOB SRC *.cpp *.h ../s3tc_compressor_lib/*.h ../s3tc_compressor_lib/*.cpp) ADD_EXECUTABLE(panoply_maker ${SRC}) -INCLUDE_DIRECTORIES(${LIBXML2_INCLUDE_DIR} ${S3TC_INCLUDE_DIR}) -TARGET_LINK_LIBRARIES(panoply_maker ${LIBXML2_LIBRARIES} ${PLATFORM_LINKFLAGS} ${S3TC_LIBRARY} nelmisc nel3d) +FIND_PACKAGE(Squish REQUIRED) + +INCLUDE_DIRECTORIES(${LIBXML2_INCLUDE_DIR} ${SQUISH_INCLUDE_DIR}) +TARGET_LINK_LIBRARIES(panoply_maker ${LIBXML2_LIBRARIES} ${PLATFORM_LINKFLAGS} ${SQUISH_LIBRARY} nelmisc nel3d) IF(WIN32) SET_TARGET_PROPERTIES(panoply_maker PROPERTIES LINK_FLAGS "/NODEFAULTLIB:libcmt /NODEFAULTLIB:libc" From 5a113d7950d489c3571a7d6e62528b803acd5fa3 Mon Sep 17 00:00:00 2001 From: kervala Date: Wed, 9 Jun 2010 16:24:27 +0200 Subject: [PATCH 3/6] Changed: #842 Removed unneeded libwww libs --- code/ryzom/CMakeModules/FindLibwww.cmake | 16 +++------------- 1 file changed, 3 insertions(+), 13 deletions(-) diff --git a/code/ryzom/CMakeModules/FindLibwww.cmake b/code/ryzom/CMakeModules/FindLibwww.cmake index 6c053e0e3..2fb376456 100644 --- a/code/ryzom/CMakeModules/FindLibwww.cmake +++ b/code/ryzom/CMakeModules/FindLibwww.cmake @@ -66,32 +66,22 @@ FIND_WWW_LIBRARY(LIBWWWCACHE_LIBRARY wwwcache) FIND_WWW_LIBRARY(LIBWWWCORE_LIBRARY wwwcore) FIND_WWW_LIBRARY(LIBWWWDIR_LIBRARY wwwdir) FIND_WWW_LIBRARY(LIBWWWFILE_LIBRARY wwwfile) -FIND_WWW_LIBRARY(LIBWWWFTP_LIBRARY wwwftp) -FIND_WWW_LIBRARY(LIBWWWGOPHER_LIBRARY wwwgopher) FIND_WWW_LIBRARY(LIBWWWHTML_LIBRARY wwwhtml) FIND_WWW_LIBRARY(LIBWWWHTTP_LIBRARY wwwhttp) FIND_WWW_LIBRARY(LIBWWWINIT_LIBRARY wwwinit) FIND_WWW_LIBRARY(LIBWWWMIME_LIBRARY wwwmime) FIND_WWW_LIBRARY(LIBWWWMUX_LIBRARY wwwmux) -FIND_WWW_LIBRARY(LIBWWWNEWS_LIBRARY wwwnews) -FIND_WWW_LIBRARY(LIBWWWSSL_LIBRARY wwwssl) FIND_WWW_LIBRARY(LIBWWWSTREAM_LIBRARY wwwstream) -FIND_WWW_LIBRARY(LIBWWWTELNET_LIBRARY wwwtelnet) FIND_WWW_LIBRARY(LIBWWWTRANS_LIBRARY wwwtrans) FIND_WWW_LIBRARY(LIBWWWUTILS_LIBRARY wwwutils) -FIND_WWW_LIBRARY(LIBWWWXML_LIBRARY wwwxml) -FIND_WWW_LIBRARY(LIBWWWZIP_LIBRARY wwwzip) # combine all the libraries into one variable SET(LIBWWW_LIBRARY ${LIBMD5_LIBRARY} ${LIBWWWAPP_LIBRARY} ${LIBWWWCACHE_LIBRARY} ${LIBWWWCORE_LIBRARY} ${LIBWWWDIR_LIBRARY} ${LIBWWWFILE_LIBRARY} - ${LIBWWWFTP_LIBRARY} ${LIBWWWGOPHER_LIBRARY} ${LIBWWWHTML_LIBRARY} - ${LIBWWWHTTP_LIBRARY} ${LIBWWWINIT_LIBRARY} ${LIBWWWMIME_LIBRARY} - ${LIBWWWMUX_LIBRARY} ${LIBWWWNEWS_LIBRARY} ${LIBWWWSSL_LIBRARY} - ${LIBWWWSTREAM_LIBRARY} ${LIBWWWTELNET_LIBRARY} - ${LIBWWWTRANS_LIBRARY} ${LIBWWWUTILS_LIBRARY} ${LIBWWWXML_LIBRARY} - ${LIBWWWZIP_LIBRARY} + ${LIBWWWHTML_LIBRARY} ${LIBWWWHTTP_LIBRARY} ${LIBWWWINIT_LIBRARY} + ${LIBWWWMIME_LIBRARY} ${LIBWWWMUX_LIBRARY} ${LIBWWWSTREAM_LIBRARY} + ${LIBWWWTRANS_LIBRARY} ${LIBWWWUTILS_LIBRARY} ) IF(LIBWWW_LIBRARY AND LIBWWW_INCLUDE_DIR) From 7e5502b38cd22262f206080fd752690b7704446b Mon Sep 17 00:00:00 2001 From: kervala Date: Wed, 9 Jun 2010 18:09:56 +0200 Subject: [PATCH 4/6] Changed: #842 Added pkg-config files --- code/nel/src/3d/CMakeLists.txt | 2 ++ code/nel/src/3d/nel-3d.pc.in | 4 ++-- code/nel/src/georges/CMakeLists.txt | 2 ++ code/nel/src/georges/nel-georges.pc.in | 12 ++++++++++++ code/nel/src/ligo/CMakeLists.txt | 2 ++ code/nel/src/ligo/nel-ligo.pc.in | 12 ++++++++++++ code/nel/src/misc/CMakeLists.txt | 2 ++ code/nel/src/misc/nel-misc.pc.in | 4 ++-- code/nel/src/net/CMakeLists.txt | 2 ++ code/nel/src/net/nel-net.pc.in | 12 ++++++++++++ code/nel/src/pacs/CMakeLists.txt | 2 ++ code/nel/src/pacs/nel-pacs.pc.in | 12 ++++++++++++ code/nel/src/sound/CMakeLists.txt | 2 ++ code/nel/src/sound/nel-sound.pc.in | 12 ++++++++++++ 14 files changed, 78 insertions(+), 4 deletions(-) create mode 100644 code/nel/src/georges/nel-georges.pc.in create mode 100644 code/nel/src/ligo/nel-ligo.pc.in create mode 100644 code/nel/src/net/nel-net.pc.in create mode 100644 code/nel/src/pacs/nel-pacs.pc.in create mode 100644 code/nel/src/sound/nel-sound.pc.in diff --git a/code/nel/src/3d/CMakeLists.txt b/code/nel/src/3d/CMakeLists.txt index 02d8e368a..a48f25c49 100644 --- a/code/nel/src/3d/CMakeLists.txt +++ b/code/nel/src/3d/CMakeLists.txt @@ -664,6 +664,8 @@ SOURCE_GROUP(Shadows FILES IF(NOT WIN32) ADD_LIBRARY(nel3d SHARED ${SRC}) + CONFIGURE_FILE(nel-3d.pc.in nel-3d.pc) + INSTALL(FILES nel-3d.pc DESTINATION lib/pkgconfig) ELSE(NOT WIN32) ADD_LIBRARY(nel3d STATIC ${SRC}) ENDIF(NOT WIN32) diff --git a/code/nel/src/3d/nel-3d.pc.in b/code/nel/src/3d/nel-3d.pc.in index fe31bd8f8..ade3e2d08 100644 --- a/code/nel/src/3d/nel-3d.pc.in +++ b/code/nel/src/3d/nel-3d.pc.in @@ -4,8 +4,8 @@ libdir=@libdir@ includedir=@includedir@ Name: nel-3d -Version: @VERSION@ -Description: NeL @VERSION@ +Version: @NL_VERSION@ +Description: NeL @NL_VERSION@ Reqiures: Libs: -L${libdir} Libs.private: @LIBS@ @FREETYPE_LIBS@ -lc diff --git a/code/nel/src/georges/CMakeLists.txt b/code/nel/src/georges/CMakeLists.txt index 7efb0d037..bb97967be 100644 --- a/code/nel/src/georges/CMakeLists.txt +++ b/code/nel/src/georges/CMakeLists.txt @@ -6,6 +6,8 @@ SOURCE_GROUP(headers FILES ${PRIV_H} ${PUB_H}) IF(NOT WIN32) ADD_LIBRARY(nelgeorges SHARED ${SRC}) + CONFIGURE_FILE(nel-georges.pc.in nel-georges.pc) + INSTALL(FILES nel-georges.pc DESTINATION lib/pkgconfig) ELSE(NOT WIN32) ADD_LIBRARY(nelgeorges STATIC ${SRC}) ENDIF(NOT WIN32) diff --git a/code/nel/src/georges/nel-georges.pc.in b/code/nel/src/georges/nel-georges.pc.in new file mode 100644 index 000000000..4aa509aa0 --- /dev/null +++ b/code/nel/src/georges/nel-georges.pc.in @@ -0,0 +1,12 @@ +prefix=@prefix@ +exec_prefix=@exec_prefix@ +libdir=@libdir@ +includedir=@includedir@ + +Name: nel-georges +Version: @NL_VERSION@ +Description: NeL @NL_VERSION@ +Reqiures: +Libs: -L${libdir} +Libs.private: @LIBS@ -lc +Cflags: -I${includedir} diff --git a/code/nel/src/ligo/CMakeLists.txt b/code/nel/src/ligo/CMakeLists.txt index 30402c9e0..3f445121d 100644 --- a/code/nel/src/ligo/CMakeLists.txt +++ b/code/nel/src/ligo/CMakeLists.txt @@ -2,6 +2,8 @@ FILE(GLOB SRC *.cpp *.h) IF(NOT WIN32) ADD_LIBRARY(nelligo SHARED ${SRC}) + CONFIGURE_FILE(nel-ligo.pc.in nel-ligo.pc) + INSTALL(FILES nel-ligo.pc DESTINATION lib/pkgconfig) ELSE(NOT WIN32) ADD_LIBRARY(nelligo STATIC ${SRC}) ENDIF(NOT WIN32) diff --git a/code/nel/src/ligo/nel-ligo.pc.in b/code/nel/src/ligo/nel-ligo.pc.in new file mode 100644 index 000000000..d4a535bac --- /dev/null +++ b/code/nel/src/ligo/nel-ligo.pc.in @@ -0,0 +1,12 @@ +prefix=@prefix@ +exec_prefix=@exec_prefix@ +libdir=@libdir@ +includedir=@includedir@ + +Name: nel-ligo +Version: @NL_VERSION@ +Description: NeL @NL_VERSION@ +Reqiures: +Libs: -L${libdir} +Libs.private: @LIBS@ -lc +Cflags: -I${includedir} diff --git a/code/nel/src/misc/CMakeLists.txt b/code/nel/src/misc/CMakeLists.txt index 45a619466..540f6a740 100644 --- a/code/nel/src/misc/CMakeLists.txt +++ b/code/nel/src/misc/CMakeLists.txt @@ -2,6 +2,8 @@ FILE(GLOB SRC *.cpp *.h config_file/*.cpp config_file/*.h) IF(NOT WIN32) ADD_LIBRARY(nelmisc SHARED ${SRC}) + CONFIGURE_FILE(nel-misc.pc.in nel-misc.pc) + INSTALL(FILES nel-misc.pc DESTINATION lib/pkgconfig) ELSE(NOT WIN32) ADD_LIBRARY(nelmisc STATIC ${SRC}) ENDIF(NOT WIN32) diff --git a/code/nel/src/misc/nel-misc.pc.in b/code/nel/src/misc/nel-misc.pc.in index 9e10a2beb..c4d447c42 100644 --- a/code/nel/src/misc/nel-misc.pc.in +++ b/code/nel/src/misc/nel-misc.pc.in @@ -4,8 +4,8 @@ libdir=@libdir@ includedir=@includedir@ Name: nel-misc -Version: @VERSION@ -Description: NeL @VERSION@ +Version: @NL_VERSION@ +Description: NeL @NL_VERSION@ Reqiures: Libs: -L${libdir} Libs.private: @LIBS@ -lc -lpthread -lrt -ldl diff --git a/code/nel/src/net/CMakeLists.txt b/code/nel/src/net/CMakeLists.txt index 388933c44..b77310bf8 100644 --- a/code/nel/src/net/CMakeLists.txt +++ b/code/nel/src/net/CMakeLists.txt @@ -9,6 +9,8 @@ SET(NLNET_LIB ${LIBNAME}) IF(NOT WIN32) ADD_LIBRARY(nelnet SHARED ${SRC}) + CONFIGURE_FILE(nel-net.pc.in nel-net.pc) + INSTALL(FILES nel-net.pc DESTINATION lib/pkgconfig) ELSE(NOT WIN32) ADD_LIBRARY(nelnet STATIC ${SRC}) ENDIF(NOT WIN32) diff --git a/code/nel/src/net/nel-net.pc.in b/code/nel/src/net/nel-net.pc.in new file mode 100644 index 000000000..0fb2a0462 --- /dev/null +++ b/code/nel/src/net/nel-net.pc.in @@ -0,0 +1,12 @@ +prefix=@prefix@ +exec_prefix=@exec_prefix@ +libdir=@libdir@ +includedir=@includedir@ + +Name: nel-net +Version: @NL_VERSION@ +Description: NeL @NL_VERSION@ +Reqiures: +Libs: -L${libdir} +Libs.private: @LIBS@ -lc -lpthread -lrt -ldl +Cflags: -I${includedir} -lc -lpthread -lrt -ldl diff --git a/code/nel/src/pacs/CMakeLists.txt b/code/nel/src/pacs/CMakeLists.txt index 3cfdb7a85..910396cfd 100644 --- a/code/nel/src/pacs/CMakeLists.txt +++ b/code/nel/src/pacs/CMakeLists.txt @@ -2,6 +2,8 @@ FILE(GLOB SRC *.cpp *.h) IF(NOT WIN32) ADD_LIBRARY(nelpacs SHARED ${SRC}) + CONFIGURE_FILE(nel-pacs.pc.in nel-pacs.pc) + INSTALL(FILES nel-pacs.pc DESTINATION lib/pkgconfig) ELSE(NOT WIN32) ADD_LIBRARY(nelpacs STATIC ${SRC}) ENDIF(NOT WIN32) diff --git a/code/nel/src/pacs/nel-pacs.pc.in b/code/nel/src/pacs/nel-pacs.pc.in new file mode 100644 index 000000000..133b51d53 --- /dev/null +++ b/code/nel/src/pacs/nel-pacs.pc.in @@ -0,0 +1,12 @@ +prefix=@prefix@ +exec_prefix=@exec_prefix@ +libdir=@libdir@ +includedir=@includedir@ + +Name: nel-pacs +Version: @NL_VERSION@ +Description: NeL @NL_VERSION@ +Reqiures: +Libs: -L${libdir} +Libs.private: @LIBS@ -lc -lpthread -lrt -ldl +Cflags: -I${includedir} -lc -lpthread -lrt -ldl diff --git a/code/nel/src/sound/CMakeLists.txt b/code/nel/src/sound/CMakeLists.txt index 63f21b127..d26e59c1e 100644 --- a/code/nel/src/sound/CMakeLists.txt +++ b/code/nel/src/sound/CMakeLists.txt @@ -8,6 +8,8 @@ ENDIF(APPLE) IF(NOT WIN32) ADD_LIBRARY(nelsound SHARED ${SRC}) + CONFIGURE_FILE(nel-sound.pc.in nel-sound.pc) + INSTALL(FILES nel-sound.pc DESTINATION lib/pkgconfig) ELSE(NOT WIN32) ADD_LIBRARY(nelsound STATIC ${SRC}) ENDIF(NOT WIN32) diff --git a/code/nel/src/sound/nel-sound.pc.in b/code/nel/src/sound/nel-sound.pc.in new file mode 100644 index 000000000..9994e967e --- /dev/null +++ b/code/nel/src/sound/nel-sound.pc.in @@ -0,0 +1,12 @@ +prefix=@prefix@ +exec_prefix=@exec_prefix@ +libdir=@libdir@ +includedir=@includedir@ + +Name: nel-sound +Version: @NL_VERSION@ +Description: NeL @NL_VERSION@ +Reqiures: +Libs: -L${libdir} +Libs.private: @LIBS@ -lc -lpthread -lrt -ldl +Cflags: -I${includedir} -lc -lpthread -lrt -ldl From dc69bc2c738757935c2818ad96c2d54df1747271 Mon Sep 17 00:00:00 2001 From: kervala Date: Wed, 9 Jun 2010 19:30:53 +0200 Subject: [PATCH 5/6] Changed: #842 Some unneeded libwww libs are needed on some platforms --- code/ryzom/CMakeModules/FindLibwww.cmake | 19 +++++++++++++++---- 1 file changed, 15 insertions(+), 4 deletions(-) diff --git a/code/ryzom/CMakeModules/FindLibwww.cmake b/code/ryzom/CMakeModules/FindLibwww.cmake index 2fb376456..05c9733a8 100644 --- a/code/ryzom/CMakeModules/FindLibwww.cmake +++ b/code/ryzom/CMakeModules/FindLibwww.cmake @@ -38,7 +38,9 @@ FIND_PATH(LIBWWW_ADDITIONAL_INCLUDE_DIR ) # combine both include directories into one variable -SET(LIBWWW_INCLUDE_DIR ${LIBWWW_INCLUDE_DIR} ${LIBWWW_ADDITIONAL_INCLUDE_DIR}) +IF(LIBWWW_ADDITIONAL_INCLUDE_DIR) + SET(LIBWWW_INCLUDE_DIR ${LIBWWW_INCLUDE_DIR} ${LIBWWW_ADDITIONAL_INCLUDE_DIR}) +ENDIF(LIBWWW_ADDITIONAL_INCLUDE_DIR) # helper to find all the libwww sub libraries MACRO(FIND_WWW_LIBRARY MYLIBRARY) @@ -66,22 +68,31 @@ FIND_WWW_LIBRARY(LIBWWWCACHE_LIBRARY wwwcache) FIND_WWW_LIBRARY(LIBWWWCORE_LIBRARY wwwcore) FIND_WWW_LIBRARY(LIBWWWDIR_LIBRARY wwwdir) FIND_WWW_LIBRARY(LIBWWWFILE_LIBRARY wwwfile) +FIND_WWW_LIBRARY(LIBWWWFTP_LIBRARY wwwftp) +FIND_WWW_LIBRARY(LIBWWWGOPHER_LIBRARY wwwgopher) FIND_WWW_LIBRARY(LIBWWWHTML_LIBRARY wwwhtml) FIND_WWW_LIBRARY(LIBWWWHTTP_LIBRARY wwwhttp) FIND_WWW_LIBRARY(LIBWWWINIT_LIBRARY wwwinit) FIND_WWW_LIBRARY(LIBWWWMIME_LIBRARY wwwmime) FIND_WWW_LIBRARY(LIBWWWMUX_LIBRARY wwwmux) +FIND_WWW_LIBRARY(LIBWWWNEWS_LIBRARY wwwnews) FIND_WWW_LIBRARY(LIBWWWSTREAM_LIBRARY wwwstream) +FIND_WWW_LIBRARY(LIBWWWTELNET_LIBRARY wwwtelnet) FIND_WWW_LIBRARY(LIBWWWTRANS_LIBRARY wwwtrans) FIND_WWW_LIBRARY(LIBWWWUTILS_LIBRARY wwwutils) +FIND_WWW_LIBRARY(LIBWWWXML_LIBRARY wwwxml) +FIND_WWW_LIBRARY(LIBWWWZIP_LIBRARY wwwzip) # combine all the libraries into one variable SET(LIBWWW_LIBRARY ${LIBMD5_LIBRARY} ${LIBWWWAPP_LIBRARY} ${LIBWWWCACHE_LIBRARY} ${LIBWWWCORE_LIBRARY} ${LIBWWWDIR_LIBRARY} ${LIBWWWFILE_LIBRARY} - ${LIBWWWHTML_LIBRARY} ${LIBWWWHTTP_LIBRARY} ${LIBWWWINIT_LIBRARY} - ${LIBWWWMIME_LIBRARY} ${LIBWWWMUX_LIBRARY} ${LIBWWWSTREAM_LIBRARY} - ${LIBWWWTRANS_LIBRARY} ${LIBWWWUTILS_LIBRARY} + ${LIBWWWFTP_LIBRARY} ${LIBWWWGOPHER_LIBRARY} ${LIBWWWHTML_LIBRARY} + ${LIBWWWHTTP_LIBRARY} ${LIBWWWINIT_LIBRARY} ${LIBWWWMIME_LIBRARY} + ${LIBWWWMUX_LIBRARY} ${LIBWWWNEWS_LIBRARY} + ${LIBWWWSTREAM_LIBRARY} ${LIBWWWTELNET_LIBRARY} + ${LIBWWWTRANS_LIBRARY} ${LIBWWWUTILS_LIBRARY} ${LIBWWWXML_LIBRARY} + ${LIBWWWZIP_LIBRARY} ) IF(LIBWWW_LIBRARY AND LIBWWW_INCLUDE_DIR) From e3cadf3de51c7281d83cfccda2ee71782e0da04f Mon Sep 17 00:00:00 2001 From: kervala Date: Wed, 9 Jun 2010 20:12:27 +0200 Subject: [PATCH 6/6] Fixed: #971 Another dead lock under Linux --- code/nel/include/nel/3d/driver.h | 4 ++-- code/nel/src/3d/driver.cpp | 8 ++++---- .../src/3d/driver/direct3d/driver_direct3d_texture.cpp | 4 ++-- code/nel/src/3d/driver/opengl/driver_opengl.cpp | 2 +- code/nel/src/3d/driver/opengl/driver_opengl_texture.cpp | 2 +- 5 files changed, 10 insertions(+), 10 deletions(-) diff --git a/code/nel/include/nel/3d/driver.h b/code/nel/include/nel/3d/driver.h index 21ca5b079..a4957f8ce 100644 --- a/code/nel/include/nel/3d/driver.h +++ b/code/nel/include/nel/3d/driver.h @@ -56,7 +56,7 @@ using NLMISC::CSmartPtr; using NLMISC::CRGBA; using NLMISC::CVector; using NLMISC::CMatrix; -using NLMISC::CSynchronized; +using NLMISC::CUnfairSynchronized; class CMaterial; @@ -144,7 +144,7 @@ public: protected: - CSynchronized _SyncTexDrvInfos; + CUnfairSynchronized _SyncTexDrvInfos; TTexDrvSharePtrList _TexDrvShares; TMatDrvInfoPtrList _MatDrvInfos; diff --git a/code/nel/src/3d/driver.cpp b/code/nel/src/3d/driver.cpp index af6ad6c07..063823433 100644 --- a/code/nel/src/3d/driver.cpp +++ b/code/nel/src/3d/driver.cpp @@ -50,7 +50,7 @@ IDriver::~IDriver() // Must clean up everything before closing driver. // Must doing this in release(), so assert here if not done... { - CSynchronized::CAccessor access(&_SyncTexDrvInfos); + CUnfairSynchronized::CAccessor access(&_SyncTexDrvInfos); TTexDrvInfoPtrMap &rTexDrvInfos = access.value(); nlassert( rTexDrvInfos.size() == 0 ); } @@ -81,7 +81,7 @@ bool IDriver::release(void) // Release refptr of TextureDrvInfos. Should be all null (because of precedent pass). { - CSynchronized::CAccessor access(&_SyncTexDrvInfos); + CUnfairSynchronized::CAccessor access(&_SyncTexDrvInfos); TTexDrvInfoPtrMap &rTexDrvInfos = access.value(); // must be empty, because precedent pass should have deleted all. @@ -234,7 +234,7 @@ void IDriver::removeIBDrvInfoPtr(ItIBDrvInfoPtrList ibDrvInfoIt) // *************************************************************************** void IDriver::removeTextureDrvInfoPtr(ItTexDrvInfoPtrMap texDrvInfoIt) { - CSynchronized::CAccessor access(&_SyncTexDrvInfos); + CUnfairSynchronized::CAccessor access(&_SyncTexDrvInfos); TTexDrvInfoPtrMap &rTexDrvInfos = access.value(); rTexDrvInfos.erase(texDrvInfoIt); @@ -268,7 +268,7 @@ bool IDriver::invalidateShareTexture (ITexture &texture) getTextureShareName (texture, name); // Look for the driver info for this share name - CSynchronized::CAccessor access(&_SyncTexDrvInfos); + CUnfairSynchronized::CAccessor access(&_SyncTexDrvInfos); TTexDrvInfoPtrMap &rTexDrvInfos = access.value(); TTexDrvInfoPtrMap::iterator iteDrvInfo = rTexDrvInfos.find (name); if (iteDrvInfo != rTexDrvInfos.end()) diff --git a/code/nel/src/3d/driver/direct3d/driver_direct3d_texture.cpp b/code/nel/src/3d/driver/direct3d/driver_direct3d_texture.cpp index 0c10a3eb8..0eed232ca 100644 --- a/code/nel/src/3d/driver/direct3d/driver_direct3d_texture.cpp +++ b/code/nel/src/3d/driver/direct3d/driver_direct3d_texture.cpp @@ -549,7 +549,7 @@ bool CDriverD3D::setupTextureEx (ITexture& tex, bool bUpload, bool &bAllUploaded // insert or get the texture. { - CSynchronized::CAccessor access(&_SyncTexDrvInfos); + CUnfairSynchronized::CAccessor access(&_SyncTexDrvInfos); TTexDrvInfoPtrMap &rTexDrvInfos = access.value(); ItTexDrvInfoPtrMap itTex; @@ -1013,7 +1013,7 @@ bool CDriverD3D::isTextureExist(const ITexture&tex) getTextureShareName (tex, name); { - CSynchronized::CAccessor access(&_SyncTexDrvInfos); + CUnfairSynchronized::CAccessor access(&_SyncTexDrvInfos); TTexDrvInfoPtrMap &rTexDrvInfos = access.value(); result = (rTexDrvInfos.find(name) != rTexDrvInfos.end()); } diff --git a/code/nel/src/3d/driver/opengl/driver_opengl.cpp b/code/nel/src/3d/driver/opengl/driver_opengl.cpp index be6048d5c..faf2d538d 100644 --- a/code/nel/src/3d/driver/opengl/driver_opengl.cpp +++ b/code/nel/src/3d/driver/opengl/driver_opengl.cpp @@ -720,7 +720,7 @@ bool CDriverGL::isTextureExist(const ITexture&tex) getTextureShareName (tex, name); { - CSynchronized::CAccessor access(&_SyncTexDrvInfos); + CUnfairSynchronized::CAccessor access(&_SyncTexDrvInfos); TTexDrvInfoPtrMap &rTexDrvInfos = access.value(); result = (rTexDrvInfos.find(name) != rTexDrvInfos.end()); } diff --git a/code/nel/src/3d/driver/opengl/driver_opengl_texture.cpp b/code/nel/src/3d/driver/opengl/driver_opengl_texture.cpp index 4d4166591..0acd2c57d 100644 --- a/code/nel/src/3d/driver/opengl/driver_opengl_texture.cpp +++ b/code/nel/src/3d/driver/opengl/driver_opengl_texture.cpp @@ -656,7 +656,7 @@ bool CDriverGL::setupTextureEx (ITexture& tex, bool bUpload, bool &bAllUploaded, // insert or get the texture. { - CSynchronized::CAccessor access(&_SyncTexDrvInfos); + CUnfairSynchronized::CAccessor access(&_SyncTexDrvInfos); TTexDrvInfoPtrMap &rTexDrvInfos = access.value(); ItTexDrvInfoPtrMap itTex;