Merge pull request #269 from eagleivg/xd_dev

Latest Linux fixes

.gitmodules

@@ -6,7 +6,7 @@
 	url = https://github.com/OpenXRay/luabind-deboostified.git
 [submodule "Externals/GameSpy"]
 	path = Externals/GameSpy
-	url = https://github.com/nitrocaster/GameSpy.git
+	url = https://github.com/OpenXRay/GameSpy.git
 [submodule "Externals/AGS_SDK"]
 	path = Externals/AGS_SDK
 	url = https://github.com/GPUOpen-LibrariesAndSDKs/AGS_SDK.git

CMakeLists.txt

@@ -65,18 +65,17 @@ if(CMAKE_CXX_COMPILER_ID MATCHES "GNU")
     endif()
 endif()
 
-set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fpermissive --std=c++17 -Wno-attributes -pipe")
-#set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fpermissive") This is for the future versions
-#set(CMAKE_CXX_STANDARD 14) #Otherwise adds -std=gnu++11 and breaks successful building
-#set(CMAKE_CXX_STANDARD_REQUIRED ON)
-#set(CMAKE_CXX_EXTENSIONS OFF)
+set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fpermissive --std=c++17 -Wno-attributes -pipe -Wl,--no-undefined -fvisibility=hidden")
 
 set(LUA_LIBRARIES luajit)
 
 if(NOT CMAKE_BUILD_TYPE)
     set(CMAKE_BUILD_TYPE "Release" CACHE STRING "" FORCE)
-elseif(${CMAKE_BUILD_TYPE} STREQUAL "Debug")
-    add_definitions(-DDEBUG)
+endif()
+
+if(${CMAKE_BUILD_TYPE} STREQUAL "Debug")
+    add_definitions(-DDEBUG -DMIXED)
+    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Og")
     set(LUA_LIBRARIES luajit-debug)
 endif()
 

Externals/CMakeLists.txt

@@ -2,6 +2,7 @@ include(luajit.cmake)
 add_subdirectory(luabind)
 xr_install_file(luabind)
 add_subdirectory(cximage)
+add_subdirectory(GameSpy)
 #add_subdirectory(lzo)
 #add_subdirectory(NVTT)
 add_subdirectory(OPCODE)

Externals/cximage/ximaenc.cpp

@@ -996,7 +996,7 @@ bool CxImage::CheckFormat(CxFile * hFile, DWORD imagetype)
 ////////////////////////////////////////////////////////////////////////////////
 bool CxImage::CheckFormat(BYTE * buffer, DWORD size, DWORD imagetype)
 {
-	if (buffer==NULL || size==NULL){
+	if (buffer==NULL || size==0){
 		strcpy(info.szLastError,"invalid or empty buffer");
 		return false;
 	}

Externals/ode/include/ode/common.h

@@ -314,7 +314,7 @@ typedef struct dJointFeedback {
  * when the ODE step function updates the body state.
  */
 
-void dGeomMoved (dGeomID);
+ODE_API void dGeomMoved (dGeomID);
 dGeomID dGeomGetBodyNext (dGeomID);
 
 

Externals/ode/include/ode/config.h

@@ -44,6 +44,10 @@ extern "C" {
   #elif !defined(ODE_LIB)
     #define ODE_DLL_API __declspec(dllimport)
   #endif
+#else
+  #if defined(__GNUC__) && __GNUC__ >=4
+    #define ODE_API __attribute__ ((visibility("default")))
+  #endif
 #endif
 
 #if !defined(ODE_API)

Externals/ode/include/ode/objects.h

@@ -512,10 +512,10 @@ ODE_API dBodyID dBodyCreate (dWorldID);
  */
 ODE_API void dBodyDestroy (dBodyID);
 
-void dWorldAddBody     (dWorldID,dBodyID); // X-Ray custom probably
-void dWorldAddJoint    (dWorldID,dJointID); // X-Ray custom probably
-void dWorldRemoveBody  (dWorldID,dBodyID); // X-Ray custom probably
-void dWorldRemoveJoint (dWorldID,dJointID); // X-Ray custom probably
+ODE_API void dWorldAddBody     (dWorldID,dBodyID); // X-Ray custom probably
+ODE_API void dWorldAddJoint    (dWorldID,dJointID); // X-Ray custom probably
+ODE_API void dWorldRemoveBody  (dWorldID,dBodyID); // X-Ray custom probably
+ODE_API void dWorldRemoveJoint (dWorldID,dJointID); // X-Ray custom probably
 
 /**
  * @brief Set the body's user-data pointer.
@@ -989,7 +989,7 @@ ODE_API dJointID dJointCreateSlider (dWorldID, dJointGroupID);
  * If it is nonzero the joint is allocated in the given joint group.
  */
 ODE_API dJointID dJointCreateContact (dWorldID, dJointGroupID, const dContact *);
-dJointID dJointCreateContactSpecial (dWorldID, dJointGroupID, const dContact *); // XXX: GSC custom?
+ODE_API dJointID dJointCreateContactSpecial (dWorldID, dJointGroupID, const dContact *); // XXX: GSC custom?
 
 /**
  * @brief Create a new joint of the hinge2 type.

Externals/ode/ode/src/collision_std.h

@@ -58,9 +58,9 @@ int dCollideCapsulePlane (dxGeom *o1, dxGeom *o2, int flags,
 #ifdef __cplusplus
 extern "C" {
 #endif
-int dCollideRaySphere (dxGeom *o1, dxGeom *o2, int flags,
+ODE_API int dCollideRaySphere (dxGeom *o1, dxGeom *o2, int flags,
 		       dContactGeom *contact, int skip);
-int dCollideRayBox (dxGeom *o1, dxGeom *o2, int flags,
+ODE_API int dCollideRayBox (dxGeom *o1, dxGeom *o2, int flags,
 		    dContactGeom *contact, int skip);
 int dCollideRayCapsule (dxGeom *o1, dxGeom *o2,
 			  int flags, dContactGeom *contact, int skip);