Added part of patch

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

diff --git a/src/common/descrip.mms b/src/common/descrip.mms
index 12a7b076300ee443781b6825ba87179366b86eda..4f6b5af6af44d30b760e04067066627aefb48c31 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 : 20 September 2006                                                   *
 #                                                                            *
 #*****************************************************************************
 .first
@@ -14,21 +14,27 @@ CXX_DEFINE = /define=(__WXMOTIF__=1)/name=(as_is,short)\
 CC_DEFINE = /define=(__WXMOTIF__=1)/name=(as_is,short)
 .else
 .ifdef __WXGTK__
-.ifdef __WXUNIVERSAL__
-CXX_DEFINE = /define=(__WXGTK__=1,__WXUNIVERSAL__==1)/float=ieee\
-       /name=(as_is,short)/ieee=denorm/assume=(nostdnew,noglobal_array_new)
-CC_DEFINE = /define=(__WXGTK__=1,__WXUNIVERSAL__==1)/float=ieee\
-       /name=(as_is,short)/ieee=denorm
-.else
 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
-.endif
+.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)
+CC_DEFINE = /define=(__WXX11__=1,__WXUNIVERSAL__==1)/float=ieee\
+       /name=(as_is,short)
 .else
 CXX_DEFINE =
 CC_DEFINE =
 .endif
 .endif
+.endif
+.endif
 
 YACC=bison/yacc
 
@@ -48,6 +54,8 @@ OBJECTS = \
                appcmn.obj,\
                artprov.obj,\
                artstd.obj,\
+               bmpbase.obj,\
+               bookctrl.obj,\
                choiccmn.obj,\
                clipcmn.obj,\
                clntdata.obj,\
@@ -56,6 +64,8 @@ OBJECTS = \
                cmndata.obj,\
                config.obj,\
                containr.obj,\
+               convauto.obj,\
+               colourcmn.obj,\
                cshelp.obj,\
                ctrlcmn.obj,\
                ctrlsub.obj,\
@@ -71,11 +81,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,\
@@ -85,12 +98,15 @@ OBJECTS = \
                fldlgcmn.obj,\
                fmapbase.obj,\
                fontcmn.obj,\
+               fontenumcmn.obj,\
                fontmap.obj,\
                framecmn.obj
 
 OBJECTS1=fs_inet.obj,\
                fs_zip.obj,\
                ftp.obj,\
+               gaugecmn.obj,\
+               gbsizer.obj,\
                gdicmn.obj,\
                gifdecod.obj,\
                hash.obj,\
@@ -98,6 +114,7 @@ OBJECTS1=fs_inet.obj,\
                helpbase.obj,\
                http.obj,\
                iconbndl.obj,\
+               init.obj,\
                imagall.obj,\
                imagbmp.obj,\
                image.obj,\
@@ -126,11 +143,14 @@ OBJECTS1=fs_inet.obj,\
                nbkbase.obj,\
                object.obj,\
                paper.obj,\
+               platinfo.obj,\
                popupcmn.obj,\
                prntbase.obj,\
                process.obj,\
                protocol.obj,\
                quantize.obj,\
+               radiocmn.obj,\
+               rendcmn.obj,\
                sckaddr.obj,\
                sckfile.obj,\
                sckipc.obj,\
@@ -139,12 +159,15 @@ OBJECTS1=fs_inet.obj,\
                socket.obj,\
                settcmn.obj,\
                statbar.obj,\
+               stdpbase.obj,\
+               stockitem.obj,\
                stopwatch.obj,\
                strconv.obj,\
                stream.obj,\
                string.obj,\
-               sysopt.obj,\
-               tbarbase.obj,\
+               sysopt.obj
+
+OBJECTS2=tbarbase.obj,\
                textbuf.obj,\
                textcmn.obj,\
                textfile.obj,\
@@ -153,23 +176,33 @@ OBJECTS1=fs_inet.obj,\
                toplvcmn.obj,\
                treebase.obj,\
                txtstrm.obj,\
-               unzip.obj,\
-               url.obj
-
-OBJECTS2=utilscmn.obj,\
+               url.obj,\
+               utilscmn.obj,\
                rgncmn.obj,\
+               uri.obj,\
                valgen.obj,\
                validate.obj,\
                valtext.obj,\
                variant.obj,\
                wfstream.obj,\
-               wincmn.obj,\
                wxchar.obj,\
+               wincmn.obj,\
                xpmdecod.obj,\
                zipstrm.obj,\
-               zstream.obj
+               zstream.obj,\
+               clrpickercmn.obj,\
+               filepickercmn.obj,\
+               fontpickercmn.obj,\
+               pickerbase.obj,\
+               listctrlcmn.obj
+
+OBJECTS_MOTIF=radiocmn.obj
 
-OBJECTS_MOTIF=bmpbase.obj,gaugecmn.obj
+OBJECTS_X11=accesscmn.obj,dndcmn.obj,dpycmn.obj,dseldlg.obj,\
+       dynload.obj,effects.obj,fddlgcmn.obj,fs_mem.obj,\
+       gbsizer.obj,geometry.obj,matrix.obj,radiocmn.obj,\
+       regex.obj,taskbarcmn.obj,xti.obj,xtistrm.obj,xtixml.obj,\
+       combocmn.obj
 
 SOURCES = \
                appbase.cpp,\
@@ -177,6 +210,7 @@ SOURCES = \
                artprov.cpp,\
                artstd.cpp,\
                bmpbase.cpp,\
+               bookctrl.cpp,\
                choiccmn.cpp,\
                clipcmn.cpp,\
                clntdata.cpp,\
@@ -185,6 +219,8 @@ SOURCES = \
                cmndata.cpp,\
                config.cpp,\
                containr.cpp,\
+               convauto.cpp,\
+               colourcmn.cpp,\
                cshelp.cpp,\
                ctrlcmn.cpp,\
                ctrlsub.cpp,\
@@ -200,12 +236,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,\
@@ -214,12 +253,14 @@ SOURCES = \
                fldlgcmn.cpp,\
                fmapbase.cpp,\
                fontcmn.cpp,\
+               fontenumcmn.cpp,\
                fontmap.cpp,\
                framecmn.cpp,\
                fs_inet.cpp,\
                fs_zip.cpp,\
                ftp.cpp,\
                gaugecmn.cpp,\
+               gbsizer.cpp,\
                gdicmn.cpp,\
                gifdecod.cpp,\
                hash.cpp,\
@@ -227,6 +268,7 @@ SOURCES = \
                helpbase.cpp,\
                http.cpp,\
                iconbndl.cpp,\
+               init.cpp,\
                imagall.cpp,\
                imagbmp.cpp,\
                image.cpp,\
@@ -244,6 +286,7 @@ SOURCES = \
                layout.cpp,\
                lboxcmn.cpp,\
                list.cpp,\
+               listctrlcmn.cpp,\
                log.cpp,\
                longlong.cpp,\
                memory.cpp,\
@@ -255,11 +298,14 @@ SOURCES = \
                nbkbase.cpp,\
                object.cpp,\
                paper.cpp,\
+               platinfo.cpp,\
                popupcmn.cpp,\
                prntbase.cpp,\
                process.cpp,\
                protocol.cpp,\
                quantize.cpp,\
+               radiocmn.cpp,\
+               rendcmn.cpp,\
                rgncmn.cpp,\
                sckaddr.cpp,\
                sckfile.cpp,\
@@ -269,6 +315,8 @@ SOURCES = \
                socket.cpp,\
                settcmn.cpp,\
                statbar.cpp,\
+               stdpbase.cpp,\
+               stockitem.cpp,\
                stopwatch.cpp,\
                strconv.cpp,\
                stream.cpp,\
@@ -283,7 +331,6 @@ SOURCES = \
                toplvcmn.cpp,\
                treebase.cpp,\
                txtstrm.cpp,\
-               unzip.c,\
                url.cpp,\
                utilscmn.cpp,\
                valgen.cpp,\
@@ -295,7 +342,29 @@ SOURCES = \
                wxchar.cpp,\
                xpmdecod.cpp,\
                zipstrm.cpp,\
-               zstream.cpp
+               zstream.cpp,\
+               clrpickercmn.cpp,\
+               filepickercmn.cpp,\
+               fontpickercmn.cpp,\
+               pickerbase.cpp,\
+               accesscmn.cpp,\
+               dndcmn.cpp,\
+               dpycmn.cpp,\
+               dseldlg.cpp,\
+               dynload.cpp,\
+               effects.cpp,\
+               fddlgcmn.cpp,\
+               fs_mem.cpp,\
+               gbsizer.cpp,\
+               geometry.cpp,\
+               matrix.cpp,\
+               radiocmn.cpp,\
+               regex.cpp,\
+               taskbarcmn.cpp,\
+               uri.cpp,\
+               xti.cpp,\
+               xtistrm.cpp,\
+               xtixml.cpp
 
 all : $(SOURCES)
        $(MMS)$(MMSQUALIFIERS) $(OBJECTS)
@@ -309,14 +378,24 @@ all : $(SOURCES)
        library [--.lib]libwx_motif.olb $(OBJECTS_MOTIF)
 .else
 .ifdef __WXGTK__
-.ifdef __WXUNIVERSAL__
-       library [--.lib]libwx_gtk_univ.olb $(OBJECTS)
-       library [--.lib]libwx_gtk_univ.olb $(OBJECTS1)
-       library [--.lib]libwx_gtk_univ.olb $(OBJECTS2)
-.else
+       $(MMS)$(MMSQUALIFIERS) $(OBJECTS_X11)
        library [--.lib]libwx_gtk.olb $(OBJECTS)
        library [--.lib]libwx_gtk.olb $(OBJECTS1)
        library [--.lib]libwx_gtk.olb $(OBJECTS2)
+       library [--.lib]libwx_gtk.olb $(OBJECTS_X11)
+.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)
+       library [--.lib]libwx_x11_univ.olb $(OBJECTS1)
+       library [--.lib]libwx_x11_univ.olb $(OBJECTS2)
+       library [--.lib]libwx_x11_univ.olb $(OBJECTS_X11)
+.endif
 .endif
 .endif
 .endif
@@ -326,6 +405,7 @@ appcmn.obj : appcmn.cpp
 artprov.obj : artprov.cpp
 artstd.obj : artstd.cpp
 bmpbase.obj : bmpbase.cpp
+bookctrl.obj : bookctrl.cpp
 choiccmn.obj : choiccmn.cpp
 clipcmn.obj : clipcmn.cpp
 clntdata.obj : clntdata.cpp
@@ -334,6 +414,8 @@ cmdproc.obj : cmdproc.cpp
 cmndata.obj : cmndata.cpp
 config.obj : config.cpp
 containr.obj : containr.cpp
+convauto.obj : convauto.cpp
+colourcmn.obj : colourcmn.cpp
 cshelp.obj : cshelp.cpp
 ctrlcmn.obj : ctrlcmn.cpp
 ctrlsub.obj : ctrlsub.cpp
@@ -353,8 +435,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
@@ -363,12 +447,14 @@ filesys.obj : filesys.cpp
 fldlgcmn.obj : fldlgcmn.cpp
 fmapbase.obj : fmapbase.cpp
 fontcmn.obj : fontcmn.cpp
+fontenumcmn.obj : fontenumcmn.cpp
 fontmap.obj : fontmap.cpp
 framecmn.obj : framecmn.cpp
 fs_inet.obj : fs_inet.cpp
 fs_zip.obj : fs_zip.cpp
 ftp.obj : ftp.cpp
 gaugecmn.obj : gaugecmn.cpp
+gbsizer.obj : gbsizer.cpp
 gdicmn.obj : gdicmn.cpp
 gifdecod.obj : gifdecod.cpp
 hash.obj : hash.cpp
@@ -376,6 +462,7 @@ hashmap.obj : hashmap.cpp
 helpbase.obj : helpbase.cpp
 http.obj : http.cpp
 iconbndl.obj : iconbndl.cpp
+init.obj : init.cpp
 imagall.obj : imagall.cpp
 imagbmp.obj : imagbmp.cpp
 image.obj : image.cpp
@@ -404,11 +491,14 @@ mstream.obj : mstream.cpp
 nbkbase.obj : nbkbase.cpp
 object.obj : object.cpp
 paper.obj : paper.cpp
+platinfo.obj : platinfo.cpp
 popupcmn.obj : popupcmn.cpp
 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
 sckfile.obj : sckfile.cpp
@@ -418,6 +508,8 @@ sizer.obj : sizer.cpp
 socket.obj : socket.cpp
 settcmn.obj : settcmn.cpp
 statbar.obj : statbar.cpp
+stdpbase.obj : stdpbase.cpp
+stockitem.obj : stockitem.cpp
 stopwatch.obj : stopwatch.cpp
 strconv.obj : strconv.cpp
 stream.obj : stream.cpp
@@ -432,7 +524,6 @@ tokenzr.obj : tokenzr.cpp
 toplvcmn.obj : toplvcmn.cpp
 treebase.obj : treebase.cpp
 txtstrm.obj : txtstrm.cpp
-unzip.obj : unzip.c
 url.obj : url.cpp
 utilscmn.obj : utilscmn.cpp
 valgen.obj : valgen.cpp
@@ -445,3 +536,28 @@ wxchar.obj : wxchar.cpp
 xpmdecod.obj : xpmdecod.cpp
 zipstrm.obj : zipstrm.cpp
 zstream.obj : zstream.cpp
+accesscmn.obj : accesscmn.cpp
+dndcmn.obj : dndcmn.cpp
+dpycmn.obj : dpycmn.cpp
+dseldlg.obj : dseldlg.cpp
+dynload.obj : dynload.cpp
+effects.obj : effects.cpp
+fddlgcmn.obj : fddlgcmn.cpp
+fs_mem.obj : fs_mem.cpp
+gbsizer.obj : gbsizer.cpp
+geometry.obj : geometry.cpp
+matrix.obj : matrix.cpp
+radiocmn.obj : radiocmn.cpp
+regex.obj : regex.cpp
+taskbarcmn.obj : taskbarcmn.cpp
+xti.obj : xti.cpp
+xtistrm.obj : xtistrm.cpp
+xtixml.obj : xtixml.cpp
+uri.obj : uri.cpp
+dpycmn.obj : dpycmn.cpp
+combocmn.obj : combocmn.cpp
+clrpickercmn.obj : clrpickercmn.cpp
+filepickercmn.obj : filepickercmn.cpp
+fontpickercmn.obj : fontpickercmn.cpp
+pickerbase.obj : pickerbase.cpp
+listctrlcmn.obj : listctrlcmn.cpp