Include support for OpenVMS IA64

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@69207 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/descrip.mms b/descrip.mms
index a1ab066910e49b61fc6813e2f9ed92ea3d8537cf..af04c4b11b6490582d518e627d0e0d8f58ed8dd5 100644 (file)
--- a/descrip.mms
+++ b/descrip.mms
@@ -2,7 +2,7 @@
 #                                                                            *
 # Make file for VMS                                                          *
 # Author : J.Jansen (joukj@hrem.nano.tudelft.nl)                             *
-# Date : 15 September 2011                                                   *
+# Date : 27 September 2011                                                   *
 #                                                                            *
 #*****************************************************************************
 .first
@@ -32,40 +32,40 @@ all :
 gtk : [.include.wx]setup.h
        set default [.src.generic]
        $(MMS)$(MMSQUALIFIERS)/macro=(__WXGTK__=1)
-       library [--.lib]libwx_gtk.olb [.CXX_REPOSITORY]*.obj
+       If f$getsyi("HW_MODEL") .le. 2048 then library [--.lib]libwx_gtk.olb [.CXX_REPOSITORY]*.obj
        set default [-.common]
        $(MMS)$(MMSQUALIFIERS)/macro=(__WXGTK__=1)
-       library [--.lib]libwx_gtk.olb [.CXX_REPOSITORY]*.obj
+       If f$getsyi("HW_MODEL") .le. 2048 then library [--.lib]libwx_gtk.olb [.CXX_REPOSITORY]*.obj
        set default [-.html]
        $(MMS)$(MMSQUALIFIERS)/macro=(__WXGTK__=1)
-       library [--.lib]libwx_gtk.olb [.CXX_REPOSITORY]*.obj
+       If f$getsyi("HW_MODEL") .le. 2048 then library [--.lib]libwx_gtk.olb [.CXX_REPOSITORY]*.obj
        set default [-.xml]
        $(MMS)$(MMSQUALIFIERS)/macro=(__WXGTK__=1)
        set default [-.aui]
        $(MMS)$(MMSQUALIFIERS)/macro=(__WXGTK__=1)
-       library [--.lib]libwx_gtk.olb [.CXX_REPOSITORY]*.obj
+       If f$getsyi("HW_MODEL") .le. 2048 then library [--.lib]libwx_gtk.olb [.CXX_REPOSITORY]*.obj
        set default [-.xrc]
        $(MMS)$(MMSQUALIFIERS)/macro=(__WXGTK__=1)
-       library [--.lib]libwx_gtk.olb [.CXX_REPOSITORY]*.obj
+       If f$getsyi("HW_MODEL") .le. 2048 then library [--.lib]libwx_gtk.olb [.CXX_REPOSITORY]*.obj
        set default [-.unix]
        $(MMS)$(MMSQUALIFIERS)/macro=(__WXGTK__=1)
-       library [--.lib]libwx_gtk.olb [.CXX_REPOSITORY]*.obj
+       If f$getsyi("HW_MODEL") .le. 2048 then library [--.lib]libwx_gtk.olb [.CXX_REPOSITORY]*.obj
        set default [-.propgrid]
        $(MMS)$(MMSQUALIFIERS)/macro=(__WXGTK__=1)
-       library [--.lib]libwx_gtk.olb [.CXX_REPOSITORY]*.obj
+       If f$getsyi("HW_MODEL") .le. 2048 then library [--.lib]libwx_gtk.olb [.CXX_REPOSITORY]*.obj
        set default [-.regex]
        $(MMS)$(MMSQUALIFIERS)/macro=(__WXGTK__=1)
        set default [-.ribbon]
        $(MMS)$(MMSQUALIFIERS)/macro=(__WXGTK__=1)
-       library [--.lib]libwx_gtk.olb [.CXX_REPOSITORY]*.obj
+       If f$getsyi("HW_MODEL") .le. 2048 then library [--.lib]libwx_gtk.olb [.CXX_REPOSITORY]*.obj
        set default [-.richtext]
        $(MMS)$(MMSQUALIFIERS)/macro=(__WXGTK__=1)
-       library [--.lib]libwx_gtk.olb [.CXX_REPOSITORY]*.obj
+       If f$getsyi("HW_MODEL") .le. 2048 then library [--.lib]libwx_gtk.olb [.CXX_REPOSITORY]*.obj
        set default [-.stc]
        $(MMS)$(MMSQUALIFIERS)/macro=(__WXGTK__=1)
        set default [-.gtk1]
        $(MMS)$(MMSQUALIFIERS)/macro=(__WXGTK__=1)
-       library [--.lib]libwx_gtk.olb [.CXX_REPOSITORY]*.obj
+       If f$getsyi("HW_MODEL") .le. 2048 then library [--.lib]libwx_gtk.olb [.CXX_REPOSITORY]*.obj
        set default [--.demos.bombs]
        $(MMS)$(MMSQUALIFIERS)/macro=(__WXGTK__=1)
        set default [-.forty]
@@ -160,40 +160,40 @@ gtk2 : [.include.wx]setup.h
        @gnome$root:[000000]glib2
        set default [.src.generic]
        $(MMS)$(MMSQUALIFIERS)/macro=(__WXGTK2__=1)
-       library [--.lib]libwx_gtk2.olb [.CXX_REPOSITORY]*.obj
+       If f$getsyi("HW_MODEL") .le. 2048 then library [--.lib]libwx_gtk2.olb [.CXX_REPOSITORY]*.obj
        set default [-.common]
        $(MMS)$(MMSQUALIFIERS)/macro=(__WXGTK2__=1)
-       library [--.lib]libwx_gtk2.olb [.CXX_REPOSITORY]*.obj
+       If f$getsyi("HW_MODEL") .le. 2048 then library [--.lib]libwx_gtk2.olb [.CXX_REPOSITORY]*.obj
        set default [-.html]
        $(MMS)$(MMSQUALIFIERS)/macro=(__WXGTK2__=1)
-       library [--.lib]libwx_gtk2.olb [.CXX_REPOSITORY]*.obj
+       If f$getsyi("HW_MODEL") .le. 2048 then library [--.lib]libwx_gtk2.olb [.CXX_REPOSITORY]*.obj
        set default [-.aui]
        $(MMS)$(MMSQUALIFIERS)/macro=(__WXGTK2__=1)
-       library [--.lib]libwx_gtk2.olb [.CXX_REPOSITORY]*.obj
+       If f$getsyi("HW_MODEL") .le. 2048 then library [--.lib]libwx_gtk2.olb [.CXX_REPOSITORY]*.obj
        set default [-.xml]
        $(MMS)$(MMSQUALIFIERS)/macro=(__WXGTK2__=1)
        set default [-.xrc]
        $(MMS)$(MMSQUALIFIERS)/macro=(__WXGTK2__=1)
-       library [--.lib]libwx_gtk2.olb [.CXX_REPOSITORY]*.obj
+       If f$getsyi("HW_MODEL") .le. 2048 then library [--.lib]libwx_gtk2.olb [.CXX_REPOSITORY]*.obj
        set default [-.unix]
        $(MMS)$(MMSQUALIFIERS)/macro=(__WXGTK2__=1)
-       library [--.lib]libwx_gtk2.olb [.CXX_REPOSITORY]*.obj
+       If f$getsyi("HW_MODEL") .le. 2048 then library [--.lib]libwx_gtk2.olb [.CXX_REPOSITORY]*.obj
        set default [-.propgrid]
        $(MMS)$(MMSQUALIFIERS)/macro=(__WXGTK2__=1)
-       library [--.lib]libwx_gtk2.olb [.CXX_REPOSITORY]*.obj
+       If f$getsyi("HW_MODEL") .le. 2048 then library [--.lib]libwx_gtk2.olb [.CXX_REPOSITORY]*.obj
        set default [-.regex]
        $(MMS)$(MMSQUALIFIERS)/macro=(__WXGTK2__=1)
        set default [-.ribbon]
        $(MMS)$(MMSQUALIFIERS)/macro=(__WXGTK2__=1)
-       library [--.lib]libwx_gtk2.olb [.CXX_REPOSITORY]*.obj
+       If f$getsyi("HW_MODEL") .le. 2048 then library [--.lib]libwx_gtk2.olb [.CXX_REPOSITORY]*.obj
        set default [-.richtext]
        $(MMS)$(MMSQUALIFIERS)/macro=(__WXGTK2__=1)
-       library [--.lib]libwx_gtk2.olb [.CXX_REPOSITORY]*.obj
+       If f$getsyi("HW_MODEL") .le. 2048 then library [--.lib]libwx_gtk2.olb [.CXX_REPOSITORY]*.obj
        set default [-.stc]
        $(MMS)$(MMSQUALIFIERS)/macro=(__WXGTK2__=1)
        set default [-.gtk]
        $(MMS)$(MMSQUALIFIERS)/macro=(__WXGTK2__=1)
-       library [--.lib]libwx_gtk2.olb [.CXX_REPOSITORY]*.obj
+       If f$getsyi("HW_MODEL") .le. 2048 then library [--.lib]libwx_gtk2.olb [.CXX_REPOSITORY]*.obj
        set default [--.demos.bombs]
 #      $(MMS)$(MMSQUALIFIERS)/macro=(__WXGTK2__=1)
        set default [--.samples.calendar]
@@ -234,43 +234,43 @@ gtk2 : [.include.wx]setup.h
 x11 : [.include.wx]setup.h
        set default [.src.generic]
        $(MMS)$(MMSQUALIFIERS)/macro=(__WXX11__=1,__WXUNIVERSAL__=1)
-       library [--.lib]libwx_x11_univ.olb [.CXX_REPOSITORY]*.obj
+       If f$getsyi("HW_MODEL") .le. 2048 then library [--.lib]libwx_x11_univ.olb [.CXX_REPOSITORY]*.obj
        set default [-.common]
        $(MMS)$(MMSQUALIFIERS)/macro=(__WXX11__=1,__WXUNIVERSAL__=1)
-       library [--.lib]libwx_x11_univ.olb [.CXX_REPOSITORY]*.obj
+       If f$getsyi("HW_MODEL") .le. 2048 then library [--.lib]libwx_x11_univ.olb [.CXX_REPOSITORY]*.obj
        set default [-.html]
        $(MMS)$(MMSQUALIFIERS)/macro=(__WXX11__=1,__WXUNIVERSAL__=1)
-       library [--.lib]libwx_x11_univ.olb [.CXX_REPOSITORY]*.obj
+       If f$getsyi("HW_MODEL") .le. 2048 then library [--.lib]libwx_x11_univ.olb [.CXX_REPOSITORY]*.obj
        set default [-.xml]
        $(MMS)$(MMSQUALIFIERS)/macro=(__WXX11__=1,__WXUNIVERSAL__=1)
        set default [-.xrc]
        $(MMS)$(MMSQUALIFIERS)/macro=(__WXX11__=1,__WXUNIVERSAL__=1)
-       library [--.lib]libwx_x11_univ.olb [.CXX_REPOSITORY]*.obj
+       If f$getsyi("HW_MODEL") .le. 2048 then library [--.lib]libwx_x11_univ.olb [.CXX_REPOSITORY]*.obj
        set default [-.aui]
        $(MMS)$(MMSQUALIFIERS)/macro=(__WXX11__=1,__WXUNIVERSAL__=1)
-       library [--.lib]libwx_x11_univ.olb [.CXX_REPOSITORY]*.obj
+       If f$getsyi("HW_MODEL") .le. 2048 then library [--.lib]libwx_x11_univ.olb [.CXX_REPOSITORY]*.obj
        set default [-.unix]
        $(MMS)$(MMSQUALIFIERS)/macro=(__WXX11__=1,__WXUNIVERSAL__=1)
-       library [--.lib]libwx_x11_univ.olb [.CXX_REPOSITORY]*.obj
+       If f$getsyi("HW_MODEL") .le. 2048 then library [--.lib]libwx_x11_univ.olb [.CXX_REPOSITORY]*.obj
        set default [-.propgrid]
        $(MMS)$(MMSQUALIFIERS)/macro=(__WXX11__=1,__WXUNIVERSAL__=1)
-       library [--.lib]libwx_x11_univ.olb [.CXX_REPOSITORY]*.obj
+       If f$getsyi("HW_MODEL") .le. 2048 then library [--.lib]libwx_x11_univ.olb [.CXX_REPOSITORY]*.obj
        set default [-.regex]
        $(MMS)$(MMSQUALIFIERS)/macro=(__WXX11__=1,__WXUNIVERSAL__=1)
        set default [-.ribbon]
        $(MMS)$(MMSQUALIFIERS)/macro=(__WXX11__=1,__WXUNIVERSAL__=1)
-       library [--.lib]libwx_x11_univ.olb [.CXX_REPOSITORY]*.obj
+       If f$getsyi("HW_MODEL") .le. 2048 then library [--.lib]libwx_x11_univ.olb [.CXX_REPOSITORY]*.obj
        set default [-.richtext]
        $(MMS)$(MMSQUALIFIERS)/macro=(__WXX11__=1,__WXUNIVERSAL__=1)
-       library [--.lib]libwx_x11_univ.olb [.CXX_REPOSITORY]*.obj
+       If f$getsyi("HW_MODEL") .le. 2048 then library [--.lib]libwx_x11_univ.olb [.CXX_REPOSITORY]*.obj
        set default [-.stc]
        $(MMS)$(MMSQUALIFIERS)/macro=(__WXX11__=1,__WXUNIVERSAL__=1)
        set default [-.x11]
        $(MMS)$(MMSQUALIFIERS)/macro=(__WXX11__=1,__WXUNIVERSAL__=1)
-       library [--.lib]libwx_x11_univ.olb [.CXX_REPOSITORY]*.obj
+       If f$getsyi("HW_MODEL") .le. 2048 then library [--.lib]libwx_x11_univ.olb [.CXX_REPOSITORY]*.obj
        set default [-.univ]
        $(MMS)$(MMSQUALIFIERS)/macro=(__WXX11__=1,__WXUNIVERSAL__=1)
-       library [--.lib]libwx_x11_univ.olb [.CXX_REPOSITORY]*.obj
+       If f$getsyi("HW_MODEL") .le. 2048 then library [--.lib]libwx_x11_univ.olb [.CXX_REPOSITORY]*.obj
        set default [--.demos.bombs]
 #      $(MMS)$(MMSQUALIFIERS)/macro=(__WXX11__=1,__WXUNIVERSAL__=1)
        set default [--.samples.calendar]
@@ -310,21 +310,21 @@ x11 : [.include.wx]setup.h
 motif : [.include.wx]setup.h
        set default [.src.generic]
        $(MMS)$(MMSQUALIFIERS)/macro=(__WXMOTIF__=1)
-       library [--.lib]libwx_motif.olb [.CXX_REPOSITORY]*.obj
+       If f$getsyi("HW_MODEL") .le. 2048 then library [--.lib]libwx_motif.olb [.CXX_REPOSITORY]*.obj
        set default [-.common]
        $(MMS)$(MMSQUALIFIERS)/macro=(__WXMOTIF__=1)
-       library [--.lib]libwx_motif.olb [.CXX_REPOSITORY]*.obj
+       If f$getsyi("HW_MODEL") .le. 2048 then library [--.lib]libwx_motif.olb [.CXX_REPOSITORY]*.obj
        set default [-.unix]
        $(MMS)$(MMSQUALIFIERS)/macro=(__WXMOTIF__=1)
-       library [--.lib]libwx_motif.olb [.CXX_REPOSITORY]*.obj
+       If f$getsyi("HW_MODEL") .le. 2048 then library [--.lib]libwx_motif.olb [.CXX_REPOSITORY]*.obj
        set default [-.aui]
        $(MMS)$(MMSQUALIFIERS)/macro=(__WXMOTIF__=1)
-       library [--.lib]libwx_motif.olb [.CXX_REPOSITORY]*.obj
+       If f$getsyi("HW_MODEL") .le. 2048 then library [--.lib]libwx_motif.olb [.CXX_REPOSITORY]*.obj
        set default [-.regex]
        $(MMS)$(MMSQUALIFIERS)/macro=(__WXMOTIF__=1)
        set default [-.motif]
        $(MMS)$(MMSQUALIFIERS)/macro=(__WXMOTIF__=1)
-       library [--.lib]libwx_motif.olb [.CXX_REPOSITORY]*.obj
+       If f$getsyi("HW_MODEL") .le. 2048 then library [--.lib]libwx_motif.olb [.CXX_REPOSITORY]*.obj
        set default [-.x11]
        $(MMS)$(MMSQUALIFIERS)/macro=(__WXMOTIF__=1)
        set default [--.demos.bombs]

diff --git a/src/common/descrip.mms b/src/common/descrip.mms
index b5fd23aba19ea7906d46eb129207bf3a94cbcabf..bf12ba2ec6ea35109ff22d9cce95bfc5464e2ca4 100644 (file)
--- 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 : 29 April 2011                                                       *
+# Date : 27 September 2011                                                   *
 #                                                                            *
 #*****************************************************************************
 .first
@@ -209,8 +209,9 @@ OBJECTS2=tbarbase.obj,srchcmn.obj,\
                clrpickercmn.obj,\
                filepickercmn.obj,\
                fontpickercmn.obj,\
-               pickerbase.obj,\
-               listctrlcmn.obj,socketiohandler.obj,fdiodispatcher.obj,\
+               pickerbase.obj
+
+OBJECTS3=listctrlcmn.obj,socketiohandler.obj,fdiodispatcher.obj,\
                selectdispatcher.obj,overlaycmn.obj,windowid.obj,sstream.obj,\
                wrapsizer.obj,headerctrlcmn.obj,headercolcmn.obj,\
                rearrangectrl.obj,spinctrlcmn.obj,datetimefmt.obj,xlocale.obj,\
@@ -431,11 +432,13 @@ all : $(SOURCES)
        $(MMS)$(MMSQUALIFIERS) $(OBJECTS)
        $(MMS)$(MMSQUALIFIERS) $(OBJECTS1)
        $(MMS)$(MMSQUALIFIERS) $(OBJECTS2)
+       $(MMS)$(MMSQUALIFIERS) $(OBJECTS3)
 .ifdef __WXMOTIF__
        $(MMS)$(MMSQUALIFIERS) $(OBJECTS_MOTIF)
        library [--.lib]libwx_motif.olb $(OBJECTS)
        library [--.lib]libwx_motif.olb $(OBJECTS1)
        library [--.lib]libwx_motif.olb $(OBJECTS2)
+       library [--.lib]libwx_motif.olb $(OBJECTS3)
        library [--.lib]libwx_motif.olb $(OBJECTS_MOTIF)
 .else
 .ifdef __WXGTK__
@@ -443,6 +446,7 @@ all : $(SOURCES)
        library [--.lib]libwx_gtk.olb $(OBJECTS)
        library [--.lib]libwx_gtk.olb $(OBJECTS1)
        library [--.lib]libwx_gtk.olb $(OBJECTS2)
+       library [--.lib]libwx_gtk.olb $(OBJECTS3)
        library [--.lib]libwx_gtk.olb $(OBJECTS_X11)
 .else
 .ifdef __WXGTK2__
@@ -451,6 +455,7 @@ all : $(SOURCES)
        library [--.lib]libwx_gtk2.olb $(OBJECTS)
        library [--.lib]libwx_gtk2.olb $(OBJECTS1)
        library [--.lib]libwx_gtk2.olb $(OBJECTS2)
+       library [--.lib]libwx_gtk2.olb $(OBJECTS3)
        library [--.lib]libwx_gtk2.olb $(OBJECTS_X11)
        library [--.lib]libwx_gtk2.olb $(OBJECTS_GTK2)
 .else
@@ -459,6 +464,7 @@ all : $(SOURCES)
        library [--.lib]libwx_x11_univ.olb $(OBJECTS)
        library [--.lib]libwx_x11_univ.olb $(OBJECTS1)
        library [--.lib]libwx_x11_univ.olb $(OBJECTS2)
+       library [--.lib]libwx_x11_univ.olb $(OBJECTS3)
        library [--.lib]libwx_x11_univ.olb $(OBJECTS_X11)
 .endif
 .endif
@@ -468,6 +474,7 @@ all : $(SOURCES)
 $(OBJECTS) : [--.include.wx]setup.h
 $(OBJECTS1) : [--.include.wx]setup.h
 $(OBJECTS2) : [--.include.wx]setup.h
+$(OBJECTS3) : [--.include.wx]setup.h
 $(OBJECTS_X11) : [--.include.wx]setup.h
 $(OBJECTS_GTK2) : [--.include.wx]setup.h
 $(OBJECTS_MOTIF) : [--.include.wx]setup.h

diff --git a/src/gtk/descrip.mms b/src/gtk/descrip.mms
index 2d747f4dc8f5bd393a0e6c0d02dd166e183426c7..6e9e1c673039ecc136d6fce6e6f3601107a2116b 100644 (file)
--- a/src/gtk/descrip.mms
+++ b/src/gtk/descrip.mms
@@ -2,7 +2,7 @@
 #                                                                            *
 # Make file for VMS                                                          *
 # Author : J.Jansen (joukj@hrem.nano.tudelft.nl)                             *
-# Date : 16 June 2011                                                        *
+# Date : 27 September 2011                                                   *
 #                                                                            *
 #*****************************************************************************
 .first
@@ -171,16 +171,16 @@ all : $(SOURCES)
        $(MMS)$(MMSQUALIFIERS) $(OBJECTS)
 .ifdef __WXUNIVERSAL__
        library [--.lib]libwx_gtk_univ.olb $(OBJECTS)
-       library [--.lib]libwx_gtk_univ.olb [.CXX_REPOSITORY]*.obj
+       If f$getsyi("HW_MODEL") .le. 2048 then library [--.lib]libwx_gtk_univ.olb [.CXX_REPOSITORY]*.obj
 .else
 .ifdef __WXGTK2__
        library [--.lib]libwx_gtk2.olb $(OBJECTS)
-       library [--.lib]libwx_gtk2.olb [.CXX_REPOSITORY]*.obj
+       If f$getsyi("HW_MODEL") .le. 2048 then library [--.lib]libwx_gtk2.olb [.CXX_REPOSITORY]*.obj
        $(MMS)$(MMSQUALIFIERS) $(OBJECTS0)
        library [--.lib]libwx_gtk2.olb $(OBJECTS0)
 .else
        library [--.lib]libwx_gtk.olb $(OBJECTS)
-       library [--.lib]libwx_gtk.olb [.CXX_REPOSITORY]*.obj
+       If f$getsyi("HW_MODEL") .le. 2048 then library [--.lib]libwx_gtk.olb [.CXX_REPOSITORY]*.obj
        $(MMS)$(MMSQUALIFIERS) $(OBJECTS0)
        library [--.lib]libwx_gtk.olb $(OBJECTS0)
 .endif

diff --git a/src/gtk1/descrip.mms b/src/gtk1/descrip.mms
index b79f1d57c7434df9a28d6db8cffd67ca4c737775..bf5008ad1fa9648d6890319cd396b7fd4472b279 100644 (file)
--- a/src/gtk1/descrip.mms
+++ b/src/gtk1/descrip.mms
@@ -2,7 +2,7 @@
 #                                                                            *
 # Make file for VMS                                                          *
 # Author : J.Jansen (joukj@hrem.nano.tudelft.nl)                             *
-# Date : 14 December 2010                                                    *
+# Date : 27 September 2011                                                   *
 #                                                                            *
 #*****************************************************************************
 .first
@@ -160,10 +160,10 @@ all : $(SOURCES)
        $(MMS)$(MMSQUALIFIERS) $(OBJECTS)
 .ifdef __WXUNIVERSAL__
        library [--.lib]libwx_gtk_univ.olb $(OBJECTS)
-       library [--.lib]libwx_gtk_univ.olb [.CXX_REPOSITORY]*.obj
+       If f$getsyi("HW_MODEL") .le. 2048 then library [--.lib]libwx_gtk_univ.olb [.CXX_REPOSITORY]*.obj
 .else
        library [--.lib]libwx_gtk.olb $(OBJECTS)
-       library [--.lib]libwx_gtk.olb [.CXX_REPOSITORY]*.obj
+       If f$getsyi("HW_MODEL") .le. 2048 then library [--.lib]libwx_gtk.olb [.CXX_REPOSITORY]*.obj
        $(MMS)$(MMSQUALIFIERS) $(OBJECTS0)
        library [--.lib]libwx_gtk.olb $(OBJECTS0)
 .endif

diff --git a/src/gtk1/sockgtk.cpp b/src/gtk1/sockgtk.cpp
index 8bd6a56f84ea0da1060d15f90c83064bd8a9bfe0..9051ff7c8e9bd2f961ca0c5a740e1b23b502e164 100644 (file)
--- a/src/gtk1/sockgtk.cpp
+++ b/src/gtk1/sockgtk.cpp
@@ -10,6 +10,12 @@
 ///////////////////////////////////////////////////////////////////////////////
 
 // For compilers that support precompilation, includes "wx.h".
+
+#if defined( __VMS ) && define ( __ia64 )
+// Work around for a bug in the C++ compiler on OpenVMS IA64
+# include <time.h>
+#endif
+
 #include "wx/wxprec.h"
 
 #if wxUSE_SOCKETS

diff --git a/src/stc/scintilla/src/descrip.mms b/src/stc/scintilla/src/descrip.mms
index b35df3ad0754a24ae25ca3983296d453decd1bdb..c56963e73de3998afa5bf362e91b7fb2e5231281 100644 (file)
--- 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 : 17 December 2010                                                    *
+# Date : 27 September 2011                                                   *
 #                                                                            *
 #*****************************************************************************
 
@@ -103,22 +103,22 @@ all : $(SOURCES)
 .ifdef __WXMOTIF__
        library [----.lib]libwx_motif.olb $(OBJECTS)
        library [----.lib]libwx_motif.olb $(OBJECTS1)
-       library [----.lib]libwx_motif.olb [.CXX_REPOSITORY]*.obj
+       If f$getsyi("HW_MODEL") .le. 2048 then library [----.lib]libwx_motif.olb [.CXX_REPOSITORY]*.obj
 .else
 .ifdef __WXGTK__
        library [----.lib]libwx_gtk.olb $(OBJECTS)
        library [----.lib]libwx_gtk.olb $(OBJECTS1)
-       library [----.lib]libwx_gtk.olb [.CXX_REPOSITORY]*.obj
+       If f$getsyi("HW_MODEL") .le. 2048 then library [----.lib]libwx_gtk.olb [.CXX_REPOSITORY]*.obj
 .else
 .ifdef __WXGTK2__
        library [----.lib]libwx_gtk2.olb $(OBJECTS)
        library [----.lib]libwx_gtk2.olb $(OBJECTS1)
-       library [----.lib]libwx_gtk2.olb [.CXX_REPOSITORY]*.obj
+       If f$getsyi("HW_MODEL") .le. 2048 then library [----.lib]libwx_gtk2.olb [.CXX_REPOSITORY]*.obj
 .else
 .ifdef __WXX11__
        library [----.lib]libwx_x11_univ.olb $(OBJECTS)
        library [----.lib]libwx_x11_univ.olb $(OBJECTS1)
-       library [----.lib]libwx_x11_univ.olb [.CXX_REPOSITORY]*.obj
+       If f$getsyi("HW_MODEL") .le. 2048 then library [----.lib]libwx_x11_univ.olb [.CXX_REPOSITORY]*.obj
 .endif
 .endif
 .endif