ci: bundle DLL hell with windows builds

This commit is contained in:
fgsfds committed 2023-08-13 11:56:54 +02:00
1 parent 23c57ad033
commit 83c1bd3ffd
2 files changed
+2 -1

No files matched your search

+1
View File
@@ -33,6 +33,7 @@ jobs:
run: | run: |
mkdir -p bin/data mkdir -p bin/data
cp build/ntsc-final-port/pd.exe bin/ cp build/ntsc-final-port/pd.exe bin/
cp /mingw32/bin/{SDL2.dll,zlib1.dll,libgcc_s_dw2-1.dll,libwinpthread-1.dll} bin/
touch bin/data/put_your_rom_here.txt touch bin/data/put_your_rom_here.txt
- name: Upload artifact - name: Upload artifact
uses: actions/upload-artifact@v3 uses: actions/upload-artifact@v3
+1 -1
View File
@@ -130,7 +130,7 @@ G_DIR := src/generated/$(ROMID)
ifneq (,$(findstring windows,$(TARGET_PLATFORM))) ifneq (,$(findstring windows,$(TARGET_PLATFORM)))
TARGET_CFLAGS := $(shell pkg-config sdl2 --cflags-only-I) TARGET_CFLAGS := $(shell pkg-config sdl2 --cflags-only-I)
TARGET_LDFLAGS := $(shell pkg-config sdl2 --libs) -lz -lopengl32 TARGET_LDFLAGS := $(shell pkg-config sdl2 --libs) -lz -lopengl32 -static-libstdc++
# on windows/mingw we need this to be built with a 32-bit compiler so it finds the correct libs # on windows/mingw we need this to be built with a 32-bit compiler so it finds the correct libs
TOOLCHAIN := i686-w64-mingw32- TOOLCHAIN := i686-w64-mingw32-
else # TODO else # TODO