Skip to content

Commit bbf2b50

Browse files
committed
CMake: add Release/Debug swith, fixed luajit linking
1 parent 9d9b1e7 commit bbf2b50

File tree

4 files changed

+11
-4
lines changed

4 files changed

+11
-4
lines changed

CMakeLists.txt

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,12 +19,19 @@ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fpermissive --std=c++17")
1919

2020
if(NOT CMAKE_BUILD_TYPE)
2121
set(CMAKE_BUILD_TYPE "Release" CACHE STRING "" FORCE)
22+
set(LUA_LIBRARIES luajit)
23+
elseif(${CMAKE_BUILD_TYPE} STREQUAL "RELWITHDEBINFO")
24+
set(LUA_LIBRARIES luajit)
25+
else()
26+
set(LUA_LIBRARIES luajit-debug)
2227
endif()
2328

29+
message("CMake build ${CMAKE_BUILD_TYPE}")
30+
2431
add_definitions(-D_MT -D_CPPUNWIND -DPURE_DYNAMIC_CAST -DDECLARE_SPECIALIZATION -DM_NOSTDCONTAINERS_EXT -DUSE_OGL)
2532

2633
set(LUA_INCLUDE_DIR Externals/LuaJIT/src)
27-
set(LUA_LIBRARIES luajit)
34+
2835
set(LUA_FOUND 1)
2936
if (NOT WIN32)
3037
find_package(Crypto++ REQUIRED)

src/xrAICore/CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,4 +26,4 @@ add_definitions(-DXRAICORE_EXPORTS -DAI_COMPILER -D_SECURE_SCL=0)
2626
add_library(${PROJECT_NAME} SHARED ${${PROJECT_NAME}__SOURCES} ${${PROJECT_NAME}__INCLUDES})
2727

2828
set_target_properties(${PROJECT_NAME} PROPERTIES PREFIX "")
29-
target_link_libraries(${PROJECT_NAME} xrCore xrMiscMath xrAPI xrScriptEngine luabind luajit)
29+
target_link_libraries(${PROJECT_NAME} xrCore xrMiscMath xrAPI xrScriptEngine luabind ${LUA_LIBRARIES})

src/xrEngine/CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,4 +29,4 @@ add_definitions(-DENGINE_BUILD)
2929
add_library(${PROJECT_NAME} SHARED ${${PROJECT_NAME}__SOURCES} ${${PROJECT_NAME}__INCLUDES})
3030

3131
set_target_properties(${PROJECT_NAME} PROPERTIES PREFIX "")
32-
target_link_libraries(${PROJECT_NAME} xrCore xrMiscMath luabind xrAPI xrSound xrScriptEngine luajit theora ${OGG_LIBRARIES} xrCDB xrPhysics freeimage openal lockfile ${SDL_LIBRARIES})
32+
target_link_libraries(${PROJECT_NAME} xrCore xrMiscMath luabind xrAPI xrSound xrScriptEngine ${LUA_LIBRARIES} theora ${OGG_LIBRARIES} xrCDB xrPhysics freeimage openal lockfile ${SDL_LIBRARIES})

src/xrScriptEngine/CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,4 +12,4 @@ include_directories(${CMAKE_CURRENT_SOURCE_DIR}/.. ${CMAKE_CURRENT_SOURCE_DIR}/.
1212
add_library(${PROJECT_NAME} SHARED ${${PROJECT_NAME}__SOURCES} ${${PROJECT_NAME}__INCLUDES})
1313

1414
set_target_properties(${PROJECT_NAME} PROPERTIES PREFIX "")
15-
target_link_libraries(${PROJECT_NAME} xrAPI xrCore luabind luajit)
15+
target_link_libraries(${PROJECT_NAME} xrAPI xrCore luabind ${LUA_LIBRARIES})

0 commit comments

Comments
 (0)