diff -u common/msvc_top.mak ../ghostpcl_1.38/common/msvc_top.mak --- common/msvc_top.mak Thu Sep 19 20:37:40 2002 +++ ../ghostpcl_1.38/common/msvc_top.mak Fri Jan 17 10:56:59 2003 @@ -128,29 +128,46 @@ # Link an MS executable. $(GENDIR)\ldall.tr: $(MAKEFILE) $(GENDIR)\ldgs.tr $(GENDIR)\ldconf.tr - echo /SUBSYSTEM:CONSOLE >$(GENDIR)\ldall.tr - $(CP_) $(GENDIR)\ldall.tr+$(GENDIR)\ldgs.tr $(GENDIR)\ldall.tr + $(CP_) $(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 $(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) +# AGFA Workaround to add needed ufst font libraries. +!if "$(PL_SCALER)" == "ufst" echo $(UFST_LIBDIR)\fco_lib.lib >>$(FONTLIB) echo $(UFST_LIBDIR)\if_lib.lib >>$(FONTLIB) echo $(UFST_LIBDIR)\tt_lib.lib >>$(FONTLIB) +!endif +!if $(MAKEDLL) +# Single large executable $(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) /SUBSYSTEM:CONSOLE $(LCT) /OUT:$(TARGET_XE)$(XE) $(MAIN_OBJ) $(TOP_OBJ) @$(GENDIR)\ldall.tr @$(LIBCTR) @$(FONTLIB) +!else +# Small executable and large DLL +LOADER_OBJS=$(GLOBJDIR)\dwplmain.obj $(GLOBJDIR)\dwimg.obj\ + $(GLOBJDIR)\dwreg.obj $(GLOBJDIR)\gscdefs.obj + +$(TARGET_XE)$(XE): $(TARGET_DLL) $(LOADER_OBJS) $(LIBCTR) + $(COMP) $(CCFLAGS) $(CT) /Fe$(TARGET_XE)$(XE) $(LOADER_OBJS) $(TARGET_LIB) @$(LIBCTR) +!endif -!ELSE -$(TARGET_XE)$(XE): $(GENDIR)\ldall.tr $(MAIN_OBJ) $(TOP_OBJ) $(LIBCTR) +$(TARGET_DLL): $(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) -!ENDIF + $(LINK) /DLL $(LCT) /DEF:..\pl\plwin32.def /OUT:$(TARGET_DLL) $(MAIN_OBJ) $(TOP_OBJ) @$(GENDIR)\ldall.tr @$(LIBCTR) @$(FONTLIB) + +$(GLOBJDIR)\dwplmain.obj: $(PLSRCDIR)\dwplmain.c $(GLSRCDIR)\dwmain.h $(GLSRCDIR)\dwimg.h + $(CC) $(CT) $(I_)$(PLSRCDIR)$(_I) $(I_)$(GLSRCDIR)$(_I) $(I_)$(GLGENDIR)$(_I) $(PLSRCDIR)\dwplmain.c -Fo$(GLOBJDIR)\dwplmain.$(OBJ) + +$(GLOBJDIR)\dwimg.obj: $(GLSRCDIR)\dwimg.c $(GLSRCDIR)\dwmain.h $(GLSRCDIR)\dwimg.h + $(CC) $(I_)$(GLSRCDIR)$(_I) $(I_)$(GLGENDIR)$(_I) $(GLSRCDIR)\dwimg.c -Fo$(GLOBJDIR)\dwimg.$(OBJ) + +$(GLOBJDIR)\dwreg.obj: $(GLSRCDIR)\dwreg.c $(GLSRCDIR)\dwreg.h + $(CC) $(I_)$(GLSRCDIR)$(_I) $(I_)$(GLGENDIR)$(_I) $(GLSRCDIR)\dwreg.c -Fo$(GLOBJDIR)\dwreg.$(OBJ)