From: Jouk Jansen Date: Wed, 15 Dec 2010 10:54:47 +0000 (+0000) Subject: Include compilation of tests for OpenVMS (part2) X-Git-Url: https://git.saurik.com/wxWidgets.git/commitdiff_plain/a67c2d41615427fefdbfdb773dda2d0317ba4bf9?ds=sidebyside;hp=38e5440573cfc2501af256839cfaa17c26ded7ed Include compilation of tests for OpenVMS (part2) git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@66378 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- diff --git a/src/gtk1/descrip.mms b/src/gtk1/descrip.mms index dd354525dc..b79f1d57c7 100644 --- a/src/gtk1/descrip.mms +++ b/src/gtk1/descrip.mms @@ -8,32 +8,15 @@ .first define wx [--.include.wx] -.ifdef __WXMOTIF__ -CXX_DEFINE = /define=(__WXMOTIF__=1)/name=(as_is,short)\ - /assume=(nostdnew,noglobal_array_new) -CC_DEFINE = /define=(__WXMOTIF__=1)/name=(as_is,short) +.ifdef __WXUNIVERSAL__ +CXX_DEFINE = /define=(__WXGTK__=1,__WXUNIVERSAL__==1)/float=ieee\ + /name=(as_is,short)/ieee=denorm/assume=(nostdnew,noglobal_array_new) +CC_DEFINE = /define=(__WXGTK__=1,__WXUNIVERSAL__==1)/float=ieee\ + /name=(as_is,short)/ieee=denorm .else -.ifdef __WXGTK__ -CXX_DEFINE = /define=(__WXGTK__=1)/float=ieee/name=(as_is,short)/ieee=denorm\ - /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=1)/float=ieee/name=(as_is,short)/ieee=denorm\ - /assume=(nostdnew,noglobal_array_new) -CC_DEFINE = /define=(__WXGTK__=1,VMS_GTK2=1)/float=ieee/name=(as_is,short)/ieee=denorm -.else -.ifdef __WXX11__ -CXX_DEFINE = /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 +CXX_DEFINE = /define=(__WXGTK__=1)/float=ieee/name=(as_is,short)/iee=denorm\ + /assume=(nostdnew,noglobal_array_new)/list/show=all +CC_DEFINE = /define=(__WXGTK__=1)/float=ieee/name=(as_is,short)/iee=denorm .endif .suffixes : .cpp @@ -44,60 +27,210 @@ CC_DEFINE = cc $(CFLAGS)$(CC_DEFINE) $(MMS$TARGET_NAME).c OBJECTS = \ - helpctrl.obj,helpdata.obj,helpfrm.obj,htmlcell.obj,htmlfilt.obj,\ - htmlpars.obj,htmltag.obj,htmlwin.obj,htmprint.obj,m_dflist.obj,\ - m_fonts.obj,m_hline.obj,m_image.obj,m_layout.obj,m_links.obj,\ - m_list.obj,m_pre.obj,m_tables.obj,winpars.obj,chm.obj,m_style.obj,\ - styleparams.obj,m_span.obj + app.obj,\ + bitmap.obj,\ + brush.obj,\ + clipbrd.obj,\ + colour.obj,\ + cursor.obj,\ + data.obj,\ + dataobj.obj,\ + dc.obj,\ + dcclient.obj,\ + dcmemory.obj,\ + dcscreen.obj,\ + dnd.obj,\ + evtloop.obj,\ + filedlg.obj,\ + font.obj,\ + glcanvas.obj,\ + sockgtk.obj,\ + main.obj,\ + minifram.obj,\ + pen.obj,\ + popupwin.obj,\ + renderer.obj,\ + region.obj,\ + settings.obj,\ + timer.obj,\ + tooltip.obj,\ + toplevel.obj,\ + utilsgtk.obj,\ + utilsres.obj,\ + win_gtk.obj,\ + window.obj -SOURCES = \ - helpctrl.cpp,helpdata.cpp,helpfrm.cpp,htmlcell.cpp,htmlfilt.cpp,\ - htmlpars.cpp,htmltag.cpp,htmlwin.cpp,htmprint.cpp,m_dflist.cpp,\ - m_fonts.cpp,m_hline.cpp,m_image.cpp,m_layout.cpp,m_links.cpp,\ - m_list.cpp,m_pre.cpp,m_tables.cpp,winpars.cpp,chm.cpp,m_style.cpp,\ - styleparams.cpp,m_span.cpp - +OBJECTS0= \ + bmpbuttn.obj,\ + button.obj,\ + checkbox.obj,\ + checklst.obj,\ + choice.obj,\ + combobox.obj,\ + control.obj,\ + dialog.obj,\ + fontdlg.obj,\ + frame.obj,\ + gauge.obj,\ + listbox.obj,\ + mdi.obj,\ + menu.obj,\ + notebook.obj,\ + radiobox.obj,\ + radiobut.obj,\ + scrolbar.obj,\ + scrolwin.obj,\ + slider.obj,\ + spinbutt.obj,\ + spinctrl.obj,\ + statbmp.obj,\ + statbox.obj,\ + statline.obj,\ + stattext.obj,\ + toolbar.obj,\ + textctrl.obj,\ + tglbtn.obj,\ + msgdlg.obj,mnemonics.obj + +SOURCES =\ + app.cpp,\ + bitmap.cpp,\ + bmpbuttn.cpp,\ + brush.cpp,\ + button.cpp,\ + checkbox.cpp,\ + checklst.cpp,\ + choice.cpp,\ + clipbrd.cpp,\ + colour.cpp,\ + combobox.cpp,\ + control.cpp,\ + cursor.cpp,\ + data.cpp,\ + dataobj.cpp,\ + dc.cpp,\ + dcclient.cpp,\ + dcmemory.cpp,\ + dcscreen.cpp,\ + dialog.cpp,\ + dnd.cpp,\ + evtloop.cpp,\ + filedlg.cpp,\ + font.cpp,\ + fontdlg.cpp,\ + frame.cpp,\ + gauge.cpp,\ + glcanvas.cpp,\ + sockgtk.cpp,\ + listbox.cpp,\ + main.cpp,\ + mdi.cpp,\ + menu.cpp,\ + minifram.cpp,\ + msgdlg.cpp,\ + notebook.cpp,\ + pen.cpp,\ + popupwin.cpp,\ + radiobox.cpp,\ + radiobut.cpp,\ + renderer.cpp,\ + region.cpp,\ + scrolbar.cpp,\ + scrolwin.cpp,\ + settings.cpp,\ + slider.cpp,\ + spinbutt.cpp,\ + spinctrl.cpp,\ + statbmp.cpp,\ + statbox.cpp,\ + statline.cpp,\ + stattext.cpp,\ + toolbar.cpp,\ + textctrl.cpp,\ + tglbtn.cpp,\ + timer.cpp,\ + tooltip.cpp,\ + toplevel.cpp,\ + utilsgtk.cpp,\ + utilsres.cpp,\ + win_gtk.c,\ + window.cpp,mnemonics.cpp + all : $(SOURCES) $(MMS)$(MMSQUALIFIERS) $(OBJECTS) -.ifdef __WXMOTIF__ - library [--.lib]libwx_motif.olb $(OBJECTS) +.ifdef __WXUNIVERSAL__ + library [--.lib]libwx_gtk_univ.olb $(OBJECTS) + library [--.lib]libwx_gtk_univ.olb [.CXX_REPOSITORY]*.obj .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 + library [--.lib]libwx_gtk.olb [.CXX_REPOSITORY]*.obj + $(MMS)$(MMSQUALIFIERS) $(OBJECTS0) + library [--.lib]libwx_gtk.olb $(OBJECTS0) .endif $(OBJECTS) : [--.include.wx]setup.h +$(OBJECTS0) : [--.include.wx]setup.h -helpctrl.obj : helpctrl.cpp -helpdata.obj : helpdata.cpp -helpfrm.obj : helpfrm.cpp -htmlcell.obj : htmlcell.cpp -htmlfilt.obj : htmlfilt.cpp -htmlpars.obj : htmlpars.cpp -htmltag.obj : htmltag.cpp -htmlwin.obj : htmlwin.cpp -htmprint.obj : htmprint.cpp -m_dflist.obj : m_dflist.cpp -m_fonts.obj : m_fonts.cpp -m_hline.obj : m_hline.cpp -m_image.obj : m_image.cpp -m_layout.obj : m_layout.cpp -m_links.obj : m_links.cpp -m_list.obj : m_list.cpp -m_pre.obj : m_pre.cpp -m_tables.obj : m_tables.cpp -winpars.obj : winpars.cpp - cxx $(CXXFLAGS)$(CXX_DEFINE)/nowarn winpars.cpp -chm.obj : chm.cpp -m_style.obj : m_style.cpp -styleparams.obj : styleparams.cpp -m_span.obj : m_span.cpp +app.obj : app.cpp +bitmap.obj : bitmap.cpp +bmpbuttn.obj : bmpbuttn.cpp +brush.obj : brush.cpp +button.obj : button.cpp +checkbox.obj : checkbox.cpp +checklst.obj : checklst.cpp +choice.obj : choice.cpp +clipbrd.obj :clipbrd.cpp +colour.obj : colour.cpp +combobox.obj : combobox.cpp +control.obj : control.cpp +cursor.obj : cursor.cpp +data.obj : data.cpp +dataobj.obj : dataobj.cpp +dc.obj : dc.cpp +dcclient.obj : dcclient.cpp +dcmemory.obj : dcmemory.cpp +dcscreen.obj : dcscreen.cpp +dialog.obj : dialog.cpp +dnd.obj : dnd.cpp +evtloop.obj : evtloop.cpp +filedlg.obj : filedlg.cpp +font.obj : font.cpp +fontdlg.obj : fontdlg.cpp +frame.obj : frame.cpp +gauge.obj : gauge.cpp +glcanvas.obj : glcanvas.cpp +sockgtk.obj : sockgtk.cpp +listbox.obj : listbox.cpp +main.obj : main.cpp +msgdlg.obj : msgdlg.cpp +mdi.obj : mdi.cpp +menu.obj : menu.cpp +minifram.obj : minifram.cpp +notebook.obj : notebook.cpp +pen.obj : pen.cpp +popupwin.obj : popupwin.cpp +radiobox.obj : radiobox.cpp +radiobut.obj : radiobut.cpp +renderer.obj : renderer.cpp +region.obj : region.cpp +scrolbar.obj : scrolbar.cpp +scrolwin.obj : scrolwin.cpp +settings.obj : settings.cpp +slider.obj : slider.cpp +spinbutt.obj : spinbutt.cpp +spinctrl.obj : spinctrl.cpp +statbmp.obj : statbmp.cpp +statbox.obj : statbox.cpp +statline.obj : statline.cpp +stattext.obj : stattext.cpp +toolbar.obj : toolbar.cpp +textctrl.obj : textctrl.cpp +tglbtn.obj : tglbtn.cpp +timer.obj : timer.cpp +tooltip.obj : tooltip.cpp +toplevel.obj : toplevel.cpp +utilsgtk.obj : utilsgtk.cpp +utilsres.obj : utilsres.cpp +win_gtk.obj : win_gtk.c +window.obj : window.cpp +mnemonics.obj : mnemonics.cpp diff --git a/src/html/descrip.mms b/src/html/descrip.mms index 2e68d93187..dd354525dc 100644 --- a/src/html/descrip.mms +++ b/src/html/descrip.mms @@ -2,7 +2,7 @@ # * # Make file for VMS * # Author : J.Jansen (joukj@hrem.nano.tudelft.nl) * -# Date : 21 June 2010 * +# Date : 14 December 2010 * # * #***************************************************************************** .first @@ -75,6 +75,8 @@ all : $(SOURCES) .endif .endif +$(OBJECTS) : [--.include.wx]setup.h + helpctrl.obj : helpctrl.cpp helpdata.obj : helpdata.cpp helpfrm.obj : helpfrm.cpp