Skip to content
Open
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
9 changes: 3 additions & 6 deletions .github/workflows/build-game.yml
Original file line number Diff line number Diff line change
Expand Up @@ -56,8 +56,7 @@ jobs:
echo "tools.system.package_manager:mode = install" > ~/.conan2/global.conf
echo "tools.system.package_manager:sudo = True" >> ~/.conan2/global.conf
conan remote add rigs-of-rods-deps https://conan.cloudsmith.io/rigs-of-rods/deps/ -f
conan install . -s build_type=Release -b missing -pr:b=default -c tools.cmake.cmaketoolchain:generator="Ninja" -of build
cmake --preset conan-release -DBUILD_MASTER_SERVER=ON
cmake . -GNinja -DCMAKE_BUILD_TYPE=Release -Bbuild -DCMAKE_PROJECT_TOP_LEVEL_INCLUDES=CMake/conan_provider.cmake -DBUILD_MASTER_SERVER=ON
shell: bash

- name: Build
Expand Down Expand Up @@ -94,13 +93,12 @@ jobs:
path: ~/.conan2

- name: Enable Developer Command Prompt
uses: ilammy/msvc-dev-cmd@v1.12.1
uses: ilammy/msvc-dev-cmd@v1

- name: Configure
run: |
conan remote add rigs-of-rods-deps https://conan.cloudsmith.io/rigs-of-rods/deps/ -f
conan install . -b missing -pr:b=tools/conan-profiles/vs-19-release-ninja -pr=tools/conan-profiles/vs-19-release-ninja -of build
cmake --preset conan-release -DCMAKE_INSTALL_PREFIX=redist -DCREATE_CONTENT_FOLDER=ON
cmake . -GNinja -DCMAKE_BUILD_TYPE=Release -Bbuild -DCMAKE_PROJECT_TOP_LEVEL_INCLUDES=cmake/conan_provider.cmake -DCMAKE_INSTALL_PREFIX=redist -DCREATE_CONTENT_FOLDER=ON
shell: cmd

- name: Build
Expand All @@ -115,7 +113,6 @@ jobs:
name: Windows
path: bin/Release/


- name: Clean Conan pkgs
run: conan cache clean "*" -sbd
shell: cmd
1 change: 0 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
syntax: glob
# build
CMake*
.cache
bin/*
build*/*
Expand Down
1 change: 0 additions & 1 deletion CMake/FixupBundle.cmake
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
include(BundleUtilities)
include(${BIN_DIR}/cmake/ConanBinDirs.cmake)

if (APPLE)
set(PLUGIN_EXTENSION "dylib")
Expand Down
Loading