notgne2/tuxpaint-pencil-sharpener
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Win32 build (& doc) tweaks

Browse source 
TOYAMA Shin-ichi noticed that when building for Win32 under mingw/msys,
an #include of "librsvg-cairo.h" was also necessary.

He also bumped the version # in win32/resources.rc
(and I put his credit in there).

I updated docs/RELEASE.txt to mention that .rc file also needing
updated when preparing a new release.
This commit is contained in:
Bill Kendrick 2020-04-10 19:05:52 -07:00
parent 91505fae8e
commit d172f38d4d
7 changed files with 20 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

5
docs/CHANGES.txt
View file

@ -8,7 +8,7 @@ http://www.tuxpaint.org/
$Id$ $Id$
2020.April.1 (0.9.24) 2020.April.10 (0.9.24)
* New tools * New tools
--------- ---------
* Fill * Fill
@ -35,6 +35,9 @@ $Id$
and made sure some warnings and errors were going to and made sure some warnings and errors were going to
STDERR, rather than STDOUT. STDERR, rather than STDOUT.
* Updates to build for Windows (using mingw/msys)
TOYAMA Shin-ichi <shin1@wmail.plala.or.jp>
* Other Improvements * Other Improvements
------------------ ------------------
* Added ability to move color palette options to the end of * Added ability to move color palette options to the end of

3
docs/RELEASE.txt
View file

@ -7,8 +7,9 @@ cutting a release (tagging in the source code repository, and running
* Makefile * Makefile
* Build description files: * Build description files:
* tuxpaint.spec (RPM package) * tuxpaint.spec (Linux RPM package)
* macos/Info.plist (macOS build) * macos/Info.plist (macOS build)
* win32/resources.rc (Windows mingw/msys build)
* Documentation * Documentation
(For HTML variants, be sure to run "make" in "docs/", to (For HTML variants, be sure to run "make" in "docs/", to

2
docs/en/README.txt
View file

@ -6,7 +6,7 @@
Copyright 2002-2020 by various contributors; see AUTHORS.txt Copyright 2002-2020 by various contributors; see AUTHORS.txt
http://www.tuxpaint.org/ http://www.tuxpaint.org/
June 14, 2002 - April 1, 2020 June 14, 2002 - April 10, 2020
---------------------------------------------------------------------- ----------------------------------------------------------------------

2
docs/en/html/README.html
View file

@ -22,7 +22,7 @@ version
<p>June 14, 2002 - <p>June 14, 2002 -
April 1, 2020</p> April 10, 2020</p>
</center> </center>

4
src/manpage/tuxpaint.1
View file

@ -1,5 +1,5 @@
.\" tuxpaint.1 - 2020.03.28 .\" tuxpaint.1 - 2020.04.10
.TH TUXPAINT 1 "28 March 2020" "0.9.24" "Tux Paint" .TH TUXPAINT 1 "10 April 2020" "0.9.24" "Tux Paint"
.SH NAME .SH NAME
tuxpaint -- "Tux Paint", a drawing program for young children. tuxpaint -- "Tux Paint", a drawing program for young children.

5
src/tuxpaint.c
View file

@ -22,7 +22,7 @@
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
(See COPYING.txt) (See COPYING.txt)
June 14, 2002 - April 2, 2020 June 14, 2002 - April 10, 2020
*/ */
@ -457,6 +457,9 @@ static void mtw(wchar_t * wtok, char *tok)
#else #else
#include <librsvg/rsvg.h> #include <librsvg/rsvg.h>
#ifdef WIN32
#include <librsvg/rsvg-cairo.h>
#endif
#if !defined(RSVG_H) || !defined(RSVG_CAIRO_H) #if !defined(RSVG_H) || !defined(RSVG_CAIRO_H)
#error "---------------------------------------------------" #error "---------------------------------------------------"

12
win32/resources.rc
View file

@ -26,8 +26,8 @@ IDI_ICON1 ICON DISCARDABLE "data/images/icon-win32.ico"
// //
VS_VERSION_INFO VERSIONINFO VS_VERSION_INFO VERSIONINFO
FILEVERSION 0,9,23,0 FILEVERSION 0,9,24,0
PRODUCTVERSION 0,9,23,0 PRODUCTVERSION 0,9,24,0
FILEFLAGSMASK 0x3fL FILEFLAGSMASK 0x3fL
#ifdef _DEBUG #ifdef _DEBUG
FILEFLAGS 0x21L FILEFLAGS 0x21L
@ -45,15 +45,15 @@ BEGIN
VALUE "Comments", "\0" VALUE "Comments", "\0"
VALUE "CompanyName", "New Breed Software\0" VALUE "CompanyName", "New Breed Software\0"
VALUE "FileDescription", "Tux Paint - Interactive Paint Program.\0" VALUE "FileDescription", "Tux Paint - Interactive Paint Program.\0"
VALUE "FileVersion", "0.9.23\0" VALUE "FileVersion", "0.9.24\0"
VALUE "InternalName", "Tux Paint\0" VALUE "InternalName", "Tux Paint\0"
VALUE "LegalCopyright", "Copyright (C) 2008 by Bill Kendrick\0" VALUE "LegalCopyright", "Copyright (C) 2008-2020 by Bill Kendrick, et al\0"
VALUE "LegalTrademarks", "\0" VALUE "LegalTrademarks", "\0"
VALUE "OriginalFilename", "TuxPaint.exe\0" VALUE "OriginalFilename", "TuxPaint.exe\0"
VALUE "PrivateBuild", "\0" VALUE "PrivateBuild", "\0"
VALUE "ProductName", "Tux Paint\0" VALUE "ProductName", "Tux Paint\0"
VALUE "ProductVersion", "0.9.23\0" VALUE "ProductVersion", "0.9.24\0"
VALUE "SpecialBuild", "win32 build by John Popplewell\0" VALUE "SpecialBuild", "win32 build by TOYAMA Shin-ichi\0"
END END
END END
BLOCK "VarFileInfo" BLOCK "VarFileInfo"