Skip to content

Commit fc132b6

Browse files
committed
xrLCUtil: add to Linux build
xrPhysics: remove forgoten debug from cmake
1 parent 6c6475a commit fc132b6

File tree

4 files changed

+25
-3
lines changed

4 files changed

+25
-3
lines changed

src/CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
#add_subdirectory(utils)
1+
add_subdirectory(utils)
22
add_subdirectory(Layers)
33
#add_subdirectory(xrMisc)
44
#add_subdirectory(xrAICore)

src/utils/CMakeLists.txt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
add_subdirectory(xrLCUtil)

src/utils/xrLCUtil/CMakeLists.txt

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,22 @@
1+
project(xrLCUtil)
2+
3+
list(APPEND DIRS
4+
"."
5+
)
6+
7+
add_dir("${DIRS}")
8+
9+
include_directories(
10+
${CMAKE_CURRENT_SOURCE_DIR}/../..
11+
${CMAKE_CURRENT_SOURCE_DIR}/../../sdk/include
12+
)
13+
14+
list(REMOVE_ITEM ${PROJECT_NAME}__SOURCES "${CMAKE_CURRENT_SOURCE_DIR}/./LevelCompilerLoggerWindow.cpp")
15+
list(REMOVE_ITEM ${PROJECT_NAME}__INCLUDES "${CMAKE_CURRENT_SOURCE_DIR}/./LevelCompilerLoggerWindow.hpp")
16+
list(REMOVE_ITEM ${PROJECT_NAME}__INCLUDES "${CMAKE_CURRENT_SOURCE_DIR}/./ILevelCompilerLogger.hpp")
17+
18+
add_definitions(-DXRLCUTIL_EXPORTS)
19+
add_library(${PROJECT_NAME} SHARED ${${PROJECT_NAME}__SOURCES} ${${PROJECT_NAME}__INCLUDES})
20+
21+
set_target_properties(${PROJECT_NAME} PROPERTIES PREFIX "")
22+
target_link_libraries(${PROJECT_NAME} xrCore)

src/xrPhysics/CMakeLists.txt

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,11 +13,10 @@ include_directories(
1313
${CMAKE_CURRENT_SOURCE_DIR}/../../Externals/ode/include
1414
${CMAKE_CURRENT_SOURCE_DIR}/../../sdk/include
1515
)
16-
message( "src list " ${${PROJECT_NAME}__SOURCES})
16+
1717
list(REMOVE_ITEM ${PROJECT_NAME}__SOURCES "${CMAKE_CURRENT_SOURCE_DIR}/tri-colliderKNoOPC/dcTriListCollider.cpp")
1818
#list(REMOVE_ITEM ${PROJECT_NAME}__INCLUDES "${CMAKE_CURRENT_SOURCE_DIR}/./xr_cda.h")
1919

20-
message( "src list after" ${${PROJECT_NAME}__SOURCES})
2120
add_definitions(-DXRPHYSICS_EXPORTS -DdSINGLE -D_SECURE_SCL=0)
2221
add_library(${PROJECT_NAME} SHARED ${${PROJECT_NAME}__SOURCES} ${${PROJECT_NAME}__INCLUDES})
2322

0 commit comments

Comments
 (0)