diff options
| -rw-r--r-- | graphite/makefile.mk | 12 |
1 files changed, 1 insertions, 11 deletions
diff --git a/graphite/makefile.mk b/graphite/makefile.mk index 4aeb626eeb10..1da1d14d69c7 100644 --- a/graphite/makefile.mk +++ b/graphite/makefile.mk @@ -68,8 +68,6 @@ VCNUM=7 .ELSE VCNUM=8 .ENDIF -# make use of stlport headerfiles -EXT_USE_STLPORT=TRUE BUILD_ACTION=nmake VERBOSE=1 .IF "$(debug)"!="" BUILD_FLAGS= "CFG=DEBUG" @@ -97,14 +95,6 @@ GR_CONFIGURE_FLAGS= --enable-final=yes --enable-static --disable-shared .ENDIF EXTRA_GR_CXX_FLAGS=-fPIC -.IF "$(USE_SYSTEM_STL)"!="YES" -# #i112124# STLPort seems to require libstdc++ -EXTRA_GR_LD_FLAGS=$(LIBSTLPORT) -lm -lstdc++ -GR_LIB_PATH=LD_LIBRARY_PATH=$(SOLARVERSION)/$(INPATH)/lib$(UPDMINOREXT) -.ELSE -GR_LIB_PATH= -.ENDIF - .IF "$(OS)"=="WNT" PATCH_FILES+=graphite-2.3.1.patch.mingw EXTRA_GR_CXX_FLAGS=-mthreads -nostdinc @@ -116,7 +106,7 @@ EXTRA_GR_LD_FLAGS+=-no-undefined -Wl,--enable-runtime-pseudo-reloc-v2 # don't use SOLARLIB for LDFLAGS because it pulls in system graphite so build will fail # -CONFIGURE_ACTION=bash -c 'CXXFLAGS="$(INCLUDE) $(CFLAGSCXX) $(CFLAGSCOBJ) $(CDEFS) $(CDEFSOBJ) $(SOLARINC) $(LFS_CFLAGS) $(EXTRA_GR_CXX_FLAGS)" $(GR_LIB_PATH) LDFLAGS="-L$(SOLARVERSION)/$(INPATH)/lib$(UPDMINOREXT) $(EXTRA_GR_LD_FLAGS)" ./configure $(GR_CONFIGURE_FLAGS)' +CONFIGURE_ACTION=bash -c 'CXXFLAGS="$(INCLUDE) $(CFLAGSCXX) $(CFLAGSCOBJ) $(CDEFS) $(CDEFSOBJ) $(SOLARINC) $(LFS_CFLAGS) $(EXTRA_GR_CXX_FLAGS)" LDFLAGS="-L$(SOLARVERSION)/$(INPATH)/lib$(UPDMINOREXT) $(EXTRA_GR_LD_FLAGS)" ./configure $(GR_CONFIGURE_FLAGS)' .ENDIF BUILD_DIR=$(CONFIGURE_DIR) |