diff --git a/.github/workflows/check-build.yaml b/.github/workflows/check-build.yaml index e8d1e29..cd2f55a 100644 --- a/.github/workflows/check-build.yaml +++ b/.github/workflows/check-build.yaml @@ -45,20 +45,4 @@ jobs: uses: actions/upload-artifact@v2 with: name: laika-demo-binaries-windows - path: bin - - macOS-build: - runs-on: macos-latest - steps: - - uses: actions/checkout@v2 - with: - submodules: recursive - - name: Create CMake build files - run: cmake -B build - - name: Check compilation - run: cmake --build build - - name: Upload build artifact - uses: actions/upload-artifact@v2 - with: - name: laika-demo-binaries-macos path: bin \ No newline at end of file diff --git a/CMakeLists.txt b/CMakeLists.txt index 32be7d3..6caa4f0 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -5,7 +5,7 @@ set(CMAKE_C_STANDARD 11) set(CMAKE_C_STANDARD_REQUIRED ON) # Set the project as the default startup project for VS -set_property(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} PROPERTY VS_STARTUP_PROJECT Laika) +set_property(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} PROPERTY VS_STARTUP_PROJECT LaikaLib) # include our cmake modules set(CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}/cmake-modules" ${CMAKE_MODULE_PATH}) @@ -42,10 +42,8 @@ add_subdirectory(lib) add_subdirectory(tools) # these subprojects don't support windows (sorry) -if(NOT WIN32) +if(NOT WIN32 AND (UNIX AND NOT APPLE)) + add_subdirectory(bot) # windows support Soon:tm: add_subdirectory(cnc) add_subdirectory(shell) - if(NOT APPLE) - add_subdirectory(bot) # windows support Soon:tm: - endif() endif()