From 5051209534c8a2034dcb0016d4a8fe29dcb2947b Mon Sep 17 00:00:00 2001 From: Stephan Bergmann Date: Fri, 19 Apr 2013 13:35:42 +0200 Subject: 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 --- ure/source/uretest/Makefile | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) (limited to 'ure') 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 -- cgit