mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Trying to remove the stlport mention from the code

Browse Source
This commit is contained in:
Fridrich Štrba 2011-02-09 16:20:32 +01:00
parent 30a8393e50
commit 81ef04be69
13 changed files with 1 additions and 92 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
cppu/qa/makefile.mk
View File

@ -33,13 +33,6 @@ ENABLE_EXCEPTIONS := TRUE
.INCLUDE: settings.mk
#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
CFLAGSCXX+=$(CPPUNIT_CFLAGS)
DLLPRE=# no leading "lib" on .so files

7
sal/cppunittester/makefile.mk
View File

@ -33,13 +33,6 @@ ENABLE_EXCEPTIONS = TRUE
.INCLUDE: settings.mk
#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
CFLAGSCXX += $(CPPUNIT_CFLAGS)
OBJFILES = $(APP1OBJS)

7
sal/qa/osl/condition/makefile.mk
View File

@ -36,13 +36,6 @@ ENABLE_EXCEPTIONS=TRUE
.INCLUDE : settings.mk
# 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
CFLAGS+= $(LFS_CFLAGS)
CXXFLAGS+= $(LFS_CFLAGS)

7
sal/qa/osl/file/makefile.mk
View File

@ -36,13 +36,6 @@ ENABLE_EXCEPTIONS=TRUE
.INCLUDE : settings.mk
# 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
CFLAGS+= $(LFS_CFLAGS)
CXXFLAGS+= $(LFS_CFLAGS)

7
sal/qa/osl/module/makefile.mk
View File

@ -36,13 +36,6 @@ ENABLE_EXCEPTIONS=TRUE
.INCLUDE : settings.mk
# 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
CFLAGS+= $(LFS_CFLAGS)
CXXFLAGS+= $(LFS_CFLAGS)

7
sal/qa/osl/mutex/makefile.mk
View File

@ -40,13 +40,6 @@ ENABLE_EXCEPTIONS=TRUE
.INCLUDE : settings.mk
# 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
CFLAGS+= $(LFS_CFLAGS)
CXXFLAGS+= $(LFS_CFLAGS)

7
sal/qa/osl/profile/makefile.mk
View File

@ -41,13 +41,6 @@ ENABLE_EXCEPTIONS=TRUE
.INCLUDE : settings.mk
# 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
CFLAGS+= $(LFS_CFLAGS)
CXXFLAGS+= $(LFS_CFLAGS)

7
sal/qa/osl/thread/makefile.mk
View File

@ -33,13 +33,6 @@ ENABLE_EXCEPTIONS := TRUE
.INCLUDE: settings.mk
# 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
DLLPRE = # no leading "lib" on .so files
SHL1TARGET = $(TARGET)

7
sal/qa/rtl/digest/makefile.mk
View File

@ -36,13 +36,6 @@ ENABLE_EXCEPTIONS=TRUE
.INCLUDE : settings.mk
#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
CFLAGSCXX += $(CPPUNIT_CFLAGS)
DLLPRE = # no leading "lib" on .so files

7
sal/qa/rtl/random/makefile.mk
View File

@ -35,13 +35,6 @@ ENABLE_EXCEPTIONS=TRUE
.INCLUDE : settings.mk
#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
CFLAGSCXX += $(CPPUNIT_CFLAGS)
DLLPRE = # no leading "lib" on .so files

7
sal/qa/rtl/strings/makefile.mk
View File

@ -35,13 +35,6 @@ ENABLE_EXCEPTIONS := TRUE
.INCLUDE: settings.mk
#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
CFLAGS+= $(LFS_CFLAGS)
CXXFLAGS+= $(LFS_CFLAGS)

14
sal/util/makefile.mk
View File

@ -121,20 +121,6 @@ SHL1STDLIBS+= -z allextract -staticlib=Crun -z defaultextract
SHL1STDLIBS=pthread.lib
.ENDIF # OS2
# If we compile sal with STLport checking iterators
# we need to link against the STLport
.IF "$(USE_STLP_DEBUG)" != ""
SHL1STDLIBS+=$(LIBSTLPORT)
.ENDIF
#The irony that using the system STL instead of
#stlport requires that we link libsal with the
#LIBSTLPORT alias which is not required when using
#stlport is not lost on me
.IF "$(USE_SYSTEM_STL)"=="YES"
SHL1STDLIBS+=$(LIBSTLPORT)
.ENDIF
.IF "$(OS)"=="MACOSX"
SHL1STDLIBS+=-framework CoreFoundation -framework Carbon
.ENDIF

2
ure/source/uretest/Makefile
View File

@ -120,7 +120,7 @@ out.sdk/cppmain.uno.$(SHAREDLIB_EXT): out.sdk/cppmain.$(OBJ_EXT) version.map | \
out.sdk
$(LINK) $(COMP_LINK_FLAGS) $(link_output_switch)$@ $< $(LINK_LIBS) \
$(CPPULIB) $(CPPUHELPERLIB) $(SALLIB) $(SALHELPERLIB) \
$(STLPORTLIB) $(link_std_libs)
$(link_std_libs)
out.sdk/cppmain.$(OBJ_EXT): cppmain.cc out.sdk/cpputypes.cppumaker.flag \
out.sdk/types.cppumaker.flag | out.sdk