Re: Fix for #686993, GS doesn't link with MAKEDLL=0

Please commit.

Igor.

----- Original Message ----- 
From: "Alex Cherepanov" <[email protected]>
To: "gs-code-review" <[email protected]>; "Igor V. Melichev"
<[email protected]>
Sent: Wednesday, August 13, 2003 11:31 PM
Subject: Fix for #686993, GS doesn't link with MAKEDLL=0


> Update non-DLL version to support visual tracer.
> Fix bug 686993
>
>


----------------------------------------------------------------------------
----


> Index: gs/src/dwdll.c
> ===================================================================
> RCS file: /cvs/ghostscript/gs/src/dwdll.c,v
> retrieving revision 1.5
> diff -b -u -r1.5 dwdll.c
> --- gs/src/dwdll.c 26 Feb 2002 16:09:15 -0000 1.5
> +++ gs/src/dwdll.c 13 Aug 2003 19:10:08 -0000
> @@ -189,6 +189,7 @@
>      gsdll->set_stdio = NULL;
>      gsdll->set_poll = NULL;
>      gsdll->set_display_callback = NULL;
> +    gsdll->set_visual_tracer = NULL;
>
>      if (gsdll->hmodule != (HINSTANCE)NULL)
>       FreeLibrary(gsdll->hmodule);
> Index: gs/src/dwnodll.c
> ===================================================================
> RCS file: /cvs/ghostscript/gs/src/dwnodll.c,v
> retrieving revision 1.4
> diff -b -u -r1.4 dwnodll.c
> --- gs/src/dwnodll.c 21 Feb 2002 22:24:51 -0000 1.4
> +++ gs/src/dwnodll.c 13 Aug 2003 19:10:08 -0000
> @@ -40,6 +40,7 @@
>      gsdll->init_with_args = &gsapi_init_with_args;
>      gsdll->run_string = &gsapi_run_string;
>      gsdll->exit = &gsapi_exit;
> +    gsdll->set_visual_tracer = &gsapi_set_visual_tracer;
>      return 0;
>  }
>
> Index: gs/src/msvc32.mak
> ===================================================================
> RCS file: /cvs/ghostscript/gs/src/msvc32.mak,v
> retrieving revision 1.46
> diff -b -u -r1.46 msvc32.mak
> --- gs/src/msvc32.mak 20 May 2003 19:52:29 -0000 1.46
> +++ gs/src/msvc32.mak 13 Aug 2003 19:10:09 -0000
> @@ -610,7 +610,7 @@
>   echo $(GLOBJ)dwtext.obj >> $(PSGEN)gswin32.tr
>   echo $(GLOBJ)dwreg.obj >> $(PSGEN)gswin32.tr
>   echo /DEF:$(PSSRCDIR)\dwmain32.def /OUT:$(GS_XE) > $(PSGEN)gswin32.rsp
> - $(LINK) $(LCT) @$(PSGEN)gswin32.rsp $(GLOBJ)gsdll @$(PSGEN)gswin32.tr
@$(LIBCTR) $(INTASM) @$(GLGEN)lib.tr @$(PSGEN)lib32.rsp $(GSDLL_OBJ).res
> + $(LINK) $(LCT) @$(PSGEN)gswin32.rsp $(GLOBJ)gsdll @$(PSGEN)gswin32.tr
@$(LIBCTR) $(INTASM) @$(GLGEN)lib.tr @$(PSGEN)lib32.rsp $(GSDLL_OBJ).res
$(DWTRACE)
>   del $(PSGEN)gswin32.tr
>   del $(PSGEN)gswin32.rsp
>
> @@ -623,7 +623,7 @@
>   echo $(PSOBJ)dwreg.obj >> $(PSGEN)gswin32c.tr
>   echo /SUBSYSTEM:CONSOLE > $(PSGEN)gswin32.rsp
>   echo /DEF:$(PSSRCDIR)\dw32c.def /OUT:$(GSCONSOLE_XE) >>
$(PSGEN)gswin32.rsp
> - $(LINK) $(LCT) @$(PSGEN)gswin32.rsp $(GLOBJ)gsdll @$(PSGEN)gswin32c.tr
@$(LIBCTR) $(INTASM) @$(GLGEN)lib.tr @$(PSGEN)lib32.rsp $(GS_OBJ).res
> + $(LINK) $(LCT) @$(PSGEN)gswin32.rsp $(GLOBJ)gsdll @$(PSGEN)gswin32c.tr
@$(LIBCTR) $(INTASM) @$(GLGEN)lib.tr @$(PSGEN)lib32.rsp $(GS_OBJ).res
$(DWTRACE)
>   del $(PSGEN)gswin32.rsp
>   del $(PSGEN)gswin32c.tr
>  !endif
>