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

Fix the WIN32 builds to use oldsvg and custom include path for cairo.

Browse source 
Disable use of PAPER_LIB.
Fix typo in compiling message.
This commit is contained in:
John Popplewell 2007-06-30 03:59:04 +00:00
parent 4c7515190f
commit bedbdc7cd7
1 changed files with 11 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

14
Makefile
View file

@ -257,7 +257,11 @@ win32:
CONFDIR=$(PREFIX)/etc/tuxpaint \ CONFDIR=$(PREFIX)/etc/tuxpaint \
ARCH_LINKS="-lintl -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" \
SVG_CFLAGS=-I/usr/local/include/cairo \
SVG_LIB="-lcairo -lsvg -lsvg-cairo" \
OLDSVGFLAG=OLD_SVG \
PAPER_LIB= \
# "make nokia770" builds the program for the Nokia 770. # "make nokia770" builds the program for the Nokia 770.
@ -395,7 +399,11 @@ bdist-win32:
IM_PREFIX=im \ IM_PREFIX=im \
ARCH_LINKS="-lintl -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" \
SVG_CFLAGS=-I/usr/local/include/cairo \
SVG_LIB="-lcairo -lsvg -lsvg-cairo" \
OLDSVGFLAG=OLD_SVG \
PAPER_LIB=
strip -s tuxpaint.exe strip -s tuxpaint.exe
make bdist-private-win32 \ make bdist-private-win32 \
PREFIX=./visualc/bdist \ PREFIX=./visualc/bdist \
@ -839,7 +847,7 @@ obj/win32_print.o: src/win32_print.c obj src/win32_print.h src/debug.h
obj/postscript_print.o: src/postscript_print.c obj \ obj/postscript_print.o: src/postscript_print.c obj \
src/postscript_print.h src/debug.h src/postscript_print.h src/debug.h
@echo @echo
@echo "...Compoling PostScript print support..." @echo "...Compiling PostScript print support..."
@$(CC) $(CFLGS) $(DEBUG_FLAGS) $(SDL_CFLAGS) $(DEFS) \ @$(CC) $(CFLGS) $(DEBUG_FLAGS) $(SDL_CFLAGS) $(DEFS) \
-c src/postscript_print.c -o obj/postscript_print.o -c src/postscript_print.c -o obj/postscript_print.o