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 /odk/examples/DevelopersGuide/ProfUNO | |
| 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
Diffstat (limited to 'odk/examples/DevelopersGuide/ProfUNO')
5 files changed, 0 insertions, 5 deletions
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 |