diff --git a/lib/vms_gtk2.opt b/lib/vms_gtk2.opt index 490b2440cb..4edff31f42 100644 --- a/lib/vms_gtk2.opt +++ b/lib/vms_gtk2.opt @@ -15,5 +15,6 @@ sys$share:libglib2.exe/share sys$share:freetype2shr/share sys$share:libfontconfig/share sys$share:pthread$rtl.exe/share +sys$share:libXrender.exe/share sys$library:decw$xextlibshr.exe/share sys$library:decw$xlibshr.exe/share diff --git a/src/unix/descrip.mms b/src/unix/descrip.mms index 5681043bc8..4ebf993a1e 100644 --- a/src/unix/descrip.mms +++ b/src/unix/descrip.mms @@ -2,7 +2,7 @@ # * # Make file for VMS * # Author : J.Jansen (joukj@hrem.nano.tudelft.nl) * -# Date : 22 May 2018 * +# Date : 11 October 2018 * # * #***************************************************************************** .first @@ -46,7 +46,6 @@ CC_DEFINE = OBJECTS = appunix.obj,apptraits.obj,\ dialup.obj,\ dir.obj,\ - displayx11.obj,\ dlunix.obj,\ fontenum.obj,\ fontutil.obj,\ @@ -64,6 +63,9 @@ OBJECTS = appunix.obj,apptraits.obj,\ timerunx.obj,evtloopunix.obj,fdiounix.obj,uiactionx11.obj,\ mediactrl.obj,wakeuppipe.obj,mimetype.obj +OBJECTS2=displayx11.obj + + SOURCES = appunix.cpp,apptraits.cpp,\ dialup.cpp,\ dir.cpp,\ @@ -89,21 +91,28 @@ all : $(SOURCES) $(MMS)$(MMSQUALIFIERS) $(OBJECTS) .ifdef __WXMOTIF__ library [--.lib]libwx_motif.olb $(OBJECTS) + $(MMS)$(MMSQUALIFIERS) $(OBJECTS2) + library [--.lib]libwx_motif.olb $(OBJECTS2) .else .ifdef __WXGTK__ library [--.lib]libwx_gtk.olb $(OBJECTS) + $(MMS)$(MMSQUALIFIERS) $(OBJECTS2) + library [--.lib]libwx_motif.olb $(OBJECTS2) .else .ifdef __WXGTK2__ library [--.lib]libwx_gtk2.olb $(OBJECTS) .else .ifdef __WXX11__ library [--.lib]libwx_x11_univ.olb $(OBJECTS) + $(MMS)$(MMSQUALIFIERS) $(OBJECTS2) + library [--.lib]libwx_motif.olb $(OBJECTS2) .endif .endif .endif .endif $(OBJECTS) : [--.include.wx]setup.h +$(OBJECTS2) : [--.include.wx]setup.h appunix.obj : appunix.cpp apptraits.obj : apptraits.cpp