[Libreoffice-commits] core.git: Branch 'aoo/trunk' - extensions/source sal/systools setup_native/source svtools/Executable_bmp.mk svtools/Executable_bmpsum.mk svtools/Executable_g2g.mk tools/Executable_mkunroll.mk tools/Executable_rscdep.mk tools/Executable_so_checksum.mk tools/Executable_sspretty.mk tools/StaticLibrary_ooopathutils.mk
Oliver-Rainer Wittmann
orw at apache.org
Wed Jun 12 09:07:32 PDT 2013
extensions/source/ole/makefile.mk | 12 ----------
sal/systools/win32/kill/makefile.mk | 4 +++
setup_native/source/win32/customactions/indexingfilter/makefile.mk | 4 +++
setup_native/source/win32/customactions/javafilter/makefile.mk | 4 +++
setup_native/source/win32/customactions/languagepacks/makefile.mk | 4 +++
setup_native/source/win32/customactions/patch/makefile.mk | 4 +++
setup_native/source/win32/customactions/quickstarter/makefile.mk | 4 +++
setup_native/source/win32/customactions/rebase/makefile.mk | 4 +++
setup_native/source/win32/customactions/reg4allmsdoc/makefile.mk | 4 +++
setup_native/source/win32/customactions/regactivex/makefile.mk | 5 ++++
setup_native/source/win32/customactions/relnotes/makefile.mk | 4 +++
setup_native/source/win32/customactions/shellextensions/makefile.mk | 4 +++
setup_native/source/win32/customactions/tools/makefile.mk | 4 +++
svtools/Executable_bmp.mk | 9 +++++++
svtools/Executable_bmpsum.mk | 9 +++++++
svtools/Executable_g2g.mk | 9 +++++++
tools/Executable_mkunroll.mk | 8 ++++++
tools/Executable_rscdep.mk | 8 ++++++
tools/Executable_so_checksum.mk | 8 ++++++
tools/Executable_sspretty.mk | 8 ++++++
tools/StaticLibrary_ooopathutils.mk | 9 +++++++
21 files changed, 117 insertions(+), 12 deletions(-)
New commits:
commit 65f11dc33c9464706158ddb25ed15260dbe9ba1d
Author: Oliver-Rainer Wittmann <orw at apache.org>
Date: Wed Jun 12 15:03:54 2013 +0000
122500,122378: fix build breaker in non-pro builds with and without stlport
diff --git a/extensions/source/ole/makefile.mk b/extensions/source/ole/makefile.mk
index a633fce..d7b6393 100644
--- a/extensions/source/ole/makefile.mk
+++ b/extensions/source/ole/makefile.mk
@@ -43,10 +43,6 @@ INCPRE+= $(foreach,i,$(ATL_INCLUDE) -I$(i))
.IF "$(GUI)" == "WNT" && "$(DISABLE_ATL)"==""
-.IF "$(USE_STLP_DEBUG)"!=""
-CDEFS+=-D_DEBUG
-.ENDIF # "$(USE_STLP_DEBUG)"!=""
-
SLOFILES= \
$(SLO)$/servreg.obj \
$(SLO)$/servprov.obj \
@@ -77,11 +73,7 @@ SHL1STDLIBS=\
.IF "$(COM)"=="MSC"
.IF "$(WINDOWS_VISTA_PSDK)"!="" || "$(CCNUMVER)"<="001399999999"
-.IF "$(USE_STLP_DEBUG)" != ""
- SHL1STDLIBS+= $(ATL_LIB)$/atlsd.lib
-.ELSE
SHL1STDLIBS+= $(ATL_LIB)$/atls.lib
-.ENDIF
.ENDIF # "$(WINDOWS_VISTA_PSDK)"!="" || "$(CCNUMVER)"<="001399999999"
.ENDIF # "$(COM)"=="MSC"
@@ -105,11 +97,7 @@ SHL2STDLIBS=\
.IF "$(COM)"=="MSC"
.IF "$(WINDOWS_VISTA_PSDK)"!="" || "$(CCNUMVER)"<="001399999999"
-.IF "$(USE_STLP_DEBUG)" != ""
- SHL2STDLIBS+= $(ATL_LIB)$/atlsd.lib
-.ELSE
SHL2STDLIBS+= $(ATL_LIB)$/atls.lib
-.ENDIF
.ENDIF # "$(WINDOWS_VISTA_PSDK)"!="" || "$(CCNUMVER)"<="001399999999"
.ENDIF # "$(COM)"=="MSC"
diff --git a/sal/systools/win32/kill/makefile.mk b/sal/systools/win32/kill/makefile.mk
index 56952ac..efff1d0 100644
--- a/sal/systools/win32/kill/makefile.mk
+++ b/sal/systools/win32/kill/makefile.mk
@@ -38,6 +38,10 @@ TARGETTYPE=CUI
CDEFS=-D_WIN32_WINNT=0x0501
.ENDIF
+.IF "$(USE_SYSTEM_STL)" != "YES" && "$(PRODUCT)" = ""
+CDEFS+=-D_DEBUG
+.ENDIF
+
CFLAGS+= $(LFS_CFLAGS)
CXXFLAGS+= $(LFS_CFLAGS)
diff --git a/setup_native/source/win32/customactions/indexingfilter/makefile.mk b/setup_native/source/win32/customactions/indexingfilter/makefile.mk
index e40c631..70fb20e 100644
--- a/setup_native/source/win32/customactions/indexingfilter/makefile.mk
+++ b/setup_native/source/win32/customactions/indexingfilter/makefile.mk
@@ -38,6 +38,10 @@ USE_DEFFILE=TRUE
.IF "$(GUI)"=="WNT"
+.IF "$(USE_SYSTEM_STL)" != "YES" && "$(PRODUCT)" = ""
+CDEFS+=-D_DEBUG
+.ENDIF
+
UWINAPILIB=
SLOFILES = $(SLO)$/restartindexingservice.obj
diff --git a/setup_native/source/win32/customactions/javafilter/makefile.mk b/setup_native/source/win32/customactions/javafilter/makefile.mk
index cfe86ff..9bdea6c 100644
--- a/setup_native/source/win32/customactions/javafilter/makefile.mk
+++ b/setup_native/source/win32/customactions/javafilter/makefile.mk
@@ -38,6 +38,10 @@ DYNAMIC_CRT=
.IF "$(GUI)"=="WNT"
+.IF "$(USE_SYSTEM_STL)" != "YES" && "$(PRODUCT)" = ""
+CDEFS+=-D_DEBUG
+.ENDIF
+
UWINAPILIB=
SLOFILES = $(SLO)$/jfregca.obj
diff --git a/setup_native/source/win32/customactions/languagepacks/makefile.mk b/setup_native/source/win32/customactions/languagepacks/makefile.mk
index 78b177d..b9f45d8 100644
--- a/setup_native/source/win32/customactions/languagepacks/makefile.mk
+++ b/setup_native/source/win32/customactions/languagepacks/makefile.mk
@@ -46,6 +46,10 @@ CDEFS+=-Dnot_used_define_to_disable_pch
.IF "$(GUI)"=="WNT"
+.IF "$(USE_SYSTEM_STL)" != "YES" && "$(PRODUCT)" = ""
+CDEFS+=-D_DEBUG
+.ENDIF
+
UWINAPILIB=
SLOFILES = $(SLO)$/lngpckinsthelper.obj \
diff --git a/setup_native/source/win32/customactions/patch/makefile.mk b/setup_native/source/win32/customactions/patch/makefile.mk
index 42c94d8..9df5928 100644
--- a/setup_native/source/win32/customactions/patch/makefile.mk
+++ b/setup_native/source/win32/customactions/patch/makefile.mk
@@ -45,6 +45,10 @@ CDEFS+=-Dnot_used_define_to_disable_pch
.IF "$(GUI)"=="WNT"
+.IF "$(USE_SYSTEM_STL)" != "YES" && "$(PRODUCT)" = ""
+CDEFS+=-D_DEBUG
+.ENDIF
+
UWINAPILIB=
SLOFILES = \
diff --git a/setup_native/source/win32/customactions/quickstarter/makefile.mk b/setup_native/source/win32/customactions/quickstarter/makefile.mk
index 0132005..0175b33 100644
--- a/setup_native/source/win32/customactions/quickstarter/makefile.mk
+++ b/setup_native/source/win32/customactions/quickstarter/makefile.mk
@@ -47,6 +47,10 @@ UWINAPILIB=
.IF "$(GUI)"=="WNT"
+.IF "$(USE_SYSTEM_STL)" != "YES" && "$(PRODUCT)" = ""
+CDEFS+=-D_DEBUG
+.ENDIF
+
STDSHL += \
$(ADVAPI32LIB)\
$(SHELL32LIB)\
diff --git a/setup_native/source/win32/customactions/rebase/makefile.mk b/setup_native/source/win32/customactions/rebase/makefile.mk
index f422077..5e3cc1c 100644
--- a/setup_native/source/win32/customactions/rebase/makefile.mk
+++ b/setup_native/source/win32/customactions/rebase/makefile.mk
@@ -46,6 +46,10 @@ UWINAPILIB=
.IF "$(GUI)"=="WNT"
+.IF "$(USE_SYSTEM_STL)" != "YES" && "$(PRODUCT)" = ""
+CDEFS+=-D_DEBUG
+.ENDIF
+
STDSHL += \
$(ADVAPI32LIB)\
$(SHELL32LIB)\
diff --git a/setup_native/source/win32/customactions/reg4allmsdoc/makefile.mk b/setup_native/source/win32/customactions/reg4allmsdoc/makefile.mk
index db32152..c00b8aa 100644
--- a/setup_native/source/win32/customactions/reg4allmsdoc/makefile.mk
+++ b/setup_native/source/win32/customactions/reg4allmsdoc/makefile.mk
@@ -43,6 +43,10 @@ CFLAGS+=-D_STLP_USE_STATIC_LIB
.IF "$(GUI)"=="WNT"
+.IF "$(USE_SYSTEM_STL)" != "YES" && "$(PRODUCT)" = ""
+CDEFS+=-D_DEBUG
+.ENDIF
+
UWINAPILIB=
SLOFILES = $(SLO)$/reg4allmsi.obj
diff --git a/setup_native/source/win32/customactions/regactivex/makefile.mk b/setup_native/source/win32/customactions/regactivex/makefile.mk
index 90b872a..00f6ed4 100644
--- a/setup_native/source/win32/customactions/regactivex/makefile.mk
+++ b/setup_native/source/win32/customactions/regactivex/makefile.mk
@@ -38,6 +38,11 @@ USE_DEFFILE=TRUE
.IF "$(GUI)"=="WNT"
+.IF "$(USE_SYSTEM_STL)" != "YES" && "$(PRODUCT)" = ""
+CDEFS+=-D_DEBUG
+.ENDIF
+
+
UWINAPILIB=
SLOFILES = $(SLO)$/regactivex.obj
diff --git a/setup_native/source/win32/customactions/relnotes/makefile.mk b/setup_native/source/win32/customactions/relnotes/makefile.mk
index feea746..9484cc6 100644
--- a/setup_native/source/win32/customactions/relnotes/makefile.mk
+++ b/setup_native/source/win32/customactions/relnotes/makefile.mk
@@ -46,6 +46,10 @@ UWINAPILIB=
.IF "$(GUI)"=="WNT"
+.IF "$(USE_SYSTEM_STL)" != "YES" && "$(PRODUCT)" = ""
+CDEFS+=-D_DEBUG
+.ENDIF
+
SLOFILES = $(SLO)$/relnotes.obj
STDSHL+= \
diff --git a/setup_native/source/win32/customactions/shellextensions/makefile.mk b/setup_native/source/win32/customactions/shellextensions/makefile.mk
index 2f81b32..a6f702c 100644
--- a/setup_native/source/win32/customactions/shellextensions/makefile.mk
+++ b/setup_native/source/win32/customactions/shellextensions/makefile.mk
@@ -45,6 +45,10 @@ CDEFS+=-Dnot_used_define_to_disable_pch
.IF "$(GUI)"=="WNT"
+.IF "$(USE_SYSTEM_STL)" != "YES" && "$(PRODUCT)" = ""
+CDEFS+=-D_DEBUG
+.ENDIF
+
UWINAPILIB=
SLOFILES = \
diff --git a/setup_native/source/win32/customactions/tools/makefile.mk b/setup_native/source/win32/customactions/tools/makefile.mk
index a40754b..ff8ba6a 100644
--- a/setup_native/source/win32/customactions/tools/makefile.mk
+++ b/setup_native/source/win32/customactions/tools/makefile.mk
@@ -43,6 +43,10 @@ CFLAGS+=-D_STLP_USE_STATIC_LIB
.IF "$(GUI)"=="WNT"
+.IF "$(USE_SYSTEM_STL)" != "YES" && "$(PRODUCT)" = ""
+CDEFS+=-D_DEBUG
+.ENDIF
+
UWINAPILIB=
SLOFILES = $(SLO)$/seterror.obj \
diff --git a/svtools/Executable_bmp.mk b/svtools/Executable_bmp.mk
index 3658347..e33bbfd 100644
--- a/svtools/Executable_bmp.mk
+++ b/svtools/Executable_bmp.mk
@@ -44,6 +44,15 @@ $(eval $(call gb_Executable_add_linked_libs,bmp,\
$(gb_STDLIBS) \
))
+ifneq ($(USE_SYSTEM_STL),YES)
+ifeq ($(PRODUCT),)
+ $(eval $(call gb_Executable_set_cxxflags,bmp,\
+ $$(CXXFLAGS) \
+ -D_DEBUG \
+))
+endif
+endif
+
$(eval $(call gb_Executable_add_exception_objects,bmp,\
svtools/bmpmaker/bmp \
svtools/bmpmaker/bmpcore \
diff --git a/svtools/Executable_bmpsum.mk b/svtools/Executable_bmpsum.mk
index a39e24f..2b2a0fe 100644
--- a/svtools/Executable_bmpsum.mk
+++ b/svtools/Executable_bmpsum.mk
@@ -41,6 +41,15 @@ $(eval $(call gb_Executable_add_linked_libs,bmpsum,\
$(gb_STDLIBS) \
))
+ifneq ($(USE_SYSTEM_STL),YES)
+ifeq ($(PRODUCT),)
+ $(eval $(call gb_Executable_set_cxxflags,bmpsum,\
+ $$(CXXFLAGS) \
+ -D_DEBUG \
+))
+endif
+endif
+
$(eval $(call gb_Executable_add_exception_objects,bmpsum,\
svtools/bmpmaker/bmpsum \
))
diff --git a/svtools/Executable_g2g.mk b/svtools/Executable_g2g.mk
index daba4fe..dd2ba34 100644
--- a/svtools/Executable_g2g.mk
+++ b/svtools/Executable_g2g.mk
@@ -43,6 +43,15 @@ $(eval $(call gb_Executable_add_linked_libs,g2g,\
$(gb_STDLIBS) \
))
+ifneq ($(USE_SYSTEM_STL),YES)
+ifeq ($(PRODUCT),)
+ $(eval $(call gb_Executable_set_cxxflags,g2g,\
+ $$(CXXFLAGS) \
+ -D_DEBUG \
+))
+endif
+endif
+
$(eval $(call gb_Executable_add_exception_objects,g2g,\
svtools/bmpmaker/g2g \
))
diff --git a/tools/Executable_mkunroll.mk b/tools/Executable_mkunroll.mk
index 9bd813c..aca8a9b 100644
--- a/tools/Executable_mkunroll.mk
+++ b/tools/Executable_mkunroll.mk
@@ -30,9 +30,17 @@ $(eval $(call gb_Executable_set_include,mkunroll,\
-I$(SRCDIR)/tools/bootstrp/ \
))
+STLPORT_DEBUGFLAG =
+ifneq ($(USE_SYSTEM_STL),YES)
+ifeq ($(PRODUCT),)
+STLPORT_DEBUGFLAG = -D_DEBUG
+endif
+endif
+
$(eval $(call gb_Executable_set_cxxflags,mkunroll,\
$$(CXXFLAGS) \
-D_TOOLS_STRINGLIST \
+ $(STLPORT_DEBUGFLAG) \
))
$(eval $(call gb_Executable_add_linked_libs,mkunroll,\
diff --git a/tools/Executable_rscdep.mk b/tools/Executable_rscdep.mk
index c41c13c..f60105f 100644
--- a/tools/Executable_rscdep.mk
+++ b/tools/Executable_rscdep.mk
@@ -30,9 +30,17 @@ $(eval $(call gb_Executable_set_include,rscdep,\
-I$(SRCDIR)/tools/bootstrp/ \
))
+STLPORT_DEBUGFLAG =
+ifneq ($(USE_SYSTEM_STL),YES)
+ifeq ($(PRODUCT),)
+STLPORT_DEBUGFLAG = -D_DEBUG
+endif
+endif
+
$(eval $(call gb_Executable_set_cxxflags,rscdep,\
$$(CXXFLAGS) \
-D_TOOLS_STRINGLIST \
+ $(STLPORT_DEBUGFLAG) \
))
$(eval $(call gb_Executable_add_linked_libs,rscdep,\
diff --git a/tools/Executable_so_checksum.mk b/tools/Executable_so_checksum.mk
index f77a130..3d86197 100644
--- a/tools/Executable_so_checksum.mk
+++ b/tools/Executable_so_checksum.mk
@@ -30,9 +30,17 @@ $(eval $(call gb_Executable_set_include,so_checksum,\
-I$(SRCDIR)/tools/bootstrp/ \
))
+STLPORT_DEBUGFLAG =
+ifneq ($(USE_SYSTEM_STL),YES)
+ifeq ($(PRODUCT),)
+STLPORT_DEBUGFLAG = -D_DEBUG
+endif
+endif
+
$(eval $(call gb_Executable_set_cxxflags,so_checksum,\
$$(CXXFLAGS) \
-D_TOOLS_STRINGLIST \
+ $(STLPORT_DEBUGFLAG) \
))
$(eval $(call gb_Executable_add_linked_libs,so_checksum,\
diff --git a/tools/Executable_sspretty.mk b/tools/Executable_sspretty.mk
index b61afb2..4a694f9 100644
--- a/tools/Executable_sspretty.mk
+++ b/tools/Executable_sspretty.mk
@@ -30,9 +30,17 @@ $(eval $(call gb_Executable_set_include,sspretty,\
-I$(SRCDIR)/tools/bootstrp/ \
))
+STLPORT_DEBUGFLAG =
+ifneq ($(USE_SYSTEM_STL),YES)
+ifeq ($(PRODUCT),)
+STLPORT_DEBUGFLAG = -D_DEBUG
+endif
+endif
+
$(eval $(call gb_Executable_set_cxxflags,sspretty,\
$$(CXXFLAGS) \
-D_TOOLS_STRINGLIST \
+ $(STLPORT_DEBUGFLAG) \
))
$(eval $(call gb_Executable_add_linked_libs,sspretty,\
diff --git a/tools/StaticLibrary_ooopathutils.mk b/tools/StaticLibrary_ooopathutils.mk
index a47b7e1..6d356b0 100644
--- a/tools/StaticLibrary_ooopathutils.mk
+++ b/tools/StaticLibrary_ooopathutils.mk
@@ -25,6 +25,15 @@ $(eval $(call gb_StaticLibrary_StaticLibrary,ooopathutils))
$(eval $(call gb_StaticLibrary_add_package_headers,ooopathutils,tools_inc))
+ifneq ($(USE_SYSTEM_STL),YES)
+ifeq ($(PRODUCT),)
+$(eval $(call gb_StaticLibrary_set_defs,ooopathutils,\
+ $$(DEFS) \
+ -D_DEBUG \
+))
+endif
+endif
+
$(eval $(call gb_StaticLibrary_add_exception_objects,ooopathutils,\
tools/source/misc/pathutils \
))
More information about the Libreoffice-commits
mailing list