Minor cleanup.

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

diff --git a/src/common/descrip.mms b/src/common/descrip.mms
index b76258d929b4a03103275577969763695292fd56..5e88373abaeb89809de00769d11b1c9260e7ed68 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 : 18 August 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,\
@@ -57,6 +64,8 @@ OBJECTS = \
                cmndata.obj,\
                config.obj,\
                containr.obj,\
+               convauto.obj,\
+               colourcmn.obj,\
                cshelp.obj,\
                ctrlcmn.obj,\
                ctrlsub.obj,\
@@ -72,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,\
@@ -86,12 +98,14 @@ OBJECTS = \
                fldlgcmn.obj,\
                fmapbase.obj,\
                fontcmn.obj,\
+               fontenumcmn.obj,\
                fontmap.obj,\
                framecmn.obj
 
 OBJECTS1=fs_inet.obj,\
                fs_zip.obj,\
                ftp.obj,\
+               gaugecmn.obj,\
                gdicmn.obj,\
                gifdecod.obj,\
                hash.obj,\
@@ -128,11 +142,13 @@ 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,\
@@ -142,13 +158,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,\
@@ -157,11 +175,10 @@ 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,\
@@ -173,12 +190,13 @@ OBJECTS2=utilscmn.obj,\
                zipstrm.obj,\
                zstream.obj
 
-OBJECTS_MOTIF=bmpbase.obj,gaugecmn.obj
+OBJECTS_MOTIF=radiocmn.obj
 
-OBJECTS_X11=accesscmn.obj,bmpbase.obj,dndcmn.obj,dpycmn.obj,dseldlg.obj,\
-       dynload.obj,effects.obj,fddlgcmn.obj,fs_mem.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
+       regex.obj,taskbarcmn.obj,xti.obj,xtistrm.obj,xtixml.obj,\
+       combocmn.obj
 
 SOURCES = \
                appbase.cpp,\
@@ -195,6 +213,8 @@ SOURCES = \
                cmndata.cpp,\
                config.cpp,\
                containr.cpp,\
+               convauto.cpp,\
+               colourcmn.cpp,\
                cshelp.cpp,\
                ctrlcmn.cpp,\
                ctrlsub.cpp,\
@@ -210,12 +230,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,\
@@ -224,6 +247,7 @@ SOURCES = \
                fldlgcmn.cpp,\
                fmapbase.cpp,\
                fontcmn.cpp,\
+               fontenumcmn.cpp,\
                fontmap.cpp,\
                framecmn.cpp,\
                fs_inet.cpp,\
@@ -266,11 +290,13 @@ 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,\
@@ -281,6 +307,7 @@ SOURCES = \
                socket.cpp,\
                settcmn.cpp,\
                statbar.cpp,\
+               stdpbase.cpp,\
                stockitem.cpp,\
                stopwatch.cpp,\
                strconv.cpp,\
@@ -296,7 +323,6 @@ SOURCES = \
                toplvcmn.cpp,\
                treebase.cpp,\
                txtstrm.cpp,\
-               unzip.c,\
                url.cpp,\
                utilscmn.cpp,\
                valgen.cpp,\
@@ -323,6 +349,7 @@ SOURCES = \
                radiocmn.cpp,\
                regex.cpp,\
                taskbarcmn.cpp,\
+               uri.cpp,\
                xti.cpp,\
                xtistrm.cpp,\
                xtixml.cpp
@@ -343,6 +370,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)
@@ -352,6 +384,7 @@ all : $(SOURCES)
 .endif
 .endif
 .endif
+.endif
 
 appbase.obj : appbase.cpp
 appcmn.obj : appcmn.cpp
@@ -367,6 +400,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
@@ -386,8 +421,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
@@ -396,6 +433,7 @@ 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
@@ -438,11 +476,13 @@ 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
@@ -453,6 +493,7 @@ 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
@@ -468,7 +509,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
@@ -498,3 +538,6 @@ 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