Update OpenVMS compile support

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

diff --git a/setup.h_vms b/setup.h_vms
index 19ea899e704b34cde55ee1826aa5561ab5e63973..a110b6aca2282bd5557b841d0b39f18cff00d6e9 100644 (file)
--- a/setup.h_vms
+++ b/setup.h_vms
@@ -3,7 +3,7 @@
  * Template for the set.h file for VMS                                       *
  * Created from setup.h_in                                                   *
  * Author : J.Jansen (joukj@hrem.nano.tudelft.nl)                            *
  * Template for the set.h file for VMS                                       *
  * Created from setup.h_in                                                   *
  * Author : J.Jansen (joukj@hrem.nano.tudelft.nl)                            *

- * Date : 24 March 2010                                                      *
+ * Date : 6 April 2010                                                       *

  *                                                                           *
  *****************************************************************************/
 
  *                                                                           *
  *****************************************************************************/
 


@@ -341,7 +341,24 @@ typedef pid_t GPid;
 
 #define wxUSE_PROPGRID  1
 
 
 #define wxUSE_PROPGRID  1
 

+#ifdef _MSC_VER
+#   if _MSC_VER >= 1400
+
+

 #define wxUSE_GRAPHICS_CONTEXT 0
 #define wxUSE_GRAPHICS_CONTEXT 0

+#   else
+
+
+#       define wxUSE_GRAPHICS_CONTEXT 0
+#   endif
+#else
+
+
+
+
+
+#   define wxUSE_GRAPHICS_CONTEXT 0
+#endif

 
 #define wxUSE_CONTROLS     1
 
 
 #define wxUSE_CONTROLS     1
 

diff --git a/src/stc/scintilla/src/descrip.mms b/src/stc/scintilla/src/descrip.mms
index c76bbfd9ce37094144918a7e504fd123e691e7be..0f5085811ac2951ea490cf1a0c106a25e1e12549 100644 (file)
--- a/src/stc/scintilla/src/descrip.mms
+++ b/src/stc/scintilla/src/descrip.mms
@@ -2,12 +2,15 @@
 #                                                                            *
 # Make file for VMS                                                          *
 # Author : J.Jansen (joukj@hrem.nano.tudelft.nl)                             *
 #                                                                            *
 # Make file for VMS                                                          *
 # Author : J.Jansen (joukj@hrem.nano.tudelft.nl)                             *

-# Date : 5 October 2009                                                      *
+# Date : 6 April 2010                                                        *

 #                                                                            *
 #*****************************************************************************
 #                                                                            *
 #*****************************************************************************

+

 .first
        define wx [--.include.wx]
 
 .first
        define wx [--.include.wx]
 

+.suffixes : .cpp
+

 .ifdef __WXMOTIF__
 CXX_DEFINE = /define=(__WX__=1,__WXMOTIF__=1)/name=(as_is,short)\
           /assume=(nostdnew,noglobal_array_new)/include=([],[-.src],[-.include])
 .ifdef __WXMOTIF__
 CXX_DEFINE = /define=(__WX__=1,__WXMOTIF__=1)/name=(as_is,short)\
           /assume=(nostdnew,noglobal_array_new)/include=([],[-.src],[-.include])


@@ -42,6 +45,8 @@ CC_DEFINE =
 
 .cxx.obj :
        cxx $(CXXFLAGS)$(CXX_DEFINE) $(MMS$TARGET_NAME).cxx
 
 .cxx.obj :
        cxx $(CXXFLAGS)$(CXX_DEFINE) $(MMS$TARGET_NAME).cxx

+.cpp.obj :
+       cxx $(CXXFLAGS)$(CXX_DEFINE) $(MMS$TARGET_NAME).cpp

 .c.obj :
        cc $(CFLAGS)$(CC_DEFINE) $(MMS$TARGET_NAME).c
 
 .c.obj :
        cc $(CFLAGS)$(CC_DEFINE) $(MMS$TARGET_NAME).c
 


@@ -64,7 +69,10 @@ OBJECTS1=LexHTML.obj,LexInno.obj,LexKix.obj,LexLisp.obj,LexLout.obj,LexLua.obj,\
        LexTCL.obj,LexTeX.obj,LexVB.obj,LexVerilog.obj,LexVHDL.obj,\
        LexYAML.obj,LineMarker.obj,PositionCache.obj,PropSet.obj,RESearch.obj,\
        RunStyles.obj,ScintillaBase.obj,Style.obj,StyleContext.obj,\
        LexTCL.obj,LexTeX.obj,LexVB.obj,LexVerilog.obj,LexVHDL.obj,\
        LexYAML.obj,LineMarker.obj,PositionCache.obj,PropSet.obj,RESearch.obj,\
        RunStyles.obj,ScintillaBase.obj,Style.obj,StyleContext.obj,\

-       UniConversion.obj,ViewStyle.obj,WindowAccessor.obj,XPM.obj
+       UniConversion.obj,ViewStyle.obj,WindowAccessor.obj,XPM.obj,\
+       PerLine.obj,Selection.obj,LexPowerPro.obj,Array.obj,LexCOBOL.obj,\
+       LexMagik.obj,LexMarkdown.obj,LexMySQL.obj,LexNimrod.obj,\
+       LexPowerShell.obj,LexSML.obj,LexSorcus.obj,LexTACL.obj,LexTAL.obj

 
 SOURCES=AutoComplete.cxx,CallTip.cxx,CellBuffer.cxx,CharClassify.cxx,\
        ContractionState.cxx,Decoration.cxx,Document.cxx,DocumentAccessor.cxx,\
 
 SOURCES=AutoComplete.cxx,CallTip.cxx,CellBuffer.cxx,CharClassify.cxx,\
        ContractionState.cxx,Decoration.cxx,Document.cxx,DocumentAccessor.cxx,\


@@ -84,7 +92,10 @@ SOURCES=AutoComplete.cxx,CallTip.cxx,CellBuffer.cxx,CharClassify.cxx,\
        LexTCL.cxx,LexTeX.cxx,LexVB.cxx,LexVerilog.cxx,LexVHDL.cxx,\
        LexYAML.cxx,LineMarker.cxx,PositionCache.cxx,PropSet.cxx,RESearch.cxx,\
        RunStyles.cxx,ScintillaBase.cxx,Style.cxx,StyleContext.cxx,\
        LexTCL.cxx,LexTeX.cxx,LexVB.cxx,LexVerilog.cxx,LexVHDL.cxx,\
        LexYAML.cxx,LineMarker.cxx,PositionCache.cxx,PropSet.cxx,RESearch.cxx,\
        RunStyles.cxx,ScintillaBase.cxx,Style.cxx,StyleContext.cxx,\

-       UniConversion.cxx,ViewStyle.cxx,WindowAccessor.cxx,XPM.cxx
+       UniConversion.cxx,ViewStyle.cxx,WindowAccessor.cxx,XPM.cxx,\
+       PerLine.cxx,Selection.cxx,LexPowerPro.cxx,Array.cpp,LexCOBOL.cxx,\
+       LexMagik.cxx,LexMarkdown.cxx,LexMySQL.cxx,LexNimrod.cxx,\
+       LexPowerShell.cxx,LexSML.cxx,LexSorcus.cxx,LexTACL.cxx,LexTAL.cxx

 
 all : $(SOURCES)
        $(MMS)$(MMSQUALIFIERS) $(OBJECTS)
 
 all : $(SOURCES)
        $(MMS)$(MMSQUALIFIERS) $(OBJECTS)


@@ -92,18 +103,22 @@ all : $(SOURCES)
 .ifdef __WXMOTIF__
        library [----.lib]libwx_motif.olb $(OBJECTS)
        library [----.lib]libwx_motif.olb $(OBJECTS1)
 .ifdef __WXMOTIF__
        library [----.lib]libwx_motif.olb $(OBJECTS)
        library [----.lib]libwx_motif.olb $(OBJECTS1)

+       library [----.lib]libwx_motif.olb [.CXX_REPOSITORY]*.obj

 .else
 .ifdef __WXGTK__
        library [----.lib]libwx_gtk.olb $(OBJECTS)
        library [----.lib]libwx_gtk.olb $(OBJECTS1)
 .else
 .ifdef __WXGTK__
        library [----.lib]libwx_gtk.olb $(OBJECTS)
        library [----.lib]libwx_gtk.olb $(OBJECTS1)

+       library [----.lib]libwx_gtk.olb [.CXX_REPOSITORY]*.obj

 .else
 .ifdef __WXGTK2__
        library [----.lib]libwx_gtk2.olb $(OBJECTS)
        library [----.lib]libwx_gtk2.olb $(OBJECTS1)
 .else
 .ifdef __WXGTK2__
        library [----.lib]libwx_gtk2.olb $(OBJECTS)
        library [----.lib]libwx_gtk2.olb $(OBJECTS1)

+       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)
 .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

 .endif
 .endif
 .endif
 .endif
 .endif
 .endif


@@ -203,3 +218,17 @@ UniConversion.obj : UniConversion.cxx
 ViewStyle.obj : ViewStyle.cxx
 WindowAccessor.obj : WindowAccessor.cxx
 XPM.obj : XPM.cxx
 ViewStyle.obj : ViewStyle.cxx
 WindowAccessor.obj : WindowAccessor.cxx
 XPM.obj : XPM.cxx

+PerLine.obj : PerLine.cxx
+Selection.obj : Selection.cxx
+LexPowerPro.obj : LexPowerPro.cxx
+Array.obj : Array.cpp
+LexCOBOL.obj : LexCOBOL.cxx
+LexMagik.obj : LexMagik.cxx
+LexMarkdown.obj : LexMarkdown.cxx
+LexMySQL.obj : LexMySQL.cxx
+LexNimrod.obj : LexNimrod.cxx
+LexPowerShell.obj : LexPowerShell.cxx
+LexSML.obj : LexSML.cxx
+LexSorcus.obj : LexSorcus.cxx
+LexTACL.obj : LexTACL.cxx
+LexTAL.obj : LexTAL.cxx