Add a hack to allow an external jpeg library to still be used on

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

diff --git a/src/common/descrip.mms b/src/common/descrip.mms
index 6926bd47a9d3c53c145f3d92de34e427b3685a11..7f77b71fd7e64cc0996ac21c93b7e8b5c6205024 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 : 1 November 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
 
@@ -44,6 +50,8 @@ LEX=flex
        cc $(CFLAGS)$(CC_DEFINE) $(MMS$TARGET_NAME).c
 
 OBJECTS = \
+               anidecod.obj,\
+               animatecmn.obj,\
                appbase.obj,\
                appcmn.obj,\
                artprov.obj,\
@@ -58,6 +66,8 @@ OBJECTS = \
                cmndata.obj,\
                config.obj,\
                containr.obj,\
+               convauto.obj,\
+               colourcmn.obj,\
                cshelp.obj,\
                ctrlcmn.obj,\
                ctrlsub.obj,\
@@ -68,11 +78,13 @@ OBJECTS = \
                dbgrid.obj,\
                dbtable.obj,\
                dcbase.obj,\
+               dcbufcmn.obj,\
                dircmn.obj,\
                dlgcmn.obj,\
                dobjcmn.obj,\
                docmdi.obj,\
                docview.obj,\
+               dpycmn.obj,\
                dynarray.obj,\
                dynlib.obj,\
                encconv.obj,\
@@ -82,6 +94,7 @@ OBJECTS = \
                fddlgcmn.obj,\
                ffile.obj,\
                file.obj,\
+               fileback.obj,\
                fileconf.obj,\
                filename.obj,\
                filefn.obj,\
@@ -89,12 +102,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,\
+               gbsizer.obj,\
                gdicmn.obj,\
                gifdecod.obj,\
                hash.obj,\
@@ -113,6 +128,7 @@ OBJECTS1=fs_inet.obj,\
                imagpcx.obj,\
                imagpng.obj,\
                imagpnm.obj,\
+               imagtga.obj,\
                imagtiff.obj,\
                imagxpm.obj,\
                intl.obj,\
@@ -131,6 +147,7 @@ OBJECTS1=fs_inet.obj,\
                nbkbase.obj,\
                object.obj,\
                paper.obj,\
+               platinfo.obj,\
                popupcmn.obj,\
                prntbase.obj,\
                process.obj,\
@@ -152,8 +169,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 +180,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,\
@@ -176,16 +193,24 @@ OBJECTS2=utilscmn.obj,\
                wincmn.obj,\
                xpmdecod.obj,\
                zipstrm.obj,\
-               zstream.obj
+               zstream.obj,\
+               clrpickercmn.obj,\
+               filepickercmn.obj,\
+               fontpickercmn.obj,\
+               pickerbase.obj,\
+               listctrlcmn.obj
 
-OBJECTS_MOTIF=gaugecmn.obj,radiocmn.obj
+OBJECTS_MOTIF=radiocmn.obj,combocmn.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 = \
+               anidecod.cpp,\
+               animatecmn.cpp,\
                appbase.cpp,\
                appcmn.cpp,\
                artprov.cpp,\
@@ -200,6 +225,8 @@ SOURCES = \
                cmndata.cpp,\
                config.cpp,\
                containr.cpp,\
+               convauto.cpp,\
+               colourcmn.cpp,\
                cshelp.cpp,\
                ctrlcmn.cpp,\
                ctrlsub.cpp,\
@@ -210,11 +237,13 @@ SOURCES = \
                dbgrid.cpp,\
                dbtable.cpp,\
                dcbase.cpp,\
+               dcbufcmn.cpp,\
                dircmn.cpp,\
                dlgcmn.cpp,\
                dobjcmn.cpp,\
                docmdi.cpp,\
                docview.cpp,\
+               dpycmn.cpp,\
                dynarray.cpp,\
                dynlib.cpp,\
                encconv.cpp,\
@@ -224,6 +253,7 @@ SOURCES = \
                ffile.cpp,\
                fddlgcmn.cpp,\
                file.cpp,\
+               fileback.cpp,\
                fileconf.cpp,\
                filename.cpp,\
                filefn.cpp,\
@@ -231,12 +261,13 @@ 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,\
@@ -255,6 +286,7 @@ SOURCES = \
                imagpcx.cpp,\
                imagpng.cpp,\
                imagpnm.cpp,\
+               imagtga.cpp,\
                imagtiff.cpp,\
                imagxpm.cpp,\
                intl.cpp,\
@@ -262,6 +294,7 @@ SOURCES = \
                layout.cpp,\
                lboxcmn.cpp,\
                list.cpp,\
+               listctrlcmn.cpp,\
                log.cpp,\
                longlong.cpp,\
                memory.cpp,\
@@ -273,6 +306,7 @@ SOURCES = \
                nbkbase.cpp,\
                object.cpp,\
                paper.cpp,\
+               platinfo.cpp,\
                popupcmn.cpp,\
                prntbase.cpp,\
                process.cpp,\
@@ -317,6 +351,10 @@ SOURCES = \
                xpmdecod.cpp,\
                zipstrm.cpp,\
                zstream.cpp,\
+               clrpickercmn.cpp,\
+               filepickercmn.cpp,\
+               fontpickercmn.cpp,\
+               pickerbase.cpp,\
                accesscmn.cpp,\
                dndcmn.cpp,\
                dpycmn.cpp,\
@@ -348,9 +386,16 @@ all : $(SOURCES)
        library [--.lib]libwx_motif.olb $(OBJECTS_MOTIF)
 .else
 .ifdef __WXGTK__
+       $(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)
@@ -361,7 +406,10 @@ all : $(SOURCES)
 .endif
 .endif
 .endif
+.endif
 
+anidecod.obj : anidecod.cpp
+animatecmn.obj : animatecmn.cpp
 appbase.obj : appbase.cpp
 appcmn.obj : appcmn.cpp
 artprov.obj : artprov.cpp
@@ -376,6 +424,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,6 +436,7 @@ db.obj : db.cpp
 dbgrid.obj : dbgrid.cpp
 dbtable.obj : dbtable.cpp
 dcbase.obj : dcbase.cpp
+dcbufcmn.obj : dcbufcmn.cpp
 dircmn.obj : dircmn.cpp
 dlgcmn.obj : dlgcmn.cpp
 dobjcmn.obj : dobjcmn.cpp
@@ -400,6 +451,7 @@ extended.obj : extended.c
 ffile.obj : ffile.cpp
 fddlgcmn.obj : fddlgcmn.cpp
 file.obj : file.cpp
+fileback.obj : fileback.cpp
 fileconf.obj : fileconf.cpp
 filefn.obj : filefn.cpp
 filename.obj : filename.cpp
@@ -407,12 +459,13 @@ 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
@@ -431,6 +484,7 @@ imagjpeg.obj : imagjpeg.cpp
 imagpcx.obj : imagpcx.cpp
 imagpng.obj : imagpng.cpp
 imagpnm.obj : imagpnm.cpp
+imagtga.obj : imagtga.cpp
 imagtiff.obj : imagtiff.cpp
 imagxpm.obj : imagxpm.cpp
 intl.obj : intl.cpp
@@ -449,6 +503,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 +566,10 @@ 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