diff options
| author | Kurt Zenker <kz@openoffice.org> | 2009-12-03 15:17:19 +0100 |
|---|---|---|
| committer | Kurt Zenker <kz@openoffice.org> | 2009-12-03 15:17:19 +0100 |
| commit | c8e66142b9fd5bd81b4e6649986355a95c41b68b (patch) | |
| tree | e7c2243996299e88f94350c65745fe2302e1842c /solenv/inc/set_wntx64.mk | |
| parent | 1c5f52715aeb9d89a87dde9990571645a5c231f5 (diff) | |
| parent | b0fa0c2db60858335b065aa26b01864c6df64002 (diff) | |
CWS-TOOLING: integrate CWS tkr28_DEV300
Diffstat (limited to 'solenv/inc/set_wntx64.mk')
| -rw-r--r-- | solenv/inc/set_wntx64.mk | 24 |
1 files changed, 20 insertions, 4 deletions
diff --git a/solenv/inc/set_wntx64.mk b/solenv/inc/set_wntx64.mk index fb8178f7e510..23dbee21d2cd 100644 --- a/solenv/inc/set_wntx64.mk +++ b/solenv/inc/set_wntx64.mk @@ -46,8 +46,12 @@ LIBMGR_X64=$(WRAPCMD) $(LIBMGR_X64_BINARY) $(NOLOGO) IMPLIB_X64=$(WRAPCMD) $(LIBMGR_X64_BINARY) USE_CFLAGS_X64=-c -nologo -Gs $(NOLOGO) -Zm500 -Zc:forScope,wchar_t- -GR -USE_CFLAGS_X64+=$(CFLAGS_X64) 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+=-DDEBUG +.ENDIF # "$(debug)"!="" +USE_CFLAGS_X64+=$(CFLAGS_X64) USE_CDEFS_X64+=$(CDEFS_X64) INCLUDE_X64=$(subst,/stl$(SPACECHAR),dont_use_stl$(SPACECHAR) $(INCLUDE)) @@ -85,6 +89,10 @@ 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) @@ -98,7 +106,7 @@ STDSLOCUI_X64= IMPLIBFLAGS_X64=-machine:X64 LIBPATH_X64=$(PSDK)/lib/x64 -LIBPATH_VC_X64=$(PSDK)/vc/lib/x64 +LIBPATH_VC_X64=$(COMPATH)/lib/amd64 ADVAPI32LIB_X64=$(LIBPATH_X64)/advapi32.lib SHELL32LIB_X64=$(LIBPATH_X64)/shell32.lib @@ -182,8 +190,16 @@ DEF1TARGETN_X64=$(MISC_X64)/$(DEF1NAME_X64).def .IF "$(DEF2NAME_X64)"!="" DEF2TARGETN_X64=$(MISC_X64)/$(DEF2NAME_X64).def .ENDIF -.ENDIF # "$(BUILD_X64)"!="" - +$(SLO_X64)/%.obj : $(MISC_X64)/%.c + @echo ------------------------------ + @echo Making: $@ + -$(MKDIR) $(@:d) + @-$(MKDIR) $(MISC_X64) + @@-$(RM) $@ + @$(TYPE) $(mktmp $(CC_X64) $(USE_CFLAGS_X64) $(INCLUDE_C) $(CFLAGSCC_X64) $(CFLAGSSLO_X64) $(USE_CDEFS_X64) $(CDEFSSLO_X64) $(CFLAGSAPPEND_X64) $(CFLAGSOUTOBJ)$(SLO_X64)/$*.obj $(MISC_X64)/$*.c ) + @$(ECHONL) + $(CC_X64) @$(mktmp $(USE_CFLAGS_X64) $(INCLUDE_C) $(CFLAGSCC_X64) $(CFLAGSSLO_X64) $(USE_CDEFS_X64) $(CDEFSSLO_X64) $(CFLAGSAPPEND_X64) $(CFLAGSOUTOBJ)$(SLO_X64)/$*.obj $(MISC_X64)/$*.c ) +.ENDIF # "$(BUILD_X64)"!="" |