From 256e97fb7d55aba8fe10c4c375a0228cbbdb7d86 Mon Sep 17 00:00:00 2001 From: Jouk Jansen Date: Mon, 20 Dec 2010 09:23:57 +0000 Subject: [PATCH] include compile support for tests on OpenVMS (part3) git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@66405 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- src/stc/scintilla/src/descrip.mms | 8 ++++---- src/unix/descrip.mms | 7 ++++--- 2 files changed, 8 insertions(+), 7 deletions(-) diff --git a/src/stc/scintilla/src/descrip.mms b/src/stc/scintilla/src/descrip.mms index e24bea8..b35df3a 100644 --- a/src/stc/scintilla/src/descrip.mms +++ b/src/stc/scintilla/src/descrip.mms @@ -2,7 +2,7 @@ # * # Make file for VMS * # Author : J.Jansen (joukj@hrem.nano.tudelft.nl) * -# Date : 14 December 2010 * +# Date : 17 December 2010 * # * #***************************************************************************** @@ -12,7 +12,7 @@ .suffixes : .cpp .ifdef __WXMOTIF__ -CXX_DEFINE = /define=(__WX__=1,__WXMOTIF__=1)/name=(as_is,short)\ +CXX_DEFINE = /define=(__WX__=1,__WXMOTIF__=1,__USE_STD_IOSTREAM=1)/name=(as_is,short)\ /assume=(nostdnew,noglobal_array_new)/include=([],[-.src],[-.include]) CC_DEFINE = /define=(__WX__=1,__WXMOTIF__=1)/name=(as_is,short)\ /include=([],[-.src],[-.include]) @@ -24,13 +24,13 @@ CC_DEFINE = /define=(__WX__=1,__WXGTK__=1)/float=ieee/name=(as_is,short)/ieee=de /include=([],[-.src],[-.include]) .else .ifdef __WXGTK2__ -CXX_DEFINE = /define=(__WX__=1,__WXGTK__=1,VMS_GTK2=1)/float=ieee/name=(as_is,short)/ieee=denorm\ +CXX_DEFINE = /define=(__WX__=1,__WXGTK__=1,VMS_GTK2=1,__USE_STD_IOSTREAM=1)/float=ieee/name=(as_is,short)/ieee=denorm\ /assume=(nostdnew,noglobal_array_new)/include=([],[-.src],[-.include]) CC_DEFINE = /define=(__WX__=1,__WXGTK__=1,VMS_GTK2=1)/float=ieee/name=(as_is,short)\ /ieee=denorm/include=([],[-.src],[-.include]) .else .ifdef __WXX11__ -CXX_DEFINE = /define=(__WX__=1,__WXX11__=1,__WXUNIVERSAL__==1)/float=ieee\ +CXX_DEFINE = /define=(__WX__=1,__WXX11__=1,__WXUNIVERSAL__==1,__USE_STD_IOSTREAM=1)/float=ieee\ /name=(as_is,short)/assume=(nostdnew,noglobal_array_new)\ /include=([],[-.src],[-.include]) CC_DEFINE = /define=(__WX__=1,__WXX11__=1,__WXUNIVERSAL__==1)/float=ieee\ diff --git a/src/unix/descrip.mms b/src/unix/descrip.mms index f62d70e..942c016 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 : 28 June 2010 * +# Date : 17 December 2010 * # * #***************************************************************************** .first @@ -61,7 +61,7 @@ OBJECTS = appunix.obj,apptraits.obj,\ sound_sdl.obj,\ stdpaths.obj,\ taskbarx11.obj,\ - timerunx.obj,evtloopunix.obj,fdiounix.obj + timerunx.obj,evtloopunix.obj,fdiounix.obj,uiactionx11.obj SOURCES = appunix.cpp,apptraits.cpp,\ dialup.cpp,\ @@ -81,7 +81,7 @@ SOURCES = appunix.cpp,apptraits.cpp,\ sound_sdl.cpp,\ stdpaths.cpp,\ taskbarx11.cpp,\ - timerunx.cpp,evtloopunix.cpp,fdiounix.cpp + timerunx.cpp,evtloopunix.cpp,fdiounix.cpp,uiactionx11.cpp all : $(SOURCES) $(MMS)$(MMSQUALIFIERS) $(OBJECTS) @@ -128,3 +128,4 @@ timerunx.obj : timerunx.cpp evtloopunix.obj : evtloopunix.cpp cxx $(CXXFLAGS)$(CXX_DEFINE)/nowarn evtloopunix.cpp fdiounix.obj : fdiounix.cpp +uiactionx11.obj : uiactionx11.cpp -- 2.7.4