diff options
| author | Dirk Völzke <dv@openoffice.org> | 2009-10-29 14:54:41 +0000 |
|---|---|---|
| committer | Dirk Völzke <dv@openoffice.org> | 2009-10-29 14:54:41 +0000 |
| commit | 941aa19d6059eb8c21022b213cc8e42ea2f3216c (patch) | |
| tree | 84dc09ee3049cd1948f106b0696893c3c523ff46 /solenv/inc/set_wntx64.mk | |
| parent | ae583267a12bf3b7473268ab043fc7e71e79b2f5 (diff) | |
#i106129# Don't use debug system libraries until we fully support x64 on windows
Diffstat (limited to 'solenv/inc/set_wntx64.mk')
| -rw-r--r-- | solenv/inc/set_wntx64.mk | 15 |
1 files changed, 5 insertions, 10 deletions
diff --git a/solenv/inc/set_wntx64.mk b/solenv/inc/set_wntx64.mk index 32591c2ee8d4..a6962c216ec5 100644 --- a/solenv/inc/set_wntx64.mk +++ b/solenv/inc/set_wntx64.mk @@ -49,7 +49,7 @@ USE_CFLAGS_X64=-c -nologo -Gs $(NOLOGO) -Zm500 -Zc:forScope,wchar_t- -GR USE_CDEFS_X64+= -DWIN32 -D_AMD64_=1 -D_CRT_SECURE_NO_DEPRECATE -D_CRT_NONSTDC_NO_DEPRECATE -D_CRT_NON_CONFORMING_SWPRINTFS .IF "$(debug)"!="" USE_CFLAGS_X64+=-Zi -Fd$(MISC_X64)/$(@:b).pdb -USE_CDEFS_X64+=-D_DEBUG +USE_CDEFS_X64+=-DDEBUG .ENDIF # "$(debug)"!="" USE_CFLAGS_X64+=$(CFLAGS_X64) USE_CDEFS_X64+=$(CDEFS_X64) @@ -89,14 +89,14 @@ LINKFLAGS_X64+= -NODEFAULTLIB -RELEASE -DEBUG -INCREMENTAL:NO .ENDIF # "$(PRODUCT)"!="full" MAPFILE=-out:$$@ +.IF "$(debug)" != "" +LINKFLAGS_X64+= $(LINKFLAGSDEBUG) +.ENDIF + LINKFLAGSSHLCUI_X64=/SUBSYSTEM:CONSOLE /DLL LINKFLAGSSHL_X64=$(LINKFLAGSSHLCUI_X64) CDEFSSLO_X64+=$(CDEFSMT_X64) $(CDEFSOBJMT_X64) -.IF "$(debug)"!="" -CFLAGSSLO_X64+=-MTd -.ELSE CFLAGSSLO_X64+=-MT -.ENDIF "$(debug)"!="" STDOBJGUI_X64= STDSLOGUI_X64= @@ -136,13 +136,8 @@ UNICOWSLIB_X64=$(LIBPATH_X64)/unicows.lib WININETLIB_X64=$(LIBPATH_X64)/wininet.lib OLDNAMESLIB_X64=$(LIBPATH_VC_X64)/oldnames.lib MSIMG32LIB_X64=$(LIBPATH_X64)/msimg32.lib -.IF "$(debug)"!="" -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 # "$(debug)"!="" MISC_X64=$(MISC)/x64 OBJ_X64=$(OBJ)/x64 |