Removed WXWIN_COMPATIBILITY_2_2 together with code guarded by it.

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

diff --git a/src/unix/descrip.mms b/src/unix/descrip.mms
index 8803139cd623d3026cff6d52f9ebe8364ce909ac..10f7ee30ff9b89d928a842d0742533b92025547d 100644 (file)
--- a/src/unix/descrip.mms
+++ b/src/unix/descrip.mms
@@ -9,18 +9,26 @@
        define wx [--.include.wx]
 
 .ifdef __WXMOTIF__
-CXX_DEFINE = /define=(__WXMOTIF__=1)
-CC_DEFINE = /define=(__WXMOTIF__=1)
+CXX_DEFINE = /define=(__WXMOTIF__=1)/name=(as_is,short)\
+          /assume=(nostdnew,noglobal_array_new)
+CC_DEFINE = /define=(__WXMOTIF__=1)/name=(as_is,short)
 .else
 .ifdef __WXGTK__
 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 __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
+.endif
 
 .suffixes : .cpp
 
@@ -29,25 +37,41 @@ CC_DEFINE =
 .c.obj :
        cc $(CFLAGS)$(CC_DEFINE) $(MMS$TARGET_NAME).c
 
-OBJECTS = \
+OBJECTS =       baseunix.obj,\
                dialup.obj,\
                dir.obj,\
+               dlunix.obj,\
                fontenum.obj,\
                fontutil.obj,\
                gsocket.obj,\
                mimetype.obj,\
                threadpsx.obj,\
-               utilsunx.obj
+               utilsunx.obj,\
+               utilsx11.obj,\
+               joystick.obj,\
+               snglinst.obj,\
+               sound.obj,\
+               sound_sdl.obj,\
+               stdpaths.obj,\
+               taskbarx11.obj
 
-SOURCES = \
+SOURCES =       baseunix.cpp,\
                dialup.cpp,\
                dir.cpp,\
+               dlunix.cpp,\
                fontenum.cpp,\
                fontutil.cpp,\
-               gsocket.c,\
+               gsocket.cpp,\
                mimetype.cpp,\
                threadpsx.cpp,\
-               utilsunx.cpp
+               utilsunx.cpp,\
+               utilsx11.cpp,\
+               joystick.cpp,\
+               snglinst.cpp,\
+               sound.cpp,\
+               sound_sdl.cpp,\
+               stdpaths.cpp,\
+               taskbarx11.cpp
 
 all : $(SOURCES)
        $(MMS)$(MMSQUALIFIERS) $(OBJECTS)
@@ -56,14 +80,28 @@ all : $(SOURCES)
 .else
 .ifdef __WXGTK__
        library [--.lib]libwx_gtk.olb $(OBJECTS)
+.else
+.ifdef __WXX11__
+       library [--.lib]libwx_x11_univ.olb $(OBJECTS)
+.endif
 .endif
 .endif
 
+baseunix.obj : baseunix.cpp
 dialup.obj : dialup.cpp
 dir.obj : dir.cpp
+dlunix.obj : dlunix.cpp
 fontenum.obj : fontenum.cpp
 fontutil.obj : fontutil.cpp
-gsocket.obj : gsocket.c
+gsocket.obj : gsocket.cpp
+       cxx $(CXXFLAGS)$(CXX_DEFINE)/nowarn gsocket.cpp
 mimetype.obj : mimetype.cpp
 threadpsx.obj : threadpsx.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