diff options
Diffstat (limited to 'psi/msvc.mak')
| -rw-r--r-- | psi/msvc.mak | 247 |
1 files changed, 201 insertions, 46 deletions
diff --git a/psi/msvc.mak b/psi/msvc.mak index 7b097f97..c5c3b464 100644 --- a/psi/msvc.mak +++ b/psi/msvc.mak @@ -97,6 +97,9 @@ DEFAULT_OBJ_DIR=$(DEFAULT_OBJ_DIR)rt !ifdef WIN64 DEFAULT_OBJ_DIR=$(DEFAULT_OBJ_DIR)64 !endif +!ifdef XP +DEFAULT_OBJ_DIR=$(DEFAULT_OBJ_DIR)xp +!endif !ifndef AUXDIR AUXDIR=$(DEFAULT_OBJ_DIR)\aux_ @@ -118,6 +121,9 @@ BINDIR=.\bin !endif !endif !endif +!ifdef XP +BINDIR=$(BINDIR)xp +!endif !endif !ifndef GLSRCDIR GLSRCDIR=.\base @@ -232,6 +238,26 @@ GPDLGENDIR=$(GLGENDIR) GPDLOBJDIR=$(GLOBJDIR) !endif +!ifndef URFSRCDIR +URFSRCDIR=.\urf +!endif +!ifndef URFGENDIR +URFGENDIR=$(GLGENDIR) +!endif +!ifndef URFOBJDIR +URFOBJDIR=$(GLOBJDIR) +!endif + +!ifndef IMGSRCDIR +IMGSRCDIR=.\gpdl\img +!endif +!ifndef IMGGENDIR +IMGGENDIR=$(GLGENDIR) +!endif +!ifndef IMGOBJDIR +IMGOBJDIR=$(GLOBJDIR) +!endif + CONTRIBDIR=.\contrib # Can we build PCL and XPS @@ -271,7 +297,7 @@ XPS_TARGET=gxps GPDL_TARGET=gpdl !endif -PCL_XPS_TARGETS=$(PCL_TARGET) $(XPS_TARGET) +PCL_XPS_PDL_TARGETS=$(PCL_TARGET) $(XPS_TARGET) $(GPDL_TARGET) # Define the root directory for Ghostscript installation. @@ -547,6 +573,28 @@ WITH_CUPS=0 WITH_CUPS=0 !endif +# Should we build URF... +!ifdef WITH_URF +!if "$(WITH_URF)"!="0" +WITH_URF=1 +!else +WITH_URF=0 +!endif +!else +!if exist ("$(URFSRCDIR)") +WITH_URF=1 +!else +WITH_URF=0 +!endif +!endif +!if "$(WITH_URF)"=="1" +ENABLE_URF=$(D_)URF_INCLUDED$(_D) +GPDL_URF_TOP_OBJ=$(GPDLOBJ)/$(GPDL_URF_TOP_OBJ_FILE) +URF_INCLUDE=$(I_)$(URFSRCDIR)$(_I) +URF_DEV=$(GLD)urfd.dev +SURFX_H=$(URFSRCDIR)$(D)surfx.h +!endif + # Should we build using CAL.... CALSRCDIR=cal !ifdef WITH_CAL @@ -617,7 +665,8 @@ TIFFSRCDIR=tiff$(D) TIFFCONFDIR=$(TIFFSRCDIR) TIFFCONFIG_SUFFIX=.vc TIFFPLATFORM=win32 -TIFFCFLAGS="-DJPEG_LIB_MK1_OR_12BIT=0" +TIFF_CFLAGS=-DJPEG_SUPPORT -DOJPEG_SUPPORT -DJPEG_LIB_MK1_OR_12BIT=0 +ENABLE_TIFF=$(D_)TIFF_INCLUDED$(_D) !endif # Define the directory where the zlib sources are stored. @@ -750,13 +799,22 @@ XCFLAGS= !endif !ifndef CFLAGS +!if !defined(DEBUG) || "$(DEBUG)"=="0" +CFLAGS=/DNDEBUG +!else CFLAGS= !endif +!endif !ifdef DEVSTUDIO CFLAGS=$(CFLAGS) /FC !endif +!ifdef XP +CFLAGS=$(CFLAGS) /D_USING_V110_SDK71_ +SUBSUBSYS=,"5.01" +!endif + !ifdef CLUSTER CFLAGS=$(CFLAGS) -DCLUSTER !endif @@ -830,6 +888,7 @@ SBRFLAGS=/FR$(SBRDIR)\$(NUL) MSVC_VERSION=5 !endif !if "$(_NMAKE_VER)" == "6.00.8168.0" +# VC 6 MSVC_VERSION=6 !endif !if "$(_NMAKE_VER)" == "7.00.9466" @@ -843,50 +902,82 @@ MSVC_VERSION=7 MSVC_MINOR_VERSION=1 !endif !if "$(_NMAKE_VER)" == "8.00.40607.16" +# VS2005 MSVC_VERSION=8 !endif !if "$(_NMAKE_VER)" == "8.00.50727.42" +# VS2005 MSVC_VERSION=8 !endif !if "$(_NMAKE_VER)" == "8.00.50727.762" +# VS2005 MSVC_VERSION=8 !endif !if "$(_NMAKE_VER)" == "9.00.21022.08" +# VS2008 MSVC_VERSION=9 !endif !if "$(_NMAKE_VER)" == "9.00.30729.01" +# VS2008 MSVC_VERSION=9 !endif !if "$(_NMAKE_VER)" == "10.00.30319.01" +# VS2010 MSVC_VERSION=10 !endif !if "$(_NMAKE_VER)" == "11.00.50522.1" +# VS2012 MSVC_VERSION=11 !endif !if "$(_NMAKE_VER)" == "11.00.50727.1" +# VS2012 MSVC_VERSION=11 !endif !if "$(_NMAKE_VER)" == "11.00.60315.1" +# VS2012 MSVC_VERSION=11 !endif !if "$(_NMAKE_VER)" == "11.00.60610.1" +# VS2012 MSVC_VERSION=11 !endif !if "$(_NMAKE_VER)" == "12.00.21005.1" +# VS 2013 MSVC_VERSION=12 !endif !if "$(_NMAKE_VER)" == "14.00.23506.0" +# VS2015 MSVC_VERSION=14 !endif -!if "$(_NMAKE_VER)" == "14.14.26433.0" +!if "$(_NMAKE_VER)" == "14.00.24210.0" +# VS2015 MSVC_VERSION=14 !endif -!if "$(_NMAKE_VER)" == "14.16.27026.1" -MSVC_VERSION=14 +!if "$(_NMAKE_VER)" == "14.16.27034.0" +# VS2017 or VS2019 (Toolset v141) +MSVC_VERSION=15 +MS_TOOLSET_VERSION=14.16.27034 +!endif +!if "$(_NMAKE_VER)" == "14.24.28314.0" +# VS2019 (Toolset v142) +MSVC_VERSION=16 +MS_TOOLSET_VERSION=14.24.28314 +!endif +!if "$(_NMAKE_VER)" == "14.24.28315.0" +# VS2019 (Toolset v142 - update) +MSVC_VERSION=16 +MS_TOOLSET_VERSION=14.24.28315 +!endif +!if "$(_NMAKE_VER)" == "14.24.28316.0" +# VS2019 (Toolset v142 - update) +MSVC_VERSION=16 +MS_TOOLSET_VERSION=14.24.28316 !endif !endif !ifndef MSVC_VERSION +!MESSAGE Could not determine MSVC_VERSION! Guessing at an ancient one. +!MESSAGE Unknown nmake version: $(_NMAKE_VER) MSVC_VERSION=6 !endif !ifndef MSVC_MINOR_VERSION @@ -1174,6 +1265,59 @@ LINKLIBPATH=/LIBPATH:"$(COMPBASE)\lib\amd64" /LIBPATH:"$(COMPBASE)\PlatformSDK\L ! endif !endif +!if $(MSVC_VERSION) == 15 +! ifndef DEVSTUDIO +DEVSTUDIO=C:\Program Files (x86)\Microsoft Visual Studio\2017\Community\VC\Tools\MSVC\$(MS_TOOLSET_VERSION) +! endif +! if "$(DEVSTUDIO)"=="" +COMPBASE= +SHAREDBASE= +! else +! if $(BUILD_SYSTEM) == 64 +DEVSTUDIO_HOST=Hostx64 +! else +DEVSTUDIO_HOST=Hostx86 +! endif +! ifdef WIN64 +DEVSTUDIO_TARGET=x64 +! else +DEVSTUDIO_TARGET=x86 +! endif +COMPDIR=$(DEVSTUDIO)\bin\$(DEVSTUDIO_HOST)\$(DEVSTUDIO_TARGET) +RCDIR= +LINKLIBPATH=/LIBPATH:"$(DEVSTUDIO)\lib\$(DEVSTUDIO_TARGET)" +! endif +!endif + +!if $(MSVC_VERSION) == 16 +! ifndef DEVSTUDIO +! if exist("C:\Program Files (x86)\Microsoft Visual Studio\2019\Professional") +DEVSTUDIO_VARIANT="Professional" +! else +DEVSTUDIO_VARIANT="Community" +! endif +DEVSTUDIO=C:\Program Files (x86)\Microsoft Visual Studio\2019\$(DEVSTUDIO_VARIANT)\VC\Tools\MSVC\$(MS_TOOLSET_VERSION) +! endif +! if "$(DEVSTUDIO)"=="" +COMPBASE= +SHAREDBASE= +! else +! if $(BUILD_SYSTEM) == 64 +DEVSTUDIO_HOST=Hostx64 +! else +DEVSTUDIO_HOST=Hostx86 +! endif +! ifdef WIN64 +DEVSTUDIO_TARGET=x64 +! else +DEVSTUDIO_TARGET=x86 +! endif +COMPDIR=$(DEVSTUDIO)\bin\$(DEVSTUDIO_HOST)\$(DEVSTUDIO_TARGET) +RCDIR= +LINKLIBPATH=/LIBPATH:"$(DEVSTUDIO)\lib\$(DEVSTUDIO_TARGET)" +! endif +!endif + !if "$(ARM)"=="1" VCINSTDIR=$(VS110COMNTOOLS)..\..\VC\ @@ -1424,7 +1568,7 @@ FEATURE_DEVS=$(GLD)pipe.dev $(GLD)gsnogc.dev $(GLD)htxlib.dev $(GLD)psl3lib.dev $(GLD)seprlib.dev $(GLD)translib.dev $(GLD)cidlib.dev $(GLD)psf0lib.dev $(GLD)psf1lib.dev\ $(GLD)psf2lib.dev $(GLD)lzwd.dev $(GLD)sicclib.dev $(GLD)mshandle.dev $(GLD)mspoll.dev \ $(GLD)ramfs.dev $(GLD)sjpx.dev $(GLD)sjbig2.dev \ - $(GLD)pwgd.dev $(GLD)siscale.dev + $(GLD)pwgd.dev $(GLD)siscale.dev $(URF_DEV) !ifndef METRO @@ -1487,12 +1631,15 @@ DEVICE_DEVS16=$(DD)bbox.dev $(DD)plib.dev $(DD)plibg.dev $(DD)plibm.dev $(DD)pli !if "$(WITH_CUPS)" == "1" DEVICE_DEVS16=$(DEVICE_DEVS16) $(DD)cups.dev !endif +!if "$(WITH_URF)" == "1" +DEVICE_DEVS16=$(DEVICE_DEVS16) $(DD)urfgray.dev $(DD)urfrgb.dev $(DD)urfcmyk.dev +!endif # Overflow for DEVS3,4,5,6,9 DEVICE_DEVS17=$(DD)ljet3.dev $(DD)ljet3d.dev $(DD)ljet4.dev $(DD)ljet4d.dev DEVICE_DEVS18=$(DD)pj.dev $(DD)pjxl.dev $(DD)pjxl300.dev $(DD)jetp3852.dev $(DD)r4081.dev DEVICE_DEVS19=$(DD)lbp8.dev $(DD)m8510.dev $(DD)necp6.dev $(DD)bjc600.dev $(DD)bjc800.dev DEVICE_DEVS20=$(DD)pnm.dev $(DD)pnmraw.dev $(DD)ppm.dev $(DD)ppmraw.dev $(DD)pamcmyk32.dev $(DD)pamcmyk4.dev $(DD)pnmcmyk.dev $(DD)pam.dev -DEVICE_DEVS21=$(DD)spotcmyk.dev $(DD)devicen.dev $(DD)bmpsep1.dev $(DD)bmpsep8.dev $(DD)bmp16m.dev $(DD)bmp32b.dev $(DD)psdcmyk.dev $(DD)psdrgb.dev $(DD)gprf.dev $(DD)psdcmyk16.dev $(DD)psdrgb16.dev +DEVICE_DEVS21=$(DD)spotcmyk.dev $(DD)devicen.dev $(DD)bmpsep1.dev $(DD)bmpsep8.dev $(DD)bmp16m.dev $(DD)bmp32b.dev $(DD)psdcmyk.dev $(DD)psdrgb.dev $(DD)psdcmyk16.dev $(DD)psdrgb16.dev !endif CONTRIB_DEVS=$(DD)pcl3.dev $(DD)hpdjplus.dev $(DD)hpdjportable.dev $(DD)hpdj310.dev $(DD)hpdj320.dev $(DD)hpdj340.dev $(DD)hpdj400.dev $(DD)hpdj500.dev $(DD)hpdj500c.dev $(DD)hpdj510.dev $(DD)hpdj520.dev $(DD)hpdj540.dev $(DD)hpdj550c.dev $(DD)hpdj560c.dev $(DD)hpdj600.dev $(DD)hpdj660c.dev $(DD)hpdj670c.dev $(DD)hpdj680c.dev $(DD)hpdj690c.dev $(DD)hpdj850c.dev $(DD)hpdj855c.dev $(DD)hpdj870c.dev $(DD)hpdj890c.dev $(DD)hpdj1120c.dev $(DD)cdj670.dev $(DD)cdj850.dev $(DD)cdj880.dev $(DD)cdj890.dev $(DD)cdj970.dev $(DD)cdj1600.dev $(DD)cdnj500.dev $(DD)chp2200.dev $(DD)lips3.dev $(DD)lxm3200.dev $(DD)lex2050.dev $(DD)lxm3200.dev $(DD)lex5700.dev $(DD)lex7000.dev $(DD)oki4w.dev $(DD)gdi.dev $(DD)samsunggdi.dev $(DD)dl2100.dev $(DD)la50.dev $(DD)la70.dev $(DD)la75.dev $(DD)la75plus.dev $(DD)ln03.dev $(DD)xes.dev $(DD)md2k.dev $(DD)md5k.dev $(DD)lips4.dev $(DD)bj10v.dev $(DD)bj10vh.dev $(DD)md50Mono.dev $(DD)md50Eco.dev $(DD)md1xMono.dev $(DD)lp2000.dev $(DD)escpage.dev $(DD)npdl.dev $(DD)rpdl.dev $(DD)fmpr.dev $(DD)fmlbp.dev $(DD)jj100.dev $(DD)lbp310.dev $(DD)lbp320.dev $(DD)mj700v2c.dev $(DD)mj500c.dev $(DD)mj6000c.dev $(DD)mj8000c.dev $(DD)pr201.dev $(DD)pr150.dev $(DD)pr1000.dev $(DD)pr1000_4.dev $(DD)lips2p.dev $(DD)bjc880j.dev $(DD)bjcmono.dev $(DD)bjcgray.dev $(DD)bjccmyk.dev $(DD)bjccolor.dev @@ -1509,7 +1656,7 @@ BITSTREAM_CFLAGS= # Define the name of the makefile -- used in dependencies. -MAKEFILE=$(PSSRCDIR)\msvc32.mak +MAKEFILE=$(PSSRCDIR)\msvc.mak TOP_MAKEFILES=$(MAKEFILE) $(GLSRCDIR)\msvccmd.mak $(GLSRCDIR)\msvctail.mak $(GLSRCDIR)\winlib.mak $(PSSRCDIR)\winint.mak # Define the files to be removed by `make clean'. @@ -1661,7 +1808,7 @@ $(GS_XE): $(GSDLL_DLL) !else $(GS_XE): $(GSDLL_DLL) $(DWOBJ) $(GSCONSOLE_XE) $(GLOBJ)gp_wutf8.$(OBJ) $(TOP_MAKEFILES) - echo /SUBSYSTEM:WINDOWS > $(PSGEN)gswin.rsp + echo /SUBSYSTEM:WINDOWS$(SUBSUBSYS) > $(PSGEN)gswin.rsp !if "$(PROFILE)"=="1" echo /Profile >> $(PSGEN)gswin.rsp !endif @@ -1676,7 +1823,7 @@ $(GS_XE): $(GSDLL_DLL) $(DWOBJ) $(GSCONSOLE_XE) $(GLOBJ)gp_wutf8.$(OBJ) $(TOP_M # The console mode small EXE loader $(GSCONSOLE_XE): $(OBJC) $(GS_OBJ).res $(PSSRCDIR)\dw64c.def $(PSSRCDIR)\dw32c.def $(GLOBJ)gp_wutf8.$(OBJ) $(TOP_MAKEFILES) - echo /SUBSYSTEM:CONSOLE > $(PSGEN)gswin.rsp + echo /SUBSYSTEM:CONSOLE$(SUBSUBSYS) > $(PSGEN)gswin.rsp !if "$(PROFILE)"=="1" echo /Profile >> $(PSGEN)gswin.rsp !endif @@ -1713,7 +1860,7 @@ $(GPCL6DLL_DLL): $(ECHOGS_XE) $(GSDLL_OBJ).res $(LIBCTR) $(LIB_ALL) $(PCL_DEVS_A del $(PCLGEN)gpclwin.rsp $(GPCL_XE): $(GPCL6DLL_DLL) $(DWMAINOBJS) $(GS_OBJ).res $(TOP_MAKEFILES) - echo /SUBSYSTEM:CONSOLE > $(PCLGEN)gpclwin.rsp + echo /SUBSYSTEM:CONSOLE$(SUBSUBSYS) > $(PCLGEN)gpclwin.rsp !if "$(PROFILE)"=="1" echo /Profile >> $(PCLGEN)gpclwin.rsp !endif @@ -1741,7 +1888,7 @@ $(GXPSDLL_DLL): $(ECHOGS_XE) $(GSDLL_OBJ).res $(LIBCTR) $(LIB_ALL) $(XPS_DEVS_AL del $(PCLGEN)gxpswin.rsp $(GXPS_XE): $(GXPSDLL_DLL) $(DWMAINOBJS) $(GS_OBJ).res $(TOP_MAKEFILES) - echo /SUBSYSTEM:CONSOLE > $(XPSGEN)gxpswin.rsp + echo /SUBSYSTEM:CONSOLE$(SUBSUBSYS) > $(XPSGEN)gxpswin.rsp !if "$(PROFILE)"=="1" echo /Profile >> $(XPSGEN)gxpswin.rsp !endif @@ -1781,7 +1928,7 @@ $(GPDLDLL_DLL): $(ECHOGS_XE) $(GSDLL_OBJ).res $(LIBCTR) $(LIB_ALL) $(PCL_DEVS_AL del $(GPDLGEN)gpdlwin.rsp $(GPDL_XE): $(GPDLDLL_DLL) $(DWMAINOBJS) $(GS_OBJ).res $(TOP_MAKEFILES) - echo /SUBSYSTEM:CONSOLE > $(GPDLGEN)gpdlwin.rsp + echo /SUBSYSTEM:CONSOLE$(SUBSUBSYS) > $(GPDLGEN)gpdlwin.rsp !if "$(PROFILE)"=="1" echo /Profile >> $(XPSGEN)gpdlwin.rsp !endif @@ -1827,7 +1974,7 @@ $(GSCONSOLE_XE): $(ECHOGS_XE) $(gs_tr) $(GS_ALL) $(DEVS_ALL) $(GSDLL_OBJS) $(OBJ echo $(GLOBJ)dwimg.obj >> $(PSGEN)gswin.tr echo $(PSOBJ)dwmainc.obj >> $(PSGEN)gswin.tr echo $(PSOBJ)dwreg.obj >> $(PSGEN)gswin.tr - echo /SUBSYSTEM:CONSOLE > $(PSGEN)gswin.rsp + echo /SUBSYSTEM:CONSOLE$(SUBSUBSYS) > $(PSGEN)gswin.rsp !ifdef WIN64 echo /DEF:$(PSSRCDIR)\dw64c.def /OUT:$(GSCONSOLE_XE) >> $(PSGEN)gswin.rsp !else @@ -1845,7 +1992,7 @@ $(GPCL_XE): $(ECHOGS_XE) $(LIBCTR) $(LIB_ALL) $(WINMAINOBJS) $(PCL_DEVS_ALL) $(P copy $(pclld_tr) $(PCLGEN)gpclwin.tr echo $(WINMAINOBJS) $(MAIN_OBJ) $(TOP_OBJ) $(INT_ARCHIVE_SOME) $(XOBJS) >> $(PCLGEN)gpclwin.tr echo $(PCLOBJ)pclromfs$(COMPILE_INITS).$(OBJ) >> $(PCLGEN)gpclwin.tr - echo /SUBSYSTEM:CONSOLE > $(PCLGEN)pclwin.rsp + echo /SUBSYSTEM:CONSOLE$(SUBSUBSYS) > $(PCLGEN)pclwin.rsp echo /OUT:$(GPCL_XE) >> $(PCLGEN)pclwin.rsp $(LINK) $(LCT) @$(PCLGEN)pclwin.rsp @$(PCLGEN)gpclwin.tr $(LINKLIBPATH) @$(LIBCTR) @$(PCLGEN)pcllib.rsp del $(PCLGEN)pclwin.rsp @@ -1858,7 +2005,7 @@ $(GXPS_XE): $(ECHOGS_XE) $(LIBCTR) $(LIB_ALL) $(WINMAINOBJS) $(XPS_DEVS_ALL) $(X copy $(xpsld_tr) $(XPSGEN)gxpswin.tr echo $(WINMAINOBJS) $(MAIN_OBJ) $(XPS_TOP_OBJS) $(INT_ARCHIVE_SOME) $(XOBJS) >> $(XPSGEN)gxpswin.tr echo $(PCLOBJ)xpsromfs$(COMPILE_INITS).$(OBJ) >> $(XPSGEN)gxpswin.tr - echo /SUBSYSTEM:CONSOLE > $(XPSGEN)xpswin.rsp + echo /SUBSYSTEM:CONSOLE$(SUBSUBSYS) > $(XPSGEN)xpswin.rsp echo /OUT:$(GXPS_XE) >> $(XPSGEN)xpswin.rsp $(LINK) $(LCT) @$(XPSGEN)xpswin.rsp @$(XPSGEN)gxpswin.tr $(LINKLIBPATH) @$(LIBCTR) @$(XPSGEN)xpslib.rsp del $(XPSGEN)xpswin.rsp @@ -1872,7 +2019,7 @@ $(GPDL_XE): $(ECHOGS_XE) $(ld_tr) $(gpdl_tr) $(LIBCTR) $(LIB_ALL) $(WINMAINOBJS) copy $(gpdlld_tr) $(GPDLGEN)gpdlwin.tr echo $(WINMAINOBJS) $(MAIN_OBJ) $(GPDL_PSI_TOP_OBJS) $(PCL_PXL_TOP_OBJS) $(PSI_TOP_OBJ) $(XPS_TOP_OBJ) $(XOBJS) >> $(GPDLGEN)gpdlwin.tr echo $(PCLOBJ)pdlromfs$(COMPILE_INITS).$(OBJ) >> $(GPDLGEN)gpdlwin.tr - echo /SUBSYSTEM:CONSOLE > $(GPDLGEN)gpdlwin.rsp + echo /SUBSYSTEM:CONSOLE$(SUBSUBSYS) > $(GPDLGEN)gpdlwin.rsp echo /OUT:$(GPDL_XE) >> $(GPDLGEN)gpdlwin.rsp $(LINK) $(LCT) @$(GPDLGEN)gpdlwin.rsp @$(GPDLGEN)gpdlwin.tr $(LINKLIBPATH) @$(LIBCTR) @$(GPDLGEN)gpdllib.rsp del $(GPDLGEN)gpdlwin.rsp @@ -1888,28 +2035,36 @@ WINDEFS=WIN64= BUILD_SYSTEM="$(BUILD_SYSTEM)" PGMFILES="$(PGMFILES)" PGMFILESx86 WINDEFS=BUILD_SYSTEM="$(BUILD_SYSTEM)" PGMFILES="$(PGMFILES)" PGMFILESx86="$(PGMFILESx86)" !endif -DEBUGDEFS=DEBUG=1 TDEBUG=1 +RECURSIVEDEFS=$(WINDEFS) +!ifdef XP +RECURSIVEDEFS=XP=$(XP) $(RECURSIVEDEFS) +!endif +!ifdef DEVSTUDIO +RECURSIVEDEFS=DEVSTUDIO="$(DEVSTUDIO)" $(RECURSIVEDEFS) +!endif + +DEBUGDEFS=DEBUG=1 TDEBUG=1 $(RECURSIVEDEFS) debug: - nmake -f $(MAKEFILE) DEVSTUDIO="$(DEVSTUDIO)" FT_BRIDGE=$(FT_BRIDGE) $(DEBUGDEFS) $(WINDEFS) + nmake -f $(MAKEFILE) $(DEBUGDEFS) FT_BRIDGE=$(FT_BRIDGE) gsdebug: - nmake -f $(MAKEFILE) DEVSTUDIO="$(DEVSTUDIO)" FT_BRIDGE=$(FT_BRIDGE) $(DEBUGDEFS) $(WINDEFS) gs + nmake -f $(MAKEFILE) $(DEBUGDEFS) FT_BRIDGE=$(FT_BRIDGE) gs gpcl6debug: - nmake -f $(MAKEFILE) DEVSTUDIO="$(DEVSTUDIO)" FT_BRIDGE=$(FT_BRIDGE) $(DEBUGDEFS) $(WINDEFS) gpcl6 + nmake -f $(MAKEFILE) $(DEBUGDEFS) FT_BRIDGE=$(FT_BRIDGE) gpcl6 gxpsdebug: - nmake -f $(MAKEFILE) DEVSTUDIO="$(DEVSTUDIO)" FT_BRIDGE=$(FT_BRIDGE) $(DEBUGDEFS) $(WINDEFS) gxps + nmake -f $(MAKEFILE) $(DEBUGDEFS) FT_BRIDGE=$(FT_BRIDGE) gxps gpdldebug: - nmake -f $(MAKEFILE) DEVSTUDIO="$(DEVSTUDIO)" FT_BRIDGE=$(FT_BRIDGE) $(DEBUGDEFS) $(WINDEFS) gpdl + nmake -f $(MAKEFILE) $(DEBUGDEFS) FT_BRIDGE=$(FT_BRIDGE) gpdl debugclean: - nmake -f $(MAKEFILE) DEVSTUDIO="$(DEVSTUDIO)" FT_BRIDGE=$(FT_BRIDGE) $(DEBUGDEFS) $(WINDEFS) clean + nmake -f $(MAKEFILE) $(DEBUGDEFS) FT_BRIDGE=$(FT_BRIDGE) clean debugbsc: - nmake -f $(MAKEFILE) DEVSTUDIO="$(DEVSTUDIO)" FT_BRIDGE=$(FT_BRIDGE) $(DEBUGDEFS) $(WINDEFS) bsc + nmake -f $(MAKEFILE) $(DEBUGDEFS) FT_BRIDGE=$(FT_BRIDGE) bsc # --------------------- Memento targets --------------------- # # Simply set some definitions and call ourselves back # @@ -1917,52 +2072,52 @@ debugbsc: MEMENTODEFS=$(DEBUGDEFS) MEMENTO=1 memento-target: - nmake -f $(MAKEFILE) DEVSTUDIO="$(DEVSTUDIO)" FT_BRIDGE=$(FT_BRIDGE) $(MEMENTODEFS) $(WINDEFS) + nmake -f $(MAKEFILE) $(MEMENTODEFS) FT_BRIDGE=$(FT_BRIDGE) gsmemento: - nmake -f $(MAKEFILE) DEVSTUDIO="$(DEVSTUDIO)" FT_BRIDGE=$(FT_BRIDGE) $(MEMENTODEFS) $(WINDEFS) gs + nmake -f $(MAKEFILE) $(MEMENTODEFS) FT_BRIDGE=$(FT_BRIDGE) gs gpcl6memento: - nmake -f $(MAKEFILE) DEVSTUDIO="$(DEVSTUDIO)" FT_BRIDGE=$(FT_BRIDGE) $(MEMENTODEFS) $(WINDEFS) gpcl6 + nmake -f $(MAKEFILE) $(MEMENTODEFS) FT_BRIDGE=$(FT_BRIDGE) gpcl6 gxpsmemento: - nmake -f $(MAKEFILE) DEVSTUDIO="$(DEVSTUDIO)" FT_BRIDGE=$(FT_BRIDGE) $(MEMENTODEFS) $(WINDEFS) gxps + nmake -f $(MAKEFILE) $(MEMENTODEFS) FT_BRIDGE=$(FT_BRIDGE) gxps gpdlmemento: - nmake -f $(MAKEFILE) DEVSTUDIO="$(DEVSTUDIO)" FT_BRIDGE=$(FT_BRIDGE) $(MEMENTODEFS) $(WINDEFS) gpdl + nmake -f $(MAKEFILE) $(MEMENTODEFS) FT_BRIDGE=$(FT_BRIDGE) gpdl mementoclean: - nmake -f $(MAKEFILE) DEVSTUDIO="$(DEVSTUDIO)" FT_BRIDGE=$(FT_BRIDGE) $(MEMENTODEFS) $(WINDEFS) clean + nmake -f $(MAKEFILE) $(MEMENTODEFS) FT_BRIDGE=$(FT_BRIDGE) clean mementobsc: - nmake -f $(MAKEFILE) DEVSTUDIO="$(DEVSTUDIO)" FT_BRIDGE=$(FT_BRIDGE) $(MEMENTODEFS) $(WINDEFS) bsc + nmake -f $(MAKEFILE) $(MEMENTODEFS) FT_BRIDGE=$(FT_BRIDGE) bsc # --------------------- Profile targets --------------------- # # Simply set some definitions and call ourselves back # -PROFILEDEFS=PROFILE=1 +PROFILEDEFS=$(RECURSIVEDEFS) PROFILE=1 profile: profile-target: - nmake -f $(MAKEFILE) DEVSTUDIO="$(DEVSTUDIO)" FT_BRIDGE=$(FT_BRIDGE) $(PROFILEDEFS) $(WINDEFS) + nmake -f $(MAKEFILE) $(PROFILEDEFS) FT_BRIDGE=$(FT_BRIDGE) gsprofile: - nmake -f $(MAKEFILE) DEVSTUDIO="$(DEVSTUDIO)" FT_BRIDGE=$(FT_BRIDGE) $(PROFILEDEFS) $(WINDEFS) gs + nmake -f $(MAKEFILE) $(PROFILEDEFS) FT_BRIDGE=$(FT_BRIDGE) gs gpcl6profile: - nmake -f $(MAKEFILE) DEVSTUDIO="$(DEVSTUDIO)" FT_BRIDGE=$(FT_BRIDGE) $(PROFILEDEFS) $(WINDEFS) gpcl6 + nmake -f $(MAKEFILE) $(PROFILEDEFS) FT_BRIDGE=$(FT_BRIDGE) gpcl6 gxpsprofile: - nmake -f $(MAKEFILE) DEVSTUDIO="$(DEVSTUDIO)" FT_BRIDGE=$(FT_BRIDGE) $(PROFILEDEFS) $(WINDEFS) gxps + nmake -f $(MAKEFILE) $(PROFILEDEFS) FT_BRIDGE=$(FT_BRIDGE) gxps gpdlprofile: - nmake -f $(MAKEFILE) DEVSTUDIO="$(DEVSTUDIO)" FT_BRIDGE=$(FT_BRIDGE) $(PROFILEDEFS) $(WINDEFS) gpdl + nmake -f $(MAKEFILE) $(PROFILEDEFS) FT_BRIDGE=$(FT_BRIDGE) gpdl profileclean: - nmake -f $(MAKEFILE) DEVSTUDIO="$(DEVSTUDIO)" FT_BRIDGE=$(FT_BRIDGE) $(PROFILEDEFS) $(WINDEFS) clean + nmake -f $(MAKEFILE) $(PROFILEDEFS) FT_BRIDGE=$(FT_BRIDGE) clean profilebsc: - nmake -f $(MAKEFILE) DEVSTUDIO="$(DEVSTUDIO)" FT_BRIDGE=$(FT_BRIDGE) $(PROFILEDEFS) $(WINDEFS) bsc + nmake -f $(MAKEFILE) $(PROFILEDEFS) FT_BRIDGE=$(FT_BRIDGE) bsc @@ -1999,22 +2154,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) UFST_CFLAGS="$(UFST_CFLAGS)" $(WINDEFS) + nmake -f $(MAKEFILE) $(RECURSIVEDEFS) $(UFSTBASEDEFS) $(UFSTDEBUGDEFS) UFST_CFLAGS="$(UFST_CFLAGS)" ufst-debugclean: ufst-lib - nmake -f $(MAKEFILE) DEVSTUDIO="$(DEVSTUDIO)" $(UFSTBASEDEFS) $(UFSTDEBUGDEFS) UFST_CFLAGS="$(UFST_CFLAGS)" $(WINDEFS) clean + nmake -f $(MAKEFILE) $(RECURSIVEDEFS) $(UFSTBASEDEFS) $(UFSTDEBUGDEFS) UFST_CFLAGS="$(UFST_CFLAGS)" clean ufst-debugbsc: ufst-lib - nmake -f $(MAKEFILE) DEVSTUDIO="$(DEVSTUDIO)" $(UFSTBASEDEFS) $(UFSTDEBUGDEFS) UFST_CFLAGS="$(UFST_CFLAGS)" $(WINDEFS) bsc + nmake -f $(MAKEFILE) $(RECURSIVEDEFS) $(UFSTBASEDEFS) $(UFSTDEBUGDEFS) UFST_CFLAGS="$(UFST_CFLAGS)" bsc ufst: ufst-lib - nmake -f $(MAKEFILE) DEVSTUDIO="$(DEVSTUDIO)" $(UFSTBASEDEFS) $(UFSTDEFS) UFST_CFLAGS="$(UFST_CFLAGS)" $(WINDEFS) + nmake -f $(MAKEFILE) $(RECURSIVEDEFS) $(UFSTBASEDEFS) $(UFSTDEFS) UFST_CFLAGS="$(UFST_CFLAGS)" ufst-clean: ufst-lib - nmake -f $(MAKEFILE) DEVSTUDIO="$(DEVSTUDIO)" $(UFSTBASEDEFS) $(UFSTDEFS) UFST_CFLAGS="$(UFST_CFLAGS)" $(WINDEFS) clean + nmake -f $(MAKEFILE) $(RECURSIVEDEFS) $(UFSTBASEDEFS) $(UFSTDEFS) UFST_CFLAGS="$(UFST_CFLAGS)" clean ufst-bsc: ufst-lib - nmake -f $(MAKEFILE) DEVSTUDIO="$(DEVSTUDIO)" $(UFSTBASEDEFS) $(UFSTDEFS) UFST_CFLAGS="$(UFST_CFLAGS)" $(WINDEFS) bsc + nmake -f $(MAKEFILE) $(RECURSIVEDEFS) $(UFSTBASEDEFS) $(UFSTDEFS) UFST_CFLAGS="$(UFST_CFLAGS)" bsc #----------------------- Individual Product Targets --------------------# gs:$(GS_XE) $(GSCONSOLE_XE) |