feat: Switch to the latest cpp-sc2 and adjust build routine

Signed-off-by: Alexander Kurbatov <[email protected]>
alkurbatov · Aug 6, 2022 · 08a295d · 08a295d
1 parent 23680d6
commit 08a295d
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 8 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -2,7 +2,7 @@
 #
 # Copyright (c) 2017-2022 Alexander Kurbatov
 
-cmake_minimum_required(VERSION 3.1)
+cmake_minimum_required(VERSION 3.15)
 
 project(Suvorov)
 
@@ -15,6 +15,9 @@ set(PROJECT_VERSION_PATCH 0)
 # Specify output directories.
 set(EXECUTABLE_OUTPUT_PATH "${PROJECT_BINARY_DIR}/bin")
 
+# Use statically linked runtime
+set(CMAKE_MSVC_RUNTIME_LIBRARY "MultiThreaded$<$<CONFIG:Debug>:Debug>")
+
 # Build with c++14 support, required by sc2api.
 set(CMAKE_CXX_STANDARD 14)
 

diff --git a/contrib/cpp-sc2 b/contrib/cpp-sc2
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
@@ -37,19 +37,17 @@ set(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} -DDEBUG")
 
 # Create the executable.
 add_executable(Suvorov ${BOT_SOURCES})
-target_link_libraries(Suvorov
-    sc2api sc2lib sc2utils sc2protocol civetweb libprotobuf
-)
+target_link_libraries(Suvorov PRIVATE cpp_sc2)
 
 if (MINGW)
-    target_link_libraries(Suvorov ssp)
+    target_link_libraries(Suvorov PRIVATE ssp)
 endif()
 
 if (APPLE)
-    target_link_libraries(Suvorov "-framework Carbon")
+    target_link_libraries(Suvorov PRIVATE "-framework Carbon")
 endif ()
 
 # Linux specific.
 if (UNIX AND NOT APPLE)
-    target_link_libraries(Suvorov pthread dl)
+    target_link_libraries(Suvorov PRIVATE pthread dl)
 endif ()
+9 −0		.github/workflows/publish_docs.yml
+4 −0		.gitignore
+0 −3		.gitmodules
+37 −1		CHANGELOG.md
+11 −48		CMakeLists.txt
+1 −1		CODE_OF_CONDUCT.md
+3 −3		README.md
+1 −1		contrib/civetweb
+0 −1		contrib/ipv6-parse
+4 −13		examples/CMakeLists.txt
+0 −187		include/sc2api/typeids/sc2_4.10.0_typeenums.h
+0 −187		include/sc2api/typeids/sc2_4.10.4_typeenums.h
+3,716 −0		include/sc2api/typeids/sc2_5.0.10_typeenums.h
+0 −199		include/sc2api/typeids/sc2_5.0.5_typeenums.h
+1 −1		protocol
+15 −112		src/CMakeLists.txt
+34 −0		src/sc2api/CMakeLists.txt
+0 −187		src/sc2api/typeids/sc2_4.10.0_typeenums.cpp
+0 −187		src/sc2api/typeids/sc2_4.10.4_typeenums.cpp
+3,699 −0		src/sc2api/typeids/sc2_5.0.10_typeenums.cpp
+0 −199		src/sc2api/typeids/sc2_5.0.5_typeenums.cpp
+11 −0		src/sc2lib/CMakeLists.txt
+40 −0		src/sc2protocol/CMakeLists.txt
+16 −0		src/sc2renderer/CMakeLists.txt
+15 −0		src/sc2utils/CMakeLists.txt