From 8f96683438e5b588caafecc442bba6a2da801e17 Mon Sep 17 00:00:00 2001 From: Jouk Jansen Date: Tue, 27 Aug 2013 12:02:20 +0000 Subject: [PATCH] Update OpenVMS compile support git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@74712 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- descrip.mms | 8 +++- samples/notebook/descrip.mms | 75 ++++++++++++++++++++++++++++++++++++ src/common/descrip.mms | 8 ++-- src/motif/descrip.mms | 4 +- src/unix/descrip.mms | 7 ++-- 5 files changed, 94 insertions(+), 8 deletions(-) create mode 100644 samples/notebook/descrip.mms diff --git a/descrip.mms b/descrip.mms index 2f069ddf70..ffef431745 100644 --- a/descrip.mms +++ b/descrip.mms @@ -2,7 +2,7 @@ # * # Make file for VMS * # Author : J.Jansen (joukj@hrem.nano.tudelft.nl) * -# Date : 21 January 2013 * +# Date : 27 August 2013 * # * #***************************************************************************** .first @@ -136,6 +136,8 @@ gtk : [.include.wx]setup.h $(MMS)$(MMSQUALIFIERS)/macro=(__WXGTK__=1) set default [-.minimal] $(MMS)$(MMSQUALIFIERS)/macro=(__WXGTK__=1) + set default [-.notebook] + $(MMS)$(MMSQUALIFIERS)/macro=(__WXGTK__=1) set default [-.propgrid] $(MMS)$(MMSQUALIFIERS)/macro=(__WXGTK__=1) set default [-.regtest] @@ -305,6 +307,8 @@ x11 : [.include.wx]setup.h # $(MMS)$(MMSQUALIFIERS)/macro=(__WXX11__=1,__WXUNIVERSAL__=1) set default [-.minimal] $(MMS)$(MMSQUALIFIERS)/macro=(__WXX11__=1,__WXUNIVERSAL__=1) + set default [-.notebook] + $(MMS)$(MMSQUALIFIERS)/macro=(__WXX11__=1,__WXUNIVERSAL__=1) set default [-.richedit] # $(MMS)$(MMSQUALIFIERS)/macro=(__WXX11__=1,__WXUNIVERSAL__=1) set default [-.thread] @@ -358,6 +362,8 @@ motif : [.include.wx]setup.h $(MMS)$(MMSQUALIFIERS)/macro=(__WXMOTIF__=1) set default [-.minimal] $(MMS)$(MMSQUALIFIERS)/macro=(__WXMOTIF__=1) + set default [-.notebook] + $(MMS)$(MMSQUALIFIERS)/macro=(__WXMOTIF__=1) set default [-.thread] $(MMS)$(MMSQUALIFIERS)/macro=(__WXMOTIF__=1) set default [-.widgets] diff --git a/samples/notebook/descrip.mms b/samples/notebook/descrip.mms new file mode 100644 index 0000000000..b9ada224c5 --- /dev/null +++ b/samples/notebook/descrip.mms @@ -0,0 +1,75 @@ +#***************************************************************************** +# * +# Make file for VMS * +# Author : J.Jansen (joukj@hrem.nano.tudelft.nl) * +# Date : 22 August 2013 * +# * +#***************************************************************************** +.first + define wx [--.include.wx] + +.ifdef __WXMOTIF__ +CXX_DEFINE = /define=(__WXMOTIF__=1)/name=(as_is,short)\ + /assume=(nostdnew,noglobal_array_new) +.else +.ifdef __WXGTK__ +CXX_DEFINE = /define=(__WXGTK__=1)/float=ieee/name=(as_is,short)/ieee=denorm\ + /assume=(nostdnew,noglobal_array_new) +.else +.ifdef __WXGTK2__ +CXX_DEFINE = /define=(__WXGTK__=1,VMS_GTK2=1)/float=ieee/name=(as_is,short)/ieee=denorm\ + /assume=(nostdnew,noglobal_array_new) +.else +.ifdef __WXX11__ +CXX_DEFINE = /define=(__WXX11__=1,__WXUNIVERSAL__==1)/float=ieee\ + /name=(as_is,short)/assume=(nostdnew,noglobal_array_new) +.else +CXX_DEFINE = +.endif +.endif +.endif +.endif + +.suffixes : .cpp + +.cpp.obj : + cxx $(CXXFLAGS)$(CXX_DEFINE) $(MMS$TARGET_NAME).cpp + +all : +.ifdef __WXMOTIF__ + $(MMS)$(MMSQUALIFIERS) notebook.exe +.else +.ifdef __WXGTK__ + $(MMS)$(MMSQUALIFIERS) notebook_gtk.exe +.else +.ifdef __WXGTK2__ + $(MMS)$(MMSQUALIFIERS) notebook_gtk2.exe +.else +.ifdef __WXX11__ + $(MMS)$(MMSQUALIFIERS) notebook_x11.exe +.endif +.endif +.endif +.endif + +.ifdef __WXMOTIF__ +notebook.exe : notebook.obj + cxxlink notebook,[--.lib]vms/opt +.else +.ifdef __WXGTK__ +notebook_gtk.exe : notebook.obj + cxxlink/exec=notebook_gtk.exe notebook,[--.lib]vms_gtk/opt +.else +.ifdef __WXGTK2__ +notebook_gtk2.exe : notebook.obj + cxxlink/exec=notebook_gtk2.exe notebook,[--.lib]vms_gtk2/opt +.else +.ifdef __WXX11__ +notebook_x11.exe : notebook.obj + cxxlink/exec=notebook_x11.exe notebook,[--.lib]vms_x11_univ/opt +.endif +.endif +.endif +.endif + +notebook.obj : notebook.cpp diff --git a/src/common/descrip.mms b/src/common/descrip.mms index 8302b61519..33208580e7 100644 --- a/src/common/descrip.mms +++ b/src/common/descrip.mms @@ -2,7 +2,7 @@ # * # Make file for VMS * # Author : J.Jansen (joukj@hrem.nano.tudelft.nl) * -# Date : 21 january 2013 * +# Date : 20 August 2013 * # * #***************************************************************************** .first @@ -225,7 +225,7 @@ OBJECTS3=listctrlcmn.obj,socketiohandler.obj,fdiodispatcher.obj,\ spinbtncmn.obj,scrolbarcmn.obj,colourdata.obj,fontdata.obj,\ valnum.obj,numformatter.obj,markupparser.obj,\ affinematrix2d.obj,richtooltipcmn.obj,persist.obj,time.obj,\ - textmeasurecmn.obj + textmeasurecmn.obj,modalhook.obj OBJECTS_MOTIF=radiocmn.obj,combocmn.obj @@ -429,7 +429,8 @@ SOURCES = \ bmpbtncmn.cpp,checklstcmn.cpp,statbmpcmn.cpp,dirctrlcmn.cpp,\ gridcmn.cpp,odcombocmn.cpp,spinbtncmn.cpp,scrolbarcmn.cpp,\ colourdata.cpp,fontdata.cpp affinematrix2d.cpp\ - richtooltipcmn.cpp persist.cpp time.cpp textmeasurecmn.cpp + richtooltipcmn.cpp persist.cpp time.cpp textmeasurecmn.cpp \ + modalhook.cpp all : $(SOURCES) $(MMS)$(MMSQUALIFIERS) $(OBJECTS) @@ -716,3 +717,4 @@ richtooltipcmn.obj : richtooltipcmn.cpp persist.obj : persist.cpp time.obj : time.cpp textmeasurecmn.obj : textmeasurecmn.cpp +modalhook.obj : modalhook.cpp diff --git a/src/motif/descrip.mms b/src/motif/descrip.mms index 41444569d4..d6bd8367d1 100644 --- a/src/motif/descrip.mms +++ b/src/motif/descrip.mms @@ -2,7 +2,7 @@ # * # Make file for VMS * # Author : J.Jansen (joukj@hrem.nano.tudelft.nl) * -# Date : 2 December 2008 * +# Date : 21 August 2013 * # * #***************************************************************************** .first @@ -186,4 +186,6 @@ toplevel.obj : toplevel.cpp timer.obj : timer.cpp toolbar.obj : toolbar.cpp utils.obj : utils.cpp + cxx $(CXXFLAGS)$(CXX_DEFINE)/warn=disab=(UNSCOMZER)\ + $(MMS$TARGET_NAME).cpp window.obj : window.cpp diff --git a/src/unix/descrip.mms b/src/unix/descrip.mms index 21d2bf97bf..5ca84694c0 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 : 7 January 2011 * +# Date : 20 August 2013 * # * #***************************************************************************** .first @@ -62,7 +62,7 @@ OBJECTS = appunix.obj,apptraits.obj,\ stdpaths.obj,\ taskbarx11.obj,\ timerunx.obj,evtloopunix.obj,fdiounix.obj,uiactionx11.obj,\ - mediactrl.obj + mediactrl.obj,wakeuppipe.obj SOURCES = appunix.cpp,apptraits.cpp,\ dialup.cpp,\ @@ -83,7 +83,7 @@ SOURCES = appunix.cpp,apptraits.cpp,\ stdpaths.cpp,\ taskbarx11.cpp,\ timerunx.cpp,evtloopunix.cpp,fdiounix.cpp,uiactionx11.cpp,\ - mediactrl.cpp + mediactrl.cpp,wakeuppipe.cpp all : $(SOURCES) $(MMS)$(MMSQUALIFIERS) $(OBJECTS) @@ -132,3 +132,4 @@ evtloopunix.obj : evtloopunix.cpp fdiounix.obj : fdiounix.cpp uiactionx11.obj : uiactionx11.cpp mediactrl.obj : mediactrl.cpp +wakeuppipe.obj : wakeuppipe.cpp -- 2.45.2