Merge branch 'master' into sdl2.0

This commit is contained in:
Bill Kendrick 2022-06-14 00:38:27 -07:00
commit 5532ddd2fd
507 changed files with 565 additions and 532 deletions

View file

@ -26,8 +26,8 @@ IDI_ICON1 ICON DISCARDABLE "data/images/icon-win32.ico"
//
VS_VERSION_INFO VERSIONINFO
FILEVERSION 0,9,28,0
PRODUCTVERSION 0,9,28,0
FILEVERSION 0,9,29,0
PRODUCTVERSION 0,9,29,0
FILEFLAGSMASK 0x3fL
#ifdef _DEBUG
FILEFLAGS 0x21L
@ -45,14 +45,14 @@ BEGIN
VALUE "Comments", "\0"
VALUE "CompanyName", "New Breed Software\0"
VALUE "FileDescription", "Tux Paint - Interactive Paint Program.\0"
VALUE "FileVersion", "0.9.28\0"
VALUE "FileVersion", "0.9.29\0"
VALUE "InternalName", "Tux Paint\0"
VALUE "LegalCopyright", "Copyright (C) 2002-2022 by Bill Kendrick, et al\0"
VALUE "LegalTrademarks", "\0"
VALUE "OriginalFilename", "TuxPaint.exe\0"
VALUE "PrivateBuild", "\0"
VALUE "ProductName", "Tux Paint\0"
VALUE "ProductVersion", "0.9.28\0"
VALUE "ProductVersion", "0.9.29\0"
VALUE "SpecialBuild", "win32 build by TOYAMA Shin-ichi\0"
END
END

View file

@ -140,7 +140,7 @@ Name: "desktopicon"; Description: "{cm:CreateDesktopIcon}"; GroupDescription: "{
[Files]
Source: "{#BdistDir}\*.dll"; DestDir: "{app}"; Flags: ignoreversion
Source: "{#BdistDir}\*.exe"; DestDir: "{app}"; Flags: ignoreversion
Source: "{#BdistDir}\tuxpaint.conf"; DestDir: "{app}"; Flags: ignoreversion
Source: "{#BdistDir}\tuxpaint.cfg"; DestDir: "{app}"; Flags: ignoreversion
Source: "{#BdistDir}\data\*"; DestDir: "{app}\data"; Excludes: "CVS"; Flags: ignoreversion recursesubdirs createallsubdirs
Source: "{#BdistDir}\docs\*"; DestDir: "{app}\docs"; Excludes: "CVS,Makefile,*~"; Flags: ignoreversion recursesubdirs createallsubdirs
Source: "{#BdistDir}\etc\*"; DestDir: "{app}\etc"; Flags: skipifsourcedoesntexist ignoreversion recursesubdirs createallsubdirs