Skip to content

Commit

Permalink
xrLCUtil: add to Linux build
Browse files Browse the repository at this point in the history
xrPhysics: remove forgoten debug from cmake
  • Loading branch information
eagleivg committed Jun 6, 2018
1 parent 6c6475a commit fc132b6
Show file tree
Hide file tree
Showing 4 changed files with 25 additions and 3 deletions.
2 changes: 1 addition & 1 deletion src/CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#add_subdirectory(utils)
add_subdirectory(utils)
add_subdirectory(Layers)
#add_subdirectory(xrMisc)
#add_subdirectory(xrAICore)
Expand Down
1 change: 1 addition & 0 deletions src/utils/CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
add_subdirectory(xrLCUtil)
22 changes: 22 additions & 0 deletions src/utils/xrLCUtil/CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -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)
3 changes: 1 addition & 2 deletions src/xrPhysics/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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})

Expand Down

0 comments on commit fc132b6

Please sign in to comment.