fixed wxMBConv_iconv::GetMBNul()

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

diff --git a/src/common/descrip.mms b/src/common/descrip.mms
index 5ac8039ba8bce367b49c0ebfc076d7f6c4270f0d..09e28969fca29bc696a1d2b2317ae4da241ab144 100644 (file)
--- a/src/common/descrip.mms
+++ b/src/common/descrip.mms
@@ -1,8 +1,8 @@
 #*****************************************************************************
 #                                                                            *
 # Make file for VMS                                                          *
-# Author : J.Jansen (joukj@hrem.stm.tudelft.nl)                              *
-# Date : 9 November 1999                                                     *
+# Author : J.Jansen (joukj@hrem.nano.tudelft.nl)                             *
+# Date : 19 January 2006                                                     *
 #                                                                            *
 #*****************************************************************************
 .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
+.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)
@@ -29,6 +34,7 @@ CC_DEFINE =
 .endif
 .endif
 .endif
+.endif
 
 YACC=bison/yacc
 
@@ -48,6 +54,7 @@ OBJECTS = \
                appcmn.obj,\
                artprov.obj,\
                artstd.obj,\
+               bmpbase.obj,\
                bookctrl.obj,\
                choiccmn.obj,\
                clipcmn.obj,\
@@ -72,11 +79,14 @@ OBJECTS = \
                dobjcmn.obj,\
                docmdi.obj,\
                docview.obj,\
+               dpycmn.obj,\
                dynarray.obj,\
                dynlib.obj,\
                encconv.obj,\
                event.obj,\
+               evtloopcmn.obj,\
                extended.obj,\
+               fddlgcmn.obj,\
                ffile.obj,\
                file.obj,\
                fileconf.obj,\
@@ -133,6 +143,7 @@ OBJECTS1=fs_inet.obj,\
                process.obj,\
                protocol.obj,\
                quantize.obj,\
+               radiocmn.obj,\
                rendcmn.obj,\
                sckaddr.obj,\
                sckfile.obj,\
@@ -174,9 +185,9 @@ OBJECTS2=utilscmn.obj,\
                zipstrm.obj,\
                zstream.obj
 
-OBJECTS_MOTIF=bmpbase.obj,gaugecmn.obj
+OBJECTS_MOTIF=gaugecmn.obj,radiocmn.obj
 
-OBJECTS_X11=accesscmn.obj,bmpbase.obj,dndcmn.obj,dpycmn.obj,dseldlg.obj,\
+OBJECTS_X11=accesscmn.obj,dndcmn.obj,dpycmn.obj,dseldlg.obj,\
        dynload.obj,effects.obj,fddlgcmn.obj,fs_mem.obj,gaugecmn.obj,\
        gbsizer.obj,geometry.obj,matrix.obj,radiocmn.obj,\
        regex.obj,taskbarcmn.obj,xti.obj,xtistrm.obj,xtixml.obj
@@ -211,12 +222,15 @@ SOURCES = \
                dobjcmn.cpp,\
                docmdi.cpp,\
                docview.cpp,\
+               dpycmn.cpp,\
                dynarray.cpp,\
                dynlib.cpp,\
                encconv.cpp,\
                event.cpp,\
+               evtloopcmn.cpp,\
                extended.c,\
                ffile.cpp,\
+               fddlgcmn.cpp,\
                file.cpp,\
                fileconf.cpp,\
                filename.cpp,\
@@ -272,6 +286,7 @@ SOURCES = \
                process.cpp,\
                protocol.cpp,\
                quantize.cpp,\
+               radiocmn.cpp,\
                rendcmn.cpp,\
                rgncmn.cpp,\
                sckaddr.cpp,\
@@ -345,6 +360,11 @@ all : $(SOURCES)
        library [--.lib]libwx_gtk.olb $(OBJECTS1)
        library [--.lib]libwx_gtk.olb $(OBJECTS2)
 .else
+.ifdef __WXGTK2__
+       library [--.lib]libwx_gtk2.olb $(OBJECTS)
+       library [--.lib]libwx_gtk2.olb $(OBJECTS1)
+       library [--.lib]libwx_gtk2.olb $(OBJECTS2)
+.else
 .ifdef __WXX11__
        $(MMS)$(MMSQUALIFIERS) $(OBJECTS_X11)
        library [--.lib]libwx_x11_univ.olb $(OBJECTS)
@@ -354,6 +374,7 @@ all : $(SOURCES)
 .endif
 .endif
 .endif
+.endif
 
 appbase.obj : appbase.cpp
 appcmn.obj : appcmn.cpp
@@ -388,8 +409,10 @@ dynarray.obj : dynarray.cpp
 dynlib.obj : dynlib.cpp
 encconv.obj : encconv.cpp
 event.obj : event.cpp
+evtloopcmn.obj : evtloopcmn.cpp
 extended.obj : extended.c
 ffile.obj : ffile.cpp
+fddlgcmn.obj : fddlgcmn.cpp
 file.obj : file.cpp
 fileconf.obj : fileconf.cpp
 filefn.obj : filefn.cpp
@@ -445,6 +468,7 @@ prntbase.obj : prntbase.cpp
 process.obj : process.cpp
 protocol.obj : protocol.cpp
 quantize.obj : quantize.cpp
+radiocmn.obj : radiocmn.cpp
 rendcmn.obj : rendcmn.cpp
 rgncmn.obj : rgncmn.cpp
 sckaddr.obj : sckaddr.cpp
@@ -501,3 +525,4 @@ xti.obj : xti.cpp
 xtistrm.obj : xtistrm.cpp
 xtixml.obj : xtixml.cpp
 uri.obj : uri.cpp
+dpycmn.obj : dpycmn.cpp