merge

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)

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)
+

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<TTexDrvInfoPtrMap> _SyncTexDrvInfos;
+	CUnfairSynchronized<TTexDrvInfoPtrMap> _SyncTexDrvInfos;
 
 	TTexDrvSharePtrList		_TexDrvShares;
 	TMatDrvInfoPtrList		_MatDrvInfos;

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)

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<TTexDrvInfoPtrMap>::CAccessor access(&_SyncTexDrvInfos);
+		CUnfairSynchronized<TTexDrvInfoPtrMap>::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<TTexDrvInfoPtrMap>::CAccessor access(&_SyncTexDrvInfos);
+		CUnfairSynchronized<TTexDrvInfoPtrMap>::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<TTexDrvInfoPtrMap>::CAccessor access(&_SyncTexDrvInfos);
+	CUnfairSynchronized<TTexDrvInfoPtrMap>::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<TTexDrvInfoPtrMap>::CAccessor access(&_SyncTexDrvInfos);
+	CUnfairSynchronized<TTexDrvInfoPtrMap>::CAccessor access(&_SyncTexDrvInfos);
 	TTexDrvInfoPtrMap &rTexDrvInfos = access.value();
 	TTexDrvInfoPtrMap::iterator iteDrvInfo = rTexDrvInfos.find (name);
 	if (iteDrvInfo != rTexDrvInfos.end())

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<TTexDrvInfoPtrMap>::CAccessor access(&_SyncTexDrvInfos);
+			CUnfairSynchronized<TTexDrvInfoPtrMap>::CAccessor access(&_SyncTexDrvInfos);
 			TTexDrvInfoPtrMap &rTexDrvInfos = access.value();
 
 			ItTexDrvInfoPtrMap	itTex;
@@ -1013,7 +1013,7 @@ bool CDriverD3D::isTextureExist(const ITexture&tex)
 	getTextureShareName (tex, name);
 
 	{
-		CSynchronized<TTexDrvInfoPtrMap>::CAccessor access(&_SyncTexDrvInfos);
+		CUnfairSynchronized<TTexDrvInfoPtrMap>::CAccessor access(&_SyncTexDrvInfos);
 		TTexDrvInfoPtrMap &rTexDrvInfos = access.value();
 		result = (rTexDrvInfos.find(name) != rTexDrvInfos.end());
 	}

code/nel/src/3d/driver/opengl/driver_opengl.cpp

@@ -720,7 +720,7 @@ bool CDriverGL::isTextureExist(const ITexture&tex)
 	getTextureShareName (tex, name);
 
 	{
-		CSynchronized<TTexDrvInfoPtrMap>::CAccessor access(&_SyncTexDrvInfos);
+		CUnfairSynchronized<TTexDrvInfoPtrMap>::CAccessor access(&_SyncTexDrvInfos);
 		TTexDrvInfoPtrMap &rTexDrvInfos = access.value();
 		result = (rTexDrvInfos.find(name) != rTexDrvInfos.end());
 	}

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<TTexDrvInfoPtrMap>::CAccessor access(&_SyncTexDrvInfos);
+			CUnfairSynchronized<TTexDrvInfoPtrMap>::CAccessor access(&_SyncTexDrvInfos);
 			TTexDrvInfoPtrMap &rTexDrvInfos = access.value();
 
 			ItTexDrvInfoPtrMap	itTex;

code/nel/src/3d/driver/opengl/mac/cocoa_adapter.mm

@@ -374,7 +374,7 @@ void showCursor(bool b)
 	}
 	
 	if(error != kCGErrorSuccess)
-		nlerror("cannot get capture / un-capture cursor");
+		nlerror("cannot capture / un-capture cursor");
 }
 
 void setMousePos(float x, float y) 

code/nel/src/3d/nel-3d.pc.in

@@ -4,8 +4,8 @@ libdir=@libdir@
 includedir=@includedir@
 
 Name: nel-3d
-Version: @VERSION@
+Version: @NL_VERSION@
-Description: NeL @VERSION@
+Description: NeL @NL_VERSION@
 Reqiures:
 Libs: -L${libdir}
 Libs.private: @LIBS@ @FREETYPE_LIBS@ -lc

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)

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}

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)

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}

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)

code/nel/src/misc/nel-misc.pc.in

@@ -4,8 +4,8 @@ libdir=@libdir@
 includedir=@includedir@
 
 Name: nel-misc
-Version: @VERSION@
+Version: @NL_VERSION@
-Description: NeL @VERSION@
+Description: NeL @NL_VERSION@
 Reqiures:
 Libs: -L${libdir}
 Libs.private: @LIBS@ -lc -lpthread -lrt -ldl

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 "${CMAKE_CURRENT_BINARY_DIR}/nel-net.pc" DESTINATION lib/pkgconfig)
 ELSE(NOT WIN32)
   ADD_LIBRARY(nelnet STATIC ${SRC})
 ENDIF(NOT WIN32)

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

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)

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

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) 

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 

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

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})
+FIND_PACKAGE(Squish REQUIRED)
-TARGET_LINK_LIBRARIES(panoply_maker ${LIBXML2_LIBRARIES} ${PLATFORM_LINKFLAGS} ${S3TC_LIBRARY} nelmisc nel3d)
+
+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"

code/ryzom/CMakeModules/FindLibwww.cmake

@@ -38,7 +38,9 @@ FIND_PATH(LIBWWW_ADDITIONAL_INCLUDE_DIR
 )
 
 # combine both include directories into one variable
+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)
@@ -74,7 +76,6 @@ 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)
@@ -88,7 +89,7 @@ SET(LIBWWW_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}
+  ${LIBWWWMUX_LIBRARY} ${LIBWWWNEWS_LIBRARY}
   ${LIBWWWSTREAM_LIBRARY} ${LIBWWWTELNET_LIBRARY}
   ${LIBWWWTRANS_LIBRARY} ${LIBWWWUTILS_LIBRARY} ${LIBWWWXML_LIBRARY}
   ${LIBWWWZIP_LIBRARY}