diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2013-04-19 13:35:42 +0200 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2013-04-19 14:02:18 +0200 |
| commit | 5051209534c8a2034dcb0016d4a8fe29dcb2947b (patch) | |
| tree | 4348b7b3d087c28586f73ad30242d9ee683b27a7 | |
| parent | 04a54e7180c2cf9f4855211055ecbc6a41deff56 (diff) | |
Adapt SDK to usage of msvcrtd for Windows --enable-dbgutil
* Re-use existing settings/dk.mk to tunnel ENABLE_DEBUG into the SDK. Turns out
this was explicitly included in ~all examples Makefiles, but only after
settings.mk where it is now used, so include it in settings.mk now and dropped
it from all the exmaples Makefiles.
* The old settings.mk was apparently confused with using /MT ("link with
LIBCMT.LIB") on cl command line and /MD ("link with MSVCRT.LIB") on link
command line (where it was ignored), and you apparently can't pass both
together to cl, so I settled on /MD (resp. /MDd) now and dropped /MT (resp.
/MTd). No idea if that is exactly right, however.
* Introduced client-facing LIBO_SDK_LDFLAGS_STDLIBS that covers kernel32.lib and
msvcrt.lib vs. msvcrtd.lib on Windows. Adapted examples Makefiles and
/ure/source/uretest/Makefile accordingly. Some examples Makefiles
additionally use msvcprt.lib, no idea whether that still needs to be
addressed.
Change-Id: Ia8d9d177e415abfbaf6f9fa6239f0ef9998868be
70 files changed, 41 insertions, 87 deletions
diff --git a/odk/CustomTarget_settings.mk b/odk/CustomTarget_settings.mk index fb798b0086ee..358561b99c22 100644 --- a/odk/CustomTarget_settings.mk +++ b/odk/CustomTarget_settings.mk @@ -30,6 +30,7 @@ $(eval $(call gb_CustomTarget_register_target,odk/odkcommon/settings,dk.mk)) $(odk_WORKDIR)/settings/dk.mk: $(SRCDIR)/odk/pack/copying/dk.mk $(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),build,SED,1) tr -d "\015" < $< | sed -e 's/@@RELEASE@@/$(PRODUCTVERSION)/' \ - -e 's/@@BUILDID@@/$(LIBO_VERSION_MAJOR).$(LIBO_VERSION_MINOR).$(LIBO_VERSION_MICRO).$(LIBO_VERSION_PATCH)/' > $@ + -e 's/@@BUILDID@@/$(LIBO_VERSION_MAJOR).$(LIBO_VERSION_MINOR).$(LIBO_VERSION_MICRO).$(LIBO_VERSION_PATCH)/' \ + -e 's/@@ENABLE_DBGUTIL@@/$(ENABLE_DBGUTIL)/' > $@ # vim: set noet sw=4 ts=4: diff --git a/odk/examples/CLI/CSharp/Spreadsheet/Makefile b/odk/examples/CLI/CSharp/Spreadsheet/Makefile index 219d867fb268..6d03200e4a7f 100644 --- a/odk/examples/CLI/CSharp/Spreadsheet/Makefile +++ b/odk/examples/CLI/CSharp/Spreadsheet/Makefile @@ -27,7 +27,6 @@ SETTINGS = $(PRJ)/settings include $(SETTINGS)/settings.mk include $(SETTINGS)/std.mk -#include $(SETTINGS)/dk.mk CSC_FLAGS = -warnaserror+ -noconfig -platform:x86 VBC_FLAGS = -warnaserror+ diff --git a/odk/examples/CLI/VB.NET/WriterDemo/Makefile b/odk/examples/CLI/VB.NET/WriterDemo/Makefile index 5a79f728221c..b7425b348715 100644 --- a/odk/examples/CLI/VB.NET/WriterDemo/Makefile +++ b/odk/examples/CLI/VB.NET/WriterDemo/Makefile @@ -23,7 +23,6 @@ SETTINGS = $(PRJ)/settings include $(SETTINGS)/settings.mk include $(SETTINGS)/std.mk -include $(SETTINGS)/dk.mk CSC_FLAGS = -warnaserror+ -incremental- -noconfig VBC_FLAGS = -warnaserror+ diff --git a/odk/examples/DevelopersGuide/BasicAndDialogs/CreatingDialogs/Makefile b/odk/examples/DevelopersGuide/BasicAndDialogs/CreatingDialogs/Makefile index e6549be017c5..bcd47ac1725f 100644 --- a/odk/examples/DevelopersGuide/BasicAndDialogs/CreatingDialogs/Makefile +++ b/odk/examples/DevelopersGuide/BasicAndDialogs/CreatingDialogs/Makefile @@ -39,7 +39,6 @@ SETTINGS=$(PRJ)/settings include $(SETTINGS)/settings.mk include $(SETTINGS)/std.mk -include $(SETTINGS)/dk.mk # Define non-platform/compiler specific settings EXAMPLE_NAME=BaDCreatingDialogsExample diff --git a/odk/examples/DevelopersGuide/BasicAndDialogs/ToolkitControls/Makefile b/odk/examples/DevelopersGuide/BasicAndDialogs/ToolkitControls/Makefile index c5f17ec68b88..bd3a43444d64 100644 --- a/odk/examples/DevelopersGuide/BasicAndDialogs/ToolkitControls/Makefile +++ b/odk/examples/DevelopersGuide/BasicAndDialogs/ToolkitControls/Makefile @@ -39,7 +39,6 @@ SETTINGS=$(PRJ)/settings include $(SETTINGS)/settings.mk include $(SETTINGS)/std.mk -include $(SETTINGS)/dk.mk # Define non-platform/compiler specific settings SAMPLE_NAME=BaDToolkitControls diff --git a/odk/examples/DevelopersGuide/Charts/Makefile b/odk/examples/DevelopersGuide/Charts/Makefile index d6727662bfbb..d6ff9edcdc18 100644 --- a/odk/examples/DevelopersGuide/Charts/Makefile +++ b/odk/examples/DevelopersGuide/Charts/Makefile @@ -39,7 +39,6 @@ SETTINGS=$(PRJ)/settings include $(SETTINGS)/settings.mk include $(SETTINGS)/std.mk -include $(SETTINGS)/dk.mk # Define non-platform/compiler specific settings SAMPLE_NAME=DevGuideChartExample diff --git a/odk/examples/DevelopersGuide/Components/Addons/JobsAddon/Makefile b/odk/examples/DevelopersGuide/Components/Addons/JobsAddon/Makefile index 052cea359530..6ee3481fcff2 100644 --- a/odk/examples/DevelopersGuide/Components/Addons/JobsAddon/Makefile +++ b/odk/examples/DevelopersGuide/Components/Addons/JobsAddon/Makefile @@ -39,7 +39,6 @@ SETTINGS=$(PRJ)/settings include $(SETTINGS)/settings.mk include $(SETTINGS)/std.mk -include $(SETTINGS)/dk.mk # Define non-platform/compiler specific settings COMP_NAME=AsyncJob diff --git a/odk/examples/DevelopersGuide/Components/Addons/ProtocolHandlerAddon_cpp/Makefile b/odk/examples/DevelopersGuide/Components/Addons/ProtocolHandlerAddon_cpp/Makefile index ffd276548244..239b7e283ea7 100644 --- a/odk/examples/DevelopersGuide/Components/Addons/ProtocolHandlerAddon_cpp/Makefile +++ b/odk/examples/DevelopersGuide/Components/Addons/ProtocolHandlerAddon_cpp/Makefile @@ -39,7 +39,6 @@ SETTINGS=$(PRJ)/settings include $(SETTINGS)/settings.mk include $(SETTINGS)/std.mk -include $(SETTINGS)/dk.mk # Define non-platform/compiler specific settings COMP_NAME=ProtocolHandlerAddon_cpp @@ -76,7 +75,7 @@ $(SHAREDLIB_OUT)/%.$(SHAREDLIB_EXT) : $(SLOFILES) -$(MKDIR) $(subst /,$(PS),$(OUT_COMP_GEN)) $(LINK) $(COMP_LINK_FLAGS) /OUT:$@ \ /MAP:$(OUT_COMP_GEN)/$(subst $(SHAREDLIB_EXT),map,$(@F)) $(SLOFILES) \ - $(CPPUHELPERLIB) $(CPPULIB) $(SALLIB) msvcprt.lib msvcrt.lib kernel32.lib + $(CPPUHELPERLIB) $(CPPULIB) $(SALLIB) msvcprt.lib $(LIBO_SDK_LDFLAGS_STDLIBS) $(LINK_MANIFEST) else $(SHAREDLIB_OUT)/%.$(SHAREDLIB_EXT) : $(SLOFILES) diff --git a/odk/examples/DevelopersGuide/Components/Addons/ProtocolHandlerAddon_java/Makefile b/odk/examples/DevelopersGuide/Components/Addons/ProtocolHandlerAddon_java/Makefile index 82a87aea4ecf..e85570b49555 100644 --- a/odk/examples/DevelopersGuide/Components/Addons/ProtocolHandlerAddon_java/Makefile +++ b/odk/examples/DevelopersGuide/Components/Addons/ProtocolHandlerAddon_java/Makefile @@ -39,7 +39,6 @@ SETTINGS=$(PRJ)/settings include $(SETTINGS)/settings.mk include $(SETTINGS)/std.mk -include $(SETTINGS)/dk.mk # Define non-platform/compiler specific settings COMP_NAME=ProtocolHandlerAddon_java diff --git a/odk/examples/DevelopersGuide/Components/CppComponent/Makefile b/odk/examples/DevelopersGuide/Components/CppComponent/Makefile index 7fd696559a05..5a63f4687b43 100644 --- a/odk/examples/DevelopersGuide/Components/CppComponent/Makefile +++ b/odk/examples/DevelopersGuide/Components/CppComponent/Makefile @@ -39,7 +39,6 @@ SETTINGS=$(PRJ)/settings include $(SETTINGS)/settings.mk include $(SETTINGS)/std.mk -include $(SETTINGS)/dk.mk # Define non-platform/compiler specific settings SAMPLE_NAME=CppComponentSample @@ -109,7 +108,7 @@ $(SHAREDLIB_OUT)/%.$(SHAREDLIB_EXT) : $(SLOFILES) -$(MKDIR) $(subst /,$(PS),$(SAMPLE_GEN_OUT)) $(LINK) $(COMP_LINK_FLAGS) /OUT:$@ \ /MAP:$(SAMPLE_GEN_OUT)/$(subst $(SHAREDLIB_EXT),map,$(@F)) $(SLOFILES) \ - $(CPPUHELPERLIB) $(CPPULIB) $(SALLIB) msvcprt.lib msvcrt.lib kernel32.lib + $(CPPUHELPERLIB) $(CPPULIB) $(SALLIB) msvcprt.lib $(LIBO_SDK_LDFLAGS_STDLIBS) $(LINK_MANIFEST) else $(SHAREDLIB_OUT)/%.$(SHAREDLIB_EXT) : $(SLOFILES) diff --git a/odk/examples/DevelopersGuide/Components/JavaComponent/Makefile b/odk/examples/DevelopersGuide/Components/JavaComponent/Makefile index e532d218960d..b2a203cffb78 100644 --- a/odk/examples/DevelopersGuide/Components/JavaComponent/Makefile +++ b/odk/examples/DevelopersGuide/Components/JavaComponent/Makefile @@ -39,7 +39,6 @@ SETTINGS=$(PRJ)/settings include $(SETTINGS)/settings.mk include $(SETTINGS)/std.mk -include $(SETTINGS)/dk.mk # Define non-platform/compiler specific settings diff --git a/odk/examples/DevelopersGuide/Components/SimpleLicense/Makefile b/odk/examples/DevelopersGuide/Components/SimpleLicense/Makefile index c0eeca6b0962..8dd4f0502f94 100644 --- a/odk/examples/DevelopersGuide/Components/SimpleLicense/Makefile +++ b/odk/examples/DevelopersGuide/Components/SimpleLicense/Makefile @@ -39,7 +39,6 @@ SETTINGS=$(PRJ)/settings include $(SETTINGS)/settings.mk include $(SETTINGS)/std.mk -include $(SETTINGS)/dk.mk # Define non-platform/compiler specific settings diff --git a/odk/examples/DevelopersGuide/Components/Thumbs/Makefile b/odk/examples/DevelopersGuide/Components/Thumbs/Makefile index 7070493a8cf1..4bcddf50463e 100644 --- a/odk/examples/DevelopersGuide/Components/Thumbs/Makefile +++ b/odk/examples/DevelopersGuide/Components/Thumbs/Makefile @@ -39,7 +39,6 @@ SETTINGS=$(PRJ)/settings include $(SETTINGS)/settings.mk include $(SETTINGS)/std.mk -include $(SETTINGS)/dk.mk include thumbs.mk diff --git a/odk/examples/DevelopersGuide/Components/Thumbs/org/openoffice/comp/test/Makefile b/odk/examples/DevelopersGuide/Components/Thumbs/org/openoffice/comp/test/Makefile index 6894e1d9bb49..c89cbb62f0a6 100644 --- a/odk/examples/DevelopersGuide/Components/Thumbs/org/openoffice/comp/test/Makefile +++ b/odk/examples/DevelopersGuide/Components/Thumbs/org/openoffice/comp/test/Makefile @@ -39,7 +39,6 @@ SETTINGS=$(PRJ)/settings include $(SETTINGS)/settings.mk include $(SETTINGS)/std.mk -include $(SETTINGS)/dk.mk include ../../../../thumbs.mk diff --git a/odk/examples/DevelopersGuide/Components/Thumbs/org/openoffice/test/Makefile b/odk/examples/DevelopersGuide/Components/Thumbs/org/openoffice/test/Makefile index bfd0b05204a2..a9f13dbf5920 100644 --- a/odk/examples/DevelopersGuide/Components/Thumbs/org/openoffice/test/Makefile +++ b/odk/examples/DevelopersGuide/Components/Thumbs/org/openoffice/test/Makefile @@ -39,7 +39,6 @@ SETTINGS=$(PRJ)/settings include $(SETTINGS)/settings.mk include $(SETTINGS)/std.mk -include $(SETTINGS)/dk.mk include ../../../thumbs.mk diff --git a/odk/examples/DevelopersGuide/Components/dialogcomponent/Makefile b/odk/examples/DevelopersGuide/Components/dialogcomponent/Makefile index 6d2ec903d0e7..f0b38086061a 100644 --- a/odk/examples/DevelopersGuide/Components/dialogcomponent/Makefile +++ b/odk/examples/DevelopersGuide/Components/dialogcomponent/Makefile @@ -39,7 +39,6 @@ SETTINGS=$(PRJ)/settings include $(SETTINGS)/settings.mk include $(SETTINGS)/std.mk -include $(SETTINGS)/dk.mk # Define non-platform/compiler specific settings diff --git a/odk/examples/DevelopersGuide/Config/Makefile b/odk/examples/DevelopersGuide/Config/Makefile index 9b1e54fc341a..b334e8cfb18d 100644 --- a/odk/examples/DevelopersGuide/Config/Makefile +++ b/odk/examples/DevelopersGuide/Config/Makefile @@ -39,7 +39,6 @@ SETTINGS=$(PRJ)/settings include $(SETTINGS)/settings.mk include $(SETTINGS)/std.mk -include $(SETTINGS)/dk.mk # Define non-platform/compiler specific settings SAMPLE_NAME=DevGuideConfigExamples diff --git a/odk/examples/DevelopersGuide/Database/DriverSkeleton/Makefile b/odk/examples/DevelopersGuide/Database/DriverSkeleton/Makefile index df8d6f95e3a2..373acacf9240 100644 --- a/odk/examples/DevelopersGuide/Database/DriverSkeleton/Makefile +++ b/odk/examples/DevelopersGuide/Database/DriverSkeleton/Makefile @@ -39,7 +39,6 @@ SETTINGS=$(PRJ)/settings include $(SETTINGS)/settings.mk include $(SETTINGS)/std.mk -include $(SETTINGS)/dk.mk # Define non-platform/compiler specific settings COMP_NAME=DatabaseSDBCDriverSkeleton @@ -84,7 +83,7 @@ $(SHAREDLIB_OUT)/%.$(SHAREDLIB_EXT) : $(SLOFILES) -$(MKDIR) $(subst /,$(PS),$(OUT_COMP_MISC)) $(LINK) $(COMP_LINK_FLAGS) /OUT:$@ \ /MAP:$(OUT_COMP_MISC)/$(COMP_NAME).map $(SLOFILES) \ - $(CPPUHELPERLIB) $(CPPULIB) $(SALLIB) msvcprt.lib msvcrt.lib kernel32.lib + $(CPPUHELPERLIB) $(CPPULIB) $(SALLIB) msvcprt.lib $(LIBO_SDK_LDFLAGS_STDLIBS) $(LINK_MANIFEST) else $(SHAREDLIB_OUT)/%.$(SHAREDLIB_EXT) : $(SLOFILES) diff --git a/odk/examples/DevelopersGuide/Database/Makefile b/odk/examples/DevelopersGuide/Database/Makefile index 8f9dd84e5767..a155fcaf5c89 100644 --- a/odk/examples/DevelopersGuide/Database/Makefile +++ b/odk/examples/DevelopersGuide/Database/Makefile @@ -39,7 +39,6 @@ SETTINGS=$(PRJ)/settings include $(SETTINGS)/settings.mk include $(SETTINGS)/std.mk -include $(SETTINGS)/dk.mk # Define non-platform/compiler specific settings EXAMPLE_NAME=DataBaseExamples diff --git a/odk/examples/DevelopersGuide/Drawing/Makefile b/odk/examples/DevelopersGuide/Drawing/Makefile index 2bf39023d4fd..e5bbf1bf187c 100644 --- a/odk/examples/DevelopersGuide/Drawing/Makefile +++ b/odk/examples/DevelopersGuide/Drawing/Makefile @@ -39,7 +39,6 @@ SETTINGS=$(PRJ)/settings include $(SETTINGS)/settings.mk include $(SETTINGS)/std.mk -include $(SETTINGS)/dk.mk # Define non-platform/compiler specific settings SAMPLE_NAME=DrawingExamples diff --git a/odk/examples/DevelopersGuide/Extensions/DialogWithHelp/Makefile b/odk/examples/DevelopersGuide/Extensions/DialogWithHelp/Makefile index d46590ef5e22..171dd53933ad 100644 --- a/odk/examples/DevelopersGuide/Extensions/DialogWithHelp/Makefile +++ b/odk/examples/DevelopersGuide/Extensions/DialogWithHelp/Makefile @@ -39,7 +39,6 @@ SETTINGS=$(PRJ)/settings include $(SETTINGS)/settings.mk include $(SETTINGS)/std.mk -include $(SETTINGS)/dk.mk # Define non-platform/compiler specific settings SAMPLE_NAME=ExtDialogWithHelp diff --git a/odk/examples/DevelopersGuide/FirstSteps/Makefile b/odk/examples/DevelopersGuide/FirstSteps/Makefile index 782e9d1fdb86..53077d093366 100644 --- a/odk/examples/DevelopersGuide/FirstSteps/Makefile +++ b/odk/examples/DevelopersGuide/FirstSteps/Makefile @@ -39,7 +39,6 @@ SETTINGS=$(PRJ)/settings include $(SETTINGS)/settings.mk include $(SETTINGS)/std.mk -include $(SETTINGS)/dk.mk # Define non-platform/compiler specific settings EXAMPLE_NAME=FirstStepsExamples diff --git a/odk/examples/DevelopersGuide/Forms/Makefile b/odk/examples/DevelopersGuide/Forms/Makefile index 2964e4ef6e6c..54cf7aad9113 100644 --- a/odk/examples/DevelopersGuide/Forms/Makefile +++ b/odk/examples/DevelopersGuide/Forms/Makefile @@ -39,7 +39,6 @@ SETTINGS=$(PRJ)/settings include $(SETTINGS)/settings.mk include $(SETTINGS)/std.mk -include $(SETTINGS)/dk.mk # Define non-platform/compiler specific settings SAMPLE_NAME=FormsExamples diff --git a/odk/examples/DevelopersGuide/GUI/Makefile b/odk/examples/DevelopersGuide/GUI/Makefile index 4ec70489cedf..6eb18efdc7f6 100644 --- a/odk/examples/DevelopersGuide/GUI/Makefile +++ b/odk/examples/DevelopersGuide/GUI/Makefile @@ -39,7 +39,6 @@ SETTINGS=$(PRJ)/settings include $(SETTINGS)/settings.mk include $(SETTINGS)/std.mk -include $(SETTINGS)/dk.mk # Define non-platform/compiler specific settings SAMPLE_NAME=GUIExamples diff --git a/odk/examples/DevelopersGuide/OfficeDev/Clipboard/Makefile b/odk/examples/DevelopersGuide/OfficeDev/Clipboard/Makefile index 6c7b7c5496d8..90884f2f4693 100644 --- a/odk/examples/DevelopersGuide/OfficeDev/Clipboard/Makefile +++ b/odk/examples/DevelopersGuide/OfficeDev/Clipboard/Makefile @@ -39,7 +39,6 @@ SETTINGS=$(PRJ)/settings include $(SETTINGS)/settings.mk include $(SETTINGS)/std.mk -include $(SETTINGS)/dk.mk # Define non-platform/compiler specific settings EXAMPLE_NAME=OfficeDevClipboardExample diff --git a/odk/examples/DevelopersGuide/OfficeDev/DesktopEnvironment/Makefile b/odk/examples/DevelopersGuide/OfficeDev/DesktopEnvironment/Makefile index bbabb215d48a..b4e69cfd1228 100644 --- a/odk/examples/DevelopersGuide/OfficeDev/DesktopEnvironment/Makefile +++ b/odk/examples/DevelopersGuide/OfficeDev/DesktopEnvironment/Makefile @@ -39,7 +39,6 @@ SETTINGS=$(PRJ)/settings include $(SETTINGS)/settings.mk include $(SETTINGS)/std.mk -include $(SETTINGS)/dk.mk # Define non-platform/compiler specific settings EXAMPLE_NAME=OfficeDevDesktopEnv diff --git a/odk/examples/DevelopersGuide/OfficeDev/DesktopEnvironment/nativelib/unix/Makefile b/odk/examples/DevelopersGuide/OfficeDev/DesktopEnvironment/nativelib/unix/Makefile index d2d4e9340892..aa7a158b8657 100644 --- a/odk/examples/DevelopersGuide/OfficeDev/DesktopEnvironment/nativelib/unix/Makefile +++ b/odk/examples/DevelopersGuide/OfficeDev/DesktopEnvironment/nativelib/unix/Makefile @@ -39,7 +39,6 @@ SETTINGS=$(PRJ)/settings include $(SETTINGS)/settings.mk include $(SETTINGS)/std.mk -include $(SETTINGS)/dk.mk # Define non-platform/compiler specific settings SHL_NAME=nativeview diff --git a/odk/examples/DevelopersGuide/OfficeDev/DesktopEnvironment/nativelib/windows/Makefile b/odk/examples/DevelopersGuide/OfficeDev/DesktopEnvironment/nativelib/windows/Makefile index 7052c2f968cc..62980a2eed4d 100644 --- a/odk/examples/DevelopersGuide/OfficeDev/DesktopEnvironment/nativelib/windows/Makefile +++ b/odk/examples/DevelopersGuide/OfficeDev/DesktopEnvironment/nativelib/windows/Makefile @@ -39,7 +39,6 @@ SETTINGS=$(PRJ)/settings include $(SETTINGS)/settings.mk include $(SETTINGS)/std.mk -include $(SETTINGS)/dk.mk # Define non-platform/compiler specific settings SHL_NAME=nativeview @@ -68,7 +67,7 @@ $(SHAREDLIB_OUT)/$(SHAREDLIB_PRE)$(SHL_NAME).$(SHAREDLIB_EXT) : $(SLOFILES) $(SH -$(MKDIR) $(subst /,$(PS),$(OUT_SHL_MISC)) $(LINK) $(LIBRARY_LINK_FLAGS) /DEF:$(SHL_NAME).def /OUT:$@ \ /MAP:$(OUT_SHL_MISC)/$(SHL_NAME).map $(LINK_JAVA_LIBS) \ - $(SLOFILES) jawt.lib msvcrt.lib kernel32.lib user32.lib + $(SLOFILES) jawt.lib $(LIBO_SDK_LDFLAGS_STDLIBS) user32.lib $(LINK_MANIFEST) .PHONY: clean diff --git a/odk/examples/DevelopersGuide/OfficeDev/DisableCommands/Makefile b/odk/examples/DevelopersGuide/OfficeDev/DisableCommands/Makefile index 436871f49b87..0d60cb414d75 100644 --- a/odk/examples/DevelopersGuide/OfficeDev/DisableCommands/Makefile +++ b/odk/examples/DevelopersGuide/OfficeDev/DisableCommands/Makefile @@ -39,7 +39,6 @@ SETTINGS=$(PRJ)/settings include $(SETTINGS)/settings.mk include $(SETTINGS)/std.mk -include $(SETTINGS)/dk.mk # Define non-platform/compiler specific settings EXAMPLE_NAME=OfficeDevDisableCommandsTest diff --git a/odk/examples/DevelopersGuide/OfficeDev/FilterDevelopment/AsciiFilter/Makefile b/odk/examples/DevelopersGuide/OfficeDev/FilterDevelopment/AsciiFilter/Makefile index d0ce80991c11..507f6cac487c 100644 --- a/odk/examples/DevelopersGuide/OfficeDev/FilterDevelopment/AsciiFilter/Makefile +++ b/odk/examples/DevelopersGuide/OfficeDev/FilterDevelopment/AsciiFilter/Makefile @@ -39,7 +39,6 @@ SETTINGS=$(PRJ)/settings include $(SETTINGS)/settings.mk include $(SETTINGS)/std.mk -include $(SETTINGS)/dk.mk # Define non-platform/compiler specific settings SAMPLE_NAME=OfficeDevAsciiFilterExample diff --git a/odk/examples/DevelopersGuide/OfficeDev/FilterDevelopment/FlatXmlFilterDetection/Makefile b/odk/examples/DevelopersGuide/OfficeDev/FilterDevelopment/FlatXmlFilterDetection/Makefile index 8fd95e44d65b..2a9e241864b5 100644 --- a/odk/examples/DevelopersGuide/OfficeDev/FilterDevelopment/FlatXmlFilterDetection/Makefile +++ b/odk/examples/DevelopersGuide/OfficeDev/FilterDevelopment/FlatXmlFilterDetection/Makefile @@ -39,7 +39,6 @@ SETTINGS=$(PRJ)/settings include $(SETTINGS)/settings.mk include $(SETTINGS)/std.mk -include $(SETTINGS)/dk.mk # Define non-platform/compiler specific settings COMP_NAME=FlatXmlTypeDetection @@ -78,7 +77,7 @@ $(SHAREDLIB_OUT)/%.$(SHAREDLIB_EXT) : $(SLOFILES) -$(MKDIR) $(subst /,$(PS),$(OUT_COMP_GEN)) $(LINK) $(COMP_LINK_FLAGS) /OUT:$@ \ /MAP:$(OUT_COMP_GEN)/$(subst $(SHAREDLIB_EXT),map,$(@F)) $(SLOFILES) \ - $(CPPUHELPERLIB) $(CPPULIB) $(SALLIB) msvcprt.lib msvcrt.lib kernel32.lib + $(CPPUHELPERLIB) $(CPPULIB) $(SALLIB) msvcprt.lib $(LIBO_SDK_LDFLAGS_STDLIBS) $(LINK_MANIFEST) else $(SHAREDLIB_OUT)/%.$(SHAREDLIB_EXT) : $(SLOFILES) diff --git a/odk/examples/DevelopersGuide/OfficeDev/FilterDevelopment/FlatXmlFilter_cpp/Makefile b/odk/examples/DevelopersGuide/OfficeDev/FilterDevelopment/FlatXmlFilter_cpp/Makefile index 61c384a488cd..73e4b7e2aee9 100644 --- a/odk/examples/DevelopersGuide/OfficeDev/FilterDevelopment/FlatXmlFilter_cpp/Makefile +++ b/odk/examples/DevelopersGuide/OfficeDev/FilterDevelopment/FlatXmlFilter_cpp/Makefile @@ -39,7 +39,6 @@ SETTINGS=$(PRJ)/settings include $(SETTINGS)/settings.mk include $(SETTINGS)/std.mk -include $(SETTINGS)/dk.mk # Define non-platform/compiler specific settings COMP_NAME=FlatXmlFilter_cpp @@ -75,7 +74,7 @@ $(SHAREDLIB_OUT)/%.$(SHAREDLIB_EXT) : $(SLOFILES) -$(MKDIR) $(subst /,$(PS),$(OUT_COMP_GEN)) $(LINK) $(COMP_LINK_FLAGS) /OUT:$@ \ /MAP:$(OUT_COMP_GEN)/$(subst $(SHAREDLIB_EXT),map,$(@F)) $(SLOFILES) \ - $(CPPUHELPERLIB) $(CPPULIB) $(SALLIB) msvcprt.lib msvcrt.lib kernel32.lib + $(CPPUHELPERLIB) $(CPPULIB) $(SALLIB) msvcprt.lib $(LIBO_SDK_LDFLAGS_STDLIBS) $(LINK_MANIFEST) else $(SHAREDLIB_OUT)/%.$(SHAREDLIB_EXT) : $(SLOFILES) diff --git a/odk/examples/DevelopersGuide/OfficeDev/FilterDevelopment/FlatXmlFilter_java/Makefile b/odk/examples/DevelopersGuide/OfficeDev/FilterDevelopment/FlatXmlFilter_java/Makefile index a619e9d9c9d0..58366b7d5308 100644 --- a/odk/examples/DevelopersGuide/OfficeDev/FilterDevelopment/FlatXmlFilter_java/Makefile +++ b/odk/examples/DevelopersGuide/OfficeDev/FilterDevelopment/FlatXmlFilter_java/Makefile @@ -39,7 +39,6 @@ SETTINGS=$(PRJ)/settings include $(SETTINGS)/settings.mk include $(SETTINGS)/std.mk -include $(SETTINGS)/dk.mk # Define non-platform/compiler specific settings COMP_NAME=FlatXmlFilter_java diff --git a/odk/examples/DevelopersGuide/OfficeDev/Linguistic/Makefile b/odk/examples/DevelopersGuide/OfficeDev/Linguistic/Makefile index 83491a844dfb..95b6204c003a 100644 --- a/odk/examples/DevelopersGuide/OfficeDev/Linguistic/Makefile +++ b/odk/examples/DevelopersGuide/OfficeDev/Linguistic/Makefile @@ -39,7 +39,6 @@ SETTINGS=$(PRJ)/settings include $(SETTINGS)/settings.mk include $(SETTINGS)/std.mk -include $(SETTINGS)/dk.mk # Define non-platform/compiler specific settings EXAMPLE_NAME=OfficeDevLinguisticExample diff --git a/odk/examples/DevelopersGuide/OfficeDev/Makefile b/odk/examples/DevelopersGuide/OfficeDev/Makefile index 17b4eafc3d69..88c4df966e00 100644 --- a/odk/examples/DevelopersGuide/OfficeDev/Makefile +++ b/odk/examples/DevelopersGuide/OfficeDev/Makefile @@ -39,7 +39,6 @@ SETTINGS=$(PRJ)/settings include $(SETTINGS)/settings.mk include $(SETTINGS)/std.mk -include $(SETTINGS)/dk.mk # Define non-platform/compiler specific settings EXAMPLE_NAME=OfficeDevExamples diff --git a/odk/examples/DevelopersGuide/OfficeDev/PathSettings/Makefile b/odk/examples/DevelopersGuide/OfficeDev/PathSettings/Makefile index 663468b74d4c..bc55266efb84 100644 --- a/odk/examples/DevelopersGuide/OfficeDev/PathSettings/Makefile +++ b/odk/examples/DevelopersGuide/OfficeDev/PathSettings/Makefile @@ -39,7 +39,6 @@ SETTINGS=$(PRJ)/settings include $(SETTINGS)/settings.mk include $(SETTINGS)/std.mk -include $(SETTINGS)/dk.mk # Define non-platform/compiler specific settings EXAMPLE_NAME=OfficeDevPathSettingsTest diff --git a/odk/examples/DevelopersGuide/OfficeDev/PathSubstitution/Makefile b/odk/examples/DevelopersGuide/OfficeDev/PathSubstitution/Makefile index 19dabe19b33e..20bb65687613 100644 --- a/odk/examples/DevelopersGuide/OfficeDev/PathSubstitution/Makefile +++ b/odk/examples/DevelopersGuide/OfficeDev/PathSubstitution/Makefile @@ -39,7 +39,6 @@ SETTINGS=$(PRJ)/settings include $(SETTINGS)/settings.mk include $(SETTINGS)/std.mk -include $(SETTINGS)/dk.mk # Define non-platform/compiler specific settings EXAMPLE_NAME=OfficeDevPathSubstitutionTest diff --git a/odk/examples/DevelopersGuide/OfficeDev/TerminationTest/Makefile b/odk/examples/DevelopersGuide/OfficeDev/TerminationTest/Makefile index babc895e3265..ae3d607cfe72 100644 --- a/odk/examples/DevelopersGuide/OfficeDev/TerminationTest/Makefile +++ b/odk/examples/DevelopersGuide/OfficeDev/TerminationTest/Makefile @@ -39,7 +39,6 @@ SETTINGS=$(PRJ)/settings include $(SETTINGS)/settings.mk include $(SETTINGS)/std.mk -include $(SETTINGS)/dk.mk # Define non-platform/compiler specific settings EXAMPLE_NAME=OfficeDevTerminationTest diff --git a/odk/examples/DevelopersGuide/ProfUNO/CppBinding/Makefile b/odk/examples/DevelopersGuide/ProfUNO/CppBinding/Makefile index 2e7f904f6f96..5e4a06138121 100644 --- a/odk/examples/DevelopersGuide/ProfUNO/CppBinding/Makefile +++ b/odk/examples/DevelopersGuide/ProfUNO/CppBinding/Makefile @@ -39,7 +39,6 @@ SETTINGS=$(PRJ)/settings include $(SETTINGS)/settings.mk include $(SETTINGS)/std.mk -include $(SETTINGS)/dk.mk # Define non-platform/compiler specific settings SAMPLE_NAME=ProfUnoCppBinding diff --git a/odk/examples/DevelopersGuide/ProfUNO/InterprocessConn/Makefile b/odk/examples/DevelopersGuide/ProfUNO/InterprocessConn/Makefile index e0565ddad175..84920642cca4 100644 --- a/odk/examples/DevelopersGuide/ProfUNO/InterprocessConn/Makefile +++ b/odk/examples/DevelopersGuide/ProfUNO/InterprocessConn/Makefile @@ -39,7 +39,6 @@ SETTINGS=$(PRJ)/settings include $(SETTINGS)/settings.mk include $(SETTINGS)/std.mk -include $(SETTINGS)/dk.mk # Define non-platform/compiler specific settings EXAMPLE_NAME=ProfUNOInterprocessExamples diff --git a/odk/examples/DevelopersGuide/ProfUNO/Lifetime/Makefile b/odk/examples/DevelopersGuide/ProfUNO/Lifetime/Makefile index 31c934fce729..2b334745948c 100644 --- a/odk/examples/DevelopersGuide/ProfUNO/Lifetime/Makefile +++ b/odk/examples/DevelopersGuide/ProfUNO/Lifetime/Makefile @@ -39,7 +39,6 @@ SETTINGS=$(PRJ)/settings include $(SETTINGS)/settings.mk include $(SETTINGS)/std.mk -include $(SETTINGS)/dk.mk # Define non-platform/compiler specific settings COMPONENT_NAME=ProfUnoLifetime diff --git a/odk/examples/DevelopersGuide/ProfUNO/SimpleBootstrap_cpp/Makefile b/odk/examples/DevelopersGuide/ProfUNO/SimpleBootstrap_cpp/Makefile index de0d09b675e7..de4604e82bc6 100644 --- a/odk/examples/DevelopersGuide/ProfUNO/SimpleBootstrap_cpp/Makefile +++ b/odk/examples/DevelopersGuide/ProfUNO/SimpleBootstrap_cpp/Makefile @@ -39,7 +39,6 @@ SETTINGS=$(PRJ)/settings include $(SETTINGS)/settings.mk include $(SETTINGS)/std.mk -include $(SETTINGS)/dk.mk # Define non-platform/compiler specific settings APP_NAME=SimpleBootstrap_cpp diff --git a/odk/examples/DevelopersGuide/ProfUNO/SimpleBootstrap_java/Makefile b/odk/examples/DevelopersGuide/ProfUNO/SimpleBootstrap_java/Makefile index fd89206c58cd..6ba1c78e0138 100644 --- a/odk/examples/DevelopersGuide/ProfUNO/SimpleBootstrap_java/Makefile +++ b/odk/examples/DevelopersGuide/ProfUNO/SimpleBootstrap_java/Makefile @@ -39,7 +39,6 @@ SETTINGS=$(PRJ)/settings include $(SETTINGS)/settings.mk include $(SETTINGS)/std.mk -include $(SETTINGS)/dk.mk # Define non-platform/compiler specific settings COMPONENT_NAME=SimpleBootstrap_java diff --git a/odk/examples/DevelopersGuide/ScriptingFramework/SayHello/Makefile b/odk/examples/DevelopersGuide/ScriptingFramework/SayHello/Makefile index 9017df49dd6b..0df943224fe1 100644 --- a/odk/examples/DevelopersGuide/ScriptingFramework/SayHello/Makefile +++ b/odk/examples/DevelopersGuide/ScriptingFramework/SayHello/Makefile @@ -39,7 +39,6 @@ SETTINGS=$(PRJ)/settings include $(SETTINGS)/settings.mk include $(SETTINGS)/std.mk -include $(SETTINGS)/dk.mk # Define non-platform/compiler specific settings SAMPLE_NAME=SayHello diff --git a/odk/examples/DevelopersGuide/ScriptingFramework/ScriptSelector/Makefile b/odk/examples/DevelopersGuide/ScriptingFramework/ScriptSelector/Makefile index 1088fe5db0de..6fa4046bd041 100644 --- a/odk/examples/DevelopersGuide/ScriptingFramework/ScriptSelector/Makefile +++ b/odk/examples/DevelopersGuide/ScriptingFramework/ScriptSelector/Makefile @@ -39,7 +39,6 @@ SETTINGS=$(PRJ)/settings include $(SETTINGS)/settings.mk include $(SETTINGS)/std.mk -include $(SETTINGS)/dk.mk # Define non-platform/compiler specific settings SAMPLE_NAME=ScriptSelector diff --git a/odk/examples/DevelopersGuide/Spreadsheet/Makefile b/odk/examples/DevelopersGuide/Spreadsheet/Makefile index 5b0724cf2311..39633e176919 100644 --- a/odk/examples/DevelopersGuide/Spreadsheet/Makefile +++ b/odk/examples/DevelopersGuide/Spreadsheet/Makefile @@ -39,7 +39,6 @@ SETTINGS=$(PRJ)/settings include $(SETTINGS)/settings.mk include $(SETTINGS)/std.mk -include $(SETTINGS)/dk.mk # Define non-platform/compiler specific settings SAMPLE_NAME=DevGuideSpreadsheetExamples diff --git a/odk/examples/DevelopersGuide/Text/Makefile b/odk/examples/DevelopersGuide/Text/Makefile index 3f192809d16f..d27923b6f9cf 100644 --- a/odk/examples/DevelopersGuide/Text/Makefile +++ b/odk/examples/DevelopersGuide/Text/Makefile @@ -39,7 +39,6 @@ SETTINGS=$(PRJ)/settings include $(SETTINGS)/settings.mk include $(SETTINGS)/std.mk -include $(SETTINGS)/dk.mk # Define non-platform/compiler specific settings SAMPLE_NAME=TextExample diff --git a/odk/examples/DevelopersGuide/UCB/Makefile b/odk/examples/DevelopersGuide/UCB/Makefile index a6b172bfa602..22dd94bada64 100644 --- a/odk/examples/DevelopersGuide/UCB/Makefile +++ b/odk/examples/DevelopersGuide/UCB/Makefile @@ -38,7 +38,6 @@ SETTINGS=$(PRJ)/settings include $(SETTINGS)/settings.mk include $(SETTINGS)/std.mk -include $(SETTINGS)/dk.mk # Define non-platform/compiler specific settings EXAMPLE_NAME=UCBExamples diff --git a/odk/examples/OLE/activex/Makefile b/odk/examples/OLE/activex/Makefile index 815fa86b9783..15167bc93ba4 100644 --- a/odk/examples/OLE/activex/Makefile +++ b/odk/examples/OLE/activex/Makefile @@ -39,7 +39,6 @@ SETTINGS=$(PRJ)/settings include $(SETTINGS)/settings.mk include $(SETTINGS)/std.mk -include $(SETTINGS)/dk.mk # Define non-platform/compiler specific settings COMPONENT_NAME=so_activex @@ -96,7 +95,7 @@ $(SHAREDLIB_OUT)/$(SHAREDLIB_PRE)%.$(SHAREDLIB_EXT) : $(SLOFILES) $(OUT_COMP_GEN @echo . $(LINK) $(LIBRARY_LINK_FLAGS) /OUT:$@ /MAP:$(OUT_COMP_GEN)/$(subst $(SHAREDLIB_EXT),map,$(@F)) \ /DEF:so_activex.def /IMPLIB:$(OUT_LIB)/iso_activex.lib $(SLOFILES) \ - msvcrt.lib kernel32.lib user32.lib uuid.lib advapi32.lib ole32.lib oleaut32.lib gdi32.lib \ + $(LIBO_SDK_LDFLAGS_STDLIBS) user32.lib uuid.lib advapi32.lib ole32.lib oleaut32.lib gdi32.lib \ urlmon.lib Shlwapi.lib oldnames.lib $(CL_NEW_LIB) $(OUT_COMP_GEN)/so_activex.res $(LINK_MANIFEST) diff --git a/odk/examples/cpp/DocumentLoader/Makefile b/odk/examples/cpp/DocumentLoader/Makefile index 2b6ebe795f44..812d133324f6 100644 --- a/odk/examples/cpp/DocumentLoader/Makefile +++ b/odk/examples/cpp/DocumentLoader/Makefile @@ -39,7 +39,6 @@ SETTINGS=$(PRJ)/settings include $(SETTINGS)/settings.mk include $(SETTINGS)/std.mk -include $(SETTINGS)/dk.mk # Define non-platform/compiler specific settings COMPONENT_NAME=DocumentLoader diff --git a/odk/examples/cpp/complextoolbarcontrols/Makefile b/odk/examples/cpp/complextoolbarcontrols/Makefile index 98541eb3d489..a8f1a18386e1 100644 --- a/odk/examples/cpp/complextoolbarcontrols/Makefile +++ b/odk/examples/cpp/complextoolbarcontrols/Makefile @@ -39,7 +39,6 @@ SETTINGS=$(PRJ)/settings include $(SETTINGS)/settings.mk include $(SETTINGS)/std.mk -include $(SETTINGS)/dk.mk # Define non-platform/compiler specific settings COMP_NAME=complextoolbarcontrols @@ -84,7 +83,7 @@ $(SHAREDLIB_OUT)/%.$(SHAREDLIB_EXT) : $(SLOFILES) -$(MKDIR) $(subst /,$(PS),$(OUT_COMP_GEN)) $(LINK) $(COMP_LINK_FLAGS) /OUT:$@ \ /MAP:$(OUT_COMP_GEN)/$(subst $(SHAREDLIB_EXT),map,$(@F)) $(SLOFILES) \ - $(CPPUHELPERLIB) $(CPPULIB) $(SALLIB) msvcprt.lib msvcrt.lib kernel32.lib + $(CPPUHELPERLIB) $(CPPULIB) $(SALLIB) msvcprt.lib $(LIBO_SDK_LDFLAGS_STDLIBS) $(LINK_MANIFEST) else $(SHAREDLIB_OUT)/%.$(SHAREDLIB_EXT) : $(SLOFILES) diff --git a/odk/examples/cpp/counter/Makefile b/odk/examples/cpp/counter/Makefile index da808beb9452..b848adb02afd 100644 --- a/odk/examples/cpp/counter/Makefile +++ b/odk/examples/cpp/counter/Makefile @@ -39,7 +39,6 @@ SETTINGS=$(PRJ)/settings include $(SETTINGS)/settings.mk include $(SETTINGS)/std.mk -include $(SETTINGS)/dk.mk # Define non-platform/compiler specific settings COMP_NAME=counter @@ -111,7 +110,7 @@ $(SHAREDLIB_OUT)/%.$(SHAREDLIB_EXT) : $(SLOFILES) -$(MKDIR) $(subst /,$(PS),$(OUT_COMP_GEN)) $(LINK) $(COMP_LINK_FLAGS) /OUT:$@ \ /MAP:$(OUT_COMP_GEN)/$(subst $(SHAREDLIB_EXT),map,$(@F)) $(SLOFILES) \ - $(CPPUHELPERLIB) $(CPPULIB) $(SALLIB) msvcprt.lib msvcrt.lib kernel32.lib + $(CPPUHELPERLIB) $(CPPULIB) $(SALLIB) msvcprt.lib $(LIBO_SDK_LDFLAGS_STDLIBS) $(LINK_MANIFEST) else $(SHAREDLIB_OUT)/%.$(SHAREDLIB_EXT) : $(SLOFILES) diff --git a/odk/examples/cpp/remoteclient/Makefile b/odk/examples/cpp/remoteclient/Makefile index 96c490195d41..bcb7048d8794 100644 --- a/odk/examples/cpp/remoteclient/Makefile +++ b/odk/examples/cpp/remoteclient/Makefile @@ -39,7 +39,6 @@ SETTINGS=$(PRJ)/settings include $(SETTINGS)/settings.mk include $(SETTINGS)/std.mk -include $(SETTINGS)/dk.mk # Define non-platform/compiler specific settings COMP_NAME=remoteclientsample @@ -84,7 +83,7 @@ $(SHAREDLIB_OUT)/%.$(SHAREDLIB_EXT) : $(SLOFILES) -$(MKDIR) $(subst /,$(PS),$(OUT_COMP_GEN)) $(LINK) $(COMP_LINK_FLAGS) /OUT:$@ \ /MAP:$(OUT_COMP_GEN)/$(subst $(SHAREDLIB_EXT),map,$(@F)) $(SLOFILES) \ - $(CPPUHELPERLIB) $(CPPULIB) $(SALLIB) msvcprt.lib msvcrt.lib kernel32.lib + $(CPPUHELPERLIB) $(CPPULIB) $(SALLIB) msvcprt.lib $(LIBO_SDK_LDFLAGS_STDLIBS) $(LINK_MANIFEST) else $(SHAREDLIB_OUT)/%.$(SHAREDLIB_EXT) : $(SLOFILES) diff --git a/odk/examples/java/ConverterServlet/Makefile b/odk/examples/java/ConverterServlet/Makefile index 8c1828cea7b2..2dff683c3f1b 100644 --- a/odk/examples/java/ConverterServlet/Makefile +++ b/odk/examples/java/ConverterServlet/Makefile @@ -39,7 +39,6 @@ SETTINGS=$(PRJ)/settings include $(SETTINGS)/settings.mk include $(SETTINGS)/std.mk -include $(SETTINGS)/dk.mk # Define non-platform/compiler specific settings COMPONENT_NAME=ConverterServletExample diff --git a/odk/examples/java/DocumentHandling/Makefile b/odk/examples/java/DocumentHandling/Makefile index 0cf208330bfd..08e8f0f79ee8 100644 --- a/odk/examples/java/DocumentHandling/Makefile +++ b/odk/examples/java/DocumentHandling/Makefile @@ -39,7 +39,6 @@ SETTINGS=$(PRJ)/settings include $(SETTINGS)/settings.mk include $(SETTINGS)/std.mk -include $(SETTINGS)/dk.mk # Define non-platform/compiler specific settings SAMPLE_NAME=JavaDocumentHandlingExamples diff --git a/odk/examples/java/Drawing/Makefile b/odk/examples/java/Drawing/Makefile index 6281c2462a16..861ab96ff439 100644 --- a/odk/examples/java/Drawing/Makefile +++ b/odk/examples/java/Drawing/Makefile @@ -39,7 +39,6 @@ SETTINGS=$(PRJ)/settings include $(SETTINGS)/settings.mk include $(SETTINGS)/std.mk -include $(SETTINGS)/dk.mk # Define non-platform/compiler specific settings EXAMPLE_NAME=JavaDrawingExample diff --git a/odk/examples/java/EmbedDocument/Container1/Makefile b/odk/examples/java/EmbedDocument/Container1/Makefile index 88103f2f230f..88279bbe54dc 100644 --- a/odk/examples/java/EmbedDocument/Container1/Makefile +++ b/odk/examples/java/EmbedDocument/Container1/Makefile @@ -23,7 +23,6 @@ SETTINGS=$(PRJ)/settings include $(SETTINGS)/settings.mk include $(SETTINGS)/std.mk -include $(SETTINGS)/dk.mk # Define non-platform/compiler specific settings COMPONENT_NAME=EmbedDocument.Container1 diff --git a/odk/examples/java/EmbedDocument/EmbeddedObject/Makefile b/odk/examples/java/EmbedDocument/EmbeddedObject/Makefile index 59e71869b0fe..b568c39c2a98 100755 --- a/odk/examples/java/EmbedDocument/EmbeddedObject/Makefile +++ b/odk/examples/java/EmbedDocument/EmbeddedObject/Makefile @@ -37,7 +37,6 @@ SETTINGS=$(PRJ)/settings include $(SETTINGS)/settings.mk include $(SETTINGS)/std.mk -# include $(SETTINGS)/dk.mk # Define non-platform/compiler specific settings diff --git a/odk/examples/java/Inspector/Makefile b/odk/examples/java/Inspector/Makefile index 4a3ed71c29e2..0b90edf42296 100644 --- a/odk/examples/java/Inspector/Makefile +++ b/odk/examples/java/Inspector/Makefile @@ -39,7 +39,6 @@ SETTINGS=$(PRJ)/settings include $(SETTINGS)/settings.mk include $(SETTINGS)/std.mk -include $(SETTINGS)/dk.mk # Define non-platform/compiler specific settings diff --git a/odk/examples/java/MinimalComponent/Makefile b/odk/examples/java/MinimalComponent/Makefile index 876ecb928020..13dc762966f6 100644 --- a/odk/examples/java/MinimalComponent/Makefile +++ b/odk/examples/java/MinimalComponent/Makefile @@ -39,7 +39,6 @@ SETTINGS=$(PRJ)/settings include $(SETTINGS)/settings.mk include $(SETTINGS)/std.mk -include $(SETTINGS)/dk.mk # Define non-platform/compiler specific settings diff --git a/odk/examples/java/NotesAccess/Makefile b/odk/examples/java/NotesAccess/Makefile index 87e41d3c1e7a..f403e58b48b0 100644 --- a/odk/examples/java/NotesAccess/Makefile +++ b/odk/examples/java/NotesAccess/Makefile @@ -39,7 +39,6 @@ SETTINGS=$(PRJ)/settings include $(SETTINGS)/settings.mk include $(SETTINGS)/std.mk -include $(SETTINGS)/dk.mk # Define non-platform/compiler specific settings EXAMPLE_NAME=NotesAccessExample diff --git a/odk/examples/java/PropertySet/Makefile b/odk/examples/java/PropertySet/Makefile index 7a79f340d79c..2ab04e13ed94 100644 --- a/odk/examples/java/PropertySet/Makefile +++ b/odk/examples/java/PropertySet/Makefile @@ -39,7 +39,6 @@ SETTINGS=$(PRJ)/settings include $(SETTINGS)/settings.mk include $(SETTINGS)/std.mk -include $(SETTINGS)/dk.mk # Define non-platform/compiler specific settings COMP_NAME=PropTest diff --git a/odk/examples/java/Spreadsheet/Makefile b/odk/examples/java/Spreadsheet/Makefile index 43ba6d0325b2..e246628496f5 100644 --- a/odk/examples/java/Spreadsheet/Makefile +++ b/odk/examples/java/Spreadsheet/Makefile @@ -39,7 +39,6 @@ SETTINGS=$(PRJ)/settings include $(SETTINGS)/settings.mk include $(SETTINGS)/std.mk -include $(SETTINGS)/dk.mk # Define non-platform/compiler specific settings EXAMPLE_NAME=JavaSpreadsheetExamples diff --git a/odk/examples/java/Storage/Makefile b/odk/examples/java/Storage/Makefile index 05f1755209fe..3bf990b5df67 100644 --- a/odk/examples/java/Storage/Makefile +++ b/odk/examples/java/Storage/Makefile @@ -23,7 +23,6 @@ SETTINGS=$(PRJ)/settings include $(SETTINGS)/settings.mk include $(SETTINGS)/std.mk -include $(SETTINGS)/dk.mk # Define non-platform/compiler specific settings COMPONENT_NAME=JavaStorageTestExample diff --git a/odk/examples/java/Text/Makefile b/odk/examples/java/Text/Makefile index 9fb4b6226407..cdfdcb29fdcd 100644 --- a/odk/examples/java/Text/Makefile +++ b/odk/examples/java/Text/Makefile @@ -39,7 +39,6 @@ SETTINGS=$(PRJ)/settings include $(SETTINGS)/settings.mk include $(SETTINGS)/std.mk -include $(SETTINGS)/dk.mk # Define non-platform/compiler specific settings EXAMPLE_NAME=JavaTextExamples diff --git a/odk/examples/java/ToDo/Makefile b/odk/examples/java/ToDo/Makefile index 7ab59a047315..94fc4dde8a00 100644 --- a/odk/examples/java/ToDo/Makefile +++ b/odk/examples/java/ToDo/Makefile @@ -39,7 +39,6 @@ SETTINGS=$(PRJ)/settings include $(SETTINGS)/settings.mk include $(SETTINGS)/std.mk -include $(SETTINGS)/dk.mk # Define non-platform/compiler specific settings COMP_NAME=ToDo diff --git a/odk/examples/python/toolpanel/Makefile b/odk/examples/python/toolpanel/Makefile index b0a974713aeb..7460471f24f3 100644 --- a/odk/examples/python/toolpanel/Makefile +++ b/odk/examples/python/toolpanel/Makefile @@ -31,7 +31,6 @@ SETTINGS = $(PRJ)/settings include $(SETTINGS)/settings.mk include $(SETTINGS)/std.mk -include $(SETTINGS)/dk.mk FILES = \ CalcWindowState.xcu \ diff --git a/odk/pack/copying/dk.mk b/odk/pack/copying/dk.mk index 4cbe5b1ab563..387ef1394f85 100644 --- a/odk/pack/copying/dk.mk +++ b/odk/pack/copying/dk.mk @@ -1,3 +1,4 @@ # OpenOffice.org @@RELEASE@@ SDK dependent settings SDKVERSION=@@RELEASE@@ BUILDID=@@BUILDID@@ +LIBO_SDK_ENABLE_DBGUTIL=@@ENABLE_DBGUTIL@@ diff --git a/odk/settings/settings.mk b/odk/settings/settings.mk index b69724a36127..ffab229693b5 100644 --- a/odk/settings/settings.mk +++ b/odk/settings/settings.mk @@ -19,6 +19,8 @@ # Global settings file for the minimal build environment of the SDK # This file have to updated/extended for other platforms. +include $(OO_SDK_HOME)/settings/dk.mk + # test for the platform PLATFORM := $(shell $(PRJ)/config.guess | cut -d"-" -f3,4) @@ -93,12 +95,20 @@ BLANK= EMPTYSTRING= PATH_SEPARATOR=; +ifeq "$(LIBO_SDK_ENABLE_DBGUTIL)" "TRUE" +LIBO_SDK_DETAIL_CFLAGS_MSVCRT = -MDd +LIBO_SDK_DETAIL_LDFLAGS_MSVCRT = msvcrtd.lib +else +LIBO_SDK_DETAIL_CFLAGS_MSVCRT = -MD +LIBO_SDK_DETAIL_LDFLAGS_MSVCRT = msvcrt.lib +endif + # use this for release version ifeq "$(DEBUG)" "yes" OPT_FLAGS=-Zi endif -CC_FLAGS_JNI=-c -MT -Zm500 -Zc:forScope,wchar_t- -wd4251 -wd4275 -wd4290 -wd4675 -wd4786 -wd4800 -Zc:forScope -GR -EHa $(OPT_FLAGS) -CC_FLAGS=-c -MT -Zm500 -Zc:forScope,wchar_t- -wd4251 -wd4275 -wd4290 -wd4675 -wd4786 -wd4800 -Zc:forScope -GR -EHa $(OPT_FLAGS) +CC_FLAGS_JNI=-c $(LIBO_SDK_DETAIL_CFLAGS_MSVCRT) -Zm500 -Zc:forScope,wchar_t- -wd4251 -wd4275 -wd4290 -wd4675 -wd4786 -wd4800 -Zc:forScope -GR -EHa $(OPT_FLAGS) +CC_FLAGS=-c $(LIBO_SDK_DETAIL_CFLAGS_MSVCRT) -Zm500 -Zc:forScope,wchar_t- -wd4251 -wd4275 -wd4290 -wd4675 -wd4786 -wd4800 -Zc:forScope -GR -EHa $(OPT_FLAGS) ifeq "$(CPP_MANIFEST)" "true" LINK_MANIFEST=mt -manifest $@.manifest "-outputresource:$@;2" else @@ -115,9 +125,11 @@ CC_DEFINES_JNI=-DWIN32 -DWNT -D_DLL -DCPPU_ENV=msci CC_DEFINES=-DWIN32 -DWNT -D_DLL -DCPPU_ENV=msci CC_OUTPUT_SWITCH=-Fo -LIBRARY_LINK_FLAGS=/MD /DLL /DEBUGTYPE:cv +LIBO_SDK_LDFLAGS_STDLIBS = $(LIBO_SDK_DETAIL_LDFLAGS_MSVCRT) kernel32.lib + +LIBRARY_LINK_FLAGS=/DLL /DEBUGTYPE:cv COMP_LINK_FLAGS=$(LIBRARY_LINK_FLAGS) /DEF:$(PRJ)/settings/component.uno.def -EXE_LINK_FLAGS=/MAP /OPT:NOREF /SUBSYSTEM:CONSOLE /BASE:0x1b000000 /DEBUGTYPE:cv /MD msvcrt.lib kernel32.lib +EXE_LINK_FLAGS=/MAP /OPT:NOREF /SUBSYSTEM:CONSOLE /BASE:0x1b000000 /DEBUGTYPE:cv $(LIBO_SDK_LDFLAGS_STDLIBS) ifeq "$(DEBUG)" "yes" LIBRARY_LINK_FLAGS+=/DEBUG EXE_LINK_FLAGS+=/DEBUG @@ -131,7 +143,7 @@ endif # use this for release version #EXE_LINK_FLAGS=/MAP /OPT:NOREF /SUBSYSTEM:CONSOLE /BASE:0x1100000 -#LIBRARY_LINK_FLAGS=/MD /DLL +#LIBRARY_LINK_FLAGS=/DLL endif @@ -224,6 +236,8 @@ CC_DEFINES_JNI=-DUNX -DSOLARIS -DCPPU_ENV=$(CPPU_ENV) -DGCC CC_DEFINES=-DUNX -DSOLARIS -DSPARC -DCPPU_ENV=$(CPPU_ENV) -DHAVE_GCC_VISIBILITY_FEATURE -DGCC CC_OUTPUT_SWITCH=-o +LIBO_SDK_LDFLAGS_STDLIBS = + #LIBRARY_LINK_FLAGS=-w -mt -z combreloc -PIC -temp=/tmp '-R$$ORIGIN' -z text -norunpath -G -Bdirect -Bdynamic -lpthread -lCrun -lc -lm LIBRARY_LINK_FLAGS=-w -mt -z combreloc -fPIC -PIC -temp=/tmp '-R$$ORIGIN' -z text -norunpath -G -Bdirect -Bdynamic -lpthread -lCrun -lc -lm # means if used CC is lower then version 5.5 use option -instance=static @@ -348,6 +362,8 @@ CC_DEFINES=-DUNX -DGCC -DLINUX -DCPPU_ENV=$(CPPU_ENV) -DHAVE_GCC_VISIBILITY_FEAT CC_OUTPUT_SWITCH=-o +LIBO_SDK_LDFLAGS_STDLIBS = + LIBRARY_LINK_FLAGS=-shared -Wl,-z,origin '-Wl,-rpath,$$ORIGIN' ifeq "$(PROCTYPE)" "ppc" @@ -453,6 +469,8 @@ CC_DEFINES=-DUNX -DGCC -DMACOSX -DCPPU_ENV=$(CPPU_ENV) -DHAVE_GCC_VISIBILITY_FEA CC_OUTPUT_SWITCH=-o +LIBO_SDK_LDFLAGS_STDLIBS = + LIBRARY_LINK_FLAGS=-dynamiclib -single_module -Wl,-multiply_defined,suppress $(GCC_ARCH_OPTION) # install_name '@executable_path$/(@:f)' @@ -561,6 +579,8 @@ CC_DEFINES=-DUNX -DGCC -DFREEBSD -DCPPU_ENV=$(CPPU_ENV) -DHAVE_GCC_VISIBILITY_FE CC_OUTPUT_SWITCH=-o +LIBO_SDK_LDFLAGS_STDLIBS = + LIBRARY_LINK_FLAGS=-shared -Wl,-z,origin '-Wl,-rpath,$$ORIGIN' COMP_LINK_FLAGS=$(LIBRARY_LINK_FLAGS) diff --git a/ure/source/uretest/Makefile b/ure/source/uretest/Makefile index 98d0cca41a95..bf200e244008 100644 --- a/ure/source/uretest/Makefile +++ b/ure/source/uretest/Makefile @@ -33,7 +33,6 @@ qt = " qt2 = cwd = $(subst \,/,$(shell cd)) link_output_switch = -out: -link_std_libs = kernel32.lib msvcrt.lib ure_java_url = $(subst $(subst .,., ),%%20,$(subst \,/,$(URLPREFIX)$(OO_SDK_URE_JAVA_DIR))) ure_unorc_url = $(subst $(subst .,., ),%%20,$(subst \,/,$(URLPREFIX)$(OO_SDK_URE_LIB_DIR)/uno.ini)) else @@ -41,7 +40,6 @@ qt = ' qt2 = ' cwd = $(PWD) link_output_switch = $(subst .,.,-o ) -link_std_libs = ure_java_url = $(URLPREFIX)$(OO_SDK_URE_JAVA_DIR) ure_unorc_url = $(URLPREFIX)$(OO_SDK_URE_LIB_DIR)/unorc endif @@ -114,7 +112,7 @@ clean: out.sdk/cppmain.uno.$(SHAREDLIB_EXT): out.sdk/cppmain.$(OBJ_EXT) | out.sdk $(LINK) $(COMP_LINK_FLAGS) $(link_output_switch)$@ $< $(LINK_LIBS) \ $(CPPULIB) $(CPPUHELPERLIB) $(SALLIB) $(SALHELPERLIB) \ - $(link_std_libs) + $(LIBO_SDK_LDFLAGS_STDLIBS) out.sdk/cppmain.$(OBJ_EXT): cppmain.cc out.sdk/cpputypes.cppumaker.flag \ out.sdk/types.cppumaker.flag | out.sdk @@ -124,7 +122,7 @@ out.sdk/cppmain.$(OBJ_EXT): cppmain.cc out.sdk/cpputypes.cppumaker.flag \ out.sdk/cpptest.uno.$(SHAREDLIB_EXT): out.sdk/cpptest.$(OBJ_EXT) | out.sdk $(LINK) $(COMP_LINK_FLAGS) $(link_output_switch)$@ $< $(LINK_LIBS) \ - $(CPPULIB) $(CPPUHELPERLIB) $(SALLIB) $(link_std_libs) + $(CPPULIB) $(CPPUHELPERLIB) $(SALLIB) $(LIBO_SDK_LDFLAGS_STDLIBS) out.sdk/cpptest.$(OBJ_EXT): cpptest.cc out.sdk/cpputypes.cppumaker.flag \ out.sdk/types.cppumaker.flag | out.sdk @@ -134,7 +132,7 @@ out.sdk/cpptest.$(OBJ_EXT): cpptest.cc out.sdk/cpputypes.cppumaker.flag \ out.sdk/cppserver.uno.$(SHAREDLIB_EXT): out.sdk/cppserver.$(OBJ_EXT) | out.sdk $(LINK) $(COMP_LINK_FLAGS) $(link_output_switch)$@ $< $(LINK_LIBS) \ - $(CPPULIB) $(CPPUHELPERLIB) $(SALLIB) $(link_std_libs) + $(CPPULIB) $(CPPUHELPERLIB) $(SALLIB) $(LIBO_SDK_LDFLAGS_STDLIBS) out.sdk/cppserver.$(OBJ_EXT): cppserver.cc out.sdk/cpputypes.cppumaker.flag \ out.sdk/types.cppumaker.flag | out.sdk |