diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index a475934..92ac9f2 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -28,6 +28,11 @@ jobs: with: submodules: recursive + - uses: ilammy/msvc-dev-cmd@v1 + if: runner.os == 'Windows' + with: + arch: x64 + - name: install linux dependencies if: runner.os == 'Linux' run: | @@ -35,7 +40,7 @@ jobs: sudo apt install libasound2-dev libxinerama-dev libx11-dev libxext-dev libfreetype6-dev libwebkit2gtk-4.1-dev libglu1-mesa-dev xvfb ninja-build - name: configure - run: cmake -B build . + run: cmake --preset default - name: build - run: cmake --build build + run: cmake --build __build --config Release diff --git a/.gitignore b/.gitignore index cb15c5e..dfb4b58 100644 --- a/.gitignore +++ b/.gitignore @@ -5,4 +5,7 @@ Thumbs.db # IDE's .idea/* cmake-build-*/* -*.user \ No newline at end of file +*.user + +# CMake +__build diff --git a/CMakeLists.txt b/CMakeLists.txt index adb02e1..5fe964e 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,4 +1,4 @@ -cmake_minimum_required(VERSION 3.15) +cmake_minimum_required(VERSION 3.31) set(CMAKE_CXX_STANDARD 17) set(CMAKE_CXX_STANDARD_REQUIRED ON) set(CMAKE_OSX_ARCHITECTURES "arm64;x86_64") diff --git a/CMakePresets.json b/CMakePresets.json new file mode 100644 index 0000000..03a68fd --- /dev/null +++ b/CMakePresets.json @@ -0,0 +1,22 @@ +{ + "version": 3, + "configurePresets": [ + { + "name": "default", + "generator": "Ninja Multi-Config", + "binaryDir": "${sourceDir}/__build" + } + ], + "buildPresets": [ + { + "name": "release", + "configurePreset": "default", + "configuration": "Release" + }, + { + "name": "debug", + "configurePreset": "default", + "configuration": "Debug" + } + ] +} diff --git a/README.md b/README.md index d2de836..0b5ba0d 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,6 @@ ## Eq