Skip to content

Commit cb276b5

Browse files
FrodeSolheimFrodeSolheim
committed
Simplify windows build a little bit (hardcode dlls)
1 parent ed3039a commit cb276b5

File tree

7 files changed

+61
-49
lines changed

7 files changed

+61
-49
lines changed

‎.github/workflows/Linux_ARM64.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -119,7 +119,7 @@ jobs:
119119
if: >-
120120
env.DROPBOX_REFRESH_TOKEN != null && (
121121
github.ref == 'refs/heads/beta' ||
122-
github.ref == 'refs/heads/dev' ||
122+
github.ref == 'refs/heads/fs-uae-3' ||
123123
github.ref == 'refs/heads/main' ||
124124
github.ref == 'refs/heads/master' ||
125125
github.ref == 'refs/heads/stable' ||

‎.github/workflows/Linux_x86-64.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -119,7 +119,7 @@ jobs:
119119
if: >-
120120
env.DROPBOX_REFRESH_TOKEN != null && (
121121
github.ref == 'refs/heads/beta' ||
122-
github.ref == 'refs/heads/dev' ||
122+
github.ref == 'refs/heads/fs-uae-3' ||
123123
github.ref == 'refs/heads/main' ||
124124
github.ref == 'refs/heads/master' ||
125125
github.ref == 'refs/heads/stable' ||

‎.github/workflows/Windows_x86-64.yml‎

Lines changed: 42 additions & 42 deletions
Original file line numberDiff line numberDiff line change
@@ -72,45 +72,45 @@ jobs:
7272
run: |
7373
build/env/setup
7474
75-
# - name: Bootstrap
76-
# if: hashFiles('fsbuild/bootstrap') != ''
77-
# run: |
78-
# build/env/shell fsbuild/bootstrap
79-
80-
# - name: Configure
81-
# if: hashFiles('fsbuild/configure') != ''
82-
# run: |
83-
# build/env/shell fsbuild/configure
84-
85-
# - name: Build
86-
# run: |
87-
# build/env/shell fsbuild/make
88-
89-
# - name: Bundle
90-
# run: |
91-
# fsbuild/bundle
92-
93-
# - name: Archive
94-
# run: |
95-
# fsbuild/archive
96-
97-
# - uses: actions/upload-artifact@v4
98-
# with:
99-
# name: Windows_x86-64
100-
# path: fsbuild/_dist/*
101-
102-
# - name: Upload to Dropbox
103-
# if: >-
104-
# env.DROPBOX_REFRESH_TOKEN != null && (
105-
# github.ref == 'refs/heads/beta' ||
106-
# github.ref == 'refs/heads/fs-uae-3' ||
107-
# github.ref == 'refs/heads/main' ||
108-
# github.ref == 'refs/heads/master' ||
109-
# github.ref == 'refs/heads/stable' ||
110-
# github.ref == 'refs/heads/test'
111-
# )
112-
# run: |
113-
# python3 -m venv .venv
114-
# source .venv/bin/activate
115-
# python3 -m pip install dropbox==12.0.2
116-
# fsbuild/upload
75+
- name: Bootstrap
76+
if: hashFiles('fsbuild/bootstrap') != ''
77+
run: |
78+
build/env/shell fsbuild/bootstrap
79+
80+
- name: Configure
81+
if: hashFiles('fsbuild/configure') != ''
82+
run: |
83+
build/env/shell fsbuild/configure
84+
85+
- name: Build
86+
run: |
87+
build/env/shell fsbuild/make
88+
89+
- name: Bundle
90+
run: |
91+
fsbuild/bundle
92+
93+
- name: Archive
94+
run: |
95+
fsbuild/archive
96+
97+
- uses: actions/upload-artifact@v4
98+
with:
99+
name: Windows_x86-64
100+
path: fsbuild/_dist/*
101+
102+
- name: Upload to Dropbox
103+
if: >-
104+
env.DROPBOX_REFRESH_TOKEN != null && (
105+
github.ref == 'refs/heads/beta' ||
106+
github.ref == 'refs/heads/fs-uae-3' ||
107+
github.ref == 'refs/heads/main' ||
108+
github.ref == 'refs/heads/master' ||
109+
github.ref == 'refs/heads/stable' ||
110+
github.ref == 'refs/heads/test'
111+
)
112+
run: |
113+
python3 -m venv .venv
114+
source .venv/bin/activate
115+
python3 -m pip install dropbox==12.0.2
116+
fsbuild/upload

‎.github/workflows/macOS_ARM64.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -137,7 +137,7 @@ jobs:
137137
if: >-
138138
env.DROPBOX_REFRESH_TOKEN != null && (
139139
github.ref == 'refs/heads/beta' ||
140-
github.ref == 'refs/heads/dev' ||
140+
github.ref == 'refs/heads/fs-uae-3' ||
141141
github.ref == 'refs/heads/main' ||
142142
github.ref == 'refs/heads/master' ||
143143
github.ref == 'refs/heads/stable' ||

‎.github/workflows/macOS_x86-64.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -137,7 +137,7 @@ jobs:
137137
if: >-
138138
env.DROPBOX_REFRESH_TOKEN != null && (
139139
github.ref == 'refs/heads/beta' ||
140-
github.ref == 'refs/heads/dev' ||
140+
github.ref == 'refs/heads/fs-uae-3' ||
141141
github.ref == 'refs/heads/main' ||
142142
github.ref == 'refs/heads/master' ||
143143
github.ref == 'refs/heads/stable' ||

‎.github/workflows/source.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -116,7 +116,7 @@ jobs:
116116
if: >-
117117
env.DROPBOX_REFRESH_TOKEN != null && (
118118
github.ref == 'refs/heads/beta' ||
119-
github.ref == 'refs/heads/dev' ||
119+
github.ref == 'refs/heads/fs-uae-3' ||
120120
github.ref == 'refs/heads/main' ||
121121
github.ref == 'refs/heads/master' ||
122122
github.ref == 'refs/heads/stable' ||

‎dist/windows/Makefile.in‎

Lines changed: 14 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ progdir:
1818

1919
make -C ../..
2020

21-
# For qemu-uae on Windows
21+
# For qemu-uae on Windows
2222
# python3 clib.py libpixman-1-0.dll $(fs_uae_dir)
2323

2424
cp -a ../../fs-uae.exe $(fs_uae_dir)/
@@ -39,7 +39,19 @@ progdir:
3939
# strip $(fs_uae_dir)/*.exe
4040
# strip $(fs_uae_dir)/*.dll
4141

42-
cd ../.. && python3 fsbuild/standalone.py dist/windows/$(fs_uae_dir)
42+
# cd ../.. && python3 fsbuild/standalone.py dist/windows/$(fs_uae_dir)
43+
cp $$MINGW_PREFIX/bin/libgcc_s_seh-1.dll $(fs_uae_dir)
44+
cp $$MINGW_PREFIX/bin/libglib-2.0-0.dll $(fs_uae_dir)
45+
cp $$MINGW_PREFIX/bin/libiconv-2.dll $(fs_uae_dir)
46+
cp $$MINGW_PREFIX/bin/libintl-8.dll $(fs_uae_dir)
47+
cp $$MINGW_PREFIX/bin/libmpeg2-0.dll $(fs_uae_dir)
48+
cp $$MINGW_PREFIX/bin/libmpeg2convert-0.dll $(fs_uae_dir)
49+
cp $$MINGW_PREFIX/bin/libpng16-16.dll $(fs_uae_dir)
50+
cp $$MINGW_PREFIX/bin/libstdc++-6.dll $(fs_uae_dir)
51+
cp $$MINGW_PREFIX/bin/libwinpthread-1.dll $(fs_uae_dir)
52+
cp $$MINGW_PREFIX/bin/OpenAL32.dll $(fs_uae_dir)
53+
cp $$MINGW_PREFIX/bin/SDL2.dll $(fs_uae_dir)
54+
cp $$MINGW_PREFIX/bin/zlib1.dll $(fs_uae_dir)
4355

4456
python3 sign.py $(fs_uae_dir)/*.exe
4557

0 commit comments

Comments
 (0)