Compare commits
No commits in common. "e172e3356d5c8b0b4c9214c482ba33691767e02c" and "0ce03f5395c2e6605edaca26f4e80c8a9c832f38" have entirely different histories.
e172e3356d
...
0ce03f5395
2 changed files with 6 additions and 6 deletions
|
@ -25,8 +25,8 @@ set(BUILD_STATIC ON CACHE BOOL "" FORCE)
|
||||||
set(BUILD_STATIC_PIC ON CACHE BOOL "" FORCE)
|
set(BUILD_STATIC_PIC ON CACHE BOOL "" FORCE)
|
||||||
set(BUILD_STATIC_UNIQUE_GLOBALS OFF CACHE BOOL "" FORCE)
|
set(BUILD_STATIC_UNIQUE_GLOBALS OFF CACHE BOOL "" FORCE)
|
||||||
|
|
||||||
set(WITH_INTERCONNECT OFF CACHE BOOL "" FORCE)
|
set(WITH_INTERCONNECT ON CACHE BOOL "" FORCE)
|
||||||
set(WITH_PLUGINMANAGER OFF CACHE BOOL "" FORCE)
|
set(WITH_PLUGINMANAGER ON CACHE BOOL "" FORCE)
|
||||||
set(WITH_TESTSUITE OFF CACHE BOOL "" FORCE)
|
set(WITH_TESTSUITE OFF CACHE BOOL "" FORCE)
|
||||||
set(WITH_MAIN ON CACHE BOOL "" FORCE)
|
set(WITH_MAIN ON CACHE BOOL "" FORCE)
|
||||||
add_subdirectory(third-party/corrade EXCLUDE_FROM_ALL)
|
add_subdirectory(third-party/corrade EXCLUDE_FROM_ALL)
|
||||||
|
@ -56,7 +56,6 @@ set(WITH_GL ON CACHE BOOL "" FORCE)
|
||||||
set(WITH_MESHTOOLS OFF CACHE BOOL "" FORCE)
|
set(WITH_MESHTOOLS OFF CACHE BOOL "" FORCE)
|
||||||
set(WITH_PRIMITIVES OFF CACHE BOOL "" FORCE)
|
set(WITH_PRIMITIVES OFF CACHE BOOL "" FORCE)
|
||||||
set(WITH_SCENEGRAPH OFF CACHE BOOL "" FORCE)
|
set(WITH_SCENEGRAPH OFF CACHE BOOL "" FORCE)
|
||||||
set(WITH_SCENETOOLS OFF CACHE BOOL "" FORCE)
|
|
||||||
set(WITH_SHADERS ON CACHE BOOL "" FORCE)
|
set(WITH_SHADERS ON CACHE BOOL "" FORCE)
|
||||||
set(WITH_SHADERTOOLS OFF CACHE BOOL "" FORCE)
|
set(WITH_SHADERTOOLS OFF CACHE BOOL "" FORCE)
|
||||||
set(WITH_TEXT OFF CACHE BOOL "" FORCE)
|
set(WITH_TEXT OFF CACHE BOOL "" FORCE)
|
||||||
|
|
|
@ -18,9 +18,9 @@ set(CMAKE_CXX_STANDARD 14)
|
||||||
set(CMAKE_CXX_STANDARD_REQUIRED ON)
|
set(CMAKE_CXX_STANDARD_REQUIRED ON)
|
||||||
set(CMAKE_CXX_EXTENSIONS OFF)
|
set(CMAKE_CXX_EXTENSIONS OFF)
|
||||||
|
|
||||||
set(SAVETOOL_PROJECT_VERSION 1.4.0-pre)
|
set(SAVETOOL_PROJECT_VERSION 1.3.2)
|
||||||
|
|
||||||
find_package(Corrade REQUIRED Main Containers Utility)
|
find_package(Corrade REQUIRED Main Containers Utility Interconnect)
|
||||||
find_package(Magnum REQUIRED GL Sdl2Application)
|
find_package(Magnum REQUIRED GL Sdl2Application)
|
||||||
find_package(MagnumIntegration REQUIRED ImGui)
|
find_package(MagnumIntegration REQUIRED ImGui)
|
||||||
|
|
||||||
|
@ -170,7 +170,7 @@ if(CMAKE_BUILD_TYPE STREQUAL Debug)
|
||||||
add_compile_definitions(SAVETOOL_DEBUG_BUILD)
|
add_compile_definitions(SAVETOOL_DEBUG_BUILD)
|
||||||
endif()
|
endif()
|
||||||
add_compile_definitions(SAVETOOL_VERSION="${SAVETOOL_PROJECT_VERSION}"
|
add_compile_definitions(SAVETOOL_VERSION="${SAVETOOL_PROJECT_VERSION}"
|
||||||
SAVETOOL_CODENAME="Enigmatic Ellenier"
|
SAVETOOL_CODENAME="Dickish Cyclops"
|
||||||
SUPPORTED_GAME_VERSION="0.8.6")
|
SUPPORTED_GAME_VERSION="0.8.6")
|
||||||
|
|
||||||
if(CMAKE_BUILD_TYPE STREQUAL Release)
|
if(CMAKE_BUILD_TYPE STREQUAL Release)
|
||||||
|
@ -186,6 +186,7 @@ endif()
|
||||||
target_link_libraries(MassBuilderSaveTool PRIVATE
|
target_link_libraries(MassBuilderSaveTool PRIVATE
|
||||||
Corrade::Containers
|
Corrade::Containers
|
||||||
Corrade::Utility
|
Corrade::Utility
|
||||||
|
Corrade::Interconnect
|
||||||
Corrade::Main
|
Corrade::Main
|
||||||
Magnum::Magnum
|
Magnum::Magnum
|
||||||
Magnum::GL
|
Magnum::GL
|
||||||
|
|
Loading…
Reference in a new issue