Compare commits

..

2 Commits

2 changed files with 10 additions and 9 deletions

View File

@@ -17,8 +17,8 @@ jobs:
cc: gcc cc: gcc
- os: windows-11-arm - os: windows-11-arm
cc: gcc cc: gcc
- os: macos-latest # - os: macos-latest
cc: cc # cc: cc
env: env:
CC: ${{matrix.cc}} CC: ${{matrix.cc}}
runs-on: ${{matrix.os}} runs-on: ${{matrix.os}}
@@ -47,10 +47,10 @@ jobs:
key: ${{runner.os}}_${{runner.arch}}-lib/obj-${{steps.get-hash.outputs.HASH}} key: ${{runner.os}}_${{runner.arch}}-lib/obj-${{steps.get-hash.outputs.HASH}}
restore-keys: ${{runner.os}}_${{runner.arch}}-lib/obj- restore-keys: ${{runner.os}}_${{runner.arch}}-lib/obj-
# - run: make -Bj libs - run: make -Bj libs
# if: steps.cache-deps.outputs.cache-hit != 'true' && runner.os != 'Windows' if: steps.cache-deps.outputs.cache-hit != 'true' && runner.os != 'Windows'
# - run: make -Bj2 libs # compile fewer cores, to save memory. - run: make -Bj2 libs # compile fewer cores, to save memory.
# if: steps.cache-deps.outputs.cache-hit != 'true' && runner.os == 'Windows' if: steps.cache-deps.outputs.cache-hit != 'true' && runner.os == 'Windows'
#
# - run: make -j all - run: make -j all
# - run: make -j test - run: make -j test

View File

@@ -32,6 +32,7 @@ LDLIBS += -lglfw3 -larchive -lm
ifeq ($(OS),Windows_NT) ifeq ($(OS),Windows_NT)
ISWIN = 1 ISWIN = 1
NAME := $(NAME).exe NAME := $(NAME).exe
LDLIBS += -lopengl32 -lgdi32
$(warning Detected Windows_NT, please refer to the documentation if you encounter issues.) $(warning Detected Windows_NT, please refer to the documentation if you encounter issues.)
else ifeq ($(shell uname -s),Darwin) else ifeq ($(shell uname -s),Darwin)
LDLIBS += -framework Cocoa -framework OpenGL -framework IOKit LDLIBS += -framework Cocoa -framework OpenGL -framework IOKit