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

Now links with 'shlwapi.dll' so that it works on Windows 98.

Browse source 
Changed DATA_PREFIX, DOC_PREFIX, LOCALE_PREFIX to be relative to the
executable for the compilation phase.
Changed DATA_PREFIX, DOC_PREFIX, LOCALE_PREFIX to be in the $(PREFIX)/bin
directory for the installation phase. Very non-standard, but until these
paths are configurable at runtime I can't think of a better solution.
This commit is contained in:
John Popplewell 2005-07-19 04:38:58 +00:00
parent fd21f4d859
commit 3f07d39e0e
1 changed files with 10 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

18
Makefile
View file

@ -146,19 +146,20 @@ beos:
ARCH_LIBS="obj/BeOS_print.o" ARCH_LIBS="obj/BeOS_print.o"
# "make win32" builds the program for Windows using MinGW/MSYS # "make win32" builds the program for Windows using MinGW/MSYS
# The DATA_, DOC_ and LOCALE_ prefixes are relative to the executable.
win32: win32:
make \ make \
PREFIX=/usr/local \ PREFIX=/usr/local \
BIN_PREFIX=$(PREFIX)/bin \ BIN_PREFIX=$(PREFIX)/bin \
EXE_EXT=.exe \ EXE_EXT=.exe \
DATA_PREFIX=$(PREFIX)/share/tuxpaint \ DATA_PREFIX=data \
DOC_PREFIX=$(PREFIX)/share/doc/tuxpaint \ DOC_PREFIX=docs \
MAN_PREFIX=$(PREFIX)/share/man \ MAN_PREFIX=$(PREFIX)/share/man \
ICON_PREFIX=. \ ICON_PREFIX=. \
X11_ICON_PREFIX=. \ X11_ICON_PREFIX=. \
LOCALE_PREFIX=$(PREFIX)/share/locale \ LOCALE_PREFIX=locale \
CONFDIR=$(PREFIX)/etc/tuxpaint \ CONFDIR=$(PREFIX)/etc/tuxpaint \
ARCH_LINKS="-lintl-3 -lpng12 -lwinspool" \ ARCH_LINKS="-lintl-3 -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"
@ -234,20 +235,21 @@ install-beos:
ARCH_LIBS="obj/BeOS_print.o" ARCH_LIBS="obj/BeOS_print.o"
# "make install-win32" installs Tux Paint, but using MinGW/MSYS settings # "make install-win32" installs Tux Paint, but using MinGW/MSYS settings
# Install the data, docs and locale files in a VERY non-standard place.
install-win32: install-win32:
strip -s tuxpaint.exe strip -s tuxpaint.exe
make install-private-win32 \ make install-private-win32 \
PREFIX=/usr/local \ PREFIX=/usr/local \
BIN_PREFIX=$(PREFIX)/bin \ BIN_PREFIX=$(PREFIX)/bin \
EXE_EXT=.exe \ EXE_EXT=.exe \
DATA_PREFIX=$(PREFIX)/share/tuxpaint \ DATA_PREFIX=$(PREFIX)/bin/data \
DOC_PREFIX=$(PREFIX)/share/doc/tuxpaint \ DOC_PREFIX=$(PREFIX)/bin/docs \
MAN_PREFIX=$(PREFIX)/share/man \ MAN_PREFIX=$(PREFIX)/share/man \
ICON_PREFIX=. \ ICON_PREFIX=. \
X11_ICON_PREFIX=. \ X11_ICON_PREFIX=. \
LOCALE_PREFIX=$(PREFIX)/share/locale \ LOCALE_PREFIX=$(PREFIX)/bin/locale \
CONFDIR=$(PREFIX)/etc/tuxpaint \ CONFDIR=$(PREFIX)/etc/tuxpaint \
ARCH_LINKS="-lintl-3 -lpng12 -lwinspool" \ ARCH_LINKS="-lintl-3 -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"