diff options
| author | Tor Lillqvist <tlillqvist@novell.com> | 2011-08-22 23:05:55 +0300 |
|---|---|---|
| committer | Tor Lillqvist <tlillqvist@novell.com> | 2011-08-22 23:35:19 +0300 |
| commit | c3b5c166b9bc212d631558a7568a6eb24fea11c0 (patch) | |
| tree | 37fc6a6769d8ea2edc3c06b906fcb1adbc227811 /solenv | |
| parent | e012efa0b6fbfdd09d81f74e8913f9d40e782ab4 (diff) | |
Make a dbgutil build of the Explorer extension succeed
Take notice of USE_DEBUG_RUNTIME also in set_wntx64.mk.
Don't unset USE_DEBUG_RUNTIME and don't hardcode the non-debugging
msvcprt.lib when building the Explorer extension.
Undefine OSL_DEBUG_LEVEL in its source files that would otherwise drag
in the diagnosing functions from sal. We don't link the Explorer
extension with sal.
As such it might not make much sense to actually *use* a shell
extension built with assertions in the C++ library, against the
debugging C/C++ runtime. You don't want assertions to fire in
Explorer, do you? On the other hand, one could be debugging an
Explorer extension remotely. Maybe even locally, I don't know if some
lower levels of Windows get upset if Explorer is unresponsive due to
being debugged, or something.
But anyway, the main point for now is to make an --enable-dbgutil
build succeed.
Alternatively we could also make sure USE_DEBUG_RUNTIME is unset in
*all* makefiles in shell.
Diffstat (limited to 'solenv')
| -rw-r--r-- | solenv/inc/set_wntx64.mk | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/solenv/inc/set_wntx64.mk b/solenv/inc/set_wntx64.mk index bc8fb7445dfd..c29e8ba8f9df 100644 --- a/solenv/inc/set_wntx64.mk +++ b/solenv/inc/set_wntx64.mk @@ -51,6 +51,9 @@ USE_CDEFS_X64+= -D$(OS) -D$(GUI) -D$(GVER) -D$(COM) -DX86_64 -DWIN32 -D_AMD64_=1 USE_CFLAGS_X64+=-Zi -Fd$(MISC_X64)/$(@:b).pdb USE_CDEFS_X64+=-DDEBUG .ENDIF # "$(debug)"!="" +.IF "$(USE_DEBUG_RUNTIME)" != "" +USE_CDEFS_X64+=-D_DEBUG +.ENDIF USE_CFLAGS_X64+=$(CFLAGS_X64) USE_CDEFS_X64+=$(CDEFS_X64) INCLUDE_X64=$(subst,/stl$(SPACECHAR),dont_use_stl$(SPACECHAR) $(INCLUDE)) @@ -144,8 +147,13 @@ URLMONLIB_X64=$(LIBPATH_X64)/urlmon.lib WININETLIB_X64=$(LIBPATH_X64)/wininet.lib OLDNAMESLIB_X64=$(LIBPATH_VC_X64)/oldnames.lib MSIMG32LIB_X64=$(LIBPATH_X64)/msimg32.lib +.IF "$(USE_DEBUG_RUNTIME)" != "" +MSVCPRT_X64=$(LIBPATH_VC_X64)/msvcprtd.lib +MSVCRT_X64=$(LIBPATH_VC_X64)/msvcrtd.lib +.ELSE MSVCPRT_X64=$(LIBPATH_VC_X64)/msvcprt.lib MSVCRT_X64=$(LIBPATH_VC_X64)/msvcrt.lib +.ENDIF MISC_X64=$(MISC)/x64 OBJ_X64=$(OBJ)/x64 |