Skip to content

Update to assets and resources in GUI and installers #1088

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
tturocy merged 5 commits into from
Aug 27, 2026
Merged

Update to assets and resources in GUI and installers #1088

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
343b1c6
Reinstate missing resource file for Windows builds and update icon to…
tturocy Aug 27, 2026
bd9ddb6
Update Windows installer/uninstaller with new branding
tturocy Aug 27, 2026
e559357
Update MacOS disk image with new branding
tturocy Aug 27, 2026
8f04abe
Customise Windows installer - remove license agreement, add ability t…
tturocy Aug 27, 2026
853dc8e
Correct encoding of copyright notice in about dialog
tturocy Aug 27, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 10 additions & 8 deletions Makefile.am
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,19 +26,20 @@ include build_support/catalog/catalog.am

EXTRA_DIST = \
build_support/msw/gambit.wxs.in \
build_support/msw/banner.bmp \
build_support/msw/dialog.bmp \
build_support/osx/Info.plist.in \
build_support/osx/gambit.icns \
build_support/osx/dmg_background.tiff \
build_support/osx/make-dmg.sh \
src/gui/bitmaps/calc.xpm \
src/gui/bitmaps/efg.ico \
src/gui/bitmaps/gambitbig.xpm \
src/gui/bitmaps/gambit.bmp \
src/gui/bitmaps/gambit.ico \
src/gui/bitmaps/gambit.xpm \
src/gui/bitmaps/move.xpm \
src/gui/bitmaps/newtable.xpm \
src/gui/bitmaps/newtree.xpm \
src/gui/bitmaps/next.xpm \
src/gui/bitmaps/nfg.ico \
src/gui/bitmaps/open.xpm \
src/gui/bitmaps/prev.xpm \
src/gui/bitmaps/profiles.xpm \
Expand Down Expand Up @@ -518,12 +519,17 @@ gambit_CPPFLAGS = $(AM_CPPFLAGS) $(WX_CXXFLAGS)
gambit_LDADD_LIBS = libbimatrix.a libliap.a liblogit.a libgtracer.a \
libsimpdiv.a libenumpoly.a libgames.a libcore.a

gambit_DEPENDENCIES = $(RC_OBJECT_PATH) $(gambit_LDADD_LIBS)

if IS_WIN32
gambit_LDADD = $(RC_OBJECT_PATH) $(gambit_LDADD_LIBS) $(WX_LIBS_STATIC) -ldeflate -lzstd -llerc -lWebP
else
gambit_LDADD = $(RC_OBJECT_PATH) $(gambit_LDADD_LIBS) $(WX_LIBS)
endif

src/gui/bitmaps/gambitrc.o: src/gui/bitmaps/gambitrc.rc
$(WINDRES) $(WX_CXXFLAGS) -I$(srcdir)/src/gui/bitmaps -o $@ $<

osx-bundle:
make all
-rm -rf Gambit.app
Expand All @@ -538,11 +544,7 @@ osx-bundle:
cp ${bin_PROGRAMS} Gambit.app/Contents/MacOS

osx-dmg: osx-bundle
-rm -rf .dmg
-mkdir .dmg
cp -r Gambit.app .dmg
hdiutil create Gambit.dmg -volname Gambit -srcfolder .dmg -format UDZO -imagekey zlib-level=9
rm -rf .dmg
${top_srcdir}/build_support/osx/make-dmg.sh Gambit.app Gambit.dmg

msw-msi:
-mkdir installer
Expand Down
Binary file added build_support/msw/banner.bmp
View file
Open in desktop
Binary file not shown.
Binary file added build_support/msw/dialog.bmp
View file
Open in desktop
Binary file not shown.
68 changes: 64 additions & 4 deletions build_support/msw/gambit.wxs.in
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,64 @@

<MajorUpgrade DowngradeErrorMessage="A later version of [ProductName] is already installed." />

<WixVariable Id="WixUILicenseRtf" Value="build_support/msw/license.rtf"/>
<UI>
<UIRef Id="WixUI_Minimal"/>
<WixVariable Id="WixUIBannerBmp" Value="build_support/msw/banner.bmp"/>
<WixVariable Id="WixUIDialogBmp" Value="build_support/msw/dialog.bmp"/>

<Icon Id="Gambit.ico" SourceFile="src/gui/bitmaps/gambit.ico"/>
<Property Id="ARPPRODUCTICON" Value="Gambit.ico"/>

<Property Id="WIXUI_INSTALLDIR" Value="ApplicationRootDirectory"/>
<UI Id="WixUI_GambitInstall">
<TextStyle Id="WixUI_Font_Normal" FaceName="Tahoma" Size="8"/>
<TextStyle Id="WixUI_Font_Bigger" FaceName="Tahoma" Size="12"/>
<TextStyle Id="WixUI_Font_Title" FaceName="Tahoma" Size="9" Bold="yes"/>
<Property Id="DefaultUIFont" Value="WixUI_Font_Normal"/>
<Property Id="WixUI_Mode" Value="InstallDir"/>

<DialogRef Id="WelcomeDlg"/>
<DialogRef Id="InstallDirDlg"/>
<DialogRef Id="VerifyReadyDlg"/>
<DialogRef Id="MaintenanceWelcomeDlg"/>
<DialogRef Id="MaintenanceTypeDlg"/>
<DialogRef Id="ExitDialog"/>
<DialogRef Id="BrowseDlg"/>
<DialogRef Id="DiskCostDlg"/>
<DialogRef Id="ErrorDlg"/>
<DialogRef Id="FatalError"/>
<DialogRef Id="FilesInUse"/>
<DialogRef Id="MsiRMFilesInUse"/>
<DialogRef Id="PrepareDlg"/>
<DialogRef Id="ProgressDlg"/>
<DialogRef Id="ResumeDlg"/>
<DialogRef Id="UserExit"/>

<Publish Dialog="BrowseDlg" Control="OK" Event="DoAction" Value="WixUIValidatePath" Order="3">1</Publish>
<Publish Dialog="BrowseDlg" Control="OK" Event="SpawnDialog" Value="InvalidDirDlg" Order="4"><![CDATA[WIXUI_INSTALLDIR_VALID<>"1"]]></Publish>

<Publish Dialog="ExitDialog" Control="Finish" Event="EndDialog" Value="Return" Order="999">1</Publish>

<Publish Dialog="WelcomeDlg" Control="Next" Event="NewDialog" Value="InstallDirDlg">NOT Installed</Publish>
<Publish Dialog="WelcomeDlg" Control="Next" Event="NewDialog" Value="VerifyReadyDlg">Installed AND PATCH</Publish>

<Publish Dialog="InstallDirDlg" Control="Back" Event="NewDialog" Value="WelcomeDlg">1</Publish>
<Publish Dialog="InstallDirDlg" Control="Next" Event="SetTargetPath" Value="[WIXUI_INSTALLDIR]" Order="1">1</Publish>
<Publish Dialog="InstallDirDlg" Control="Next" Event="DoAction" Value="WixUIValidatePath" Order="2">NOT WIXUI_DONTVALIDATEPATH</Publish>
<Publish Dialog="InstallDirDlg" Control="Next" Event="SpawnDialog" Value="InvalidDirDlg" Order="3"><![CDATA[NOT WIXUI_DONTVALIDATEPATH AND WIXUI_INSTALLDIR_VALID<>"1"]]></Publish>
<Publish Dialog="InstallDirDlg" Control="Next" Event="NewDialog" Value="VerifyReadyDlg" Order="4">WIXUI_DONTVALIDATEPATH OR WIXUI_INSTALLDIR_VALID="1"</Publish>
<Publish Dialog="InstallDirDlg" Control="ChangeFolder" Property="_BrowseProperty" Value="[WIXUI_INSTALLDIR]" Order="1">1</Publish>
<Publish Dialog="InstallDirDlg" Control="ChangeFolder" Event="SpawnDialog" Value="BrowseDlg" Order="2">1</Publish>

<Publish Dialog="VerifyReadyDlg" Control="Back" Event="NewDialog" Value="InstallDirDlg" Order="1">NOT Installed</Publish>
<Publish Dialog="VerifyReadyDlg" Control="Back" Event="NewDialog" Value="MaintenanceTypeDlg" Order="2">Installed AND NOT PATCH</Publish>
<Publish Dialog="VerifyReadyDlg" Control="Back" Event="NewDialog" Value="WelcomeDlg" Order="2">Installed AND PATCH</Publish>

<Publish Dialog="MaintenanceWelcomeDlg" Control="Next" Event="NewDialog" Value="MaintenanceTypeDlg">1</Publish>

<Publish Dialog="MaintenanceTypeDlg" Control="RepairButton" Event="NewDialog" Value="VerifyReadyDlg">1</Publish>
<Publish Dialog="MaintenanceTypeDlg" Control="RemoveButton" Event="NewDialog" Value="VerifyReadyDlg">1</Publish>
<Publish Dialog="MaintenanceTypeDlg" Control="Back" Event="NewDialog" Value="MaintenanceWelcomeDlg">1</Publish>

<UIRef Id="WixUI_Common"/>
</UI>

<Directory Id="TARGETDIR" Name="SourceDir">
Expand Down Expand Up @@ -51,6 +106,9 @@
<Component Id="Gambit_simpdiv.exe" Guid="354FC5CE-9067-4910-83CB-6014CC4318EF" Win64="yes">
<File Id="gambit_simpdiv.exe" Source="installer\gambit-simpdiv.exe" KeyPath="yes" Checksum="yes"/>
</Component>
<Component Id="Gambit.copying" Guid="F3CFB57F-7C3E-4E9C-AA80-C9BED8B1FAF4" Win64="yes">
<File Id="copying.txt" Source="COPYING" Name="COPYING.txt" KeyPath="yes"/>
</Component>
</DirectoryRef>

<DirectoryRef Id="ApplicationProgramsFolder">
Expand All @@ -64,7 +122,8 @@
Name="Uninstall Gambit @GAMBIT_MSI_MAJOR@"
Description="Uninstalls Gambit"
Target="[System64Folder]msiexec.exe"
Arguments="/x [ProductCode]"/>
Arguments="/x [ProductCode]"
Icon="Gambit.ico"/>
<RemoveFolder Id="ApplicationProgramsFolder" On="uninstall"/>
<RegistryValue Root="HKCU" Key="Software\Gambit\Gambit @GAMBIT_MSI_MAJOR@" Name="installed" Type="integer" Value="1" KeyPath="yes"/>
</Component>
Expand All @@ -80,6 +139,7 @@
<ComponentRef Id="Gambit_logit.exe"/>
<ComponentRef Id="Gambit_lp.exe"/>
<ComponentRef Id="Gambit_simpdiv.exe"/>
<ComponentRef Id="Gambit.copying"/>
<ComponentRef Id="ApplicationShortcut"/>
</Feature>
</Product>
Expand Down
Loading
Loading