From fd423a0f8f20cb494a8d19b8a222d70f5c261b93 Mon Sep 17 00:00:00 2001 From: Jouk Jansen Date: Fri, 7 Jan 2011 14:03:51 +0000 Subject: [PATCH] Update OpenVMS compile support git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@66618 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- descrip.mms | 4 ++- samples/mediaplayer/descrip.mms | 75 +++++++++++++++++++++++++++++++++++++++++ src/common/descrip.mms | 18 ++++++---- src/unix/descrip.mms | 9 +++-- 4 files changed, 96 insertions(+), 10 deletions(-) create mode 100644 samples/mediaplayer/descrip.mms diff --git a/descrip.mms b/descrip.mms index 7eeb535..fcb3bf1 100644 --- a/descrip.mms +++ b/descrip.mms @@ -2,7 +2,7 @@ # * # Make file for VMS * # Author : J.Jansen (joukj@hrem.nano.tudelft.nl) * -# Date : 15 December 2010 * +# Date : 7 January 2011 * # * #***************************************************************************** .first @@ -126,6 +126,8 @@ gtk : [.include.wx]setup.h $(MMS)$(MMSQUALIFIERS)/macro=(__WXGTK__=1) set default [-.mdi] $(MMS)$(MMSQUALIFIERS)/macro=(__WXGTK__=1) + set default [-.mediaplayer] + $(MMS)$(MMSQUALIFIERS)/macro=(__WXGTK__=1) set default [-.menu] $(MMS)$(MMSQUALIFIERS)/macro=(__WXGTK__=1) set default [-.minimal] diff --git a/samples/mediaplayer/descrip.mms b/samples/mediaplayer/descrip.mms new file mode 100644 index 0000000..a7a9b5b --- /dev/null +++ b/samples/mediaplayer/descrip.mms @@ -0,0 +1,75 @@ +#***************************************************************************** +# * +# Make file for VMS * +# Author : J.Jansen (joukj@hrem.nano.tudelft.nl) * +# Date : 5 January 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) mediaplayer.exe +.else +.ifdef __WXGTK__ + $(MMS)$(MMSQUALIFIERS) mediaplayer_gtk.exe +.else +.ifdef __WXGTK2__ + $(MMS)$(MMSQUALIFIERS) mediaplayer_gtk2.exe +.else +.ifdef __WXX11__ + $(MMS)$(MMSQUALIFIERS) mediaplayer_x11.exe +.endif +.endif +.endif +.endif + +.ifdef __WXMOTIF__ +mediaplayer.exe : mediaplayer.obj + cxxlink mediaplayer,[--.lib]vms/opt +.else +.ifdef __WXGTK__ +mediaplayer_gtk.exe : mediaplayer.obj + cxxlink/exec=mediaplayer_gtk.exe mediaplayer,[--.lib]vms_gtk/opt +.else +.ifdef __WXGTK2__ +mediaplayer_gtk2.exe : mediaplayer.obj + cxxlink/exec=mediaplayer_gtk2.exe mediaplayer,[--.lib]vms_gtk2/opt +.else +.ifdef __WXX11__ +mediaplayer_x11.exe : mediaplayer.obj + cxxlink/exec=mediaplayer_x11.exe mediaplayer,[--.lib]vms_x11_univ/opt +.endif +.endif +.endif +.endif + +mediaplayer.obj : mediaplayer.cpp diff --git a/src/common/descrip.mms b/src/common/descrip.mms index 81bbba3..2b2e230 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 : 6 January 2011 * +# Date : 7 January 2011 * # * #***************************************************************************** .first @@ -79,7 +79,6 @@ OBJECTS = \ cshelp.obj,\ ctrlcmn.obj,\ ctrlsub.obj,\ - datacmn.obj,\ datetime.obj,\ datstrm.obj,\ dcbase.obj,\ @@ -220,7 +219,9 @@ OBJECTS2=tbarbase.obj,srchcmn.obj,\ translation.obj,languageinfo.obj,filehistorycmn.obj,\ stdstream.obj,uiactioncmn.obj,arttango.obj,mediactrlcmn.obj,\ panelcmn.obj,checkboxcmn.obj,statboxcmn.obj,slidercmn.obj,\ - statlinecmn.obj,radiobtncmn.obj,bmpbtncmn.obj,checklstcmn.obj + statlinecmn.obj,radiobtncmn.obj,bmpbtncmn.obj,checklstcmn.obj,\ + statbmpcmn.obj,dirctrlcmn.obj,gridcmn.obj,odcombocmn.obj,\ + spinbtncmn.obj,scrolbarcmn.obj OBJECTS_MOTIF=radiocmn.obj,combocmn.obj @@ -263,7 +264,6 @@ SOURCES = \ cshelp.cpp,\ ctrlcmn.cpp,\ ctrlsub.cpp,\ - datacmn.cpp,\ datetime.cpp,\ datstrm.cpp,\ dcbase.cpp,\ @@ -422,7 +422,8 @@ SOURCES = \ tarstrm.cpp,datavcmn.cpp,debugrpt.cpp,uiactioncmn.cpp,\ arttango.cpp,mediactrlcmn.cpp,panelcmn.cpp,checkboxcmn.cpp,\ statboxcmn.cpp,slidercmn.cpp,statlinecmn.cpp,radiobtncmn.cpp,\ - bmpbtncmn.cpp,checklstcmn.cpp + bmpbtncmn.cpp,checklstcmn.cpp,statbmpcmn.cpp,dirctrlcmn.cpp,\ + gridcmn.cpp,odcombocmn.cpp,spinbtncmn.cpp,scrolbarcmn.cpp all : $(SOURCES) $(MMS)$(MMSQUALIFIERS) $(OBJECTS) @@ -496,7 +497,6 @@ colourcmn.obj : colourcmn.cpp cshelp.obj : cshelp.cpp ctrlcmn.obj : ctrlcmn.cpp ctrlsub.obj : ctrlsub.cpp -datacmn.obj : datacmn.cpp datetime.obj : datetime.cpp datstrm.obj : datstrm.cpp dcbase.obj : dcbase.cpp @@ -687,3 +687,9 @@ statlinecmn.obj : statlinecmn.cpp radiobtncmn.obj : radiobtncmn.cpp bmpbtncmn.obj : bmpbtncmn.cpp checklstcmn.obj : checklstcmn.cpp +statbmpcmn.obj : statbmpcmn.cpp +dirctrlcmn.obj : dirctrlcmn.cpp +gridcmn.obj : gridcmn.cpp +odcombocmn.obj : odcombocmn.cpp +spinbtncmn.obj : spinbtncmn.cpp +scrolbarcmn.obj : scrolbarcmn.cpp diff --git a/src/unix/descrip.mms b/src/unix/descrip.mms index 942c016..21d2bf9 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 : 17 December 2010 * +# Date : 7 January 2011 * # * #***************************************************************************** .first @@ -61,7 +61,8 @@ OBJECTS = appunix.obj,apptraits.obj,\ sound_sdl.obj,\ stdpaths.obj,\ taskbarx11.obj,\ - timerunx.obj,evtloopunix.obj,fdiounix.obj,uiactionx11.obj + timerunx.obj,evtloopunix.obj,fdiounix.obj,uiactionx11.obj,\ + mediactrl.obj SOURCES = appunix.cpp,apptraits.cpp,\ dialup.cpp,\ @@ -81,7 +82,8 @@ SOURCES = appunix.cpp,apptraits.cpp,\ sound_sdl.cpp,\ stdpaths.cpp,\ taskbarx11.cpp,\ - timerunx.cpp,evtloopunix.cpp,fdiounix.cpp,uiactionx11.cpp + timerunx.cpp,evtloopunix.cpp,fdiounix.cpp,uiactionx11.cpp,\ + mediactrl.cpp all : $(SOURCES) $(MMS)$(MMSQUALIFIERS) $(OBJECTS) @@ -129,3 +131,4 @@ evtloopunix.obj : evtloopunix.cpp cxx $(CXXFLAGS)$(CXX_DEFINE)/nowarn evtloopunix.cpp fdiounix.obj : fdiounix.cpp uiactionx11.obj : uiactionx11.cpp +mediactrl.obj : mediactrl.cpp -- 2.7.4