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

Updates for win32 SVG support. Update resource version information.

Browse source
This commit is contained in:
John Popplewell 2007-03-22 19:57:57 +00:00
parent d8ca6e80fd
commit 52a8db16ac
2 changed files with 15 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

13
Makefile
View file

@ -233,7 +233,7 @@ win32:
X11_ICON_PREFIX=. \ X11_ICON_PREFIX=. \
LOCALE_PREFIX=$(PREFIX)/share/locale \ LOCALE_PREFIX=$(PREFIX)/share/locale \
CONFDIR=$(PREFIX)/etc/tuxpaint \ CONFDIR=$(PREFIX)/etc/tuxpaint \
ARCH_LINKS="-lintl-3 -lpng12 -lwinspool -lshlwapi" \ ARCH_LINKS="-lintl -lpng12 -lwinspool -lshlwapi" \
ARCH_HEADERS="src/win32_print.h" \ ARCH_HEADERS="src/win32_print.h" \
ARCH_LIBS="obj/win32_print.o obj/resource.o" ARCH_LIBS="obj/win32_print.o obj/resource.o"
@ -361,7 +361,7 @@ bdist-win32:
DATA_PREFIX=data \ DATA_PREFIX=data \
DOC_PREFIX=docs \ DOC_PREFIX=docs \
LOCALE_PREFIX=locale \ LOCALE_PREFIX=locale \
ARCH_LINKS="-lintl-3 -lpng12 -lwinspool -lshlwapi" \ ARCH_LINKS="-lintl -lpng12 -lwinspool -lshlwapi" \
ARCH_HEADERS="src/win32_print.h" \ ARCH_HEADERS="src/win32_print.h" \
ARCH_LIBS="obj/win32_print.o obj/resource.o" ARCH_LIBS="obj/win32_print.o obj/resource.o"
strip -s tuxpaint.exe strip -s tuxpaint.exe
@ -641,17 +641,24 @@ install-dlls:
@echo @echo
@echo "...Installing Windows DLLs..." @echo "...Installing Windows DLLs..."
@install -d $(BIN_PREFIX) @install -d $(BIN_PREFIX)
@cp `which libintl-3.dll` $(BIN_PREFIX) @cp `which libintl-8.dll` $(BIN_PREFIX)
@cp `which libiconv-2.dll` $(BIN_PREFIX) @cp `which libiconv-2.dll` $(BIN_PREFIX)
@cp `which libpng12.dll` $(BIN_PREFIX) @cp `which libpng12.dll` $(BIN_PREFIX)
@cp `which SDL.dll` $(BIN_PREFIX) @cp `which SDL.dll` $(BIN_PREFIX)
@cp `which SDL_image.dll` $(BIN_PREFIX) @cp `which SDL_image.dll` $(BIN_PREFIX)
@cp `which SDL_mixer.dll` $(BIN_PREFIX) @cp `which SDL_mixer.dll` $(BIN_PREFIX)
@cp `which SDL_ttf.dll` $(BIN_PREFIX) @cp `which SDL_ttf.dll` $(BIN_PREFIX)
@cp `which libfreetype-6.dll` $(BIN_PREFIX)
@cp `which zlib1.dll` $(BIN_PREFIX) @cp `which zlib1.dll` $(BIN_PREFIX)
@cp `which libogg-0.dll` $(BIN_PREFIX) @cp `which libogg-0.dll` $(BIN_PREFIX)
@cp `which libvorbis-0.dll` $(BIN_PREFIX) @cp `which libvorbis-0.dll` $(BIN_PREFIX)
@cp `which libvorbisfile-3.dll` $(BIN_PREFIX) @cp `which libvorbisfile-3.dll` $(BIN_PREFIX)
@cp `which libcairo-2.dll` $(BIN_PREFIX)
@cp `which svg-cairo.dll` $(BIN_PREFIX)
@cp `which svg.dll` $(BIN_PREFIX)
@cp `which jpeg.dll` $(BIN_PREFIX)
@cp `which libxml2-2.dll` $(BIN_PREFIX)
@strip -s $(BIN_PREFIX)/*.dll
# Install the import script: # Install the import script:

10
visualc/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,16,0 FILEVERSION 0,9,17,0
PRODUCTVERSION 0,9,16,0 PRODUCTVERSION 0,9,17,0
FILEFLAGSMASK 0x3fL FILEFLAGSMASK 0x3fL
#ifdef _DEBUG #ifdef _DEBUG
FILEFLAGS 0x21L FILEFLAGS 0x21L
@ -45,14 +45,14 @@ BEGIN
VALUE "Comments", "\0" VALUE "Comments", "\0"
VALUE "CompanyName", "New Breed Software\0" VALUE "CompanyName", "New Breed Software\0"
VALUE "FileDescription", "Tux Paint - Unicode test version.\0" VALUE "FileDescription", "Tux Paint - Unicode test version.\0"
VALUE "FileVersion", "0.9.16rc1\0" VALUE "FileVersion", "0.9.17cvs\0"
VALUE "InternalName", "Tux Paint\0" VALUE "InternalName", "Tux Paint\0"
VALUE "LegalCopyright", "Copyright © 2005 by Bill Kendrick\0" VALUE "LegalCopyright", "Copyright © 2007 by Bill Kendrick\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.16rc1\0" VALUE "ProductVersion", "0.9.17cvs\0"
VALUE "SpecialBuild", "win32 build by John Popplewell\0" VALUE "SpecialBuild", "win32 build by John Popplewell\0"
END END
END END