diff options
| author | Armin Le Grand <alg@apache.org> | 2013-11-27 16:25:40 +0000 |
|---|---|---|
| committer | Armin Le Grand <alg@apache.org> | 2013-11-27 16:25:40 +0000 |
| commit | 812e2a8bf64274e47db572b8ca592f49b1263ad7 (patch) | |
| tree | 404f9a7432e94c42a09bb76b33eb7d38186ccff6 /basegfx | |
| parent | 9818d8d1c64bd93adfaacb8a2f824a9db1f4987d (diff) | |
resync to trunk (after accessibility integration)
Diffstat (limited to 'basegfx')
| -rw-r--r-- | basegfx/source/workbench/Makefile | 2 | ||||
| -rw-r--r-- | basegfx/test/makefile.mk | 9 |
2 files changed, 2 insertions, 9 deletions
diff --git a/basegfx/source/workbench/Makefile b/basegfx/source/workbench/Makefile index e39f15e79638..34f1edb86371 100644 --- a/basegfx/source/workbench/Makefile +++ b/basegfx/source/workbench/Makefile @@ -63,7 +63,7 @@ #test : bezierclip.cxx convexhull.cxx # g++ -Wall -g \ # -I. -I. -I../inc -I./inc -I./unx/inc -I./unxlngi4/inc -I. -I/develop4/update/SRX644/unxlngi4/inc.m4/stl -I/develop4/update/SRX644/unxlngi4/inc.m4/external -I/develop4/update/SRX644/unxlngi4/inc.m4 -I/develop4/update/SRX644/src.m4/solenv/unxlngi4/inc -I/net/grande/develop6/update/dev/gcc_3.0.1_linux_libc2.11_turbolinux/include -I/develop4/update/SRX644/src.m4/solenv/inc -I/develop4/update/SRX644/unxlngi4/inc.m4/stl -I/net/grande.germany/develop6/update/dev/gcc_3.0.1_linux_libc2.11_turbolinux/redhat60/usr/include -I/net/grande.germany/develop6/update/dev/gcc_3.0.1_linux_libc2.11_turbolinux/redhat60/usr/include/X11 -I/develop4/update/SRX644/src.m4/res -I/net/grande/develop6/update/dev/Linux_JDK_1.4.0/include -I/net/grande/develop6/update/dev/Linux_JDK_1.4.0/include/linux -I. -I./res -I. \ -# -include preinclude.h -D_USE_NAMESPACE -DGLIBC=2 -D_USE_NAMESPACE=1 -DSTLPORT_VERSION=400 -D_STLP_DEBUG \ +# -include preinclude.h -D_USE_NAMESPACE -DGLIBC=2 -D_USE_NAMESPACE=1 -D_STLP_DEBUG \ # bezierclip.cxx convexhull.cxx -o bezierclip prog : bezierclip.cxx convexhull.cxx diff --git a/basegfx/test/makefile.mk b/basegfx/test/makefile.mk index 402b820a2741..7eb234ac5257 100644 --- a/basegfx/test/makefile.mk +++ b/basegfx/test/makefile.mk @@ -37,14 +37,7 @@ ENABLE_EXCEPTIONS=TRUE @all: @echo "cppunit disabled. nothing do do." -.ELSE # "$(WITH_CPPUNIT)" != "YES" - -#building with stlport, but cppunit was not built with stlport -.IF "$(USE_SYSTEM_STL)"!="YES" -.IF "$(SYSTEM_CPPUNIT)"=="YES" -CFLAGSCXX+=-DADAPT_EXT_STL -.ENDIF -.ENDIF +.ELSE CFLAGSCXX += $(CPPUNIT_CFLAGS) |