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/CustomTarget_settings.mk | |
| 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/CustomTarget_settings.mk')
| -rw-r--r-- | odk/CustomTarget_settings.mk | 3 |
1 files changed, 2 insertions, 1 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: |