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 --- odk/examples/java/Spreadsheet/Makefile | 1 - 1 file changed, 1 deletion(-) (limited to 'odk/examples/java/Spreadsheet/Makefile') 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 -- cgit