Use string.h instead of memory.h, since some system don't have memory.h and

[wxWidgets.git] / src / xrc / descrip.mms

diff --git a/src/xrc/descrip.mms b/src/xrc/descrip.mms
index c2058df5f518a3f189e7c168df9786ab0c6cf007..82a2a262d7ffb83da8e7afb1be5c0421766ac271 100755 (executable)
--- a/src/xrc/descrip.mms
+++ b/src/xrc/descrip.mms
@@ -1,8 +1,8 @@
 #*****************************************************************************
 #                                                                            *
 # Make file for VMS                                                          *
 #*****************************************************************************
 #                                                                            *
 # Make file for VMS                                                          *

-# Author : J.Jansen (joukj@hrem.stm.tudelft.nl)                              *
-# Date : 20 October 2004                                                      *
+# Author : J.Jansen (joukj@hrem.nano.tudelft.nl)                             *
+# Date : 13 February 2006                                                    *

 #                                                                            *
 #*****************************************************************************
 .first
 #                                                                            *
 #*****************************************************************************
 .first


@@ -18,6 +18,11 @@ 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
           /assume=(nostdnew,noglobal_array_new)
 CC_DEFINE = /define=(__WXGTK__=1)/float=ieee/name=(as_is,short)/ieee=denorm
 .else

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

 .ifdef __WXX11__
 CXX_DEFINE = /define=(__WXX11__=1,__WXUNIVERSAL__==1)/float=ieee\
        /name=(as_is,short)/assume=(nostdnew,noglobal_array_new)
 .ifdef __WXX11__
 CXX_DEFINE = /define=(__WXX11__=1,__WXUNIVERSAL__==1)/float=ieee\
        /name=(as_is,short)/assume=(nostdnew,noglobal_array_new)


@@ -29,6 +34,7 @@ CC_DEFINE =
 .endif
 .endif
 .endif
 .endif
 .endif
 .endif

+.endif

 
 .suffixes : .cpp
 
 
 .suffixes : .cpp
 


@@ -63,11 +69,15 @@ all : $(SOURCES)
 .ifdef __WXGTK__
        library [--.lib]libwx_gtk.olb $(OBJECTS)
 .else
 .ifdef __WXGTK__
        library [--.lib]libwx_gtk.olb $(OBJECTS)
 .else

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

 .ifdef __WXX11__
        library [--.lib]libwx_x11_univ.olb $(OBJECTS)
 .endif
 .endif
 .endif
 .ifdef __WXX11__
        library [--.lib]libwx_x11_univ.olb $(OBJECTS)
 .endif
 .endif
 .endif

+.endif

 
 xh_bmp.obj : xh_bmp.cpp
 xh_bmpbt.obj : xh_bmpbt.cpp
 
 xh_bmp.obj : xh_bmp.cpp
 xh_bmpbt.obj : xh_bmpbt.cpp