diff options
| author | Tor Lillqvist <tlillqvist@novell.com> | 2011-01-24 00:18:00 +0200 |
|---|---|---|
| committer | Tor Lillqvist <tlillqvist@novell.com> | 2011-01-24 00:18:08 +0200 |
| commit | 13f646d1aefdf6937062d2b4fe639a3f3d7030f7 (patch) | |
| tree | 316e986625d3ee03c417aa77c4a8014bc072cc18 /graphite | |
| parent | 631f331d3c53a0fa0bce20ede1aae14de3670c7e (diff) | |
Interpret any non-empty value of $(debug) as true, like elsewhere
Also, avoid double slash when redirecting the pdb file just for
cleanliness.
Diffstat (limited to 'graphite')
| -rw-r--r-- | graphite/makefile.mk | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/graphite/makefile.mk b/graphite/makefile.mk index 181d70b27728..0e7b81cd7897 100644 --- a/graphite/makefile.mk +++ b/graphite/makefile.mk @@ -77,9 +77,9 @@ VCNUM=8 # make use of stlport headerfiles EXT_USE_STLPORT=TRUE BUILD_ACTION=nmake VERBOSE=1 -.IF "$(debug)"=="true" +.IF "$(debug)"!="" BUILD_FLAGS= "CFG=DEBUG" -CFLAGSWITHPATH= $(CFLAGS:s!-Fd.!-Fd../../../../../!) +CFLAGSWITHPATH= $(CFLAGS:s!-Fd./!-Fd../../../../../!) .ELSE # Speed Optimization is really needed for Graphite CFLAGSWITHPATH= $(CFLAGS) /O2 @@ -96,7 +96,7 @@ BUILD_FLAGS+= "CFLAGS4MSC=$(CFLAGS4MSC)" /F makefile.vc$(VCNUM) lib_dll .IF "$(COM)"=="GCC" # Does linux want --disable-shared? -.IF "$(debug)"=="true" +.IF "$(debug)"!="" GR_CONFIGURE_FLAGS= --enable-debug=yes --disable-final --enable-static --disable-shared .ELSE GR_CONFIGURE_FLAGS= --enable-final=yes --enable-static --disable-shared @@ -129,7 +129,7 @@ BUILD_DIR=$(CONFIGURE_DIR) .IF "$(OS)"=="WNT" && "$(COM)"!="GCC" #OUT2LIB=win32$/bin.msvc$/*.lib -.IF "$(debug)"=="true" +.IF "$(debug)"!="" OUT2LIB=engine$/debug$/*.lib .ELSE OUT2LIB=engine$/release$/*.lib @@ -147,7 +147,7 @@ OUT2LIB+=src$/.libs$/libgraphite.*.dylib .ELSE .IF "$(OS)"=="WNT" && "$(COM)"!="GCC" #OUT2LIB+=engine$/src$/.libs$/libgraphite*.dll -.IF "$(debug)"=="true" +.IF "$(debug)"!="" OUT2BIN= \ # engine$/debug$/*.dll \ engine$/debug$/*.pdb |