Committing in .

 Modified Files:
 	wxWindows/descrip.mms wxWindows/samples/caret/descrip.mms

 Compile support for caret sample on wxGTK/VMS
----------------------------------------------------------------------

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

diff --git a/descrip.mms b/descrip.mms
index 91baaad732be93ab959235e772c287ebb1693c4f..72f7eeb5330286a152c98c2401a26f1d97bbf2ee 100644 (file)
--- a/descrip.mms
+++ b/descrip.mms
@@ -32,7 +32,9 @@ gtk : setup.h
        $(MMS)$(MMSQUALIFIERS)/macro=(__WXGTK__=1)
        set default [--.demos.bombs]
        $(MMS)$(MMSQUALIFIERS)/macro=(__WXGTK__=1)
        $(MMS)$(MMSQUALIFIERS)/macro=(__WXGTK__=1)
        set default [--.demos.bombs]
        $(MMS)$(MMSQUALIFIERS)/macro=(__WXGTK__=1)

-       set default [--.samples.minimal]
+       set default [--.samples.caret]
+       $(MMS)$(MMSQUALIFIERS)/macro=(__WXGTK__=1)
+       set default [-.minimal]

        $(MMS)$(MMSQUALIFIERS)/macro=(__WXGTK__=1)
 
 motif : setup.h
        $(MMS)$(MMSQUALIFIERS)/macro=(__WXGTK__=1)
 
 motif : setup.h

diff --git a/samples/caret/descrip.mms b/samples/caret/descrip.mms
index 56acfb3d333d019c8dd33b56719d513d8e1d6204..78972c1e9023070ee311e9dabd4ab4c581cb20a5 100644 (file)
--- a/samples/caret/descrip.mms
+++ b/samples/caret/descrip.mms
@@ -11,8 +11,13 @@
 .ifdef __WXMOTIF__
 CXX_DEFINE = /define=(__WXMOTIF__=1)
 .else
 .ifdef __WXMOTIF__
 CXX_DEFINE = /define=(__WXMOTIF__=1)
 .else

+.ifdef __WXGTK__
+CXX_DEFINE = /define=(__WXGTK__=1)/float=ieee/name=(as_is,short)/ieee=denorm\
+          /assume=(nostdnew,noglobal_array_new)
+.else

 CXX_DEFINE =
 .endif
 CXX_DEFINE =
 .endif

+.endif

 
 .suffixes : .cpp
 
 
 .suffixes : .cpp
 


@@ -20,11 +25,22 @@ CXX_DEFINE =
        cxx $(CXXFLAGS)$(CXX_DEFINE) $(MMS$TARGET_NAME).cpp
 
 all :
        cxx $(CXXFLAGS)$(CXX_DEFINE) $(MMS$TARGET_NAME).cpp
 
 all :

+.ifdef __WXMOTIF__

        $(MMS)$(MMSQUALIFIERS) caret.exe
        $(MMS)$(MMSQUALIFIERS) caret.exe

+.else
+.ifdef __WXGTK__
+       $(MMS)$(MMSQUALIFIERS) caret_gtk.exe
+.endif
+.endif

 
 

-caret.exe : caret.obj

 .ifdef __WXMOTIF__
 .ifdef __WXMOTIF__

+caret.exe : caret.obj

        cxxlink caret,[--.lib]vms/opt
        cxxlink caret,[--.lib]vms/opt

+.else
+.ifdef __WXGTK__
+caret_gtk.exe : caret.obj
+       cxxlink/exec=caret_gtk.exe caret,[--.lib]vms_gtk/opt
+.endif

 .endif
 
 caret.obj : caret.cpp
 .endif
 
 caret.obj : caret.cpp