diff --git a/lib/vms.opt b/lib/vms.opt index abc3ca3c52..873b5e8642 100644 --- a/lib/vms.opt +++ b/lib/vms.opt @@ -4,6 +4,7 @@ sys$library:libpng.olb/lib sys$library:libz.olb/lib sys$library:tiff.olb/lib X11:libxpm.olb/lib +sys$library:libxinerama.olb/lib sys$library:decw$xextlibshr.exe/share sys$library:decw$xlibshr.exe/share sys$library:decw$xtlibshrr5.exe/share diff --git a/lib/vms_gtk.opt b/lib/vms_gtk.opt index 5cc8077e0a..48fbb0270e 100644 --- a/lib/vms_gtk.opt +++ b/lib/vms_gtk.opt @@ -10,4 +10,6 @@ sys$share:libgtk.exe/share sys$share:libgdk.exe/share sys$share:libglib.exe/share sys$share:pthread$rtl.exe/share +sys$library:libxinerama.olb/lib +sys$library:decw$xextlibshr.exe/share sys$library:decw$xlibshr.exe/share diff --git a/setup.h_vms b/setup.h_vms index f4056c716d..85bc02d2f9 100644 --- a/setup.h_vms +++ b/setup.h_vms @@ -3,7 +3,7 @@ * Template for the set.h file for VMS * * Created from setup.h_in * * Author : J.Jansen (joukj@hrem.nano.tudelft.nl) * - * Date : 23 April 2018 * + * Date : 18 May 2018 * * * *****************************************************************************/ @@ -510,7 +510,7 @@ typedef pid_t GPid; #define wxUSE_CARET 1 -#define wxUSE_DISPLAY 0 +#define wxUSE_DISPLAY 1 #define wxUSE_GEOMETRY 1 diff --git a/src/unix/descrip.mms b/src/unix/descrip.mms index e31ec59dc1..5681043bc8 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 : 13 June 2016 * +# Date : 22 May 2018 * # * #***************************************************************************** .first @@ -126,6 +126,10 @@ sound_sdl.obj : sound_sdl.cpp stdpaths.obj : stdpaths.cpp taskbarx11.obj : taskbarx11.cpp displayx11.obj : displayx11.cpp + pipe gsed -e "s/X11\/extensions/X11/" < $(MMS$TARGET_NAME).cpp\ + > $(MMS$TARGET_NAME).cpp_ + cxx $(CXXFLAGS)$(CXX_DEFINE) $(MMS$TARGET_NAME).cpp_ + delete $(MMS$TARGET_NAME).cpp_;* timerunx.obj : timerunx.cpp evtloopunix.obj : evtloopunix.cpp cxx $(CXXFLAGS)$(CXX_DEFINE)/nowarn evtloopunix.cpp