From fc132b66e0ea244315a69e5d46b193f3c2682f75 Mon Sep 17 00:00:00 2001 From: Ilya Orlov Date: Wed, 6 Jun 2018 10:28:36 +0300 Subject: [PATCH] xrLCUtil: add to Linux build xrPhysics: remove forgoten debug from cmake --- src/CMakeLists.txt | 2 +- src/utils/CMakeLists.txt | 1 + src/utils/xrLCUtil/CMakeLists.txt | 22 ++++++++++++++++++++++ src/xrPhysics/CMakeLists.txt | 3 +-- 4 files changed, 25 insertions(+), 3 deletions(-) create mode 100644 src/utils/CMakeLists.txt create mode 100644 src/utils/xrLCUtil/CMakeLists.txt diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 213270f2319..b85b66b59e7 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -1,4 +1,4 @@ -#add_subdirectory(utils) +add_subdirectory(utils) add_subdirectory(Layers) #add_subdirectory(xrMisc) #add_subdirectory(xrAICore) diff --git a/src/utils/CMakeLists.txt b/src/utils/CMakeLists.txt new file mode 100644 index 00000000000..4c499dd781a --- /dev/null +++ b/src/utils/CMakeLists.txt @@ -0,0 +1 @@ +add_subdirectory(xrLCUtil) diff --git a/src/utils/xrLCUtil/CMakeLists.txt b/src/utils/xrLCUtil/CMakeLists.txt new file mode 100644 index 00000000000..59282333d15 --- /dev/null +++ b/src/utils/xrLCUtil/CMakeLists.txt @@ -0,0 +1,22 @@ +project(xrLCUtil) + +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") +list(REMOVE_ITEM ${PROJECT_NAME}__INCLUDES "${CMAKE_CURRENT_SOURCE_DIR}/./LevelCompilerLoggerWindow.hpp") +list(REMOVE_ITEM ${PROJECT_NAME}__INCLUDES "${CMAKE_CURRENT_SOURCE_DIR}/./ILevelCompilerLogger.hpp") + +add_definitions(-DXRLCUTIL_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) diff --git a/src/xrPhysics/CMakeLists.txt b/src/xrPhysics/CMakeLists.txt index 1a362384151..70b2f20136a 100644 --- a/src/xrPhysics/CMakeLists.txt +++ b/src/xrPhysics/CMakeLists.txt @@ -13,11 +13,10 @@ include_directories( ${CMAKE_CURRENT_SOURCE_DIR}/../../Externals/ode/include ${CMAKE_CURRENT_SOURCE_DIR}/../../sdk/include ) -message( "src list " ${${PROJECT_NAME}__SOURCES}) + 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") -message( "src list after" ${${PROJECT_NAME}__SOURCES}) add_definitions(-DXRPHYSICS_EXPORTS -DdSINGLE -D_SECURE_SCL=0) add_library(${PROJECT_NAME} SHARED ${${PROJECT_NAME}__SOURCES} ${${PROJECT_NAME}__INCLUDES})