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

* Fixed building for Maemo. It was forgetting all CFLAGS except the Maemo specific ones. Now it only appends the Maemo flags.

Browse source
This commit is contained in:
Terje Bergström 2007-03-12 06:27:03 +00:00
parent 542aaf4cad
commit 85c2cf280c
1 changed files with 9 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

12
Makefile
View file

@ -82,6 +82,9 @@ NOSOUNDFLAG=__SOUND
NOSVGFLAG=__SVG NOSVGFLAG=__SVG
# Maemo flag
MAEMOFLAG=
# Where to find cursor shape XBMs # Where to find cursor shape XBMs
@ -116,7 +119,8 @@ DEFS=-DDATA_PREFIX=\"$(DATA_PREFIX)/\" \
-D$(NOSOUNDFLAG) -D$(NOSVGFLAG) -DDOC_PREFIX=\"$(DOC_PREFIX)/\" \ -D$(NOSOUNDFLAG) -D$(NOSVGFLAG) -DDOC_PREFIX=\"$(DOC_PREFIX)/\" \
-DLOCALEDIR=\"$(LOCALE_PREFIX)/\" -DCONFDIR=\"$(CONFDIR)/\" \ -DLOCALEDIR=\"$(LOCALE_PREFIX)/\" -DCONFDIR=\"$(CONFDIR)/\" \
-DVER_VERSION=\"$(VER_VERSION)\" \ -DVER_VERSION=\"$(VER_VERSION)\" \
-DVER_DATE=\"$(VER_DATE)\" -DVER_DATE=\"$(VER_DATE)\" \
-D$(MAEMOFLAG)
DEBUG_FLAGS= DEBUG_FLAGS=
#DEBUG_FLAGS=-g #DEBUG_FLAGS=-g
@ -237,8 +241,10 @@ win32:
nokia770: nokia770:
make \ make \
DATA_PREFIX=/var/lib/install/usr/share/tuxpaint \ DATA_PREFIX=/usr/share/tuxpaint \
CFLAGS="-DNOKIA_770" SVG_LIB= SVG_CFLAGS= NOSVGFLAG=NOSVG \
MAEMOFLAG=NOKIA_770
# "make install" installs all of the various parts # "make install" installs all of the various parts
# (depending on the *PREFIX variables at the top, you probably need # (depending on the *PREFIX variables at the top, you probably need