summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rwxr-xr-xgs/ghostscript-ufst.vcproj12
-rwxr-xr-xgs/ghostscript.vcproj43
-rw-r--r--gs/psi/msvc32.mak27
-rw-r--r--main/pcl6_msvc.mak4
-rwxr-xr-xwin32/language_switch.vcproj16
-rwxr-xr-xwin32/pcl.vcproj12
-rwxr-xr-xwin32/svg.vcproj12
-rwxr-xr-xwin32/xps.vcproj12
8 files changed, 96 insertions, 42 deletions
diff --git a/gs/ghostscript-ufst.vcproj b/gs/ghostscript-ufst.vcproj
index 2e7c7cc78..2a8dab3de 100755
--- a/gs/ghostscript-ufst.vcproj
+++ b/gs/ghostscript-ufst.vcproj
@@ -66,9 +66,9 @@
>
<Tool
Name="VCNMakeTool"
- BuildCommandLine="nmake -f psi\msvc32.mak UFST_ROOT=C:\ufst SBR=1 DEVSTUDIO= ufst-debug &amp;&amp; nmake -f psi\msvc32.mak UFST_ROOT=C:\ufst DEVSTUDIO= ufst-debugbsc"
- ReBuildCommandLine="nmake -f psi\msvc32.mak UFST_ROOT=C:\ufst DEVSTUDIO= ufst-debugclean &amp;&amp; nmake -f psi\msvc32.mak UFST_ROOT=C:\ufst SBR=1 DEVSTUDIO= ufst-debug &amp;&amp; nmake -f psi\msvc32.mak UFST_ROOT=C:\ufst DEVSTUDIO= ufst-debugbsc"
- CleanCommandLine="nmake -f psi\msvc32.mak UFST_ROOT=C:\ufst DEVSTUDIO= ufst-debugclean"
+ BuildCommandLine="nmake -f psi\msvc32.mak WIN64= UFST_ROOT=C:\ufst SBR=1 DEVSTUDIO= ufst-debug &amp;&amp; nmake -f psi\msvc32.mak WIN64= UFST_ROOT=C:\ufst DEVSTUDIO= ufst-debugbsc"
+ ReBuildCommandLine="nmake -f psi\msvc32.mak WIN64= UFST_ROOT=C:\ufst DEVSTUDIO= ufst-debugclean &amp;&amp; nmake -f psi\msvc32.mak WIN64= UFST_ROOT=C:\ufst SBR=1 DEVSTUDIO= ufst-debug &amp;&amp; nmake -f psi\msvc32.mak WIN64= UFST_ROOT=C:\ufst DEVSTUDIO= ufst-debugbsc"
+ CleanCommandLine="nmake -f psi\msvc32.mak WIN64= UFST_ROOT=C:\ufst DEVSTUDIO= ufst-debugclean"
Output="ghostscript-ufst.exe"
PreprocessorDefinitions="WIN32;_DEBUG"
IncludeSearchPath=""
@@ -86,9 +86,9 @@
>
<Tool
Name="VCNMakeTool"
- BuildCommandLine="nmake -f psi\msvc32.mak UFST_ROOT=C:\ufst SBR=1 DEVSTUDIO= ufst &amp;&amp; nmake -f psi\msvc32.mak UFST_ROOT=C:\ufst DEVSTUDIO= ufst-bsc"
- ReBuildCommandLine="nmake -f psi\msvc32.mak UFST_ROOT=C:\ufst DEVSTUDIO= ufst-clean &amp;&amp; nmake -f psi\msvc32.mak UFST_ROOT=C:\ufst SBR=1 DEVSTUDIO= ufst &amp;&amp; nmake -f psi\msvc32.mak UFST_ROOT=C:\ufst DEVSTUDIO= ufst-bsc"
- CleanCommandLine="nmake -f psi\msvc32.mak UFST_ROOT=C:\ufst DEVSTUDIO= ufst-clean"
+ BuildCommandLine="nmake -f psi\msvc32.mak WIN64= UFST_ROOT=C:\ufst SBR=1 DEVSTUDIO= ufst &amp;&amp; nmake -f psi\msvc32.mak WIN64= UFST_ROOT=C:\ufst DEVSTUDIO= ufst-bsc"
+ ReBuildCommandLine="nmake -f psi\msvc32.mak WIN64= UFST_ROOT=C:\ufst DEVSTUDIO= ufst-clean &amp;&amp; nmake -f psi\msvc32.mak WIN64= UFST_ROOT=C:\ufst SBR=1 DEVSTUDIO= ufst &amp;&amp; nmake -f psi\msvc32.mak WIN64= UFST_ROOT=C:\ufst DEVSTUDIO= ufst-bsc"
+ CleanCommandLine="nmake -f psi\msvc32.mak WIN64= UFST_ROOT=C:\ufst DEVSTUDIO= ufst-clean"
Output="ghostscript-ufst.exe"
PreprocessorDefinitions="WIN32;NDEBUG"
IncludeSearchPath=""
diff --git a/gs/ghostscript.vcproj b/gs/ghostscript.vcproj
index e92c6d518..a9f7916d8 100755
--- a/gs/ghostscript.vcproj
+++ b/gs/ghostscript.vcproj
@@ -11,6 +11,9 @@
<Platform
Name="Win32"
/>
+ <Platform
+ Name="x64"
+ />
</Platforms>
<ToolFiles>
</ToolFiles>
@@ -55,6 +58,46 @@
CompileAsManaged=""
/>
</Configuration>
+ <Configuration
+ Name="Debug|x64"
+ OutputDirectory="$(PlatformName)\$(ConfigurationName)"
+ IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
+ ConfigurationType="0"
+ >
+ <Tool
+ Name="VCNMakeTool"
+ BuildCommandLine="nmake -f psi\msvc32.mak WIN64= SBR=1 DEVSTUDIO= debug &amp;&amp; nmake -f psi\msvc32.mak WIN64= DEVSTUDIO= debugbsc"
+ ReBuildCommandLine="nmake -f psi\msvc32.mak WIN64= DEVSTUDIO= debugclean &amp;&amp; nmake -f psi\msvc32.mak WIN64= SBR=1 DEVSTUDIO= debug &amp;&amp; nmake -f psi\msvc32.mak WIN64= DEVSTUDIO= debugbsc"
+ CleanCommandLine="nmake -f psi\msvc32.mak WIN64= DEVSTUDIO= debugclean"
+ Output=""
+ PreprocessorDefinitions="WIN64;_DEBUG;DEBUG=1;TDEBUG=1"
+ IncludeSearchPath=""
+ ForcedIncludes=""
+ AssemblySearchPath=""
+ ForcedUsingAssemblies=""
+ CompileAsManaged=""
+ />
+ </Configuration>
+ <Configuration
+ Name="Release|x64"
+ OutputDirectory="$(PlatformName)\$(ConfigurationName)"
+ IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
+ ConfigurationType="0"
+ >
+ <Tool
+ Name="VCNMakeTool"
+ BuildCommandLine="nmake -f psi\msvc32.mak WIN64= SBR=1 DEVSTUDIO= &amp;&amp; nmake -f psi\msvc32.mak WIN64= DEVSTUDIO= bsc"
+ ReBuildCommandLine="nmake -f psi\msvc32.mak WIN64= DEVSTUDIO= clean &amp;&amp; nmake -f psi\msvc32.mak WIN64= SBR=1 DEVSTUDIO= &amp;&amp; nmake -f psi\msvc32.mak WIN64= DEVSTUDIO= bsc"
+ CleanCommandLine="nmake -f psi\msvc32.mak WIN64= DEVSTUDIO= clean"
+ Output=""
+ PreprocessorDefinitions="WIN32;NDEBUG;"
+ IncludeSearchPath=""
+ ForcedIncludes=""
+ AssemblySearchPath=""
+ ForcedUsingAssemblies=""
+ CompileAsManaged=""
+ />
+ </Configuration>
</Configurations>
<References>
</References>
diff --git a/gs/psi/msvc32.mak b/gs/psi/msvc32.mak
index 7ee3cfcee..dc430dbe5 100644
--- a/gs/psi/msvc32.mak
+++ b/gs/psi/msvc32.mak
@@ -155,7 +155,7 @@ DEBUGSYM=0
# We can compile for a 32-bit or 64-bit target
# WIN32 and WIN64 are mutually exclusive. WIN32 is the default.
-!if !defined(WIN32) && !defined(Win64)
+!if !defined(WIN32) && (!defined(Win64) || !defined(WIN64))
WIN32=0
!endif
@@ -872,15 +872,22 @@ $(UNINSTALL_XE): $(PSOBJ)dwuninst.obj $(PSOBJ)dwuninst.res $(PSSRC)dwuninst.def
# ---------------------- Debug targets ---------------------- #
# Simply set some definitions and call ourselves back #
+!ifdef WIN64
+WINDEFS=WIN64=
+!else
+WINDEFS=
+!endif
+
DEBUGDEFS=BINDIR=.\debugbin GLGENDIR=.\debugobj GLOBJDIR=.\debugobj PSLIBDIR=.\lib PSGENDIR=.\debugobj PSOBJDIR=.\debugobj DEBUG=1 TDEBUG=1 SBRDIR=.\debugobj
+
debug:
- nmake -f $(MAKEFILE) DEVSTUDIO="$(DEVSTUDIO)" FT_BRIDGE=$(FT_BRIDGE) $(DEBUGDEFS)
+ nmake -f $(MAKEFILE) DEVSTUDIO="$(DEVSTUDIO)" FT_BRIDGE=$(FT_BRIDGE) $(DEBUGDEFS) $(WINDEFS)
debugclean:
- nmake -f $(MAKEFILE) DEVSTUDIO="$(DEVSTUDIO)" FT_BRIDGE=$(FT_BRIDGE) $(DEBUGDEFS) clean
+ nmake -f $(MAKEFILE) DEVSTUDIO="$(DEVSTUDIO)" FT_BRIDGE=$(FT_BRIDGE) $(DEBUGDEFS) $(WINDEFS) clean
debugbsc:
- nmake -f $(MAKEFILE) DEVSTUDIO="$(DEVSTUDIO)" FT_BRIDGE=$(FT_BRIDGE) $(DEBUGDEFS) bsc
+ nmake -f $(MAKEFILE) DEVSTUDIO="$(DEVSTUDIO)" FT_BRIDGE=$(FT_BRIDGE) $(DEBUGDEFS) $(WINDEFS) bsc
@@ -901,22 +908,22 @@ ufst-lib:
# nmake -f makefile.artifex fco_lib.a if_lib.a psi_lib.a tt_lib.a
ufst-debug: ufst-lib
- nmake -f $(MAKEFILE) DEVSTUDIO="$(DEVSTUDIO)" $(UFSTBASEDEFS) $(UFSTDEBUGDEFS)
+ nmake -f $(MAKEFILE) DEVSTUDIO="$(DEVSTUDIO)" $(UFSTBASEDEFS) $(UFSTDEBUGDEFS) $(WINDEFS)
ufst-debugclean: ufst-lib
- nmake -f $(MAKEFILE) DEVSTUDIO="$(DEVSTUDIO)" $(UFSTBASEDEFS) $(UFSTDEBUGDEFS) clean
+ nmake -f $(MAKEFILE) DEVSTUDIO="$(DEVSTUDIO)" $(UFSTBASEDEFS) $(UFSTDEBUGDEFS) $(WINDEFS) clean
ufst-debugbsc: ufst-lib
- nmake -f $(MAKEFILE) DEVSTUDIO="$(DEVSTUDIO)" $(UFSTBASEDEFS) $(UFSTDEBUGDEFS) bsc
+ nmake -f $(MAKEFILE) DEVSTUDIO="$(DEVSTUDIO)" $(UFSTBASEDEFS) $(UFSTDEBUGDEFS) $(WINDEFS) bsc
ufst: ufst-lib
- nmake -f $(MAKEFILE) DEVSTUDIO="$(DEVSTUDIO)" $(UFSTBASEDEFS) $(UFSTDEFS)
+ nmake -f $(MAKEFILE) DEVSTUDIO="$(DEVSTUDIO)" $(UFSTBASEDEFS) $(UFSTDEFS) $(WINDEFS)
ufst-clean: ufst-lib
- nmake -f $(MAKEFILE) DEVSTUDIO="$(DEVSTUDIO)" $(UFSTBASEDEFS) $(UFSTDEFS) clean
+ nmake -f $(MAKEFILE) DEVSTUDIO="$(DEVSTUDIO)" $(UFSTBASEDEFS) $(UFSTDEFS) $(WINDEFS) clean
ufst-bsc: ufst-lib
- nmake -f $(MAKEFILE) DEVSTUDIO="$(DEVSTUDIO)" $(UFSTBASEDEFS) $(UFSTDEFS) bsc
+ nmake -f $(MAKEFILE) DEVSTUDIO="$(DEVSTUDIO)" $(UFSTBASEDEFS) $(UFSTDEFS) $(WINDEFS) bsc
diff --git a/main/pcl6_msvc.mak b/main/pcl6_msvc.mak
index 1d28a5558..db6f12a2c 100644
--- a/main/pcl6_msvc.mak
+++ b/main/pcl6_msvc.mak
@@ -230,6 +230,10 @@ XCFLAGS=$(XCFLAGS) /DSVG_INCLUDED
!endif
!endif
+!ifdef WIN64
+XCFLAGS=$(XCFLAGS) /DWIN64
+!endif
+
XCFLAGS=$(XCFLAGS) $(PDL_INCLUDE_FLAGS)
!ifndef TOP_OBJ
diff --git a/win32/language_switch.vcproj b/win32/language_switch.vcproj
index 597981c86..9bcd62bc8 100755
--- a/win32/language_switch.vcproj
+++ b/win32/language_switch.vcproj
@@ -66,11 +66,11 @@
>
<Tool
Name="VCNMakeTool"
- BuildCommandLine="cd ..\language_switch &amp;&amp; nmake -f pspcl6_msvc.mak DEBUG=1 TDEBUG=1 DEBUGSYM=1 DEVSTUDIO= SBR=1 &amp;&amp; nmake -f pspcl6_msvc.mak DEBUG=1 TDEBUG=1 DEBUGSYM=1 DEVSTUDIO= bsc"
- ReBuildCommandLine="cd ..\language_switch &amp;&amp; nmake /A -f pspcl6_msvc.mak DEBUG=1 TDEBUG=1 DEBUGSYM=1 DEVSTUDIO= &amp;&amp; nmake -f pspcl6_msvc.mak DEBUG=1 TDEBUG=1 DEBUGSYM=1 DEVSTUDIO= bsc"
- CleanCommandLine="cd ..\language_switch &amp;&amp; nmake -f pspcl6_msvc.mak DEBUG=1 TDEBUG=1 DEBUGSYM=1 DEVSTUDIO= clean"
+ BuildCommandLine="cd ..\language_switch &amp;&amp; nmake -f pspcl6_msvc.mak WIN64= DEBUG=1 TDEBUG=1 DEBUGSYM=1 DEVSTUDIO= SBR=1 &amp;&amp; nmake -f pspcl6_msvc.mak WIN64= DEBUG=1 TDEBUG=1 DEBUGSYM=1 DEVSTUDIO= bsc"
+ ReBuildCommandLine="cd ..\language_switch &amp;&amp; nmake /A -f pspcl6_msvc.mak WIN64= DEBUG=1 TDEBUG=1 DEBUGSYM=1 DEVSTUDIO= &amp;&amp; nmake -f pspcl6_msvc.mak WIN64= DEBUG=1 TDEBUG=1 DEBUGSYM=1 DEVSTUDIO= bsc"
+ CleanCommandLine="cd ..\language_switch &amp;&amp; nmake -f pspcl6_msvc.mak WIN64= DEBUG=1 TDEBUG=1 DEBUGSYM=1 DEVSTUDIO= clean"
Output=""
- PreprocessorDefinitions="WIN32;_DEBUG;"
+ PreprocessorDefinitions="WIN64;_DEBUG;"
IncludeSearchPath=""
ForcedIncludes=""
AssemblySearchPath=""
@@ -86,11 +86,11 @@
>
<Tool
Name="VCNMakeTool"
- BuildCommandLine="cd ..\language_switch &amp;&amp; nmake -f pspcl6_msvc.mak DEVSTUDIO= SBR=1 &amp;&amp; nmake -f pspcl6_msvc.mak DEVSTUDIO= bsc"
- ReBuildCommandLine="cd ..\language_switch &amp;&amp; nmake /A -f pspcl6_msvc.mak DEVSTUDIO= SBR=1 &amp;&amp; nmake -f pspcl6_msvc.mak DEVSTUDIO= bsc"
- CleanCommandLine="cd ..\language_switch &amp;&amp; nmake -f pspcl6_msvc.mak DEVSTUDIO= clean"
+ BuildCommandLine="cd ..\language_switch &amp;&amp; nmake -f pspcl6_msvc.mak WIN64= DEVSTUDIO= SBR=1 &amp;&amp; nmake -f pspcl6_msvc.mak WIN64= DEVSTUDIO= bsc"
+ ReBuildCommandLine="cd ..\language_switch &amp;&amp; nmake /A -f pspcl6_msvc.mak WIN64= DEVSTUDIO= SBR=1 &amp;&amp; nmake -f pspcl6_msvc.mak WIN64= DEVSTUDIO= bsc"
+ CleanCommandLine="cd ..\language_switch &amp;&amp; nmake -f pspcl6_msvc.mak WIN64= DEVSTUDIO= clean"
Output=""
- PreprocessorDefinitions="WIN32;NDEBUG;"
+ PreprocessorDefinitions="WIN64;NDEBUG;"
IncludeSearchPath=""
ForcedIncludes=""
AssemblySearchPath=""
diff --git a/win32/pcl.vcproj b/win32/pcl.vcproj
index 3a0b818d8..db87320b3 100755
--- a/win32/pcl.vcproj
+++ b/win32/pcl.vcproj
@@ -66,9 +66,9 @@
>
<Tool
Name="VCNMakeTool"
- BuildCommandLine="cd ..\main &amp;&amp; nmake -f pcl6_msvc.mak DEBUG=1 TDEBUG=1 DEBUGSYM=1 SBR=1 DEVSTUDIO= &amp;&amp; nmake -f pcl6_msvc.mak DEBUG=1 TDEBUG=1 DEBUGSYM=1 DEVSTUDIO= bsc"
- ReBuildCommandLine="cd ..\main &amp;&amp; nmake /A -f pcl6_msvc.mak DEBUG=1 TDEBUG=1 DEBUGSYM=1 SBR=1 DEVSTUDIO= &amp;&amp; nmake -f pcl6_msvc.mak DEBUG=1 TDEBUG=1 DEBUGSYM=1 DEVSTUDIO= bsc"
- CleanCommandLine="cd ..\main &amp;&amp; nmake -f pcl6_msvc.mak clean DEBUG=1 TDEBUG=1 DEBUGSYM=1 DEVSTUDIO="
+ BuildCommandLine="cd ..\main &amp;&amp; nmake -f pcl6_msvc.mak WIN64= DEBUG=1 TDEBUG=1 DEBUGSYM=1 SBR=1 DEVSTUDIO= &amp;&amp; nmake -f pcl6_msvc.mak WIN64= DEBUG=1 TDEBUG=1 DEBUGSYM=1 DEVSTUDIO= bsc"
+ ReBuildCommandLine="cd ..\main &amp;&amp; nmake /A -f pcl6_msvc.mak WIN64= DEBUG=1 TDEBUG=1 DEBUGSYM=1 SBR=1 DEVSTUDIO= &amp;&amp; nmake -f pcl6_msvc.mak WIN64= DEBUG=1 TDEBUG=1 DEBUGSYM=1 DEVSTUDIO= bsc"
+ CleanCommandLine="cd ..\main &amp;&amp; nmake -f pcl6_msvc.mak WIN64= clean DEBUG=1 TDEBUG=1 DEBUGSYM=1 DEVSTUDIO="
Output=""
PreprocessorDefinitions="WIN32;_DEBUG;"
IncludeSearchPath=""
@@ -86,9 +86,9 @@
>
<Tool
Name="VCNMakeTool"
- BuildCommandLine="cd ..\main &amp;&amp; nmake -f pcl6_msvc.mak SBR=1 DEVSTUDIO= &amp;&amp; nmake -f pcl6_msvc.mak DEVSTUDIO= bsc"
- ReBuildCommandLine="cd ..\main &amp;&amp; nmake /A -f pcl6_msvc.mak SBR=1 DEVSTUDIO= &amp;&amp; nmake -f pcl6_msvc.mak DEVSTUDIO= bsc"
- CleanCommandLine="cd ..\main &amp;&amp; nmake -f pcl6_msvc.mak DEVSTUDIO= clean"
+ BuildCommandLine="cd ..\main &amp;&amp; nmake -f pcl6_msvc.mak WIN64= SBR=1 DEVSTUDIO= &amp;&amp; nmake -f pcl6_msvc.mak WIN64= DEVSTUDIO= bsc"
+ ReBuildCommandLine="cd ..\main &amp;&amp; nmake /A -f pcl6_msvc.mak WIN64= SBR=1 DEVSTUDIO= &amp;&amp; nmake -f pcl6_msvc.mak WIN64= DEVSTUDIO= bsc"
+ CleanCommandLine="cd ..\main &amp;&amp; nmake -f pcl6_msvc.mak WIN64= DEVSTUDIO= clean"
Output=""
PreprocessorDefinitions="WIN32;NDEBUG;"
IncludeSearchPath=""
diff --git a/win32/svg.vcproj b/win32/svg.vcproj
index b39a59aa7..3b70f94b1 100755
--- a/win32/svg.vcproj
+++ b/win32/svg.vcproj
@@ -66,9 +66,9 @@
>
<Tool
Name="VCNMakeTool"
- BuildCommandLine="cd ..\svg &amp;&amp; nmake -f svg_msvc.mak DEBUG=1 TDEBUG=1 DEBUGSYM=1 SBR=1 DEVSTUDIO= &amp;&amp; nmake -f svg_msvc.mak DEBUG=1 TDEBUG=1 DEBUGSYM=1 DEVSTUDIO= bsc"
- ReBuildCommandLine="cd ..\svg &amp;&amp; nmake /A -f svg_msvc.mak DEBUG=1 TDEBUG=1 DEBUGSYM=1 SBR=1 DEVSTUDIO= &amp;&amp; nmake -f svg_msvc.mak DEBUG=1 TDEBUG=1 DEBUGSYM=1 DEVSTUDIO= bsc"
- CleanCommandLine="cd ..\svg &amp;&amp; nmake -f svg_msvc.mak DEBUG=1 TDEBUG=1 DEBUGSYM=1 DEVSTUDIO= clean"
+ BuildCommandLine="cd ..\svg &amp;&amp; nmake -f svg_msvc.mak WIN64= DEBUG=1 TDEBUG=1 DEBUGSYM=1 SBR=1 DEVSTUDIO= &amp;&amp; nmake -f svg_msvc.mak WIN64= DEBUG=1 TDEBUG=1 DEBUGSYM=1 DEVSTUDIO= bsc"
+ ReBuildCommandLine="cd ..\svg &amp;&amp; nmake /A -f svg_msvc.mak WIN64= DEBUG=1 TDEBUG=1 DEBUGSYM=1 SBR=1 DEVSTUDIO= &amp;&amp; nmake -f svg_msvc.mak WIN64= DEBUG=1 TDEBUG=1 DEBUGSYM=1 DEVSTUDIO= bsc"
+ CleanCommandLine="cd ..\svg &amp;&amp; nmake -f svg_msvc.mak WIN64= DEBUG=1 TDEBUG=1 DEBUGSYM=1 DEVSTUDIO= clean"
Output=""
PreprocessorDefinitions="WIN32;_DEBUG;"
IncludeSearchPath=""
@@ -86,9 +86,9 @@
>
<Tool
Name="VCNMakeTool"
- BuildCommandLine="cd ..\svg &amp;&amp; nmake -f svg_msvc.mak SBR=1 DEVSTUDIO= &amp;&amp; nmake -f svg_msvc.mak DEVSTUDIO= bsc"
- ReBuildCommandLine="cd ..\svg &amp;&amp; nmake /A -f svg_msvc.mak SBR=1 DEVSTUDIO= &amp;&amp; nmake -f svg_msvc.mak DEVSTUDIO= bsc"
- CleanCommandLine="cd ..\svg &amp;&amp; nmake -f svg_msvc.mak DEVSTUDIO= clean"
+ BuildCommandLine="cd ..\svg &amp;&amp; nmake -f svg_msvc.mak WIN64= SBR=1 DEVSTUDIO= &amp;&amp; nmake -f svg_msvc.mak WIN64= DEVSTUDIO= bsc"
+ ReBuildCommandLine="cd ..\svg &amp;&amp; nmake /A -f svg_msvc.mak WIN64= SBR=1 DEVSTUDIO= &amp;&amp; nmake -f svg_msvc.mak WIN64= DEVSTUDIO= bsc"
+ CleanCommandLine="cd ..\svg &amp;&amp; nmake -f svg_msvc.mak WIN64= DEVSTUDIO= clean"
Output=""
PreprocessorDefinitions="WIN32;NDEBUG;"
IncludeSearchPath=""
diff --git a/win32/xps.vcproj b/win32/xps.vcproj
index 945165017..1d1fbd391 100755
--- a/win32/xps.vcproj
+++ b/win32/xps.vcproj
@@ -66,9 +66,9 @@
>
<Tool
Name="VCNMakeTool"
- BuildCommandLine="cd ..\xps &amp;&amp; nmake -f xps_msvc.mak DEBUG=1 TDEBUG=1 DEBUGSYM=1 SBR=1 DEVSTUDIO= &amp;&amp; nmake -f xps_msvc.mak DEBUG=1 TDEBUG=1 DEBUGSYM=1 DEVSTUDIO= bsc"
- ReBuildCommandLine="cd ..\xps &amp;&amp; nmake /A -f xps_msvc.mak DEBUG=1 TDEBUG=1 DEBUGSYM=1 SBR=1 DEVSTUDIO= &amp;&amp; nmake -f xps_msvc.mak DEBUG=1 TDEBUG=1 DEBUGSYM=1 DEVSTUDIO= bsc"
- CleanCommandLine="cd ..\xps &amp;&amp; nmake -f xps_msvc.mak clean DEBUG=1 TDEBUG=1 DEBUGSYM=1 DEVSTUDIO="
+ BuildCommandLine="cd ..\xps &amp;&amp; nmake -f xps_msvc.mak WIN64= DEBUG=1 TDEBUG=1 DEBUGSYM=1 SBR=1 DEVSTUDIO= &amp;&amp; nmake -f xps_msvc.mak WIN64= DEBUG=1 TDEBUG=1 DEBUGSYM=1 DEVSTUDIO= bsc"
+ ReBuildCommandLine="cd ..\xps &amp;&amp; nmake /A -f xps_msvc.mak WIN64= DEBUG=1 TDEBUG=1 DEBUGSYM=1 SBR=1 DEVSTUDIO= &amp;&amp; nmake -f xps_msvc.mak WIN64= DEBUG=1 TDEBUG=1 DEBUGSYM=1 DEVSTUDIO= bsc"
+ CleanCommandLine="cd ..\xps &amp;&amp; nmake -f xps_msvc.mak WIN64= clean DEBUG=1 TDEBUG=1 DEBUGSYM=1 DEVSTUDIO="
Output=""
PreprocessorDefinitions="WIN32;_DEBUG;"
IncludeSearchPath=""
@@ -86,9 +86,9 @@
>
<Tool
Name="VCNMakeTool"
- BuildCommandLine="cd ..\xps &amp;&amp; nmake -f xps_msvc.mak SBR=1 DEVSTUDIO= &amp;&amp; nmake -f xps_msvc.mak DEVSTUDIO= bsc"
- ReBuildCommandLine="cd ..\xps &amp;&amp; nmake /A -f xps_msvc.mak SBR=1 DEVSTUDIO= &amp;&amp; nmake -f xps_msvc.mak DEVSTUDIO= bsc"
- CleanCommandLine="cd ..\xps &amp;&amp; nmake -f xps_msvc.mak DEVSTUDIO= clean"
+ BuildCommandLine="cd ..\xps &amp;&amp; nmake -f xps_msvc.mak WIN64= SBR=1 DEVSTUDIO= &amp;&amp; nmake -f xps_msvc.mak WIN64= DEVSTUDIO= bsc"
+ ReBuildCommandLine="cd ..\xps &amp;&amp; nmake /A -f xps_msvc.mak WIN64= SBR=1 DEVSTUDIO= &amp;&amp; nmake -f xps_msvc.mak WIN64= DEVSTUDIO= bsc"
+ CleanCommandLine="cd ..\xps &amp;&amp; nmake -f xps_msvc.mak WIN64= DEVSTUDIO= clean"
Output=""
PreprocessorDefinitions="WIN32;NDEBUG;"
IncludeSearchPath=""