From e2847646e568638a653e3075897d2f212ff0c83a Mon Sep 17 00:00:00 2001 From: Jouk Jansen Date: Thu, 10 Nov 2011 14:41:14 +0000 Subject: [PATCH] Add compile support for widgets sample on OpenVMS git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@69731 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- descrip.mms | 6 +- samples/widgets/descrip.mms | 110 ++++++++++++++++++++++++++++++++++++ src/common/descrip.mms | 7 ++- src/generic/descrip.mms | 8 ++- 4 files changed, 124 insertions(+), 7 deletions(-) create mode 100644 samples/widgets/descrip.mms diff --git a/descrip.mms b/descrip.mms index af04c4b11b..ecc72bde6c 100644 --- a/descrip.mms +++ b/descrip.mms @@ -2,7 +2,7 @@ # * # Make file for VMS * # Author : J.Jansen (joukj@hrem.nano.tudelft.nl) * -# Date : 27 September 2011 * +# Date : 10 November 2011 * # * #***************************************************************************** .first @@ -152,6 +152,8 @@ gtk : [.include.wx]setup.h $(MMS)$(MMSQUALIFIERS)/macro=(__WXGTK__=1) set default [-.xrc] $(MMS)$(MMSQUALIFIERS)/macro=(__WXGTK__=1) + set default [-.widgets] + $(MMS)$(MMSQUALIFIERS)/macro=(__WXGTK__=1) set default [--.tests] $(MMS)$(MMSQUALIFIERS)/macro=(__WXGTK__=1)/ignore=warning set default [-] @@ -349,6 +351,8 @@ motif : [.include.wx]setup.h $(MMS)$(MMSQUALIFIERS)/macro=(__WXMOTIF__=1) set default [-.thread] $(MMS)$(MMSQUALIFIERS)/macro=(__WXMOTIF__=1) + set default [-.widgets] + $(MMS)$(MMSQUALIFIERS)/macro=(__WXMOTIF__=1) set default [--] [.include.wx]setup.h : setup.h_vms diff --git a/samples/widgets/descrip.mms b/samples/widgets/descrip.mms new file mode 100644 index 0000000000..4a73c7386e --- /dev/null +++ b/samples/widgets/descrip.mms @@ -0,0 +1,110 @@ +#***************************************************************************** +# * +# Make file for VMS * +# Author : J.Jansen (joukj@hrem.nano.tudelft.nl) * +# Date : 9 November 2011 * +# * +#***************************************************************************** +.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) widgets.exe +.else +.ifdef __WXGTK__ + $(MMS)$(MMSQUALIFIERS) widgets_gtk.exe +.else +.ifdef __WXGTK2__ + $(MMS)$(MMSQUALIFIERS) widgets_gtk2.exe +.else +.ifdef __WXX11__ + $(MMS)$(MMSQUALIFIERS) widgets_x11.exe +.endif +.endif +.endif +.endif + +OBJS=bmpcombobox.obj,button.obj,checkbox.obj,choice.obj,clrpicker.obj,\ + combobox.obj,datepick.obj,dirctrl.obj,dirpicker.obj,editlbox.obj,\ + filectrl.obj,filepicker.obj,fontpicker.obj,gauge.obj,hyperlnk.obj,\ + itemcontainer.obj,listbox.obj,notebook.obj,odcombobox.obj,\ + radiobox.obj,searchctrl.obj,slider.obj,spinbtn.obj,statbmp.obj,\ + static.obj,textctrl.obj,toggle.obj,widgets.obj + +.ifdef __WXMOTIF__ +widgets.exe : $(OBJS) + cxxlink/exec=widgets.exe $(OBJS),[--.lib]vms/opt +.else +.ifdef __WXGTK__ +widgets_gtk.exe : $(OBJS) + cxxlink/exec=widgets_gtk.exe $(OBJS),[--.lib]vms_gtk/opt +.else +.ifdef __WXGTK2__ +widgets_gtk2.exe : $(OBJS) + cxxlink/exec=widgets_gtk2.exe $(OBJS),[--.lib]vms_gtk2/opt +.else +.ifdef __WXX11__ +widgets_x11.exe : $(OBJS) + cxxlink/exec=widgets_x11.exe $(OBJS),[--.lib]vms_x11_univ/opt +.endif +.endif +.endif +.endif + +bmpcombobox.obj : bmpcombobox.cpp +button.obj : button.cpp +checkbox.obj : checkbox.cpp +choice.obj : choice.cpp +clrpicker.obj : clrpicker.cpp +combobox.obj : combobox.cpp +datepick.obj : datepick.cpp +dirctrl.obj : dirctrl.cpp +dirpicker.obj : dirpicker.cpp +editlbox.obj : editlbox.cpp +filectrl.obj : filectrl.cpp +filepicker.obj : filepicker.cpp +fontpicker.obj : fontpicker.cpp +gauge.obj : gauge.cpp +hyperlnk.obj : hyperlnk.cpp +itemcontainer.obj : itemcontainer.cpp +listbox.obj : listbox.cpp +notebook.obj : notebook.cpp +odcombobox.obj : odcombobox.cpp +radiobox.obj : radiobox.cpp +searchctrl.obj : searchctrl.cpp +slider.obj : slider.cpp +spinbtn.obj : spinbtn.cpp +statbmp.obj : statbmp.cpp +static.obj : static.cpp +textctrl.obj : textctrl.cpp +toggle.obj : toggle.cpp +widgets.obj : widgets.cpp + cxx $(CXXFLAGS)$(CXX_DEFINE)/object=widgets.obj widgets.cpp diff --git a/src/common/descrip.mms b/src/common/descrip.mms index d0b978fbf9..f0a29f570c 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 : 4 November 2011 * +# Date : 10 November 2011 * # * #***************************************************************************** .first @@ -224,7 +224,7 @@ OBJECTS3=listctrlcmn.obj,socketiohandler.obj,fdiodispatcher.obj,\ statbmpcmn.obj,dirctrlcmn.obj,gridcmn.obj,odcombocmn.obj,\ spinbtncmn.obj,scrolbarcmn.obj,colourdata.obj,fontdata.obj,\ valnum.obj,numformatter.obj,markupparser.obj,\ - affinematrix2d.obj,richtooltipcmn.obj + affinematrix2d.obj,richtooltipcmn.obj,persist.obj OBJECTS_MOTIF=radiocmn.obj,combocmn.obj @@ -428,7 +428,7 @@ 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 + richtooltipcmn.cpp persist.cpp all : $(SOURCES) $(MMS)$(MMSQUALIFIERS) $(OBJECTS) @@ -711,3 +711,4 @@ numformatter.obj : numformatter.cpp markupparser.obj : markupparser.cpp affinematrix2d.obj : affinematrix2d.cpp richtooltipcmn.obj : richtooltipcmn.cpp +persist.obj : persist.cpp diff --git a/src/generic/descrip.mms b/src/generic/descrip.mms index a2c1fe0f3c..09299a16ec 100644 --- a/src/generic/descrip.mms +++ b/src/generic/descrip.mms @@ -2,7 +2,7 @@ # * # Make file for VMS * # Author : J.Jansen (joukj@hrem.nano.tudelft.nl) * -# Date : 4 November 2011 * +# Date : 10 November 2011 * # * #***************************************************************************** .first @@ -94,7 +94,8 @@ OBJECTS = \ grideditors.obj,vlbox.obj,vscroll.obj,stattextg.obj,\ editlbox.obj,datavgen.obj,dbgrptg.obj,dragimgg.obj,\ richmsgdlgg.obj,commandlinkbuttong.obj,spinctlg.obj,\ - markuptext.obj,bannerwindow.obj,timectrl.obj,richtooltip.obj + markuptext.obj,bannerwindow.obj,timectrl.obj,richtooltip.obj,\ + statbmpg.obj SOURCES = \ aboutdlgg.cpp,\ @@ -166,7 +167,7 @@ SOURCES = \ ,headerctrlg.cpp,grideditors.cpp,stattextg.cpp,editlbox.cpp,\ datavgen.cpp,dbgrptg.cpp,dragimgg.cpp,richmsgdlgg.cpp,\ commandlinkbuttong.cpp,spinctlg.cpp markuptext.cpp \ - bannerwindow.cpp timectrl.cpp richtooltip.cpp + bannerwindow.cpp timectrl.cpp richtooltip.cpp statbmpg.cpp .ifdef __WXMOTIF__ OBJECTS0=statusbr.obj,statline.obj,notebook.obj,spinctlg.obj,collpaneg.obj,\ @@ -306,3 +307,4 @@ markuptext.obj : markuptext.cpp bannerwindow.obj : bannerwindow.cpp timectrl.obj : timectrl.cpp richtooltip.obj : richtooltip.cpp +statbmpg.obj : statbmpg.cpp