mirror of
https://github.com/thepigeongenerator/mcaselector-lite.git
synced 2025-12-18 09:45:45 +01:00
Compare commits
7 Commits
1140bd97bf
...
f5450232b4
| Author | SHA1 | Date | |
|---|---|---|---|
| f5450232b4 | |||
| 9f7d1fb57c | |||
| 2186ec2942 | |||
| 1ac4592503 | |||
| 4da02373a5 | |||
| c724ff0449 | |||
| 348c4e484c |
6
.github/workflows/ci.yaml
vendored
6
.github/workflows/ci.yaml
vendored
@@ -6,6 +6,7 @@ on:
|
||||
jobs:
|
||||
compile-and-test:
|
||||
strategy:
|
||||
fail-fast: false # disable fail fast, so feedback is provided for all matrix combinations
|
||||
matrix:
|
||||
os:
|
||||
- ubuntu-latest
|
||||
@@ -17,7 +18,6 @@ jobs:
|
||||
steps:
|
||||
- uses: actions/checkout@v5
|
||||
with:
|
||||
repository: ${{github.repository}}
|
||||
submodules: true
|
||||
fetch-depth: 1
|
||||
|
||||
@@ -25,13 +25,13 @@ jobs:
|
||||
if: runner.os == 'Linux'
|
||||
run: |
|
||||
sudo apt update
|
||||
sudo apt install -y libwayland-dev libxkbcommon-dev xorg-dev
|
||||
sudo apt install -y libwayland-dev libxkbcommon-dev xorg-dev cmake
|
||||
|
||||
- uses: actions/cache@v4
|
||||
with:
|
||||
path: lib/obj/
|
||||
key: ${{runner.os}}-lib/obj-${{github.sha}}
|
||||
restore-keys: ${{runner.os}}-lib/obj-
|
||||
- run: make -j libs
|
||||
- run: make -j libs -B
|
||||
- run: make -j all
|
||||
- run: make -j test
|
||||
|
||||
6
Makefile
6
Makefile
@@ -24,7 +24,7 @@ LDFLAGS += -fsanitize=address -ftrapv
|
||||
endif
|
||||
CPPFLAGS += -Iinclude -Ilib/glad/include -Ilib/glfw/include -Ilib/libarchive/libarchive
|
||||
LDFLAGS += -Llib/obj/glfw/src -Llib/obj/libarchive/libarchive
|
||||
LDLIBS += -lm -lglfw3 -larchive
|
||||
LDLIBS += -lglfw3 -larchive -lm
|
||||
|
||||
# detect if we're compiling on Windows, meaning
|
||||
# a lot of things considered "standard" are unavailable.
|
||||
@@ -52,7 +52,7 @@ clean:
|
||||
@[ -d bin/ ] && rm -vr bin/ || true
|
||||
@[ -d obj/ ] && rm -vr obj/ || true
|
||||
clean-libs:
|
||||
@[ -d lib/obj/ ] && rm -vr lib/obj/
|
||||
@[ -d lib/obj/ ] && rm -vr lib/obj/ || true
|
||||
|
||||
|
||||
# compiles the libraries using cmake
|
||||
@@ -67,7 +67,7 @@ bin/$(NAME): $(OBJ)
|
||||
@$(CC) -o $@ $^ $(LDFLAGS) $(LDLIBS)
|
||||
|
||||
# link together a testing binary
|
||||
bin/TEST_$(NAME): $(TOBJ) $(filter-out main.o,$(OBJ))
|
||||
bin/TEST_$(NAME): $(TOBJ) $(filter-out obj/src/main.o,$(OBJ))
|
||||
$(info [CC/LD] $@)
|
||||
@mkdir -p $(@D)
|
||||
@$(CC) -o $@ $^ $(LDFLAGS) $(LDLIBS)
|
||||
|
||||
Reference in New Issue
Block a user