Make the non DEBUG build the default for pcl6 with MSCV. Add the

missing parts needed to include the 'wtsimdi' device. Fix some
formatting problems (spaces instead of tab) and add the support
for including the gsromfs.obj module with PCL6 only build when
COMPILE_INITS=1. NOTE: COMPILE_INITS=1 not yet functional on MSVC.
This requires the gs/src/msvccmd.mak change for /Zi instead of
/ZI as well (external tree means it must be a separate commit).

git-svn-id: http://svn.ghostscript.com/ghostpcl/trunk/ghostpcl@2973 06663e23-700e-0410-b217-a244a6096597

1 files changed, 18 insertions, 13 deletions

diff --git a/common/msvc_top.mak b/common/msvc_top.mak
index 10185d852..a96b7932e 100644
--- a/common/msvc_top.mak
+++ b/common/msvc_top.mak
@@ -102,8 +102,8 @@ $(GENDIR)/ldgs.tr: FORCE
 	$(MAKE) /F $(GLSRCDIR)\msvc32.mak MSVC_VERSION="$(MSVC_VERSION)" \
 	GLSRCDIR="$(GLSRCDIR)" DEBUG=$(DEBUG) NOPRIVATE=$(NOPRIVATE) \
 	GLGENDIR="$(GLGENDIR)" GLOBJDIR="$(GLOBJDIR)" \
-        EXPATSRCDIR="$(EXPATSRCDIR)" SHARE_EXPAT="$(SHARE_EXPAT)" \
-        EXPAT_CFLAGS="$(EXPAT_CFLAGS)" \
+	EXPATSRCDIR="$(EXPATSRCDIR)" SHARE_EXPAT="$(SHARE_EXPAT)" \
+	EXPAT_CFLAGS="$(EXPAT_CFLAGS)" \
 	ICCSRCDIR="$(ICCSRCDIR)" IMDISRCDIR="$(IMDISRCDIR)" \
 	PNGSRCDIR="$(PNGSRCDIR)" \
 	SHARE_LIBPNG="$(SHARE_LIBPNG)" \
@@ -113,7 +113,7 @@ $(GENDIR)/ldgs.tr: FORCE
 	PSLIBDIR=$(PSLIBDIR) PSRESDIR=$(PSRESDIR)\
 	DEVSTUDIO="$(DEVSTUDIO)" \
 	XCFLAGS="$(XCFLAGS)" \
-        COMPILE_INITS=$(COMPILE_INITS) PCLXL_ROMFS_ARGS="$(PCLXL_ROMFS_ARGS)" PJL_ROMFS_ARGS="$(PJL_ROMFS_ARGS)" \
+	COMPILE_INITS=$(COMPILE_INITS) PCLXL_ROMFS_ARGS="$(PCLXL_ROMFS_ARGS)" PJL_ROMFS_ARGS="$(PJL_ROMFS_ARGS)" \
 	UFST_ROOT=$(UFST_ROOT) UFST_BRIDGE=$(UFST_BRIDGE) UFST_LIB_EXT=$(UFST_LIB_EXT) \
 	UFST_ROMFS_ARGS="$(UFST_ROMFS_ARGS)" \
 	UFST_CFLAGS="$(UFST_CFLAGS)" \
@@ -130,6 +130,11 @@ $(GENDIR)/ldgs.tr: FORCE
 
 FORCE:
 
+# COMPILE_INITS=1 means we need to include gsromfs.obj is built
+!IF "$(COMPILE_INITS)" == "1"
+ROMFS=$(GLOBJDIR)/gsromfs.obj
+!ENDIF
+
 # Build the required GS library files.  It's simplest always to build
 # the floating point emulator, even though we don't always link it in.
 # HACK * HACK * HACK - we force this make to occur since we have no
@@ -144,8 +149,8 @@ $(GENDIR)/ldgs.tr: FORCE
 	$(MAKE) /F $(GLSRCDIR)\msvclib.mak MSVC_VERSION="$(MSVC_VERSION)" \
 	GLSRCDIR="$(GLSRCDIR)" DEBUG=$(DEBUG) NOPRIVATE=$(NOPRIVATE) \
 	GLGENDIR="$(GLGENDIR)" GLOBJDIR="$(GLOBJDIR)" \
-        EXPATSRCDIR="$(EXPATSRCDIR)" SHARE_EXPAT="$(SHARE_EXPAT)" \
-        EXPAT_CFLAGS="$(EXPAT_CFLAGS)" \
+	EXPATSRCDIR="$(EXPATSRCDIR)" SHARE_EXPAT="$(SHARE_EXPAT)" \
+	EXPAT_CFLAGS="$(EXPAT_CFLAGS)" \
 	ICCSRCDIR="$(ICCSRCDIR)" IMDISRCDIR="$(IMDISRCDIR)" \
 	PNGSRCDIR="$(PNGSRCDIR)" \
 	SHARE_LIBPNG="$(SHARE_LIBPNG)" \
@@ -154,18 +159,18 @@ $(GENDIR)/ldgs.tr: FORCE
 	PSSRCDIR=$(PSSRCDIR) PSGENDIR=$(GENDIR) \
 	PSLIBDIR=$(PSLIBDIR) PSRESDIR=$(PSRESDIR)\
 	DEVSTUDIO="$(DEVSTUDIO)" \
-        COMPILE_INITS=$(COMPILE_INITS) PCLXL_ROMFS_ARGS="$(PCLXL_ROMFS_ARGS)" PJL_ROMFS_ARGS="$(PJL_ROMFS_ARGS)" \
+	COMPILE_INITS=$(COMPILE_INITS) PCLXL_ROMFS_ARGS="$(PCLXL_ROMFS_ARGS)" PJL_ROMFS_ARGS="$(PJL_ROMFS_ARGS)" \
 	UFST_ROOT=$(UFST_ROOT) UFST_BRIDGE=$(UFST_BRIDGE) UFST_LIB_EXT=$(UFST_LIB_EXT) \
-        UFST_ROMFS_ARGS="$(UFST_ROMFS_ARGS)" \
-        UFST_CFLAGS="$(UFST_CFLAGS)" \
-        PSD="$(GENDIR)/" \
+	UFST_ROMFS_ARGS="$(UFST_ROMFS_ARGS)" \
+	UFST_CFLAGS="$(UFST_CFLAGS)" \
+	PSD="$(GENDIR)/" \
 	FEATURE_DEVS="$(FEATURE_DEVS)" DEVICE_DEVS="$(DEVICE_DEVS)" \
 	BAND_LIST_STORAGE=$(BAND_LIST_STORAGE) BAND_LIST_COMPRESSOR=$(BAND_LIST_COMPRESSOR) \
 	GLOBJ=$(GLOBJ) GLGEN=$(GLGEN) \
 	FPU_TYPE="$(FPU_TYPE)" CPU_TYPE="$(CPU_TYPE)" CONFIG="$(CONFIG)" \
 	$(GLOBJDIR)\gsargs.$(OBJ) $(GLOBJDIR)\echogs.exe \
 	$(GLOBJDIR)\ld.tr $(GLOBJDIR)\gconfig.$(OBJ) \
-	$(GLOBJDIR)\gscdefs.$(OBJ)
+	$(GLOBJDIR)\gscdefs.$(OBJ) $(ROMFS)
 	$(CP_) $(GENDIR)\ld.tr $(GENDIR)\ldgs.tr
 
 !ENDIF
@@ -189,9 +194,9 @@ FONTLIB=$(GENDIR)\fontlib.tr
 # I have no idea what NODEFAULTLIB means.
 $(FONTLIB): $(MAKEFILE)
 	echo /NODEFAULTLIB:LIBC.lib > $(FONTLIB)
-        echo $(UFST_LIB)\fco_lib.lib >>$(FONTLIB)
-        echo $(UFST_LIB)\if_lib.lib >>$(FONTLIB)
-        echo $(UFST_LIB)\tt_lib.lib >>$(FONTLIB)
+	echo $(UFST_LIB)\fco_lib.lib >>$(FONTLIB)
+	echo $(UFST_LIB)\if_lib.lib >>$(FONTLIB)
+	echo $(UFST_LIB)\tt_lib.lib >>$(FONTLIB)
 
 $(TARGET_XE)$(XE): $(GENDIR)\ldall.tr $(MAIN_OBJ) $(TOP_OBJ) $(LIBCTR) $(FONTLIB)
 	$(LINK_SETUP)