Minor cleanup.

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

diff --git a/src/common/descrip.mms b/src/common/descrip.mms
index 6926bd47a9d3c53c145f3d92de34e427b3685a11..5e88373abaeb89809de00769d11b1c9260e7ed68 100644 (file)
--- a/src/common/descrip.mms
+++ b/src/common/descrip.mms
@@ -2,7 +2,7 @@
 #                                                                            *
 # Make file for VMS                                                          *
 # Author : J.Jansen (joukj@hrem.nano.tudelft.nl)                             *
-# Date : 19 January 2006                                                     *
+# 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
 
@@ -58,6 +64,8 @@ OBJECTS = \
                cmndata.obj,\
                config.obj,\
                containr.obj,\
+               convauto.obj,\
+               colourcmn.obj,\
                cshelp.obj,\
                ctrlcmn.obj,\
                ctrlsub.obj,\
@@ -73,6 +81,7 @@ OBJECTS = \
                dobjcmn.obj,\
                docmdi.obj,\
                docview.obj,\
+               dpycmn.obj,\
                dynarray.obj,\
                dynlib.obj,\
                encconv.obj,\
@@ -89,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,\
@@ -131,6 +142,7 @@ OBJECTS1=fs_inet.obj,\
                nbkbase.obj,\
                object.obj,\
                paper.obj,\
+               platinfo.obj,\
                popupcmn.obj,\
                prntbase.obj,\
                process.obj,\
@@ -152,8 +164,9 @@ OBJECTS1=fs_inet.obj,\
                strconv.obj,\
                stream.obj,\
                string.obj,\
-               sysopt.obj,\
-               tbarbase.obj,\
+               sysopt.obj
+
+OBJECTS2=tbarbase.obj,\
                textbuf.obj,\
                textcmn.obj,\
                textfile.obj,\
@@ -162,9 +175,8 @@ OBJECTS1=fs_inet.obj,\
                toplvcmn.obj,\
                treebase.obj,\
                txtstrm.obj,\
-               url.obj
-
-OBJECTS2=utilscmn.obj,\
+               url.obj,\
+               utilscmn.obj,\
                rgncmn.obj,\
                uri.obj,\
                valgen.obj,\
@@ -178,12 +190,13 @@ OBJECTS2=utilscmn.obj,\
                zipstrm.obj,\
                zstream.obj
 
-OBJECTS_MOTIF=gaugecmn.obj,radiocmn.obj
+OBJECTS_MOTIF=radiocmn.obj
 
 OBJECTS_X11=accesscmn.obj,dndcmn.obj,dpycmn.obj,dseldlg.obj,\
-       dynload.obj,effects.obj,fddlgcmn.obj,fs_mem.obj,gaugecmn.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,\
@@ -200,6 +213,8 @@ SOURCES = \
                cmndata.cpp,\
                config.cpp,\
                containr.cpp,\
+               convauto.cpp,\
+               colourcmn.cpp,\
                cshelp.cpp,\
                ctrlcmn.cpp,\
                ctrlsub.cpp,\
@@ -215,6 +230,7 @@ SOURCES = \
                dobjcmn.cpp,\
                docmdi.cpp,\
                docview.cpp,\
+               dpycmn.cpp,\
                dynarray.cpp,\
                dynlib.cpp,\
                encconv.cpp,\
@@ -231,6 +247,7 @@ SOURCES = \
                fldlgcmn.cpp,\
                fmapbase.cpp,\
                fontcmn.cpp,\
+               fontenumcmn.cpp,\
                fontmap.cpp,\
                framecmn.cpp,\
                fs_inet.cpp,\
@@ -273,6 +290,7 @@ SOURCES = \
                nbkbase.cpp,\
                object.cpp,\
                paper.cpp,\
+               platinfo.cpp,\
                popupcmn.cpp,\
                prntbase.cpp,\
                process.cpp,\
@@ -352,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)
@@ -361,6 +384,7 @@ all : $(SOURCES)
 .endif
 .endif
 .endif
+.endif
 
 appbase.obj : appbase.cpp
 appcmn.obj : appcmn.cpp
@@ -376,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
@@ -407,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
@@ -449,6 +476,7 @@ 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
@@ -511,3 +539,5 @@ xti.obj : xti.cpp
 xtistrm.obj : xtistrm.cpp
 xtixml.obj : xtixml.cpp
 uri.obj : uri.cpp
+dpycmn.obj : dpycmn.cpp
+combocmn.obj : combocmn.cpp