Skip to content

Commit e65abf8

Browse files
fmeunierfmeunier
committed
Various Windows release fixes
1 parent e21ad54 commit e65abf8

5 files changed

Lines changed: 233 additions & 8 deletions

File tree

‎data/win32/3rd-party/SDL2-LICENSE.txt‎

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
Simple DirectMedia Layer 2 (SDL2)
2+
Copyright (C) 1997-2026 Sam Lantinga <slouken@libsdl.org>
3+
4+
This software is provided 'as-is', without any express or implied
5+
warranty. In no event will the authors be held liable for any damages
6+
arising from the use of this software.
7+
8+
Permission is granted to anyone to use this software for any purpose,
9+
including commercial applications, and to alter it and redistribute it
10+
freely, subject to the following restrictions:
11+
12+
1. The origin of this software must not be misrepresented; you must not
13+
claim that you wrote the original software. If you use this software
14+
in a product, an acknowledgment in the product documentation would be
15+
appreciated but is not required.
16+
17+
2. Altered source versions must be plainly marked as such, and must not be
18+
misrepresented as being the original software.
19+
20+
3. This notice may not be removed or altered from any source distribution.

‎data/win32/LICENSES.txt‎

Lines changed: 149 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,149 @@
1+
Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
2+
Upstream-Name: Fuse - the Free Unix Spectrum Emulator
3+
Upstream-Contact: fuse-emulator-devel@lists.sourceforge.net
4+
Source: https://sourceforge.net/projects/fuse-emulator/
5+
6+
Files: *
7+
Copyright: 1999-2026 Philip Kendall and others
8+
License: GPL-2+
9+
The complete text of the license can be found in the file COPYING.txt
10+
Comment:
11+
See the AUTHORS.txt file for details on other contributors.
12+
.
13+
Files are assumed to be under the same license terms as the application
14+
as a whole unless otherwise explicitly stated in the file.
15+
.
16+
This program is built using MinGW-w64 together with additional runtime
17+
libraries from the Windows CI environment. The corresponding third-party
18+
notices copied into the package are stored in the 3rd-party directory.
19+
20+
Files: libspectrum-*.dll
21+
Copyright: 1999-2026 Philip Kendall and others
22+
License: GPL-2+
23+
The complete text of the license can be found in COPYING.txt.
24+
Additional third-party notices, when present, can be found in the
25+
3rd-party directory.
26+
27+
Files: libgcc_s_sjlj-1.dll libstdc++-6.dll
28+
Copyright: 1987-2026 Free Software Foundation, Inc.
29+
License: GPL-3+ and GCC-Runtime-Library-Exception-3.1
30+
The corresponding notices copied from the build environment can be found in
31+
the 3rd-party directory.
32+
33+
Files: libwinpthread-1.dll
34+
Copyright: 2011-2026 mingw-w64 project
35+
License: MIT
36+
The corresponding notice copied from the build environment can be found in
37+
the 3rd-party directory.
38+
39+
Files: libgpg-error-0.dll
40+
Copyright: 2003-2026 g10 Code GmbH
41+
License: LGPL-2.1+
42+
The corresponding notice copied from the build environment can be found in
43+
the 3rd-party directory.
44+
45+
Files: libgcrypt-20.dll
46+
Copyright: 1989-2026 Free Software Foundation, Inc.
47+
2012-2026 g10 Code GmbH
48+
License: LGPL-2.1+
49+
The corresponding notice copied from the build environment can be found in
50+
the 3rd-party directory.
51+
52+
Files: libpng16-16.dll
53+
Copyright: 1995-2026 The PNG Reference Library Authors
54+
License: libpng
55+
The corresponding notice copied from the build environment can be found in
56+
the 3rd-party directory.
57+
58+
Files: zlib1.dll
59+
Copyright: 1995-2026 Jean-loup Gailly and Mark Adler
60+
License: Zlib
61+
The corresponding notice copied from the build environment can be found in
62+
the 3rd-party directory.
63+
64+
Files: libbz2-1.dll
65+
Copyright: 1996-2026 Julian R Seward and others
66+
License: BSD-style
67+
The corresponding notice copied from the build environment can be found in
68+
the 3rd-party directory.
69+
70+
Files: libaudiofile-1.dll
71+
Copyright: 1998-2026 audiofile contributors
72+
License: LGPL-2.1+
73+
The corresponding notice copied from the build environment can be found in
74+
the 3rd-party directory.
75+
76+
Files: libFLAC-8.dll
77+
Copyright: 2000-2026 Josh Coalson and Xiph.Org Foundation
78+
License: BSD-style
79+
The corresponding notice copied from the build environment can be found in
80+
the 3rd-party directory.
81+
82+
Files: libOGG-0.dll
83+
Copyright: 2002-2026 Xiph.Org Foundation
84+
License: BSD-style
85+
The corresponding notice copied from the build environment can be found in
86+
the 3rd-party directory.
87+
88+
Files: libxml2-2.dll
89+
Copyright: 1998-2026 Daniel Veillard and others
90+
License: MIT
91+
The corresponding notice copied from the build environment can be found in
92+
the 3rd-party directory.
93+
94+
Files: iconv.dll
95+
Copyright: 1999-2026 Free Software Foundation, Inc.
96+
License: LGPL-2.1+
97+
The corresponding notice copied from the build environment can be found in
98+
the 3rd-party directory.
99+
100+
Files: liblzma-5.dll
101+
Copyright: 2009-2026 Tukaani Project and contributors
102+
License: public-domain and LGPL-2.1+
103+
The corresponding notice copied from the build environment can be found in
104+
the 3rd-party directory.
105+
106+
Files: SDL.dll
107+
Copyright: 1997-2026 Sam Lantinga and SDL contributors
108+
License: LGPL-2.1+
109+
The corresponding notice copied from the build environment can be found in
110+
the 3rd-party directory.
111+
112+
Files: SDL2.dll
113+
Copyright: 1997-2026 Sam Lantinga and SDL contributors
114+
License: Zlib
115+
The corresponding notice copied from the build environment can be found in
116+
the 3rd-party directory.
117+
118+
Files: roms\{128-?.rom,48.rom,plus2-?.rom,plus3-?.rom,tc2048.rom}
119+
Copyright: Amstrad
120+
License: distribution-allowed
121+
See roms\README.copyright for further information.
122+
123+
Files: roms\{disciple.rom,plusd.rom}
124+
Copyright: Datel Microelectronics
125+
License: distribution-allowed
126+
See roms\README.copyright for further information.
127+
128+
Files: roms\plus3e-?.rom
129+
Copyright: Amstrad and Garry Lancaster
130+
License: distribution-allowed
131+
See roms\README.copyright for further information.
132+
133+
Files: roms\se-?.rom
134+
Copyright: 1999-2013 Andrew Owen
135+
1989-1990 BetaSoft
136+
1981 Nine Tiles Networks Ltd
137+
License: GPL-2+
138+
The complete text of the license can be found in COPYING.txt.
139+
See roms\README.copyright for further information.
140+
141+
Files: roms\speccyboot-1.4.rom
142+
Copyright: 2009 Patrick Persson
143+
License: MIT
144+
See roms\README.copyright for further information.
145+
146+
Files: roms\tc2048-?.rom roms\tc2068-?.rom
147+
Copyright: Amstrad and Timex
148+
License: distribution-allowed
149+
See roms\README.copyright for further information.

‎data/win32/README-win32.txt‎

Lines changed: 40 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,40 @@
1+
Fuse for Windows
2+
================
3+
4+
This is a binary distribution of Fuse (the Free Unix Spectrum Emulator) for
5+
Windows. For an introduction to Fuse, see README.txt. For more detailed
6+
documentation, read fuse.html.
7+
8+
Requirements
9+
------------
10+
11+
A supported 32-bit or 64-bit Windows system for the bundled 32-bit build.
12+
13+
Libraries
14+
---------
15+
16+
These binaries are built with the MinGW/Cygwin packages used by the current
17+
Windows CI workflow. Depending on the selected UI and enabled features, the
18+
package may include DLLs from these components:
19+
20+
audiofile
21+
bzip2
22+
libFLAC
23+
libgcrypt
24+
libgpg-error
25+
libOGG
26+
libpng
27+
libspectrum
28+
libstdc++
29+
libxml2
30+
win-iconv
31+
winpthreads
32+
xz / liblzma
33+
zlib
34+
SDL
35+
SDL2
36+
37+
See LICENSES.txt for copyright and license details.
38+
39+
For more detailed documentation, browse:
40+
https://sourceforge.net/p/fuse-emulator/wiki/Building%20Fuse%20on%20Windows%20with%20Cygwin/

‎data/win32/distribution.mk‎

Lines changed: 16 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -26,24 +26,34 @@ install-win32: all
2626
test -n "$(DESTDIR)" || { echo "ERROR: set DESTDIR path"; exit 1; }
2727
$(MKDIR_P) $(DESTDIR)/roms/ || exit 1
2828
$(MKDIR_P) $(DESTDIR)/lib/ || exit 1
29-
case "$(UI)" in \
30-
sdl|sdl2) \
31-
$(MKDIR_P) $(DESTDIR)/ui/widget/ || exit 1; \
32-
cp $(top_builddir)/ui/widget/fuse.font $(DESTDIR)/ui/widget \
33-
;; \
34-
esac
29+
$(MKDIR_P) $(DESTDIR)/3rd-party/ || exit 1
30+
test "$(UI)" != "sdl" -a "$(UI)" != "sdl2" || $(MKDIR_P) $(DESTDIR)/ui/widget/ || exit 1
3531
cp $(top_srcdir)/roms/*.rom $(DESTDIR)/roms
3632
cp $(top_srcdir)/roms/README.copyright $(DESTDIR)/roms
3733
cp $(top_srcdir)/lib/*.bmp $(DESTDIR)/lib
3834
cp $(top_srcdir)/lib/*.png $(DESTDIR)/lib
3935
cp $(top_srcdir)/lib/*.scr $(DESTDIR)/lib
36+
test "$(UI)" != "sdl" -a "$(UI)" != "sdl2" || cp $(top_builddir)/ui/widget/fuse.font $(DESTDIR)/ui/widget
4037
# Copy fuse executable (we should manually copy the required libraries)
4138
cp $(top_builddir)/.libs/fuse$(EXEEXT) $(DESTDIR) || \
4239
cp $(top_builddir)/fuse$(EXEEXT) $(DESTDIR)
4340
# Get text files
4441
for file in AUTHORS ChangeLog COPYING README; \
4542
do cp "$(top_srcdir)/$$file" "$(DESTDIR)/$$file.txt"; \
4643
done
44+
cp "$(top_srcdir)/data/win32/README-win32.txt" "$(DESTDIR)/README-win32.txt"
45+
cp "$(top_srcdir)/data/win32/LICENSES.txt" "$(DESTDIR)/LICENSES.txt"
46+
@has_sdl=no; \
47+
has_sdl2=no; \
48+
test -f "$(DESTDIR)/SDL.dll" && has_sdl=yes; \
49+
test -f "$(DESTDIR)/SDL2.dll" && has_sdl2=yes; \
50+
awk -v has_sdl="$$has_sdl" -v has_sdl2="$$has_sdl2" '\
51+
/^Files: SDL\.dll$$/ { skip = ( has_sdl != "yes" ); } \
52+
/^Files: SDL2\.dll$$/ { skip = ( has_sdl2 != "yes" ); } \
53+
/^Files: / && $$0 != "Files: SDL.dll" && $$0 != "Files: SDL2.dll" { skip = 0; } \
54+
!skip { print }' \
55+
"$(DESTDIR)/LICENSES.txt" > "$(DESTDIR)/LICENSES.txt.tmp" && \
56+
mv "$(DESTDIR)/LICENSES.txt.tmp" "$(DESTDIR)/LICENSES.txt"
4757
# Get manuals
4858
if test -n "$(GROFF)"; then \
4959
sed ':a;N;$$!ba;s/\.PP\n\.TS/\.bp\n&/g' $(top_srcdir)/man/fuse.1 | \

‎data/win32/installer.nsi.in‎

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
!define FUSE_VERSION "@PACKAGE_VERSION@" ; could have letters like -RC1
2424
!define FUSE_FULL_VERSION "@FUSE_FULL_VERSION@" ; must have four numeric tokens
2525
!define DISPLAY_NAME "the Free Unix Spectrum Emulator (Fuse) ${FUSE_VERSION}"
26-
!define SETUP_FILENAME "@PACKAGE@-${FUSE_VERSION}-win32-setup"
26+
!define SETUP_FILENAME "@PACKAGE@-${FUSE_VERSION}-@UI@-setup"
2727
!define SETUP_FILE "${SETUP_FILENAME}.exe"
2828
!define HKLM_REG_KEY "Software\Microsoft\Windows\CurrentVersion\Uninstall\Fuse"
2929
!define PROG_ID "Fuse.Files.1"
@@ -366,15 +366,21 @@ section "uninstall"
366366
Delete "$INSTDIR\COPYING.txt"
367367
Delete "$INSTDIR\fuse.exe"
368368
Delete "$INSTDIR\fuse.html"
369+
Delete "$INSTDIR\LICENSES.txt"
369370
Delete "$INSTDIR\manual*.png"
370371
Delete "$INSTDIR\README.txt"
371372
Delete "$INSTDIR\README-win32.txt"
373+
Delete "$INSTDIR\3rd-party\*"
374+
RMDir "$INSTDIR\3rd-party"
375+
Delete "$INSTDIR\ui\widget\fuse.font"
376+
RMDir "$INSTDIR\ui\widget"
377+
RMDir "$INSTDIR\ui"
372378
Delete "$INSTDIR\*.dll"
373-
RMDir "$INSTDIR"
374379

375380
; Delete the uninstaller and remove the uninstall keys for Windows
376381
DetailPrint "Deleting Uninstaller..."
377382
Delete "$INSTDIR\uninstall.exe"
383+
RMDir "$INSTDIR"
378384
DeleteRegKey HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\Fuse"
379385

380386
sectionEnd

0 commit comments

Comments
 (0)