Committing in .

 Modified Files:
 	wxWindows/samples/minimal/descrip.mms
 	wxWindows/src/common/descrip.mms
 	wxWindows/src/generic/descrip.mms
 	wxWindows/src/gtk/descrip.mms wxWindows/src/unix/descrip.mms

 Compilation wxGTK for VMS updated. Now the minimal sample works OK.

----------------------------------------------------------------------

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

diff --git a/samples/minimal/descrip.mms b/samples/minimal/descrip.mms
index 3d74dde4a49928394a725ea72dfd7e6a719dc5b1..ae562743347f0adaf8af232ae96427d7ce87cace 100644 (file)
--- a/samples/minimal/descrip.mms
+++ b/samples/minimal/descrip.mms
@@ -12,7 +12,8 @@
 CXX_DEFINE = /define=(__WXMOTIF__=1)
 .else
 .ifdef __WXGTK__
-CXX_DEFINE = /list/show=all/define=(__WXGTK__=1)/float=ieee/name=(as_is,short)/ieee=denorm
+CXX_DEFINE = /define=(__WXGTK__=1)/float=ieee/name=(as_is,short)/ieee=denorm\
+          /assume=(nostdnew,noglobal_array_new)
 .else
 CXX_DEFINE =
 .endif

diff --git a/src/common/descrip.mms b/src/common/descrip.mms
index 0bc7210479f84b17885c4228cdccc9aa21c07891..8d492faffcad5f7b051a1b8633166157af6aa709 100644 (file)
--- a/src/common/descrip.mms
+++ b/src/common/descrip.mms
@@ -11,11 +11,15 @@
 
 .ifdef __WXMOTIF__
 CXX_DEFINE = /define=(__WXMOTIF__=1)
+CC_DEFINE = /define=(__WXMOTIF__=1)
 .else
 .ifdef __WXGTK__
-CXX_DEFINE = /define=(__WXGTK__=1)/float=ieee/name=(as_is,short)/ieee=denorm
+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
 CXX_DEFINE =
+CC_DEFINE =
 .endif
 .endif
 
@@ -30,7 +34,7 @@ LEX=flex
 .cpp.obj :
        cxx $(CXXFLAGS)$(CXX_DEFINE) $(MMS$TARGET_NAME).cpp
 .c.obj :
-       cc $(CFLAGS)$(CXX_DEFINE) $(MMS$TARGET_NAME).c
+       cc $(CFLAGS)$(CC_DEFINE) $(MMS$TARGET_NAME).c
 
 OBJECTS = \
                parser.obj,\

diff --git a/src/generic/descrip.mms b/src/generic/descrip.mms
index 7e09011a7bd3be4217ce8853d59f423908fac34a..664d0d2e00b220f03899e1c1b22a54a79dfcca20 100644 (file)
--- a/src/generic/descrip.mms
+++ b/src/generic/descrip.mms
@@ -10,11 +10,15 @@
 
 .ifdef __WXMOTIF__
 CXX_DEFINE = /define=(__WXMOTIF__=1)
+CC_DEFINE = /define=(__WXMOTIF__=1)
 .else
 .ifdef __WXGTK__
-CXX_DEFINE = /define=(__WXGTK__=1)/float=ieee/name=(as_is,short)/ieee=denorm
+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
 CXX_DEFINE =
+CC_DEFINE =
 .endif
 .endif
 
@@ -22,6 +26,8 @@ CXX_DEFINE =
 
 .cpp.obj :
        cxx $(CXXFLAGS)$(CXX_DEFINE) $(MMS$TARGET_NAME).cpp
+.c.obj :
+       cc $(CFLAGS)$(CC_DEFINE) $(MMS$TARGET_NAME).c
 
 OBJECTS = \
                busyinfo.obj,\

diff --git a/src/gtk/descrip.mms b/src/gtk/descrip.mms
index c2e9985e9e713d4b1a61a3619d0322b5f3f07f17..e4441a8f32fb44b01e5fdbc11184785dbbfd0b8a 100644 (file)
--- a/src/gtk/descrip.mms
+++ b/src/gtk/descrip.mms
@@ -8,14 +8,16 @@
 .first
        define wx [--.include.wx]
 
-CXX_DEFINE = /define=(__WXGTK__=1)/float=ieee/name=(as_is,short)/iee=denorm
+CXX_DEFINE = /define=(__WXGTK__=1)/float=ieee/name=(as_is,short)/iee=denorm\
+          /assume=(nostdnew,noglobal_array_new)
+CC_DEFINE = /define=(__WXGTK__=1)/float=ieee/name=(as_is,short)/iee=denorm
 
 .suffixes : .cpp
 
 .cpp.obj :
        cxx $(CXXFLAGS)$(CXX_DEFINE) $(MMS$TARGET_NAME).cpp
 .c.obj :
-       cc $(CFLAGS)$(CXX_DEFINE) $(MMS$TARGET_NAME).c
+       cc $(CFLAGS)$(CC_DEFINE) $(MMS$TARGET_NAME).c
 
 OBJECTS = \
        accel.obj,\

diff --git a/src/gtk1/descrip.mms b/src/gtk1/descrip.mms
index c2e9985e9e713d4b1a61a3619d0322b5f3f07f17..e4441a8f32fb44b01e5fdbc11184785dbbfd0b8a 100644 (file)
--- a/src/gtk1/descrip.mms
+++ b/src/gtk1/descrip.mms
@@ -8,14 +8,16 @@
 .first
        define wx [--.include.wx]
 
-CXX_DEFINE = /define=(__WXGTK__=1)/float=ieee/name=(as_is,short)/iee=denorm
+CXX_DEFINE = /define=(__WXGTK__=1)/float=ieee/name=(as_is,short)/iee=denorm\
+          /assume=(nostdnew,noglobal_array_new)
+CC_DEFINE = /define=(__WXGTK__=1)/float=ieee/name=(as_is,short)/iee=denorm
 
 .suffixes : .cpp
 
 .cpp.obj :
        cxx $(CXXFLAGS)$(CXX_DEFINE) $(MMS$TARGET_NAME).cpp
 .c.obj :
-       cc $(CFLAGS)$(CXX_DEFINE) $(MMS$TARGET_NAME).c
+       cc $(CFLAGS)$(CC_DEFINE) $(MMS$TARGET_NAME).c
 
 OBJECTS = \
        accel.obj,\

diff --git a/src/unix/descrip.mms b/src/unix/descrip.mms
index cb163e644275622e296d1f7dbc2587f79cfbde9d..8803139cd623d3026cff6d52f9ebe8364ce909ac 100644 (file)
--- a/src/unix/descrip.mms
+++ b/src/unix/descrip.mms
@@ -10,11 +10,15 @@
 
 .ifdef __WXMOTIF__
 CXX_DEFINE = /define=(__WXMOTIF__=1)
+CC_DEFINE = /define=(__WXMOTIF__=1)
 .else
 .ifdef __WXGTK__
-CXX_DEFINE = /define=(__WXGTK__=1)/float=ieee/name=(as_is,short)/ieee=denorm
+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
 CXX_DEFINE =
+CC_DEFINE =
 .endif
 .endif
 
@@ -23,7 +27,7 @@ CXX_DEFINE =
 .cpp.obj :
        cxx $(CXXFLAGS)$(CXX_DEFINE) $(MMS$TARGET_NAME).cpp
 .c.obj :
-       cc $(CFLAGS)$(CXX_DEFINE) $(MMS$TARGET_NAME).c
+       cc $(CFLAGS)$(CC_DEFINE) $(MMS$TARGET_NAME).c
 
 OBJECTS = \
                dialup.obj,\