xrCDB: added to cmake

OpenXRay · May 30, 2018 · 0d7cdb6 · 0d7cdb6
1 parent cd1aafe
commit 0d7cdb6
Show file tree

Hide file tree

Showing 7 changed files with 24 additions and 2 deletions.
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
@@ -2,7 +2,7 @@
 add_subdirectory(Layers)
 #add_subdirectory(xrMisc)
 #add_subdirectory(xrAICore)
-#add_subdirectory(xrCDB)
+add_subdirectory(xrCDB)
 add_subdirectory(xrCore)
 #add_subdirectory(xrEngine)
 #add_subdirectory(xrGame)

diff --git a/src/xrCDB/CMakeLists.txt b/src/xrCDB/CMakeLists.txt
@@ -0,0 +1,14 @@
+project(xrCDB)
+
+list(APPEND DIRS
+	"."
+	)
+
+add_dir("${DIRS}")
+
+include_directories(${CMAKE_CURRENT_SOURCE_DIR}/.. ${CMAKE_CURRENT_SOURCE_DIR}/../../sdk/include)
+
+add_library(${PROJECT_NAME} SHARED ${${PROJECT_NAME}__SOURCES} ${${PROJECT_NAME}__INCLUDES})
+
+set_target_properties(${PROJECT_NAME} PROPERTIES PREFIX "")
+target_link_libraries(${PROJECT_NAME} xrCore OPCODE xrAPI)
diff --git a/src/xrCDB/ISpatial.cpp b/src/xrCDB/ISpatial.cpp
@@ -6,7 +6,7 @@
 #include "xrEngine/xr_object.h"
 #include "xrEngine/PS_Instance.h"
 #endif
-#include "xrEngine/Device.h"
+#include "xrEngine/device.h"
 #include "xrEngine/GameFont.h"
 #include "xrEngine/PerformanceAlert.hpp"
 #include "xrCore/Threading/Lock.hpp"

diff --git a/src/xrCDB/StdAfx.h → src/xrCDB/stdafx.h b/src/xrCDB/StdAfx.h → src/xrCDB/stdafx.h
diff --git a/src/xrCDB/xrCDB.cpp b/src/xrCDB/xrCDB.cpp
@@ -14,6 +14,7 @@ namespace Opcode
 using namespace CDB;
 using namespace Opcode;
 
+#if defined(WINDOWS)
 BOOL APIENTRY DllMain(HANDLE hModule, u32 ul_reason_for_call, LPVOID lpReserved)
 {
     switch (ul_reason_for_call)
@@ -25,6 +26,7 @@ BOOL APIENTRY DllMain(HANDLE hModule, u32 ul_reason_for_call, LPVOID lpReserved)
     }
     return TRUE;
 }
+#endif
 
 // Model building
 MODEL::MODEL() :

diff --git a/src/xrCDB/xr_area_raypick.cpp b/src/xrCDB/xr_area_raypick.cpp
@@ -4,7 +4,9 @@
 #include "xrEngine/xr_collide_form.h"
 #include "xrEngine/xr_object.h"
 #include "Intersect.hpp"
+#if defined(WINDOWS)
 #include "d3d9types.h"
+#endif
 
 #ifdef DEBUG
 static BOOL _cdb_bDebug = false;

diff --git a/src/xrEngine/xr_object.h b/src/xrEngine/xr_object.h
@@ -26,7 +26,9 @@ class CInifile;
 #define CROW_RADIUS2 (60.f)
 
 class IPhysicsShell;
+#if defined(WINDOWS)
 xr_pure_interface IObjectPhysicsCollision;
+#endif
 
 class CAttachmentOwner;
 class CInventoryOwner;
@@ -186,7 +188,9 @@ class IGameObject : public virtual IFactoryObject,
     virtual IRenderVisual* Visual() const = 0;
     virtual void OnChangeVisual() = 0;
     virtual IPhysicsShell* physics_shell() = 0;
+#if defined(WINDOWS)
     virtual const IObjectPhysicsCollision* physics_collision() = 0;
+#endif
     // Name management
     virtual shared_str cName() const = 0;
     virtual void cName_set(shared_str N) = 0;