applied patch 1683441

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

diff --git a/src/common/descrip.mms b/src/common/descrip.mms
index 8a84783a084b8234c0073d2cc5bfb65039160d61..5014e4834aa26cc676d565fb80fc6344d78a2efa 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)                             *
 #                                                                            *
 # Make file for VMS                                                          *
 # Author : J.Jansen (joukj@hrem.nano.tudelft.nl)                             *

-# Date : 1 December 2006                                                     *
+# Date : 26 February 2007                                                    *

 #                                                                            *
 #*****************************************************************************
 .first
 #                                                                            *
 #*****************************************************************************
 .first


@@ -208,6 +208,10 @@ OBJECTS_X11=accesscmn.obj,dndcmn.obj,dpycmn.obj,dseldlg.obj,\
        regex.obj,taskbarcmn.obj,xti.obj,xtistrm.obj,xtixml.obj,\
        combocmn.obj
 
        regex.obj,taskbarcmn.obj,xti.obj,xtistrm.obj,xtixml.obj,\
        combocmn.obj
 

+OBJECTS_X11_2=socketevtdispatch.obj
+
+OBJECTS_GTK2=fontutilcmn.obj
+

 SOURCES = \
                anidecod.cpp,\
                animatecmn.cpp,\
 SOURCES = \
                anidecod.cpp,\
                animatecmn.cpp,\


@@ -263,6 +267,7 @@ SOURCES = \
                fontcmn.cpp,\
                fontenumcmn.cpp,\
                fontmap.cpp,\
                fontcmn.cpp,\
                fontenumcmn.cpp,\
                fontmap.cpp,\

+               fontutilcmn.cpp,\

                framecmn.cpp,\
                fs_inet.cpp,\
                ftp.cpp,\
                framecmn.cpp,\
                fs_inet.cpp,\
                ftp.cpp,\


@@ -321,6 +326,7 @@ SOURCES = \
                sckstrm.cpp,\
                sizer.cpp,\
                socket.cpp,\
                sckstrm.cpp,\
                sizer.cpp,\
                socket.cpp,\

+               socketevtdispatch.cpp,\

                settcmn.cpp,\
                statbar.cpp,\
                stdpbase.cpp,\
                settcmn.cpp,\
                statbar.cpp,\
                stdpbase.cpp,\


@@ -394,17 +400,21 @@ all : $(SOURCES)
 .else
 .ifdef __WXGTK2__
        $(MMS)$(MMSQUALIFIERS) $(OBJECTS_X11)
 .else
 .ifdef __WXGTK2__
        $(MMS)$(MMSQUALIFIERS) $(OBJECTS_X11)

+       $(MMS)$(MMSQUALIFIERS) $(OBJECTS_GTK2)

        library [--.lib]libwx_gtk2.olb $(OBJECTS)
        library [--.lib]libwx_gtk2.olb $(OBJECTS1)
        library [--.lib]libwx_gtk2.olb $(OBJECTS2)
        library [--.lib]libwx_gtk2.olb $(OBJECTS_X11)
        library [--.lib]libwx_gtk2.olb $(OBJECTS)
        library [--.lib]libwx_gtk2.olb $(OBJECTS1)
        library [--.lib]libwx_gtk2.olb $(OBJECTS2)
        library [--.lib]libwx_gtk2.olb $(OBJECTS_X11)

+       library [--.lib]libwx_gtk2.olb $(OBJECTS_GTK2)

 .else
 .ifdef __WXX11__
        $(MMS)$(MMSQUALIFIERS) $(OBJECTS_X11)
 .else
 .ifdef __WXX11__
        $(MMS)$(MMSQUALIFIERS) $(OBJECTS_X11)

+       $(MMS)$(MMSQUALIFIERS) $(OBJECTS_X11_2)

        library [--.lib]libwx_x11_univ.olb $(OBJECTS)
        library [--.lib]libwx_x11_univ.olb $(OBJECTS1)
        library [--.lib]libwx_x11_univ.olb $(OBJECTS2)
        library [--.lib]libwx_x11_univ.olb $(OBJECTS_X11)
        library [--.lib]libwx_x11_univ.olb $(OBJECTS)
        library [--.lib]libwx_x11_univ.olb $(OBJECTS1)
        library [--.lib]libwx_x11_univ.olb $(OBJECTS2)
        library [--.lib]libwx_x11_univ.olb $(OBJECTS_X11)

+       library [--.lib]libwx_x11_univ.olb $(OBJECTS_X11_2)

 .endif
 .endif
 .endif
 .endif
 .endif
 .endif


@@ -463,6 +473,7 @@ fmapbase.obj : fmapbase.cpp
 fontcmn.obj : fontcmn.cpp
 fontenumcmn.obj : fontenumcmn.cpp
 fontmap.obj : fontmap.cpp
 fontcmn.obj : fontcmn.cpp
 fontenumcmn.obj : fontenumcmn.cpp
 fontmap.obj : fontmap.cpp

+fontutilcmn.obj : fontutilcmn.cpp

 framecmn.obj : framecmn.cpp
 fs_inet.obj : fs_inet.cpp
 ftp.obj : ftp.cpp
 framecmn.obj : framecmn.cpp
 fs_inet.obj : fs_inet.cpp
 ftp.obj : ftp.cpp


@@ -520,6 +531,7 @@ sckipc.obj : sckipc.cpp
 sckstrm.obj : sckstrm.cpp
 sizer.obj : sizer.cpp
 socket.obj : socket.cpp
 sckstrm.obj : sckstrm.cpp
 sizer.obj : sizer.cpp
 socket.obj : socket.cpp

+socketevtdispatch.obj : socketevtdispatch.cpp

 settcmn.obj : settcmn.cpp
 statbar.obj : statbar.cpp
 stdpbase.obj : stdpbase.cpp
 settcmn.obj : settcmn.cpp
 statbar.obj : statbar.cpp
 stdpbase.obj : stdpbase.cpp