#i105892# Windows 64 Bit support

2 files changed, 35 insertions, 6 deletions

diff --git a/solenv/inc/set_wntx64.mk b/solenv/inc/set_wntx64.mk
index 35d9e483ded8..32591c2ee8d4 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+=-D_DEBUG
+.ENDIF # "$(debug)"!=""
+USE_CFLAGS_X64+=$(CFLAGS_X64)
 USE_CDEFS_X64+=$(CDEFS_X64)
 INCLUDE_X64=$(subst,/stl$(SPACECHAR),dont_use_stl$(SPACECHAR) $(INCLUDE))
 
@@ -88,7 +92,11 @@ MAPFILE=-out:$$@
 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=
@@ -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
@@ -128,8 +136,13 @@ 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
@@ -182,8 +195,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)"!=""
 
diff --git a/solenv/inc/tg_wntx64.mk b/solenv/inc/tg_wntx64.mk
index 607e1076a28c..87fbd261cd3b 100644
--- a/solenv/inc/tg_wntx64.mk
+++ b/solenv/inc/tg_wntx64.mk
@@ -489,18 +489,27 @@ $(SHL2IMPLIBN_X64):	\
 .ENDIF 			# "$(SHL2TARGETN_X64)"!=""
 
 
+$(SLO_X64)/%.obj : %.cpp
+    @echo ------------------------------
+    @echo Making: $@
+    @@-$(RM) $@ >& $(NULLDEV)
+    -$(MKDIR) $(@:d)
+    @-$(MKDIR) $(MISC_X64)
+    $(CAPTURE_COMMAND) $(CXX_X64) $(USE_CFLAGS_X64) $(INCLUDE_X64) $(CFLAGSCXX_X64) $(CFLAGSSLO_X64) $(USE_CDEFS_X64) $(CDEFSSLO_X64) $(CDEFSMT_X64) $(!eq,$(EXCEPTIONSFILES),$(subst,$@, $(EXCEPTIONSFILES)) $(LOCAL_EXCEPTIONS_FLAGS) $(GLOBAL_EXCEPTIONS_FLAGS)) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ)$(SLO_X64)/$*.obj $(CFLAGSINCXX)$(PWD)/$*.cpp $(CAPTURE_OUTPUT)
 
 $(SLO_X64)/%.obj : %.cxx
     @echo ------------------------------
     @echo Making: $@
     @@-$(RM) $@ >& $(NULLDEV)
     -$(MKDIR) $(@:d)
+    @-$(MKDIR) $(MISC_X64)
     $(CAPTURE_COMMAND) $(CXX_X64) $(USE_CFLAGS_X64) $(INCLUDE_X64) $(CFLAGSCXX_X64) $(CFLAGSSLO_X64) $(USE_CDEFS_X64) $(CDEFSSLO_X64) $(CDEFSMT_X64) $(!eq,$(EXCEPTIONSFILES),$(subst,$@, $(EXCEPTIONSFILES)) $(LOCAL_EXCEPTIONS_FLAGS) $(GLOBAL_EXCEPTIONS_FLAGS)) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ)$(SLO_X64)/$*.obj $(CFLAGSINCXX)$(PWD)/$*.cxx $(CAPTURE_OUTPUT)
 
 $(SLO_X64)/%.obj : $(MISC)/%.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)/$*.c )
     @$(ECHONL)
@@ -510,9 +519,8 @@ $(SLO_X64)/%.obj : %.c
     @echo ------------------------------
     @echo Making: $@
     -$(MKDIR) $(@:d)
+    @-$(MKDIR) $(MISC_X64)
     @@-$(RM) $@
     $(CC_X64) @$(mktmp $(USE_CFLAGS_X64) $(INCLUDE_C) $(CFLAGSCC_X64) $(CFLAGSSLO_X64) $(USE_CDEFS_X64) $(CDEFSSLO_X64) $(CDEFSMT_X64) $(CFLAGSAPPEND_X64) $(CFLAGSOUTOBJ)$(SLO_X64)/$*.obj $*.c )
 
 .ENDIF			# "$(BUILD_X64)"!=""
-
-BUILD64=1