Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update CMake, Submodule, Readme #1

Closed
wants to merge 2 commits into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 6 additions & 1 deletion CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -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$<$<CONFIG:Debug>:Debug>")

# Specify output directories.
set(EXECUTABLE_OUTPUT_PATH "${PROJECT_BINARY_DIR}/bin")

Expand Down
10 changes: 9 additions & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand All @@ -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)
Expand Down
2 changes: 1 addition & 1 deletion cpp-sc2
Submodule cpp-sc2 updated 56 files
+3 −4 .github/workflows/ci.yml
+40 −0 .github/workflows/publish_docs.yml
+4 −0 .gitignore
+3 −6 .gitmodules
+0 −27 .travis.yml
+0 −27 .travis/build.sh
+0 −18 .travis/install.sh
+0 −18 .travis/publish.sh
+151 −0 CHANGELOG.md
+59 −117 CMakeLists.txt
+1 −1 CODE_OF_CONDUCT.md
+1 −1 CREDITS
+5 −6 README.md
+8 −0 cmake/assets/protos.cmake
+19 −0 cmake/toolchain/x86-64-w64-mingw32.cmake
+0 −1 contrib/SDL-mirror
+0 −1 contrib/civetweb
+0 −1 contrib/ipv6-parse
+0 −1 contrib/protobuf
+74 −6 docs/building.md
+21 −31 examples/CMakeLists.txt
+1 −1 include/sc2api/sc2_client.h
+7 −7 include/sc2api/sc2_common.h
+34 −2 include/sc2api/sc2_interfaces.h
+3 −0 include/sc2api/sc2_unit.h
+0 −186 include/sc2api/typeids/sc2_4.10.0_typeenums.h
+0 −186 include/sc2api/typeids/sc2_4.10.4_typeenums.h
+3,717 −0 include/sc2api/typeids/sc2_5.0.10_typeenums.h
+0 −198 include/sc2api/typeids/sc2_5.0.5_typeenums.h
+1 −1 include/sc2utils/sc2_property_reader.h
+0 −1 protocol
+11 −114 src/CMakeLists.txt
+38 −0 src/sc2api/CMakeLists.txt
+86 −34 src/sc2api/sc2_agent.cc
+36 −26 src/sc2api/sc2_args.cc
+10 −5 src/sc2api/sc2_client.cc
+3 −1 src/sc2api/sc2_connection.cc
+10 −0 src/sc2api/sc2_unit.cc
+1 −0 src/sc2api/sc2_unit_filters.cc
+0 −186 src/sc2api/typeids/sc2_4.10.0_typeenums.cpp
+0 −186 src/sc2api/typeids/sc2_4.10.4_typeenums.cpp
+3,700 −0 src/sc2api/typeids/sc2_5.0.10_typeenums.cpp
+0 −198 src/sc2api/typeids/sc2_5.0.5_typeenums.cpp
+11 −0 src/sc2lib/CMakeLists.txt
+65 −0 src/sc2protocol/CMakeLists.txt
+14 −0 src/sc2renderer/CMakeLists.txt
+17 −0 src/sc2utils/CMakeLists.txt
+0 −4 src/sc2utils/sc2_property_reader.cc
+22 −13 tests/CMakeLists.txt
+97 −6 tests/test_unit_command.cc
+0 −9 tests/test_unit_command_common.cc
+1 −2 tests/test_unit_command_common.h
+20 −0 thirdparty/cmake/SDL.cmake
+22 −0 thirdparty/cmake/civetweb.cmake
+31 −0 thirdparty/cmake/protobuf.cmake
+8 −0 thirdparty/cmake/sc2protocol.cmake
Loading