diff options
| author | Chris Liddell <chris.liddell@artifex.com> | 2022-10-11 17:02:37 +0100 |
|---|---|---|
| committer | Chris Liddell <chris.liddell@artifex.com> | 2022-10-11 18:49:48 +0100 |
| commit | 57feba9aa34d4cf1c0d498e4442f30912de23719 (patch) | |
| tree | 468f21873871474ddcc4995a1f70ddc84df82083 /psi | |
| parent | d54d6fffba57bd417e31ab33230cbc490142bf03 (diff) | |
| download | ghostpdl-57feba9aa34d4cf1c0d498e4442f30912de23719.tar.gz | |
Fix gpdl Windows build when SO lib isn't being linked
Diffstat (limited to 'psi')
| -rw-r--r-- | psi/msvc.mak | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/psi/msvc.mak b/psi/msvc.mak index c9c22baf6..00749b9c8 100644 --- a/psi/msvc.mak +++ b/psi/msvc.mak @@ -713,6 +713,8 @@ SO_PDFEXPORT_LIB=$(SOSRCDIR)/lib/win/x64/smart-office-lib.lib winmm.lib !else SO_PDFEXPORT_LIB=$(SOSRCDIR)/lib/win/x86/smart-office-lib.lib winmm.lib !endif +!else +SO_PDFEXPORT_LIB= !endif @@ -2141,7 +2143,9 @@ $(GPDLDLL_DLL): $(ECHOGS_XE) $(GSDLL_OBJ).res $(LIBCTR) $(LIB_ALL) $(PCL_DEVS_AL echo Linking $(GPDLDLL) $(GPDLDLL_DLL) $(METRO) copy $(gpdlld_tr) $(GPDLGEN)gpdlwin.tr echo $(MAIN_OBJ) $(GPDL_PSI_TOP_OBJS) $(PCL_PXL_TOP_OBJS) $(PSI_TOP_OBJ) $(XPS_TOP_OBJ) $(PDF_TOP_OBJ) $(XOBJS) >> $(GPDLGEN)gpdlwin.tr +!if "$(SO_PDFEXPORT_LIB)"!="" echo $(SO_PDFEXPORT_LIB) >> $(GPDLGEN)gpdlwin.tr +!endif echo $(PCLOBJ)pdlromfs$(COMPILE_INITS).$(OBJ) >> $(GPDLGEN)gpdlwin.tr echo $(PCLOBJ)pdlromfs$(COMPILE_INITS)c0.$(OBJ) >> $(GPDLGEN)gpdlwin.tr echo $(PCLOBJ)pdlromfs$(COMPILE_INITS)c1.$(OBJ) >> $(GPDLGEN)gpdlwin.tr @@ -2281,7 +2285,9 @@ $(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) $(PDF_TOP_OBJ) $(XOBJS) >> $(GPDLGEN)gpdlwin.tr echo $(PCLOBJ)pdlromfs$(COMPILE_INITS).$(OBJ) >> $(GPDLGEN)gpdlwin.tr +!if "$(SO_PDFEXPORT_LIB)"!="" echo $(SO_PDFEXPORT_LIB) >> $(GPDLGEN)gpdlwin.tr +!endif echo /SUBSYSTEM:CONSOLE$(SUBSUBSYS) > $(GPDLGEN)gpdlwin.rsp !if "$(PROFILE)"=="1" echo /Profile >> $(PSGEN)gpdlwin.rsp |