Rename delegates to try and stop name clashes, probably with wxWebKitCtrl.

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

diff --git a/src/unix/descrip.mms b/src/unix/descrip.mms
index 561a7927a21b75099220131b6ffd065a27aefe94..21d2bf97bfe53941d6201ff1dc1ae645a2b32659 100644 (file)
--- a/src/unix/descrip.mms
+++ b/src/unix/descrip.mms
@@ -1,8 +1,8 @@
 #*****************************************************************************
 #                                                                            *
 # Make file for VMS                                                          *
 #*****************************************************************************
 #                                                                            *
 # Make file for VMS                                                          *

-# Author : J.Jansen (joukj@hrem.stm.tudelft.nl)                              *
-# Date : 10 November 1999                                                     *
+# Author : J.Jansen (joukj@hrem.nano.tudelft.nl)                             *
+# Date : 7 January 2011                                                      *

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


@@ -14,21 +14,27 @@ CXX_DEFINE = /define=(__WXMOTIF__=1)/name=(as_is,short)\
 CC_DEFINE = /define=(__WXMOTIF__=1)/name=(as_is,short)
 .else
 .ifdef __WXGTK__
 CC_DEFINE = /define=(__WXMOTIF__=1)/name=(as_is,short)
 .else
 .ifdef __WXGTK__

-.ifdef __WXUNIVERSAL__
-CXX_DEFINE = /define=(__WXGTK__=1,__WXUNIVERSAL__==1)/float=ieee\
-       /name=(as_is,short)/ieee=denorm/assume=(nostdnew,noglobal_array_new)
-CC_DEFINE = /define=(__WXGTK__=1,__WXUNIVERSAL__==1)/float=ieee\
-       /name=(as_is,short)/ieee=denorm
-.else

 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
 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

-.endif
+.else
+.ifdef __WXGTK2__
+CXX_DEFINE = /define=(__WXGTK__=1,VMS_GTK2)/float=ieee/name=(as_is,short)/ieee=denorm\
+          /assume=(nostdnew,noglobal_array_new)
+CC_DEFINE = /define=(__WXGTK__=1,VMS_GTK2)/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)
+CC_DEFINE = /define=(__WXX11__=1,__WXUNIVERSAL__==1)/float=ieee\
+       /name=(as_is,short)

 .else
 CXX_DEFINE =
 CC_DEFINE =
 .endif
 .endif
 .else
 CXX_DEFINE =
 CC_DEFINE =
 .endif
 .endif

+.endif
+.endif

 
 .suffixes : .cpp
 
 
 .suffixes : .cpp
 


@@ -37,27 +43,47 @@ CC_DEFINE =
 .c.obj :
        cc $(CFLAGS)$(CC_DEFINE) $(MMS$TARGET_NAME).c
 
 .c.obj :
        cc $(CFLAGS)$(CC_DEFINE) $(MMS$TARGET_NAME).c
 

-OBJECTS =       baseunix.obj,\
+OBJECTS = appunix.obj,apptraits.obj,\

                dialup.obj,\
                dir.obj,\
                dialup.obj,\
                dir.obj,\

+               displayx11.obj,\
+               dlunix.obj,\

                fontenum.obj,\
                fontutil.obj,\
                fontenum.obj,\
                fontutil.obj,\

-               gsocket.obj,\
+               sockunix.obj,\

                mimetype.obj,\
                threadpsx.obj,\
                utilsunx.obj,\
                mimetype.obj,\
                threadpsx.obj,\
                utilsunx.obj,\

-               utilsx11.obj
+               utilsx11.obj,\
+               joystick.obj,\
+               snglinst.obj,\
+               sound.obj,\
+               sound_sdl.obj,\
+               stdpaths.obj,\
+               taskbarx11.obj,\
+               timerunx.obj,evtloopunix.obj,fdiounix.obj,uiactionx11.obj,\
+               mediactrl.obj

 
 

-SOURCES =       baseunix.cpp,\
+SOURCES = appunix.cpp,apptraits.cpp,\

                dialup.cpp,\
                dir.cpp,\
                dialup.cpp,\
                dir.cpp,\

+               displayx11.cpp,\
+               dlunix.cpp,\

                fontenum.cpp,\
                fontutil.cpp,\
                fontenum.cpp,\
                fontutil.cpp,\

-               gsocket.c,\
+               sockunix.cpp,\

                mimetype.cpp,\
                threadpsx.cpp,\
                utilsunx.cpp,\
                mimetype.cpp,\
                threadpsx.cpp,\
                utilsunx.cpp,\

-               utilsx11.cpp
+               utilsx11.cpp,\
+               joystick.cpp,\
+               snglinst.cpp,\
+               sound.cpp,\
+               sound_sdl.cpp,\
+               stdpaths.cpp,\
+               taskbarx11.cpp,\
+               timerunx.cpp,evtloopunix.cpp,fdiounix.cpp,uiactionx11.cpp,\
+               mediactrl.cpp

 
 all : $(SOURCES)
        $(MMS)$(MMSQUALIFIERS) $(OBJECTS)
 
 all : $(SOURCES)
        $(MMS)$(MMSQUALIFIERS) $(OBJECTS)


@@ -65,21 +91,44 @@ all : $(SOURCES)
        library [--.lib]libwx_motif.olb $(OBJECTS)
 .else
 .ifdef __WXGTK__
        library [--.lib]libwx_motif.olb $(OBJECTS)
 .else
 .ifdef __WXGTK__

-.ifdef __WXUNIVERSAL__
-       library [--.lib]libwx_gtk_univ.olb $(OBJECTS)
-.else

        library [--.lib]libwx_gtk.olb $(OBJECTS)
        library [--.lib]libwx_gtk.olb $(OBJECTS)

+.else
+.ifdef __WXGTK2__
+       library [--.lib]libwx_gtk2.olb $(OBJECTS)
+.else
+.ifdef __WXX11__
+       library [--.lib]libwx_x11_univ.olb $(OBJECTS)
+.endif

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

-baseunix.obj : baseunix.cpp
+$(OBJECTS) : [--.include.wx]setup.h
+
+appunix.obj : appunix.cpp
+apptraits.obj : apptraits.cpp

 dialup.obj : dialup.cpp
 dir.obj : dir.cpp
 dialup.obj : dialup.cpp
 dir.obj : dir.cpp

+dlunix.obj : dlunix.cpp

 fontenum.obj : fontenum.cpp
 fontutil.obj : fontutil.cpp
 fontenum.obj : fontenum.cpp
 fontutil.obj : fontutil.cpp

-gsocket.obj : gsocket.c
+sockunix.obj : sockunix.cpp
+       cxx $(CXXFLAGS)$(CXX_DEFINE)/nowarn sockunix.cpp

 mimetype.obj : mimetype.cpp
 threadpsx.obj : threadpsx.cpp
 mimetype.obj : mimetype.cpp
 threadpsx.obj : threadpsx.cpp

+       cxx $(CXXFLAGS)$(CXX_DEFINE)/nowarn threadpsx.cpp

 utilsunx.obj : utilsunx.cpp
 utilsx11.obj : utilsx11.cpp
 utilsunx.obj : utilsunx.cpp
 utilsx11.obj : utilsx11.cpp

+joystick.obj : joystick.cpp
+snglinst.obj : snglinst.cpp
+sound.obj : sound.cpp
+sound_sdl.obj : sound_sdl.cpp
+stdpaths.obj : stdpaths.cpp
+taskbarx11.obj : taskbarx11.cpp
+displayx11.obj : displayx11.cpp
+timerunx.obj : timerunx.cpp
+evtloopunix.obj : evtloopunix.cpp
+       cxx $(CXXFLAGS)$(CXX_DEFINE)/nowarn evtloopunix.cpp
+fdiounix.obj : fdiounix.cpp
+uiactionx11.obj : uiactionx11.cpp
+mediactrl.obj : mediactrl.cpp