diff options
| author | Chris Liddell <chris.liddell@artifex.com> | 2021-02-18 16:44:43 +0000 |
|---|---|---|
| committer | Chris Liddell <chris.liddell@artifex.com> | 2021-02-18 16:44:43 +0000 |
| commit | fafb962c4f57b4b7d8e724414e3762f209099b99 (patch) | |
| tree | 3505fe6eab150fc514d2cd78c6d0e297abb8cc84 | |
| parent | a3cfccc2401222818dd4d587fd5c695811427bc4 (diff) | |
| download | ghostpdl-fafb962c4f57b4b7d8e724414e3762f209099b99.tar.gz | |
Windows gpcl6/ufst project: use better/correct targets
Firstly, the recursive call to nmake was using the wrong target name (an
internal use target), so fix that to use the "real" target.
Secondly, give the "real" target a better name, more in keeping with other
equivalents.
| -rw-r--r-- | psi/msvc.mak | 8 | ||||
| -rw-r--r-- | windows/ghostpcl-ufst.vcproj | 8 |
2 files changed, 8 insertions, 8 deletions
diff --git a/psi/msvc.mak b/psi/msvc.mak index 2743dacb1..9fcf3a300 100644 --- a/psi/msvc.mak +++ b/psi/msvc.mak @@ -2323,8 +2323,8 @@ ufst-lib: ufst-debug: ufst-lib nmake -f $(MAKEFILE) $(RECURSIVEDEFS) $(UFSTBASEDEFS) $(UFSTDEBUGDEFS) UFST_CFLAGS="$(UFST_CFLAGS)" -ufst-debug-pcl: ufst-lib - nmake -f $(MAKEFILE) $(RECURSIVEDEFS) $(UFSTBASEDEFS) $(UFSTDEBUGDEFS) UFST_CFLAGS="$(UFST_CFLAGS)" pcl +gpcl6-ufst-debug: ufst-lib + nmake -f $(MAKEFILE) $(RECURSIVEDEFS) $(UFSTBASEDEFS) $(UFSTDEBUGDEFS) UFST_CFLAGS="$(UFST_CFLAGS)" gpcl6 ufst-debugclean: ufst-lib nmake -f $(MAKEFILE) $(RECURSIVEDEFS) $(UFSTBASEDEFS) $(UFSTDEBUGDEFS) UFST_CFLAGS="$(UFST_CFLAGS)" clean @@ -2335,8 +2335,8 @@ ufst-debugbsc: ufst-lib ufst: ufst-lib nmake -f $(MAKEFILE) $(RECURSIVEDEFS) $(UFSTBASEDEFS) $(UFSTDEFS) UFST_CFLAGS="$(UFST_CFLAGS)" -ufst-pcl: ufst-lib - nmake -f $(MAKEFILE) $(RECURSIVEDEFS) $(UFSTBASEDEFS) $(UFSTDEFS) UFST_CFLAGS="$(UFST_CFLAGS)" pcl +gpcl6-ufst: ufst-lib + nmake -f $(MAKEFILE) $(RECURSIVEDEFS) $(UFSTBASEDEFS) $(UFSTDEFS) UFST_CFLAGS="$(UFST_CFLAGS)" gpcl6 ufst-clean: ufst-lib nmake -f $(MAKEFILE) $(RECURSIVEDEFS) $(UFSTBASEDEFS) $(UFSTDEFS) UFST_CFLAGS="$(UFST_CFLAGS)" clean diff --git a/windows/ghostpcl-ufst.vcproj b/windows/ghostpcl-ufst.vcproj index 9be329b79..bb7093e36 100644 --- a/windows/ghostpcl-ufst.vcproj +++ b/windows/ghostpcl-ufst.vcproj @@ -26,7 +26,7 @@ > <Tool Name="VCNMakeTool" - BuildCommandLine="cd .. && nmake -f psi\msvc32.mak UFST_ROOT=.\ufst SBR=1 DEVSTUDIO= ufst-debug-pcl && nmake -f psi\msvc32.mak UFST_ROOT=.\ufst DEVSTUDIO= ufst-debugbsc" + BuildCommandLine="cd .. && nmake -f psi\msvc32.mak UFST_ROOT=.\ufst SBR=1 DEVSTUDIO= gpcl6-ufst-debug && nmake -f psi\msvc32.mak UFST_ROOT=.\ufst DEVSTUDIO= ufst-debugbsc" ReBuildCommandLine="cd .. && nmake -f psi\msvc32.mak UFST_ROOT=.\ufst DEVSTUDIO= ufst-debugclean && nmake -f psi\msvc32.mak UFST_ROOT=.\ufst SBR=1 DEVSTUDIO= ufst-debug && nmake -f psi\msvc32.mak UFST_ROOT=.\ufst DEVSTUDIO= ufst-debugbsc" CleanCommandLine="cd .. && nmake -f psi\msvc32.mak UFST_ROOT=.\ufst DEVSTUDIO= ufst-debugclean" Output="$(ProjectDir)\..\ufstdebugbin\gswin32c.exe" @@ -46,7 +46,7 @@ > <Tool Name="VCNMakeTool" - BuildCommandLine="cd .. && nmake -f psi\msvc32.mak WIN64= UFST_ROOT=.\ufst SBR=1 DEVSTUDIO= ufst-debug-pcl && nmake -f psi\msvc32.mak WIN64= UFST_ROOT=.\ufst DEVSTUDIO= ufst-debugbsc" + BuildCommandLine="cd .. && nmake -f psi\msvc32.mak WIN64= UFST_ROOT=.\ufst SBR=1 DEVSTUDIO= gpcl6-ufst-debug && nmake -f psi\msvc32.mak WIN64= UFST_ROOT=.\ufst DEVSTUDIO= ufst-debugbsc" ReBuildCommandLine="cd .. && nmake -f psi\msvc32.mak WIN64= UFST_ROOT=.\ufst DEVSTUDIO= ufst-debugclean && nmake -f psi\msvc32.mak WIN64= UFST_ROOT=.\ufst SBR=1 DEVSTUDIO= ufst-debug && nmake -f psi\msvc32.mak WIN64= UFST_ROOT=.\ufst DEVSTUDIO= ufst-debugbsc" CleanCommandLine="cd .. && nmake -f psi\msvc32.mak WIN64= UFST_ROOT=.\ufst DEVSTUDIO= ufst-debugclean" Output="$(ProjectDir)\..\ufstdebugbin\gswin64c.exe" @@ -66,7 +66,7 @@ > <Tool Name="VCNMakeTool" - BuildCommandLine="cd .. && nmake -f psi\msvc32.mak UFST_ROOT=.\ufst SBR=1 DEVSTUDIO= ufst-pcl && nmake -f psi\msvc32.mak UFST_ROOT=.\ufst DEVSTUDIO= ufst-bsc" + BuildCommandLine="cd .. && nmake -f psi\msvc32.mak UFST_ROOT=.\ufst SBR=1 DEVSTUDIO= gpcl6-ufst && nmake -f psi\msvc32.mak UFST_ROOT=.\ufst DEVSTUDIO= ufst-bsc" ReBuildCommandLine="cd .. && nmake -f psi\msvc32.mak UFST_ROOT=.\ufst DEVSTUDIO= ufst-clean && nmake -f psi\msvc32.mak UFST_ROOT=.\ufst SBR=1 DEVSTUDIO= ufst && nmake -f psi\msvc32.mak UFST_ROOT=.\ufst DEVSTUDIO= ufst-bsc" CleanCommandLine="cd .. && nmake -f psi\msvc32.mak UFST_ROOT=.\ufst DEVSTUDIO= ufst-clean" Output="$(ProjectDir)\..\ufstbin\gswin32c.exe" @@ -86,7 +86,7 @@ > <Tool Name="VCNMakeTool" - BuildCommandLine="cd .. && nmake -f psi\msvc32.mak WIN64= UFST_ROOT=.\ufst SBR=1 DEVSTUDIO= ufst-pcl && nmake -f psi\msvc32.mak WIN64= UFST_ROOT=.\ufst DEVSTUDIO= ufst-bsc" + BuildCommandLine="cd .. && nmake -f psi\msvc32.mak WIN64= UFST_ROOT=.\ufst SBR=1 DEVSTUDIO= gpcl6-ufst && nmake -f psi\msvc32.mak WIN64= UFST_ROOT=.\ufst DEVSTUDIO= ufst-bsc" ReBuildCommandLine="cd .. && nmake -f psi\msvc32.mak WIN64= UFST_ROOT=.\ufst DEVSTUDIO= ufst-clean && nmake -f psi\msvc32.mak WIN64= UFST_ROOT=.\ufst SBR=1 DEVSTUDIO= ufst && nmake -f psi\msvc32.mak WIN64= UFST_ROOT=.\ufst DEVSTUDIO= ufst-bsc" CleanCommandLine="cd .. && nmake -f psi\msvc32.mak WIN64= UFST_ROOT=.\ufst DEVSTUDIO= ufst-clean" Output="$(ProjectDir)\..\ufstbin\gswin64c.exe" |