From 21750e4412d29686e12b5325aee4739d397def97 Mon Sep 17 00:00:00 2001 From: Nicholas Rader Date: Thu, 28 Sep 2023 23:20:00 -0600 Subject: [PATCH 1/2] Update cpp-sc2 module hash, update CMake msvc option --- CMakeLists.txt | 7 ++++++- cpp-sc2 | 2 +- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 1428be3..ad4c448 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,7 +1,12 @@ -cmake_minimum_required(VERSION 3.1) +cmake_minimum_required(VERSION 3.15) + +# https://cmake.org/cmake/help/latest/variable/CMAKE_MSVC_RUNTIME_LIBRARY.html +cmake_policy(SET CMP0091 NEW) project(CommandCenter) +set(CMAKE_MSVC_RUNTIME_LIBRARY "MultiThreaded$<$:Debug>") + # Specify output directories. set(EXECUTABLE_OUTPUT_PATH "${PROJECT_BINARY_DIR}/bin") diff --git a/cpp-sc2 b/cpp-sc2 index c295c56..c0f1518 160000 --- a/cpp-sc2 +++ b/cpp-sc2 @@ -1 +1 @@ -Subproject commit c295c562ecdd3bbd773b53d7311116c6e34c3cf5 +Subproject commit c0f15187e9317e0410eb15aca279844aaced81ad From c99995f2cd56fcd68a4fd0c15f19145bf6e68c91 Mon Sep 17 00:00:00 2001 From: Nicholas Rader Date: Fri, 29 Sep 2023 00:14:35 -0600 Subject: [PATCH 2/2] Update instructions for building Visual Studio --- README.md | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index 04f3103..695bc89 100644 --- a/README.md +++ b/README.md @@ -55,6 +55,8 @@ $ mkdir build $ cd build :: Create Visual Studio project files. +:: For Visual Studio 2022. +$ cmake ../ -G "Visual Studio 17 2022" :: For Visual Studio 2019. $ cmake ../ -G "Visual Studio 16 2019" :: For Visual Studio 2017. @@ -64,9 +66,15 @@ $ cmake ../ -G "Visual Studio 15 2017 Win64" :: The binary "CommandCenter_API.exe" should appear in the build/bin/ directory $ start CommandCenter.sln +:: Enter Debug or Release directory, based on what you built in Visual Studio. +:: $commandcenter\build> +$ cd bin\Release +or +$ cd bin\Debug + :: Launch the bot with the specified path to a SC2 map. :: Warning: The CommandCenter/bin/BotConfig.txt file must be in the same directory as the .exe to run properly -$ bin\Debug\CommandCenter.exe Ladder2019Season3/AcropolisLE.SC2Map +$ CommandCenter.exe Ladder2019Season3/AcropolisLE.SC2Map ``` # Developer Install / Compile Instructions (Linux and OS X)