From: Jouk Jansen Date: Fri, 16 Jun 2006 07:20:31 +0000 (+0000) Subject: Committing in . X-Git-Url: https://git.saurik.com/wxWidgets.git/commitdiff_plain/1fe0a566bbf649efe7cadc21e8ded82458c8bdc6?ds=inline Committing in . Update OpenVMS makefiles to support wxAUI Modified Files: wxWidgets/descrip.mms Added Files: wxWidgets/samples/aui/descrip.mms wxWidgets/src/aui/descrip.mms ---------------------------------------------------------------------- git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@39761 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- diff --git a/descrip.mms b/descrip.mms index 2c672d2346..095bd6f41d 100644 --- a/descrip.mms +++ b/descrip.mms @@ -2,7 +2,7 @@ # * # Make file for VMS * # Author : J.Jansen (joukj@hrem.nano.tudelft.nl) * -# Date : 13 February 2006 * +# Date : 15 June 2006 * # * #***************************************************************************** .first @@ -39,6 +39,8 @@ gtk : [.include.wx]setup.h $(MMS)$(MMSQUALIFIERS)/macro=(__WXGTK__=1) set default [-.xml] $(MMS)$(MMSQUALIFIERS)/macro=(__WXGTK__=1) + set default [-.aui] + $(MMS)$(MMSQUALIFIERS)/macro=(__WXGTK__=1) set default [-.xrc] $(MMS)$(MMSQUALIFIERS)/macro=(__WXGTK__=1) set default [-.unix] @@ -51,6 +53,8 @@ gtk : [.include.wx]setup.h $(MMS)$(MMSQUALIFIERS)/macro=(__WXGTK__=1) set default [--.samples.calendar] $(MMS)$(MMSQUALIFIERS)/macro=(__WXGTK__=1) + set default [-.aui] + $(MMS)$(MMSQUALIFIERS)/macro=(__WXGTK__=1) set default [-.caret] $(MMS)$(MMSQUALIFIERS)/macro=(__WXGTK__=1) set default [-.checklst] @@ -93,6 +97,8 @@ gtk2 : [.include.wx]setup.h $(MMS)$(MMSQUALIFIERS)/macro=(__WXGTK2__=1) set default [-.html] $(MMS)$(MMSQUALIFIERS)/macro=(__WXGTK2__=1) + set default [-.aui] + $(MMS)$(MMSQUALIFIERS)/macro=(__WXGTK2__=1) set default [-.xml] $(MMS)$(MMSQUALIFIERS)/macro=(__WXGTK2__=1) set default [-.xrc] @@ -153,6 +159,8 @@ x11 : [.include.wx]setup.h $(MMS)$(MMSQUALIFIERS)/macro=(__WXX11__=1,__WXUNIVERSAL__=1) set default [-.xrc] $(MMS)$(MMSQUALIFIERS)/macro=(__WXX11__=1,__WXUNIVERSAL__=1) + set default [-.aui] + $(MMS)$(MMSQUALIFIERS)/macro=(__WXX11__=1,__WXUNIVERSAL__=1) set default [-.unix] $(MMS)$(MMSQUALIFIERS)/macro=(__WXX11__=1,__WXUNIVERSAL__=1) set default [-.x11] @@ -206,6 +214,8 @@ motif : [.include.wx]setup.h $(MMS)$(MMSQUALIFIERS)/macro=(__WXMOTIF__=1) set default [-.unix] $(MMS)$(MMSQUALIFIERS)/macro=(__WXMOTIF__=1) + set default [-.aui] + $(MMS)$(MMSQUALIFIERS)/macro=(__WXMOTIF__=1) set default [-.motif] $(MMS)$(MMSQUALIFIERS)/macro=(__WXMOTIF__=1) set default [-.x11] diff --git a/samples/aui/descrip.mms b/samples/aui/descrip.mms new file mode 100755 index 0000000000..8f387355cf --- /dev/null +++ b/samples/aui/descrip.mms @@ -0,0 +1,47 @@ +#***************************************************************************** +# * +# Make file for VMS * +# Author : J.Jansen (joukj@hrem.nano.tudelft.nl) * +# Date : 15 June 2006 * +# * +#***************************************************************************** +.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 +CXX_DEFINE = +.endif +.endif + +.suffixes : .cpp + +.cpp.obj : + cxx $(CXXFLAGS)$(CXX_DEFINE) $(MMS$TARGET_NAME).cpp + +all : +.ifdef __WXMOTIF__ + $(MMS)$(MMSQUALIFIERS) auidemo.exe +.else +.ifdef __WXGTK__ + $(MMS)$(MMSQUALIFIERS) auidemo_gtk.exe +.endif +.endif + +.ifdef __WXMOTIF__ +auidemo.exe : auidemo.obj + cxxlink auidemo,[--.lib]vms/opt +.else +.ifdef __WXGTK__ +auidemo_gtk.exe : auidemo.obj + cxxlink/exec=auidemo_gtk.exe auidemo,[--.lib]vms_gtk/opt +.endif +.endif + +auidemo.obj : auidemo.cpp diff --git a/src/aui/descrip.mms b/src/aui/descrip.mms new file mode 100755 index 0000000000..833955a3a5 --- /dev/null +++ b/src/aui/descrip.mms @@ -0,0 +1,70 @@ +#***************************************************************************** +# * +# Make file for VMS * +# Author : J.Jansen (joukj@hrem.nano.tudelft.nl) * +# Date : 15 June 2006 * +# * +#***************************************************************************** +.first + define wx [--.include.wx] + +.ifdef __WXMOTIF__ +CXX_DEFINE = /nowarn/define=(__WXMOTIF__=1)/name=(as_is,short)\ + /assume=(nostdnew,noglobal_array_new) +CC_DEFINE = /define=(__WXMOTIF__=1)/name=(as_is,short) +.else +.ifdef __WXGTK__ +CXX_DEFINE = /define=(__WXGTK__=1)/float=ieee/name=(as_is,short)/ieee=denorm\ + /nowarn/assume=(nostdnew,noglobal_array_new) +CC_DEFINE = /define=(__WXGTK__=1)/float=ieee/name=(as_is,short)/ieee=denorm +.else +.ifdef __WXGTK2__ +CXX_DEFINE = /define=(__WXGTK__=1,VMS_GTK2)/float=ieee/name=(as_is,short)/ieee=denorm\ + /nowarn/assume=(nostdnew,noglobal_array_new) +CC_DEFINE = /define=(__WXGTK__=1,VMS_GTK2)/float=ieee/name=(as_is,short)/ieee=denorm +.else +.ifdef __WXX11__ +CXX_DEFINE = /nowarn/define=(__WXX11__=1,__WXUNIVERSAL__==1)/float=ieee\ + /name=(as_is,short)/assume=(nostdnew,noglobal_array_new) +CC_DEFINE = /define=(__WXX11__=1,__WXUNIVERSAL__==1)/float=ieee\ + /name=(as_is,short) +.else +CXX_DEFINE = +CC_DEFINE = +.endif +.endif +.endif +.endif + +.suffixes : .cpp + +.cpp.obj : + cxx $(CXXFLAGS)$(CXX_DEFINE) $(MMS$TARGET_NAME).cpp +.c.obj : + cc $(CFLAGS)$(CC_DEFINE) $(MMS$TARGET_NAME).c + +OBJECTS = dockart.obj,floatpane.obj,framemanager.obj + +SOURCES = dockart.cpp floatpane.cpp framemanager.cpp + +all : $(SOURCES) + $(MMS)$(MMSQUALIFIERS) $(OBJECTS) +.ifdef __WXMOTIF__ + library [--.lib]libwx_motif.olb $(OBJECTS) +.else +.ifdef __WXGTK__ + library [--.lib]libwx_gtk.olb $(OBJECTS) +.else +.ifdef __WXGTK2__ + library [--.lib]libwx_gtk2.olb $(OBJECTS) +.else +.ifdef __WXX11__ + library [--.lib]libwx_x11_univ.olb $(OBJECTS) +.endif +.endif +.endif +.endif + +dockart.obj : dockart.cpp +floatpane.obj : floatpane.cpp +framemanager.obj : framemanager.cpp