Build fix after wxColourBase introduction.

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

diff --git a/src/generic/descrip.mms b/src/generic/descrip.mms
index 40aa2e1cd676ba2c555b81b3e0125402a4eb4b64..1008b0c3b4a7a95b99a92f26b3957512c58324ee 100644 (file)
--- a/src/generic/descrip.mms
+++ b/src/generic/descrip.mms
@@ -1,8 +1,8 @@
 #*****************************************************************************
 #                                                                            *
 # Make file for VMS                                                          *
 #*****************************************************************************
 #                                                                            *
 # 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
 #                                                                            *
 #*****************************************************************************
 .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
 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
 CXX_DEFINE =
 CC_DEFINE =
 .endif
 .endif
 .endif

+.endif

 
 .suffixes : .cpp
 
 
 .suffixes : .cpp
 


@@ -41,6 +48,7 @@ OBJECTS = \
                busyinfo.obj,\
                calctrl.obj,\
                caret.obj,\
                busyinfo.obj,\
                calctrl.obj,\
                caret.obj,\

+               choicbkg.obj,\

                choicdgg.obj,\
                colrdlgg.obj,\
                datectlg.obj,\
                choicdgg.obj,\
                colrdlgg.obj,\
                datectlg.obj,\


@@ -55,6 +63,7 @@ OBJECTS = \
                helpext.obj,\
                imaglist.obj,\
                laywin.obj,\
                helpext.obj,\
                imaglist.obj,\
                laywin.obj,\

+               listbkg.obj,\

                listctrl.obj,\
                logg.obj,\
                msgdlgg.obj,\
                listctrl.obj,\
                logg.obj,\
                msgdlgg.obj,\


@@ -66,12 +75,15 @@ OBJECTS = \
                progdlgg.obj,\
                renderg.obj,\
                sashwin.obj,\
                progdlgg.obj,\
                renderg.obj,\
                sashwin.obj,\

+               scrlwing.obj,\

                selstore.obj,\
                splitter.obj,\
                tabg.obj,\
                textdlgg.obj,\
                tipdlg.obj,\
                tipwin.obj,\
                selstore.obj,\
                splitter.obj,\
                tabg.obj,\
                textdlgg.obj,\
                tipdlg.obj,\
                tipwin.obj,\

+               toolbkg.obj,\
+               treebkg.obj,\

                treectlg.obj,\
                wizard.obj
 
                treectlg.obj,\
                wizard.obj
 


@@ -80,6 +92,7 @@ SOURCES = \
                busyinfo.cpp,\
                calctrl.cpp,\
                caret.cpp,\
                busyinfo.cpp,\
                calctrl.cpp,\
                caret.cpp,\

+               choicbkg.cpp,\

                choicdgg.cpp,\
                colrdlgg.cpp,\
                datectlg.cpp,\
                choicdgg.cpp,\
                colrdlgg.cpp,\
                datectlg.cpp,\


@@ -95,6 +108,7 @@ SOURCES = \
                helpext.cpp,\
                imaglist.cpp,\
                laywin.cpp,\
                helpext.cpp,\
                imaglist.cpp,\
                laywin.cpp,\

+               listbkg.cpp,\

                listctrl.cpp,\
                logg.cpp,\
                msgdlgg.cpp,\
                listctrl.cpp,\
                logg.cpp,\
                msgdlgg.cpp,\


@@ -116,6 +130,8 @@ SOURCES = \
                textdlgg.cpp,\
                tipdlg.cpp,\
                tipwin.cpp,\
                textdlgg.cpp,\
                tipdlg.cpp,\
                tipwin.cpp,\

+               toolbkg.cpp,\
+               treebkg.cpp,\

                treectlg.cpp,\
                wizard.cpp,\
                dragimgg.cpp,\
                treectlg.cpp,\
                wizard.cpp,\
                dragimgg.cpp,\


@@ -131,11 +147,11 @@ SOURCES = \
                vscroll.cpp
 
 .ifdef __WXMOTIF__
                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,\
 .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,\
+       listbkg.obj,mdig.obj,spinctlg.obj,splash.obj,timer.obj,\

        vlbox.obj,vscroll.obj
 .else
 OBJECTS0=,accel.obj,statusbr.obj,filedlgg.obj,paletteg.obj
        vlbox.obj,vscroll.obj
 .else
 OBJECTS0=,accel.obj,statusbr.obj,filedlgg.obj,paletteg.obj


@@ -150,11 +166,15 @@ all : $(SOURCES)
 .ifdef __WXGTK__
        library/crea [--.lib]libwx_gtk.olb $(OBJECTS)$(OBJECTS0)
 .else
 .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
 .ifdef __WXX11__
        library/crea [--.lib]libwx_x11_univ.olb $(OBJECTS)$(OBJECTS0)
 .endif
 .endif
 .endif

+.endif

 
 accel.obj : accel.cpp
 busyinfo.obj : busyinfo.cpp
 
 accel.obj : accel.cpp
 busyinfo.obj : busyinfo.cpp


@@ -211,3 +231,8 @@ splash.obj : splash.cpp
 timer.obj : timer.cpp
 vlbox.obj : vlbox.cpp
 vscroll.obj : vscroll.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