Skip to content

Commit

Permalink
Update.
Browse files Browse the repository at this point in the history
  • Loading branch information
Chukobyte committed Mar 23, 2024
1 parent 9fe9b98 commit 285f23c
Show file tree
Hide file tree
Showing 2 changed files with 14 additions and 11 deletions.
21 changes: 12 additions & 9 deletions .github/workflows/test-windows-mingw-build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,17 +14,20 @@ jobs:
with:
install: gcc make

- name: install dependencies
shell: msys2 {0}
run: |
(echo ""; echo "y") | pacman -S mingw-w64-x86_64-toolchain
echo "y" | pacman -S mingw-w64-x86_64-cmake
- name: get cmake
uses: lukka/get-cmake@latest
with:
useLocalCache: true
useCloudCache: false
cmakeVersion: "3.27.0"

- name: run build
shell: msys2 {0}
run: |
cmake -G "MinGW Makefiles" . -DIS_CI_BUILD="true"
cmake --build .
uses: lukka/[email protected]
with:
cmakeListsTxtPath: '${{ github.workspace }}/CMakeLists.txt'
configurePreset: 'ninja-multi-vcpkg'
configurePresetAdditionalArgs: "['-DIS_CI_BUILD=true']"
buildPreset: 'ninja-multi-vcpkg'

- name: run unit tests
shell: msys2 {0}
Expand Down
4 changes: 2 additions & 2 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -82,10 +82,10 @@ elseif (WIN32)
target_link_libraries(${PROJECT_NAME} PUBLIC cglm glad stb_image -lmingw32 -static-libgcc SDL3::SDL3-static freetype -lws2_32)
elseif (APPLE)
# target_link_libraries(${PROJECT_NAME} PUBLIC glad stb_image zip -Xlinker SDL2::SDL2main SDL2::SDL2 freetype m)
target_link_libraries(${PROJECT_NAME} PUBLIC glad stb_image -Xlinker SDL3::SDL3-static freetype m)
target_link_libraries(${PROJECT_NAME} PUBLIC cglm glad stb_image -Xlinker SDL3::SDL3-static freetype m)
else ()
# target_link_libraries(${PROJECT_NAME} PUBLIC glad stb_image zip -static-libgcc -Xlinker -export-dynamic SDL2::SDL2main SDL2::SDL2 freetype m)
target_link_libraries(${PROJECT_NAME} PUBLIC glad stb_image -static-libgcc -Xlinker -export-dynamic SDL3::SDL3-static freetype m)
target_link_libraries(${PROJECT_NAME} PUBLIC cglm glad stb_image -static-libgcc -Xlinker -export-dynamic SDL3::SDL3-static freetype m)
endif ()

target_compile_options(${PROJECT_NAME} PUBLIC ${flags})
Expand Down

0 comments on commit 285f23c

Please sign in to comment.