From 14329e037b7e082fec4325f77214a2e42a2d2762 Mon Sep 17 00:00:00 2001 From: Jouk Jansen Date: Tue, 15 Aug 2000 08:54:05 +0000 Subject: [PATCH] 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 --- samples/minimal/descrip.mms | 3 ++- src/common/descrip.mms | 8 ++++++-- src/generic/descrip.mms | 8 +++++++- src/gtk/descrip.mms | 6 ++++-- src/gtk1/descrip.mms | 6 ++++-- src/unix/descrip.mms | 8 ++++++-- 6 files changed, 29 insertions(+), 10 deletions(-) diff --git a/samples/minimal/descrip.mms b/samples/minimal/descrip.mms index 3d74dde4a4..ae56274334 100644 --- 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 0bc7210479..8d492faffc 100644 --- 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 7e09011a7b..664d0d2e00 100644 --- 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 c2e9985e9e..e4441a8f32 100644 --- 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 c2e9985e9e..e4441a8f32 100644 --- 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 cb163e6442..8803139cd6 100644 --- 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,\ -- 2.45.2