Skip to content

C
core
Kaydet (Commit) 50512095 authored tarafından Stephan Bergmann's avatar Stephan Bergmann
Dosyalara gözat
Seçenekler

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
üst 04a54e71
Hide whitespace changes
Inline Side-by-side
Showing with 41 additions and 87 deletions
odk/CustomTarget_settings.mk
Dosyayı görüntüle @ 50512095
......@@ -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:
odk/examples/CLI/CSharp/Spreadsheet/Makefile
Dosyayı görüntüle @ 50512095
......@@ -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+
......
odk/examples/CLI/VB.NET/WriterDemo/Makefile
Dosyayı görüntüle @ 50512095
......@@ -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+
......
odk/examples/DevelopersGuide/BasicAndDialogs/CreatingDialogs/Makefile
Dosyayı görüntüle @ 50512095
......@@ -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
......
odk/examples/DevelopersGuide/BasicAndDialogs/ToolkitControls/Makefile
Dosyayı görüntüle @ 50512095
......@@ -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
......
odk/examples/DevelopersGuide/Charts/Makefile
Dosyayı görüntüle @ 50512095
......@@ -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
......
odk/examples/DevelopersGuide/Components/Addons/JobsAddon/Makefile
Dosyayı görüntüle @ 50512095
......@@ -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
......
odk/examples/DevelopersGuide/Components/Addons/ProtocolHandlerAddon_cpp/Makefile
Dosyayı görüntüle @ 50512095
......@@ -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)
......
odk/examples/DevelopersGuide/Components/Addons/ProtocolHandlerAddon_java/Makefile
Dosyayı görüntüle @ 50512095
......@@ -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
......
odk/examples/DevelopersGuide/Components/CppComponent/Makefile
Dosyayı görüntüle @ 50512095
......@@ -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)
......
odk/examples/DevelopersGuide/Components/JavaComponent/Makefile
Dosyayı görüntüle @ 50512095
......@@ -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
......
odk/examples/DevelopersGuide/Components/SimpleLicense/Makefile
Dosyayı görüntüle @ 50512095
......@@ -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
......
odk/examples/DevelopersGuide/Components/Thumbs/Makefile
Dosyayı görüntüle @ 50512095
......@@ -39,7 +39,6 @@ SETTINGS=$(PRJ)/settings
include $(SETTINGS)/settings.mk
include $(SETTINGS)/std.mk
include $(SETTINGS)/dk.mk
include thumbs.mk
......
odk/examples/DevelopersGuide/Components/Thumbs/org/openoffice/comp/test/Makefile
Dosyayı görüntüle @ 50512095
......@@ -39,7 +39,6 @@ SETTINGS=$(PRJ)/settings
include $(SETTINGS)/settings.mk
include $(SETTINGS)/std.mk
include $(SETTINGS)/dk.mk
include ../../../../thumbs.mk
......
odk/examples/DevelopersGuide/Components/Thumbs/org/openoffice/test/Makefile
Dosyayı görüntüle @ 50512095
......@@ -39,7 +39,6 @@ SETTINGS=$(PRJ)/settings
include $(SETTINGS)/settings.mk
include $(SETTINGS)/std.mk
include $(SETTINGS)/dk.mk
include ../../../thumbs.mk
......
odk/examples/DevelopersGuide/Components/dialogcomponent/Makefile
Dosyayı görüntüle @ 50512095
......@@ -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
......
odk/examples/DevelopersGuide/Config/Makefile
Dosyayı görüntüle @ 50512095
......@@ -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
......
odk/examples/DevelopersGuide/Database/DriverSkeleton/Makefile
Dosyayı görüntüle @ 50512095
......@@ -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)
......
odk/examples/DevelopersGuide/Database/Makefile
Dosyayı görüntüle @ 50512095
......@@ -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
......
odk/examples/DevelopersGuide/Drawing/Makefile
Dosyayı görüntüle @ 50512095
......@@ -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
......
odk/examples/DevelopersGuide/Extensions/DialogWithHelp/Makefile
Dosyayı görüntüle @ 50512095
......@@ -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
......
odk/examples/DevelopersGuide/FirstSteps/Makefile
Dosyayı görüntüle @ 50512095
......@@ -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
......
odk/examples/DevelopersGuide/Forms/Makefile
Dosyayı görüntüle @ 50512095
......@@ -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
......
odk/examples/DevelopersGuide/GUI/Makefile
Dosyayı görüntüle @ 50512095
......@@ -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
......
odk/examples/DevelopersGuide/OfficeDev/Clipboard/Makefile
Dosyayı görüntüle @ 50512095
......@@ -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
......
odk/examples/DevelopersGuide/OfficeDev/DesktopEnvironment/Makefile
Dosyayı görüntüle @ 50512095
......@@ -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
......
odk/examples/DevelopersGuide/OfficeDev/DesktopEnvironment/nativelib/unix/Makefile
Dosyayı görüntüle @ 50512095
......@@ -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
......
odk/examples/DevelopersGuide/OfficeDev/DesktopEnvironment/nativelib/windows/Makefile
Dosyayı görüntüle @ 50512095
......@@ -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
......
odk/examples/DevelopersGuide/OfficeDev/DisableCommands/Makefile
Dosyayı görüntüle @ 50512095
......@@ -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
......
odk/examples/DevelopersGuide/OfficeDev/FilterDevelopment/AsciiFilter/Makefile
Dosyayı görüntüle @ 50512095
......@@ -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
......
odk/examples/DevelopersGuide/OfficeDev/FilterDevelopment/FlatXmlFilterDetection/Makefile
Dosyayı görüntüle @ 50512095
......@@ -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)
......
odk/examples/DevelopersGuide/OfficeDev/FilterDevelopment/FlatXmlFilter_cpp/Makefile
Dosyayı görüntüle @ 50512095
......@@ -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)
......
odk/examples/DevelopersGuide/OfficeDev/FilterDevelopment/FlatXmlFilter_java/Makefile
Dosyayı görüntüle @ 50512095
......@@ -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
......
odk/examples/DevelopersGuide/OfficeDev/Linguistic/Makefile
Dosyayı görüntüle @ 50512095
......@@ -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
......
odk/examples/DevelopersGuide/OfficeDev/Makefile
Dosyayı görüntüle @ 50512095
......@@ -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
......
odk/examples/DevelopersGuide/OfficeDev/PathSettings/Makefile
Dosyayı görüntüle @ 50512095
......@@ -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
......
odk/examples/DevelopersGuide/OfficeDev/PathSubstitution/Makefile
Dosyayı görüntüle @ 50512095
......@@ -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
......
odk/examples/DevelopersGuide/OfficeDev/TerminationTest/Makefile
Dosyayı görüntüle @ 50512095
......@@ -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
......
odk/examples/DevelopersGuide/ProfUNO/CppBinding/Makefile
Dosyayı görüntüle @ 50512095
......@@ -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
......
odk/examples/DevelopersGuide/ProfUNO/InterprocessConn/Makefile
Dosyayı görüntüle @ 50512095
......@@ -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
......
odk/examples/DevelopersGuide/ProfUNO/Lifetime/Makefile
Dosyayı görüntüle @ 50512095
......@@ -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
......
odk/examples/DevelopersGuide/ProfUNO/SimpleBootstrap_cpp/Makefile
Dosyayı görüntüle @ 50512095
......@@ -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
......
odk/examples/DevelopersGuide/ProfUNO/SimpleBootstrap_java/Makefile
Dosyayı görüntüle @ 50512095
......@@ -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
......
odk/examples/DevelopersGuide/ScriptingFramework/SayHello/Makefile
Dosyayı görüntüle @ 50512095
......@@ -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
......
odk/examples/DevelopersGuide/ScriptingFramework/ScriptSelector/Makefile
Dosyayı görüntüle @ 50512095
......@@ -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
......
odk/examples/DevelopersGuide/Spreadsheet/Makefile
Dosyayı görüntüle @ 50512095
......@@ -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
......
odk/examples/DevelopersGuide/Text/Makefile
Dosyayı görüntüle @ 50512095
......@@ -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
......
odk/examples/DevelopersGuide/UCB/Makefile
Dosyayı görüntüle @ 50512095
......@@ -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
......
odk/examples/OLE/activex/Makefile
Dosyayı görüntüle @ 50512095
......@@ -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)
......
odk/examples/cpp/DocumentLoader/Makefile
Dosyayı görüntüle @ 50512095
......@@ -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
......
odk/examples/cpp/complextoolbarcontrols/Makefile
Dosyayı görüntüle @ 50512095
......@@ -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)
......
odk/examples/cpp/counter/Makefile
Dosyayı görüntüle @ 50512095
......@@ -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)
......
odk/examples/cpp/remoteclient/Makefile
Dosyayı görüntüle @ 50512095
......@@ -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)
......
odk/examples/java/ConverterServlet/Makefile
Dosyayı görüntüle @ 50512095
......@@ -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
......
odk/examples/java/DocumentHandling/Makefile
Dosyayı görüntüle @ 50512095
......@@ -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
......
odk/examples/java/Drawing/Makefile
Dosyayı görüntüle @ 50512095
......@@ -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
......
odk/examples/java/EmbedDocument/Container1/Makefile
Dosyayı görüntüle @ 50512095
......@@ -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
......
odk/examples/java/EmbedDocument/EmbeddedObject/Makefile
Dosyayı görüntüle @ 50512095
......@@ -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
......
odk/examples/java/Inspector/Makefile
Dosyayı görüntüle @ 50512095
......@@ -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
......
odk/examples/java/MinimalComponent/Makefile
Dosyayı görüntüle @ 50512095
......@@ -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
......
odk/examples/java/NotesAccess/Makefile
Dosyayı görüntüle @ 50512095
......@@ -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
......
odk/examples/java/PropertySet/Makefile
Dosyayı görüntüle @ 50512095
......@@ -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
......
odk/examples/java/Spreadsheet/Makefile
Dosyayı görüntüle @ 50512095
......@@ -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
......
odk/examples/java/Storage/Makefile
Dosyayı görüntüle @ 50512095
......@@ -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
......
odk/examples/java/Text/Makefile
Dosyayı görüntüle @ 50512095
......@@ -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
......
odk/examples/java/ToDo/Makefile
Dosyayı görüntüle @ 50512095
......@@ -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
......
odk/examples/python/toolpanel/Makefile
Dosyayı görüntüle @ 50512095
......@@ -31,7 +31,6 @@ SETTINGS = $(PRJ)/settings
include $(SETTINGS)/settings.mk
include $(SETTINGS)/std.mk
include $(SETTINGS)/dk.mk
FILES = \
CalcWindowState.xcu \
......
odk/pack/copying/dk.mk
Dosyayı görüntüle @ 50512095
# OpenOffice.org @@RELEASE@@ SDK dependent settings
SDKVERSION=@@RELEASE@@
BUILDID=@@BUILDID@@
LIBO_SDK_ENABLE_DBGUTIL=@@ENABLE_DBGUTIL@@
odk/settings/settings.mk
Dosyayı görüntüle @ 50512095
......@@ -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
<