fix the tests to pass with both gcc and msvc (2nd part of patch 1462778)

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

diff --git a/src/generic/descrip.mms b/src/generic/descrip.mms
index 3ae317bf36bead640741079eeb204d2fae660f93..2fd3baf4083c64ffb6570b41e9e54ea8654563fb 100644 (file)
--- a/src/generic/descrip.mms
+++ b/src/generic/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 : 10 February 2006                                                    *
 #                                                                            *
 #*****************************************************************************
 .first
@@ -24,11 +24,18 @@ CXX_DEFINE = /define=(__WXX11__=1,__WXUNIVERSAL__==1)/float=ieee\
 CC_DEFINE = /define=(__WXX11__=1,__WXUNIVERSAL__==1)/float=ieee\
        /name=(as_is,short)
 .else
+.ifdef __WXGTK2__
+CXX_DEFINE = /define=(__WXGTK__=1,VMS_GTK2==1)/float=ieee\
+       /name=(as_is,short)/assume=(nostdnew,noglobal_array_new)
+CC_DEFINE = /define=(__WX_GTK__=1,VMS_GTK2==1)/float=ieee\
+       /name=(as_is,short)
+.else
 CXX_DEFINE =
 CC_DEFINE =
 .endif
 .endif
 .endif
+.endif
 
 .suffixes : .cpp
 
@@ -41,11 +48,14 @@ OBJECTS = \
                busyinfo.obj,\
                calctrl.obj,\
                caret.obj,\
+               choicbkg.obj,\
                choicdgg.obj,\
                colrdlgg.obj,\
+               datectlg.obj,\
                dcpsg.obj,\
                dirctrlg.obj,\
                dirdlgg.obj,\
+               fdrepdlg.obj,\
                fontdlgg.obj,\
                grid.obj,\
                gridctrl.obj,\
@@ -53,6 +63,7 @@ OBJECTS = \
                helpext.obj,\
                imaglist.obj,\
                laywin.obj,\
+               listbkg.obj,\
                listctrl.obj,\
                logg.obj,\
                msgdlgg.obj,\
@@ -60,15 +71,19 @@ OBJECTS = \
                panelg.obj,\
                printps.obj,\
                prntdlgg.obj,\
+               propdlg.obj,\
                progdlgg.obj,\
                renderg.obj,\
                sashwin.obj,\
+               scrlwing.obj,\
                selstore.obj,\
                splitter.obj,\
                tabg.obj,\
                textdlgg.obj,\
                tipdlg.obj,\
                tipwin.obj,\
+               toolbkg.obj,\
+               treebkg.obj,\
                treectlg.obj,\
                wizard.obj
 
@@ -77,12 +92,15 @@ SOURCES = \
                busyinfo.cpp,\
                calctrl.cpp,\
                caret.cpp,\
+               choicbkg.cpp,\
                choicdgg.cpp,\
                colrdlgg.cpp,\
+               datectlg.cpp,\
                dcpsg.cpp,\
                dirctrlg.cpp,\
                dirdlgg.cpp,\
                filedlgg.cpp,\
+               fdrepdlg.cpp,\
                fontdlgg.cpp,\
                grid.cpp,\
                gridctrl.cpp,\
@@ -90,6 +108,7 @@ SOURCES = \
                helpext.cpp,\
                imaglist.cpp,\
                laywin.cpp,\
+               listbkg.cpp,\
                listctrl.cpp,\
                logg.cpp,\
                msgdlgg.cpp,\
@@ -99,6 +118,7 @@ SOURCES = \
                panelg.cpp,\
                printps.cpp,\
                prntdlgg.cpp,\
+               propdlg.cpp,\
                progdlgg.cpp,\
                renderg.cpp,\
                sashwin.cpp,\
@@ -110,6 +130,8 @@ SOURCES = \
                textdlgg.cpp,\
                tipdlg.cpp,\
                tipwin.cpp,\
+               toolbkg.cpp,\
+               treebkg.cpp,\
                treectlg.cpp,\
                wizard.cpp,\
                dragimgg.cpp,\
@@ -125,12 +147,12 @@ SOURCES = \
                vscroll.cpp
 
 .ifdef __WXMOTIF__
-OBJECTS0=,statusbr.obj,statline.obj,notebook.obj,scrlwing.obj,spinctlg.obj
+OBJECTS0=,statusbr.obj,statline.obj,notebook.obj,spinctlg.obj
 .else
 .ifdef __WXX11__
 OBJECTS0=,accel.obj,filedlgg.obj,dragimgg.obj,fdrepdlg.obj,htmllbox.obj,\
-       listbkg.obj,mdig.obj,scrlwing.obj,spinctlg.obj,splash.obj,timer.obj,\
-       vlbox.obj,vscroll.obj
+       listbkg.obj,mdig.obj,spinctlg.obj,splash.obj,timer.obj,\
+       vlbox.obj,vscroll.obj,combog.obj
 .else
 OBJECTS0=,accel.obj,statusbr.obj,filedlgg.obj,paletteg.obj
 .endif
@@ -144,11 +166,15 @@ all : $(SOURCES)
 .ifdef __WXGTK__
        library/crea [--.lib]libwx_gtk.olb $(OBJECTS)$(OBJECTS0)
 .else
+.ifdef __WXGTK2__
+       library/crea [--.lib]libwx_gtk2.olb $(OBJECTS)$(OBJECTS0)
+.else
 .ifdef __WXX11__
        library/crea [--.lib]libwx_x11_univ.olb $(OBJECTS)$(OBJECTS0)
 .endif
 .endif
 .endif
+.endif
 
 accel.obj : accel.cpp
 busyinfo.obj : busyinfo.cpp
@@ -156,11 +182,13 @@ calctrl.obj : calctrl.cpp
 caret.obj : caret.cpp
 choicdgg.obj : choicdgg.cpp
 colrdlgg.obj : colrdlgg.cpp
+datectlg.obj : datectlg.cpp
 dcpsg.obj : dcpsg.cpp
 dirctrlg.obj : dirctrlg.cpp
 dirdlgg.obj : dirdlgg.cpp
 filedlgg.obj : filedlgg.cpp
 fontdlgg.obj : fontdlgg.cpp
+fdrepdlg.obj : fdrepdlg.cpp
 grid.obj : grid.cpp
 gridctrl.obj : gridctrl.cpp
 gridsel.obj : gridsel.cpp
@@ -177,6 +205,7 @@ panelg.obj : panelg.cpp
 printps.obj : printps.cpp
 prntdlgg.obj : prntdlgg.cpp
 progdlgg.obj : progdlgg.cpp
+propdlg.obj : propdlg.cpp
 scrlwing.obj : scrlwing.cpp
 spinctlg.obj : spinctlg.cpp
 renderg.obj : renderg.cpp
@@ -202,3 +231,9 @@ splash.obj : splash.cpp
 timer.obj : timer.cpp
 vlbox.obj : vlbox.cpp
 vscroll.obj : vscroll.cpp
+       cxx $(CXXFLAGS)$(CXX_DEFINE)/nowarn vscroll.cpp
+listbkg.obj : listbkg.cpp
+choicbkg.obj : choicbkg.cpp
+toolbkg.obj : toolbkg.cpp
+treebkg.obj : treebkg.cpp
+combog.obj : combog.cpp