mirror-games/dca3-game
1
0
Fork 0
mirror of https://gitlab.com/skmp/dca3-game.git synced 2025-09-01 10:42:34 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity

build and CI fixes

Browse Source
This commit is contained in:
Stefanos Kornilios Mitsis Poiitidis
2025-03-09 13:58:55 +02:00
parent 3a3beda8e4
commit e616d3cd33
2 changed files with 16 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
.gitlab-ci.yml
View File

@@ -149,9 +149,8 @@ build-sim-liberty:
- $CCACHE_DIR
stage: build
before_script:
- dpkg --add-architecture i386
- apt update
- apt install -y build-essential gcc g++ gcc-multilib g++-multilib libx11-dev:i386 ccache
- apt install -y build-essential gcc g++ libx11-dev ccache
- update-ccache-symlinks
script:
- export PATH="/usr/lib/ccache:$PATH"
@@ -171,9 +170,8 @@ build-sim-liberty-clang:
- $CCACHE_DIR
stage: build
before_script:
- dpkg --add-architecture i386
- apt update
- apt install -y build-essential gcc g++ gcc-multilib g++-multilib libx11-dev:i386 clang ccache
- apt install -y build-essential gcc g++ libx11-dev clang ccache
- update-ccache-symlinks
script:
- export PATH="/usr/lib/ccache:$PATH"
@@ -193,9 +191,8 @@ build-sim-miami:
- $CCACHE_DIR
stage: build
before_script:
- dpkg --add-architecture i386
- apt update
- apt install -y build-essential gcc g++ gcc-multilib g++-multilib libx11-dev:i386 ccache
- apt install -y build-essential gcc g++ libx11-dev ccache
- update-ccache-symlinks
script:
- export PATH="/usr/lib/ccache:$PATH"
@@ -215,9 +212,8 @@ build-sim-miami-clang:
- $CCACHE_DIR
stage: build
before_script:
- dpkg --add-architecture i386
- apt update
- apt install -y build-essential gcc g++ gcc-multilib g++-multilib libx11-dev:i386 clang ccache
- apt install -y build-essential gcc g++ libx11-dev clang ccache
- update-ccache-symlinks
script:
- export PATH="/usr/lib/ccache:$PATH"

14
liberty/Makefile
View File

@@ -106,7 +106,17 @@ OBJS_O3 = \
../src/renderer/Shadows.o
OBJS_NO_FAST_MATH = \
../src/core/Cam.o \texconv.o
../src/core/Cam.o \
../src/core/Camera.o
KOS_CPPFLAGS += -fbuiltin -ffast-math -ffp-contract=fast \
-mfsrra -mfsca
ifdef KOS_BASE
include $(KOS_BASE)/Makefile.rules
else
$(warning "KOS_BASE is not set. Only prebuilt targets will work.")
endif
DEPS = $(OBJS:.o=.d) $(OBJS_TEXCONV:.o:.d)
@@ -275,7 +285,7 @@ texconv: $(OBJS_TEXCONV) | pvrtex # You'll have to rebuild pvrtex manually if yo
$(CXX) -o $@ $(OBJS_TEXCONV)
%.texconv.o: %.cpp
$(CXX) -std=c++2a -c -O3 -g -MMD -MP -o $@ -I../vendor/koshle I../vendor/librw/src $(INCLUDE) -I../vendor/emu -I../vendor/crypto -I../vendor/TriStripper/include $(DEFINES) -DDC_TEXCONV -DDC_SIM -D_INC_WINDOWS $(TEXCONV_FLAGS) $<
$(CXX) -std=c++2a -c -O3 -g -MMD -MP -o $@ -I../vendor/koshle -I../vendor/librw/src $(INCLUDE) -I../vendor/emu -I../vendor/crypto -I../vendor/TriStripper/include $(DEFINES) -DDC_TEXCONV -DDC_SIM -D_INC_WINDOWS $(TEXCONV_FLAGS) $<
-include $(DEPS)