Get rid of wxUSE_GSOCKET_CPLUSPLUS

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

diff --git a/src/common/descrip.mms b/src/common/descrip.mms
index 98fba4d95078fe69d111901866514035fb610333..a1bd0b3fd3f689816066ed0eb1017682dd81419a 100644 (file)
--- a/src/common/descrip.mms
+++ b/src/common/descrip.mms
@@ -14,21 +14,21 @@ CXX_DEFINE = /define=(__WXMOTIF__=1)/name=(as_is,short)\
 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
-.endif
+.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
 
 YACC=bison/yacc
 
@@ -44,9 +44,11 @@ LEX=flex
        cc $(CFLAGS)$(CC_DEFINE) $(MMS$TARGET_NAME).c
 
 OBJECTS = \
+               appbase.obj,\
                appcmn.obj,\
                artprov.obj,\
                artstd.obj,\
+               bookctrl.obj,\
                choiccmn.obj,\
                clipcmn.obj,\
                clntdata.obj,\
@@ -81,6 +83,8 @@ OBJECTS = \
                filename.obj,\
                filefn.obj,\
                filesys.obj,\
+               fldlgcmn.obj,\
+               fmapbase.obj,\
                fontcmn.obj,\
                fontmap.obj,\
                framecmn.obj
@@ -95,6 +99,7 @@ OBJECTS1=fs_inet.obj,\
                helpbase.obj,\
                http.obj,\
                iconbndl.obj,\
+               init.obj,\
                imagall.obj,\
                imagbmp.obj,\
                image.obj,\
@@ -128,6 +133,7 @@ OBJECTS1=fs_inet.obj,\
                process.obj,\
                protocol.obj,\
                quantize.obj,\
+               rendcmn.obj,\
                sckaddr.obj,\
                sckfile.obj,\
                sckipc.obj,\
@@ -136,6 +142,7 @@ OBJECTS1=fs_inet.obj,\
                socket.obj,\
                settcmn.obj,\
                statbar.obj,\
+               stopwatch.obj,\
                strconv.obj,\
                stream.obj,\
                string.obj,\
@@ -159,19 +166,26 @@ OBJECTS2=utilscmn.obj,\
                valtext.obj,\
                variant.obj,\
                wfstream.obj,\
-               wincmn.obj,\
                wxchar.obj,\
+               wincmn.obj,\
                xpmdecod.obj,\
                zipstrm.obj,\
                zstream.obj
 
-OBJECTS_MOTIF=bmpbase.obj
+OBJECTS_MOTIF=bmpbase.obj,gaugecmn.obj
+
+OBJECTS_X11=accesscmn.obj,bmpbase.obj,dndcmn.obj,dpycmn.obj,dseldlg.obj,\
+       dynload.obj,effects.obj,fddlgcmn.obj,fs_mem.obj,gaugecmn.obj,\
+       gbsizer.obj,geometry.obj,matrix.obj,radiocmn.obj,\
+       regex.obj,taskbarcmn.obj,xti.obj,xtistrm.obj,xtixml.obj
 
 SOURCES = \
+               appbase.cpp,\
                appcmn.cpp,\
                artprov.cpp,\
                artstd.cpp,\
                bmpbase.cpp,\
+               bookctrl.cpp,\
                choiccmn.cpp,\
                clipcmn.cpp,\
                clntdata.cpp,\
@@ -206,12 +220,15 @@ SOURCES = \
                filename.cpp,\
                filefn.cpp,\
                filesys.cpp,\
+               fldlgcmn.cpp,\
+               fmapbase.cpp,\
                fontcmn.cpp,\
                fontmap.cpp,\
                framecmn.cpp,\
                fs_inet.cpp,\
                fs_zip.cpp,\
                ftp.cpp,\
+               gaugecmn.cpp,\
                gdicmn.cpp,\
                gifdecod.cpp,\
                hash.cpp,\
@@ -219,6 +236,7 @@ SOURCES = \
                helpbase.cpp,\
                http.cpp,\
                iconbndl.cpp,\
+               init.cpp,\
                imagall.cpp,\
                imagbmp.cpp,\
                image.cpp,\
@@ -252,6 +270,7 @@ SOURCES = \
                process.cpp,\
                protocol.cpp,\
                quantize.cpp,\
+               rendcmn.cpp,\
                rgncmn.cpp,\
                sckaddr.cpp,\
                sckfile.cpp,\
@@ -261,6 +280,7 @@ SOURCES = \
                socket.cpp,\
                settcmn.cpp,\
                statbar.cpp,\
+               stopwatch.cpp,\
                strconv.cpp,\
                stream.cpp,\
                sysopt.cpp,\
@@ -286,7 +306,24 @@ SOURCES = \
                wxchar.cpp,\
                xpmdecod.cpp,\
                zipstrm.cpp,\
-               zstream.cpp
+               zstream.cpp,\
+               accesscmn.cpp,\
+               dndcmn.cpp,\
+               dpycmn.cpp,\
+               dseldlg.cpp,\
+               dynload.cpp,\
+               effects.cpp,\
+               fddlgcmn.cpp,\
+               fs_mem.cpp,\
+               gbsizer.cpp,\
+               geometry.cpp,\
+               matrix.cpp,\
+               radiocmn.cpp,\
+               regex.cpp,\
+               taskbarcmn.cpp,\
+               xti.cpp,\
+               xtistrm.cpp,\
+               xtixml.cpp
 
 all : $(SOURCES)
        $(MMS)$(MMSQUALIFIERS) $(OBJECTS)
@@ -300,22 +337,26 @@ all : $(SOURCES)
        library [--.lib]libwx_motif.olb $(OBJECTS_MOTIF)
 .else
 .ifdef __WXGTK__
-.ifdef __WXUNIVERSAL__
-       library [--.lib]libwx_gtk_univ.olb $(OBJECTS)
-       library [--.lib]libwx_gtk_univ.olb $(OBJECTS1)
-       library [--.lib]libwx_gtk_univ.olb $(OBJECTS2)
-.else
        library [--.lib]libwx_gtk.olb $(OBJECTS)
        library [--.lib]libwx_gtk.olb $(OBJECTS1)
        library [--.lib]libwx_gtk.olb $(OBJECTS2)
+.else
+.ifdef __WXX11__
+       $(MMS)$(MMSQUALIFIERS) $(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)
 .endif
 .endif
 .endif
 
+appbase.obj : appbase.cpp
 appcmn.obj : appcmn.cpp
 artprov.obj : artprov.cpp
 artstd.obj : artstd.cpp
 bmpbase.obj : bmpbase.cpp
+bookctrl.obj : bookctrl.cpp
 choiccmn.obj : choiccmn.cpp
 clipcmn.obj : clipcmn.cpp
 clntdata.obj : clntdata.cpp
@@ -350,12 +391,15 @@ fileconf.obj : fileconf.cpp
 filefn.obj : filefn.cpp
 filename.obj : filename.cpp
 filesys.obj : filesys.cpp
+fldlgcmn.obj : fldlgcmn.cpp
+fmapbase.obj : fmapbase.cpp
 fontcmn.obj : fontcmn.cpp
 fontmap.obj : fontmap.cpp
 framecmn.obj : framecmn.cpp
 fs_inet.obj : fs_inet.cpp
 fs_zip.obj : fs_zip.cpp
 ftp.obj : ftp.cpp
+gaugecmn.obj : gaugecmn.cpp
 gdicmn.obj : gdicmn.cpp
 gifdecod.obj : gifdecod.cpp
 hash.obj : hash.cpp
@@ -363,6 +407,7 @@ hashmap.obj : hashmap.cpp
 helpbase.obj : helpbase.cpp
 http.obj : http.cpp
 iconbndl.obj : iconbndl.cpp
+init.obj : init.cpp
 imagall.obj : imagall.cpp
 imagbmp.obj : imagbmp.cpp
 image.obj : image.cpp
@@ -396,6 +441,7 @@ prntbase.obj : prntbase.cpp
 process.obj : process.cpp
 protocol.obj : protocol.cpp
 quantize.obj : quantize.cpp
+rendcmn.obj : rendcmn.cpp
 rgncmn.obj : rgncmn.cpp
 sckaddr.obj : sckaddr.cpp
 sckfile.obj : sckfile.cpp
@@ -405,6 +451,7 @@ sizer.obj : sizer.cpp
 socket.obj : socket.cpp
 settcmn.obj : settcmn.cpp
 statbar.obj : statbar.cpp
+stopwatch.obj : stopwatch.cpp
 strconv.obj : strconv.cpp
 stream.obj : stream.cpp
 sysopt.obj : sysopt.cpp
@@ -431,3 +478,20 @@ wxchar.obj : wxchar.cpp
 xpmdecod.obj : xpmdecod.cpp
 zipstrm.obj : zipstrm.cpp
 zstream.obj : zstream.cpp
+accesscmn.obj : accesscmn.cpp
+dndcmn.obj : dndcmn.cpp
+dpycmn.obj : dpycmn.cpp
+dseldlg.obj : dseldlg.cpp
+dynload.obj : dynload.cpp
+effects.obj : effects.cpp
+fddlgcmn.obj : fddlgcmn.cpp
+fs_mem.obj : fs_mem.cpp
+gbsizer.obj : gbsizer.cpp
+geometry.obj : geometry.cpp
+matrix.obj : matrix.cpp
+radiocmn.obj : radiocmn.cpp
+regex.obj : regex.cpp
+taskbarcmn.obj : taskbarcmn.cpp
+xti.obj : xti.cpp
+xtistrm.obj : xtistrm.cpp
+xtixml.obj : xtixml.cpp