diff options
| -rw-r--r-- | common/msvc_top.mak | 33 | ||||
| -rw-r--r-- | common/ugcc_top.mak | 13 | ||||
| -rw-r--r-- | language_switch/pspcl6_gcc.mak | 4 | ||||
| -rw-r--r-- | language_switch/pspcl6_msvc.mak | 4 | ||||
| -rw-r--r-- | main/pcl6_msvc.mak | 16 |
5 files changed, 49 insertions, 21 deletions
diff --git a/common/msvc_top.mak b/common/msvc_top.mak index d9bbc8111..183ac2a26 100644 --- a/common/msvc_top.mak +++ b/common/msvc_top.mak @@ -94,6 +94,7 @@ CFLAGS=$(CFLAGS) /DGX_COLOR_INDEX_TYPE="$(GX_COLOR_INDEX_TYPE)" # 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 # way to determine if gs .c files are out of date. + FORCE: $(GENDIR)/ldgs.tr: FORCE @@ -123,18 +124,12 @@ $(GENDIR)/ldgs.tr: FORCE $(GLOBJDIR)\gsargs.$(OBJ) $(GLOBJDIR)\echogs.exe \ $(GLOBJDIR)\ld.tr $(GLOBJDIR)\gconfig.$(OBJ) \ $(GLOBJDIR)\gscdefs.$(OBJ) $(GLOBJDIR)\iconfig.$(OBJ) \ - $(GLOBJDIR)\iccinit$(COMPILE_INITS).$(OBJ) + $(GLOBJDIR)\iccinit$(COMPILE_INITS).$(OBJ) $(GLOBJDIR)\gsromfs$(COMPILE_INITS).$(OBJ) $(CP_) $(GENDIR)\ld.tr $(GENDIR)\ldgs.tr !ELSE 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 @@ -159,6 +154,7 @@ $(GENDIR)/ldgs.tr: FORCE PSSRCDIR=$(PSSRCDIR) PSGENDIR=$(GENDIR) \ PSLIBDIR=$(PSLIBDIR) PSRESDIR=$(PSRESDIR)\ DEVSTUDIO="$(DEVSTUDIO)" \ + XCFLAGS="$(XCFLAGS)" \ 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)" \ @@ -170,7 +166,7 @@ $(GENDIR)/ldgs.tr: FORCE CPU_TYPE="$(CPU_TYPE)" CONFIG="$(CONFIG)" \ $(GLOBJDIR)\gsargs.$(OBJ) $(GLOBJDIR)\echogs.exe \ $(GLOBJDIR)\ld.tr $(GLOBJDIR)\gconfig.$(OBJ) \ - $(GLOBJDIR)\gscdefs.$(OBJ) $(ROMFS) + $(GLOBJDIR)\gscdefs.$(OBJ) $(GLOBJDIR)\gsromfs$(COMPILE_INITS).$(OBJ) $(CP_) $(GENDIR)\ld.tr $(GENDIR)\ldgs.tr !ENDIF @@ -179,31 +175,42 @@ $(GENDIR)/ldgs.tr: FORCE $(GENDIR)\pconf.h $(GENDIR)\ldconf.tr: $(TARGET_DEVS) $(GLOBJDIR)\genconf$(XE) $(GLOBJDIR)\genconf -n - $(TARGET_DEVS) -h $(GENDIR)\pconf.h -ol $(GENDIR)\ldconf.tr +!if "$(TDEBUG)" == "1" +$(GENDIR)\lib32.rsp: $(MAKEFILE) + echo /NODEFAULTLIB:LIBC.lib > $(GENDIR)\lib32.rsp + echo /NODEFAULTLIB:LIBCMT.lib >> $(GENDIR)\lib32.rsp + echo LIBCMTD.lib >> $(GENDIR)\lib32.rsp +!else +$(GENDIR)\lib32.rsp: $(MAKEFILE) + echo /NODEFAULTLIB:LIBC.lib > $(GENDIR)\lib32.rsp + echo /NODEFAULTLIB:LIBCMTD.lib >> $(GENDIR)\lib32.rsp + echo LIBCMT.lib >> $(GENDIR)\lib32.rsp +!endif + # Link an MS executable. -$(GENDIR)\ldall.tr: $(MAKEFILE) $(GENDIR)\ldgs.tr $(GENDIR)\ldconf.tr +$(GENDIR)\ldall.tr: $(MAKEFILE) $(GENDIR)\ldgs.tr $(GENDIR)\ldconf.tr $(GENDIR)\lib32.rsp echo /SUBSYSTEM:CONSOLE >$(GENDIR)\ldall.tr $(CP_) $(GENDIR)\ldall.tr+$(GENDIR)\ldgs.tr $(GENDIR)\ldall.tr echo $(GLOBJDIR)\gsargs.$(OBJ) >>$(GENDIR)\ldall.tr echo $(GLOBJDIR)\gconfig.$(OBJ) >>$(GENDIR)\ldall.tr echo $(GLOBJDIR)\gscdefs.$(OBJ) >>$(GENDIR)\ldall.tr + echo $(GLOBJDIR)\gsromfs$(COMPILE_INITS).$(OBJ) >>$(GENDIR)\ldall.tr $(CP_) $(GENDIR)\ldall.tr+$(GENDIR)\ldconf.tr $(GENDIR)\ldall.tr # AGFA Workaround to add needed ufst font libraries. !IF "$(PL_SCALER)" == "ufst" 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) $(TARGET_XE)$(XE): $(GENDIR)\ldall.tr $(MAIN_OBJ) $(TOP_OBJ) $(LIBCTR) $(FONTLIB) $(LINK_SETUP) - $(LINK) $(LCT) /OUT:$(TARGET_XE)$(XE) $(MAIN_OBJ) $(TOP_OBJ) @$(GENDIR)\ldall.tr @$(LIBCTR) @$(FONTLIB) + $(LINK) $(LCT) /OUT:$(TARGET_XE)$(XE) $(MAIN_OBJ) $(TOP_OBJ) @$(GENDIR)\ldall.tr @$(GENDIR)\lib32.rsp @$(LIBCTR) $(FONTLIB) !ELSE $(TARGET_XE)$(XE): $(GENDIR)\ldall.tr $(MAIN_OBJ) $(TOP_OBJ) $(LIBCTR) $(LINK_SETUP) - $(LINK) $(LCT) /OUT:$(TARGET_XE)$(XE) $(MAIN_OBJ) $(TOP_OBJ) @$(GENDIR)\ldall.tr @$(LIBCTR) + $(LINK) $(LCT) /OUT:$(TARGET_XE)$(XE) $(MAIN_OBJ) $(TOP_OBJ) @$(GENDIR)\ldall.tr @$(GENDIR)\lib32.rsp @$(LIBCTR) !ENDIF diff --git a/common/ugcc_top.mak b/common/ugcc_top.mak index 45b9ec33a..5aaafd3bb 100644 --- a/common/ugcc_top.mak +++ b/common/ugcc_top.mak @@ -28,7 +28,6 @@ include $(COMMONDIR)/generic.mak # seem to be out of sync. BINDIR=./libobj -PSRESDIR=./Resource GLD=$(GLGENDIR)/ CCFLAGS=$(GENOPT) $(CFLAGS) CC_=$(CC) $(CCFLAGS) @@ -87,29 +86,29 @@ $(GENDIR)/pconf.h $(GENDIR)/ldconf.tr: $(TARGET_DEVS) $(GLOBJDIR)/genconf$(XE) $(GLOBJDIR)/genconf -n - $(TARGET_DEVS) -h $(GENDIR)/pconf.h -p "%s&s&&" -o $(GENDIR)/ldconf.tr # Create a library -$(TARGET_LIB): $(ld_tr) $(GENDIR)/ldconf.tr $(MAIN_OBJ) $(TOP_OBJ) $(XOBJS) +$(TARGET_LIB): $(ld_tr) $(GENDIR)/ldconf.tr $(MAIN_OBJ) $(TOP_OBJ) $(XOBJS) $(GLOBJDIR)/gsromfs$(COMPILE_INITS).$(OBJ) $(ECHOGS_XE) -w $(GENDIR)/ldall.tr -n - $(AR) $(ARFLAGS) $@ $(ECHOGS_XE) -a $(GENDIR)/ldall.tr -n -s $(TOP_OBJ) $(XOBJS) -s cat $(GENDIR)/ldt.tr $(GENDIR)/ldconf.tr | grep ".o" >>$(GENDIR)/ldall.tr - $(ECHOGS_XE) -a $(GENDIR)/ldall.tr -s - $(MAIN_OBJ) + $(ECHOGS_XE) -a $(GENDIR)/ldall.tr -s - $(GLOBJDIR)/gsromfs$(COMPILE_INITS).$(OBJ) $(MAIN_OBJ) LD_RUN_PATH=$(XLIBDIR); export LD_RUN_PATH; sh <$(GENDIR)/ldall.tr ifeq ($(PSICFLAGS), -DPSI_INCLUDED) # Link a Unix executable. NB - XOBS is not concatenated to the link # list here. It seems to have been done earlier on unlike the # standalone pcl build below. -$(TARGET_XE): $(ld_tr) $(GENDIR)/ldconf.tr $(MAIN_OBJ) $(TOP_OBJ) $(XOBJS) +$(TARGET_XE): $(ld_tr) $(GENDIR)/ldconf.tr $(MAIN_OBJ) $(TOP_OBJ) $(XOBJS) $(GLOBJDIR)/gsromfs$(COMPILE_INITS).$(OBJ) $(ECHOGS_XE) -w $(GENDIR)/ldall.tr -n - $(CCLD) $(LDFLAGS) $(XLIBDIRS) -o $(TARGET_XE) $(ECHOGS_XE) -a $(GENDIR)/ldall.tr -n -s $(TOP_OBJ) -s cat $(ld_tr) $(GENDIR)/ldconf.tr >>$(GENDIR)/ldall.tr - $(ECHOGS_XE) -a $(GENDIR)/ldall.tr -s - $(MAIN_OBJ) $(EXTRALIBS) $(STDLIBS) + $(ECHOGS_XE) -a $(GENDIR)/ldall.tr -s - $(GLOBJDIR)/gsromfs$(COMPILE_INITS).$(OBJ) $(MAIN_OBJ) $(EXTRALIBS) $(STDLIBS) sh <$(GENDIR)/ldall.tr else # Link a Unix executable. -$(TARGET_XE): $(ld_tr) $(GENDIR)/ldconf.tr $(MAIN_OBJ) $(TOP_OBJ) $(XOBJS) +$(TARGET_XE): $(ld_tr) $(GENDIR)/ldconf.tr $(MAIN_OBJ) $(TOP_OBJ) $(XOBJS) $(GLOBJDIR)/gsromfs$(COMPILE_INITS).$(OBJ) $(ECHOGS_XE) -w $(GENDIR)/ldall.tr -n - $(CCLD) $(LDFLAGS) $(XLIBDIRS) -o $(TARGET_XE) $(ECHOGS_XE) -a $(GENDIR)/ldall.tr -n -s $(TOP_OBJ) $(XOBJS) -s cat $(ld_tr) $(GENDIR)/ldconf.tr >>$(GENDIR)/ldall.tr - $(ECHOGS_XE) -a $(GENDIR)/ldall.tr -s - $(MAIN_OBJ) $(EXTRALIBS) $(STDLIBS) + $(ECHOGS_XE) -a $(GENDIR)/ldall.tr -s - $(GLOBJDIR)/gsromfs$(COMPILE_INITS).$(OBJ) $(MAIN_OBJ) $(EXTRALIBS) $(STDLIBS) sh <$(GENDIR)/ldall.tr endif diff --git a/language_switch/pspcl6_gcc.mak b/language_switch/pspcl6_gcc.mak index dff59376d..8f257685f 100644 --- a/language_switch/pspcl6_gcc.mak +++ b/language_switch/pspcl6_gcc.mak @@ -69,6 +69,10 @@ XOBJS?=$(GLOBJDIR)/gsargs.o $(GLOBJDIR)/gconfig.o \ $(GLOBJDIR)/gscdefs.o $(GLOBJDIR)/iconfig.o \ $(GLOBJDIR)/iccinit$(COMPILE_INITS).o +ifeq ($(COMPILE_INITS), 1) +include $(PSSRCDIR)/psromfs.mak +endif + # "Subclassed" makefile include $(MAINSRCDIR)/pcl6_gcc.mak diff --git a/language_switch/pspcl6_msvc.mak b/language_switch/pspcl6_msvc.mak index 73622aa66..370e2518b 100644 --- a/language_switch/pspcl6_msvc.mak +++ b/language_switch/pspcl6_msvc.mak @@ -201,6 +201,10 @@ FEATURE_CORE = \ FEATURE_DEVS = $(FEATURE_CORE) $(DD)\fapi.dev !endif +!if "$(COMPILE_INITS)" == "1" +!include $(PSSRCDIR)\psromfs.mak +!endif + !include $(MAINSRCDIR)\pcl6_msvc.mak # Subsystems diff --git a/main/pcl6_msvc.mak b/main/pcl6_msvc.mak index fb3d1fbd4..0cab1bbc7 100644 --- a/main/pcl6_msvc.mak +++ b/main/pcl6_msvc.mak @@ -188,6 +188,10 @@ PXL_TOP_OBJ=$(PXLOBJDIR)\pxtop.$(OBJ) PSI_TOP_OBJ= !endif +!ifndef PDL_INCLUDE_FLAGS +PDL_INCLUDE_FLAGS=/DPCL_INCLUDED +!endif + !ifdef XPS_INCLUDED !ifndef XPS_TOP_OBJ XPS_TOP_OBJ=$(XPSOBJDIR)/xpstop.$(OBJ) @@ -257,12 +261,22 @@ UFSTFONTDIR=/usr/local/fontdata5.0/ !endif !endif +# end PL_SCALER == ufst + +# flags for artifex scaler +!if "$(PL_SCALER)" == "afs" +# The mkromfs arguments for including the PCL fonts if COMPILE_INITS=1 +!ifndef PCLXL_ROMFS_ARGS +PCLXL_ROMFS_ARGS= -P ../urwfonts -d ttfonts / +!endif + +!endif +# end PL_SCALER == afs !ifdef XPS_INCLUDED EXTRALIBS=$(EXPATLIB) !endif - # Language and configuration. These are actually platform-independent, # but we define them here just to keep all parameters in one place. !ifndef TARGET_DEVS |