xrMiscMath: add to linux build

OpenXRay · Jul 28, 2018 · bd7e4dc · bd7e4dc
1 parent 0351957
commit bd7e4dc
Show file tree

Hide file tree

Showing 10 changed files with 43 additions and 22 deletions.
diff --git a/src/utils/CMakeLists.txt b/src/utils/CMakeLists.txt
@@ -1,2 +1,3 @@
 add_subdirectory(xrLCUtil)
 add_subdirectory(xrQSlim)
+add_subdirectory(xrMiscMath)
diff --git a/src/utils/xrMiscMath/CMakeLists.txt b/src/utils/xrMiscMath/CMakeLists.txt
@@ -0,0 +1,18 @@
+project(xrMiscMath)
+
+list(APPEND DIRS
+    "."
+    )
+
+add_dir("${DIRS}")
+
+include_directories(
+    ${CMAKE_CURRENT_SOURCE_DIR}/../..
+    ${CMAKE_CURRENT_SOURCE_DIR}/../../../sdk/include
+    )
+
+#list(REMOVE_ITEM ${PROJECT_NAME}__SOURCES "${CMAKE_CURRENT_SOURCE_DIR}/./LevelCompilerLoggerWindow.cpp")
+#ist(REMOVE_ITEM ${PROJECT_NAME}__INCLUDES "${CMAKE_CURRENT_SOURCE_DIR}/./LevelCompilerLoggerWindow.hpp")
+
+add_library(${PROJECT_NAME} STATIC ${${PROJECT_NAME}__SOURCES} ${${PROJECT_NAME}__INCLUDES})
+set_property(TARGET ${PROJECT_NAME} PROPERTY POSITION_INDEPENDENT_CODE ON)
diff --git a/src/xrAICore/CMakeLists.txt b/src/xrAICore/CMakeLists.txt
@@ -26,4 +26,4 @@ add_definitions(-DXRAICORE_EXPORTS -DAI_COMPILER -D_SECURE_SCL=0)
 add_library(${PROJECT_NAME} SHARED ${${PROJECT_NAME}__SOURCES} ${${PROJECT_NAME}__INCLUDES})
 
 set_target_properties(${PROJECT_NAME} PROPERTIES PREFIX "")
-target_link_libraries(${PROJECT_NAME} xrCore xrAPI xrScriptEngine luabind luajit)
+target_link_libraries(${PROJECT_NAME} xrCore xrMiscMath xrAPI xrScriptEngine luabind luajit)
diff --git a/src/xrCDB/CMakeLists.txt b/src/xrCDB/CMakeLists.txt
@@ -1,8 +1,8 @@
 project(xrCDB)
 
 list(APPEND DIRS
-	"."
-	)
+    "."
+    )
 
 add_dir("${DIRS}")
 
@@ -11,4 +11,4 @@ include_directories(${CMAKE_CURRENT_SOURCE_DIR}/.. ${CMAKE_CURRENT_SOURCE_DIR}/.
 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)
+target_link_libraries(${PROJECT_NAME} xrCore xrMiscMath OPCODE xrAPI)
diff --git a/src/xrCore/CMakeLists.txt b/src/xrCore/CMakeLists.txt
@@ -31,4 +31,4 @@ set_target_properties(${PROJECT_NAME} PROPERTIES PREFIX "")
 #this is a temporary solution until find_package will not be fixed
 set(TBB_LIBRARIES tbb tbbmalloc_proxy tbbmalloc)
 
-target_link_libraries(${PROJECT_NAME} ${SDL_LIBRARIES} ${LZO_LIBRARY} crypto++ ${PUGIXML_LIBRARY} ${TBB_LIBRARIES})
+target_link_libraries(${PROJECT_NAME} xrMiscMath ${SDL_LIBRARIES} ${LZO_LIBRARY} ${CRYPTO++_LIBRARIES} ${PUGIXML_LIBRARY} ${TBB_LIBRARIES})
diff --git a/src/xrCore/_vector2.h b/src/xrCore/_vector2.h
@@ -2,6 +2,8 @@
 #ifndef __V2D__
 #define __V2D__
 #include "xrCommon/inlining_macros.h"
+#include "xrCore/math_constants.h"
+
 
 #ifdef min
 # undef min

diff --git a/src/xrEngine/CMakeLists.txt b/src/xrEngine/CMakeLists.txt
@@ -29,4 +29,4 @@ add_definitions(-DENGINE_BUILD)
 add_library(${PROJECT_NAME} SHARED ${${PROJECT_NAME}__SOURCES} ${${PROJECT_NAME}__INCLUDES})
 
 set_target_properties(${PROJECT_NAME} PROPERTIES PREFIX "")
-target_link_libraries(${PROJECT_NAME} xrCore luabind xrAPI xrSound xrScriptEngine luajit theora ${OGG_LIBRARIES} xrCDB xrPhysics freeimage openal lockfile ${SDL_LIBRARIES})
+target_link_libraries(${PROJECT_NAME} xrCore xrMiscMath luabind xrAPI xrSound xrScriptEngine luajit theora ${OGG_LIBRARIES} xrCDB xrPhysics freeimage openal lockfile ${SDL_LIBRARIES})
diff --git a/src/xrParticles/CMakeLists.txt b/src/xrParticles/CMakeLists.txt
@@ -1,15 +1,15 @@
 project(xrParticles)
 
 list(APPEND DIRS
-	"."
-	)
+    "."
+    )
 
 add_dir("${DIRS}")
 
 include_directories(
-	${CMAKE_CURRENT_SOURCE_DIR}/.. 
-	${CMAKE_CURRENT_SOURCE_DIR}/../../sdk/include
-	)
+    ${CMAKE_CURRENT_SOURCE_DIR}/..
+    ${CMAKE_CURRENT_SOURCE_DIR}/../../sdk/include
+    )
 
 #list(REMOVE_ITEM ${PROJECT_NAME}__SOURCES "${CMAKE_CURRENT_SOURCE_DIR}/./xr_cda.cpp")
 #list(REMOVE_ITEM ${PROJECT_NAME}__INCLUDES "${CMAKE_CURRENT_SOURCE_DIR}/./xr_cda.h")
@@ -18,4 +18,4 @@ add_definitions(-DXR_PARTICLES_EXPORTS)
 add_library(${PROJECT_NAME} SHARED ${${PROJECT_NAME}__SOURCES} ${${PROJECT_NAME}__INCLUDES})
 
 set_target_properties(${PROJECT_NAME} PROPERTIES PREFIX "")
-target_link_libraries(${PROJECT_NAME} xrCore)
+target_link_libraries(${PROJECT_NAME} xrCore xrMiscMath)
diff --git a/src/xrPhysics/CMakeLists.txt b/src/xrPhysics/CMakeLists.txt
@@ -1,19 +1,19 @@
 project(xrPhysics)
 
 list(APPEND DIRS
-	"."
-	"tri-colliderknoopc"
-	"dcylinder"
-	)
+    "."
+    "tri-colliderknoopc"
+    "dcylinder"
+    )
 
 add_dir("${DIRS}")
 
 include_directories(
-	${CMAKE_CURRENT_SOURCE_DIR}/.. 
-	${CMAKE_CURRENT_SOURCE_DIR}/../../Externals/ode/include
-	${CMAKE_CURRENT_SOURCE_DIR}/../../sdk/include
+    ${CMAKE_CURRENT_SOURCE_DIR}/..
+    ${CMAKE_CURRENT_SOURCE_DIR}/../../Externals/ode/include
+    ${CMAKE_CURRENT_SOURCE_DIR}/../../sdk/include
     /usr/include/SDL2
-	)
+    )
 
 list(REMOVE_ITEM ${PROJECT_NAME}__SOURCES "${CMAKE_CURRENT_SOURCE_DIR}/tri-colliderknoopc/dcTriListCollider.cpp")
 #list(REMOVE_ITEM ${PROJECT_NAME}__INCLUDES "${CMAKE_CURRENT_SOURCE_DIR}/./xr_cda.h")
@@ -22,4 +22,4 @@ add_definitions(-DXRPHYSICS_EXPORTS -DdSINGLE -D_SECURE_SCL=0)
 add_library(${PROJECT_NAME} SHARED ${${PROJECT_NAME}__SOURCES} ${${PROJECT_NAME}__INCLUDES})
 
 set_target_properties(${PROJECT_NAME} PROPERTIES PREFIX "")
-target_link_libraries(${PROJECT_NAME} xrCore ODE xrScriptEngine xrAPI xrCDB xrSound)
+target_link_libraries(${PROJECT_NAME} xrCore xrMiscMath ODE xrScriptEngine xrAPI xrCDB xrSound)
diff --git a/src/xrSound/CMakeLists.txt b/src/xrSound/CMakeLists.txt
@@ -25,4 +25,4 @@ add_definitions(-DXRSOUND_EXPORTS -DdSINGLE -D_SECURE_SCL=0)
 add_library(${PROJECT_NAME} SHARED ${${PROJECT_NAME}__SOURCES} ${${PROJECT_NAME}__INCLUDES})
 
 set_target_properties(${PROJECT_NAME} PROPERTIES PREFIX "")
-target_link_libraries(${PROJECT_NAME} xrCore xrAPI xrCDB ${OGG_LIBRARIES} openal vorbis vorbisfile)
+target_link_libraries(${PROJECT_NAME} xrCore xrMiscMath xrAPI xrCDB ${OGG_LIBRARIES} openal vorbis vorbisfile)