diff options
| author | Fridrich Štrba <fridrich.strba@bluewin.ch> | 2011-02-09 10:49:18 +0100 |
|---|---|---|
| committer | Fridrich Štrba <fridrich.strba@bluewin.ch> | 2011-02-09 20:18:11 +0100 |
| commit | faa6b7db5c875d452d1f32a781001d79840b6c90 (patch) | |
| tree | cf8efc4c7b5b9c64ca8efcfeb734e14cb52803ed /solenv/inc/unxmacx.mk | |
| parent | 31a9634eb8c8b5564d1ca1499a3efd4098718163 (diff) | |
Removing the ext_std masterpiece
Diffstat (limited to 'solenv/inc/unxmacx.mk')
| -rw-r--r-- | solenv/inc/unxmacx.mk | 23 |
1 files changed, 1 insertions, 22 deletions
diff --git a/solenv/inc/unxmacx.mk b/solenv/inc/unxmacx.mk index 77a348138..17d942293 100644 --- a/solenv/inc/unxmacx.mk +++ b/solenv/inc/unxmacx.mk @@ -38,7 +38,7 @@ LINKOUTPUT_FILTER= # Definitions that we may need on the compile line. # -D_PTHREADS and -D_REENTRANT are needed for STLport, and must be specified when # compiling STLport sources too, either internally or externally. -CDEFS+=-DGLIBC=2 -D_PTHREADS -D_REENTRANT -DNO_PTHREAD_PRIORITY $(PROCESSOR_DEFINES) -DSTLPORT_VERSION=$(STLPORT_VER) -D_USE_NAMESPACE=1 +CDEFS+=-DGLIBC=2 -D_PTHREADS -D_REENTRANT -DNO_PTHREAD_PRIORITY $(PROCESSOR_DEFINES) -D_USE_NAMESPACE=1 .IF "$(GUIBASE)"=="unx" && "$(USE_SYSTEM_STL)"!="YES" CDEFS+=-DX_LOCALE .ENDIF @@ -165,27 +165,6 @@ CDEFS+=$(EXTRA_CDEFS) STDLIBCPP=-lstdc++ # --------------------------------- -# STLport library names -# --------------------------------- -.IF "$(USE_STLP_DEBUG)" != "" -.IF "$(STLPORT_VER)" >= "500" -LIBSTLPORT=-lstlportstlg -LIBSTLPORTST=$(STATIC) -lstlportstlg -.ELSE -LIBSTLPORT=-lstlport_gcc_stldebug -LIBSTLPORTST=$(SOLARVERSION)/$(INPATH)/lib/libstlport_gcc_stldebug.a -.ENDIF -.ELSE # "$(USE_STLP_DEBUG" != "" -.IF "$(STLPORT_VER)" >= "500" -LIBSTLPORT=-lstlport -LIBSTLPORTST=$(STATIC) -lstlport -.ELSE -LIBSTLPORT=-lstlport_gcc -LIBSTLPORTST=$(SOLARVERSION)/$(INPATH)/lib/libstlport_gcc.a -.ENDIF -.ENDIF # "$(USE_STLP_DEBUG" != "" - -# --------------------------------- # Link stage flags # --------------------------------- # always link with gcc since you may be linking c code and don't want -lstdc++ linked in! |