Applied patch [ 1194316 ] wxMediaCtrl MSW config and setup cleanup

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

diff --git a/src/common/descrip.mms b/src/common/descrip.mms
index 12a7b076300ee443781b6825ba87179366b86eda..b64ef6d63ae773feb92b36e18ca8a3577d80fb0c 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__
 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 __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

 
 YACC=bison/yacc
 
 
 YACC=bison/yacc
 


@@ -48,6 +48,8 @@ OBJECTS = \
                appcmn.obj,\
                artprov.obj,\
                artstd.obj,\
                appcmn.obj,\
                artprov.obj,\
                artstd.obj,\

+               bmpbase.obj,\
+               bookctrl.obj,\

                choiccmn.obj,\
                clipcmn.obj,\
                clntdata.obj,\
                choiccmn.obj,\
                clipcmn.obj,\
                clntdata.obj,\


@@ -76,6 +78,7 @@ OBJECTS = \
                encconv.obj,\
                event.obj,\
                extended.obj,\
                encconv.obj,\
                event.obj,\
                extended.obj,\

+               fddlgcmn.obj,\

                ffile.obj,\
                file.obj,\
                fileconf.obj,\
                ffile.obj,\
                file.obj,\
                fileconf.obj,\


@@ -98,6 +101,7 @@ OBJECTS1=fs_inet.obj,\
                helpbase.obj,\
                http.obj,\
                iconbndl.obj,\
                helpbase.obj,\
                http.obj,\
                iconbndl.obj,\

+               init.obj,\

                imagall.obj,\
                imagbmp.obj,\
                image.obj,\
                imagall.obj,\
                imagbmp.obj,\
                image.obj,\


@@ -131,6 +135,7 @@ OBJECTS1=fs_inet.obj,\
                process.obj,\
                protocol.obj,\
                quantize.obj,\
                process.obj,\
                protocol.obj,\
                quantize.obj,\

+               rendcmn.obj,\

                sckaddr.obj,\
                sckfile.obj,\
                sckipc.obj,\
                sckaddr.obj,\
                sckfile.obj,\
                sckipc.obj,\


@@ -139,6 +144,8 @@ OBJECTS1=fs_inet.obj,\
                socket.obj,\
                settcmn.obj,\
                statbar.obj,\
                socket.obj,\
                settcmn.obj,\
                statbar.obj,\

+               stdpbase.obj,\
+               stockitem.obj,\

                stopwatch.obj,\
                strconv.obj,\
                stream.obj,\
                stopwatch.obj,\
                strconv.obj,\
                stream.obj,\


@@ -153,23 +160,28 @@ OBJECTS1=fs_inet.obj,\
                toplvcmn.obj,\
                treebase.obj,\
                txtstrm.obj,\
                toplvcmn.obj,\
                treebase.obj,\
                txtstrm.obj,\

-               unzip.obj,\

                url.obj
 
 OBJECTS2=utilscmn.obj,\
                rgncmn.obj,\
                url.obj
 
 OBJECTS2=utilscmn.obj,\
                rgncmn.obj,\

+               uri.obj,\

                valgen.obj,\
                validate.obj,\
                valtext.obj,\
                variant.obj,\
                wfstream.obj,\
                valgen.obj,\
                validate.obj,\
                valtext.obj,\
                variant.obj,\
                wfstream.obj,\

-               wincmn.obj,\

                wxchar.obj,\
                wxchar.obj,\

+               wincmn.obj,\

                xpmdecod.obj,\
                zipstrm.obj,\
                zstream.obj
 
                xpmdecod.obj,\
                zipstrm.obj,\
                zstream.obj
 

-OBJECTS_MOTIF=bmpbase.obj,gaugecmn.obj
+OBJECTS_MOTIF=gaugecmn.obj,radiocmn.obj
+
+OBJECTS_X11=accesscmn.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,\
 
 SOURCES = \
                appbase.cpp,\


@@ -177,6 +189,7 @@ SOURCES = \
                artprov.cpp,\
                artstd.cpp,\
                bmpbase.cpp,\
                artprov.cpp,\
                artstd.cpp,\
                bmpbase.cpp,\

+               bookctrl.cpp,\

                choiccmn.cpp,\
                clipcmn.cpp,\
                clntdata.cpp,\
                choiccmn.cpp,\
                clipcmn.cpp,\
                clntdata.cpp,\


@@ -206,6 +219,7 @@ SOURCES = \
                event.cpp,\
                extended.c,\
                ffile.cpp,\
                event.cpp,\
                extended.c,\
                ffile.cpp,\

+               fddlgcmn.cpp,\

                file.cpp,\
                fileconf.cpp,\
                filename.cpp,\
                file.cpp,\
                fileconf.cpp,\
                filename.cpp,\


@@ -227,6 +241,7 @@ SOURCES = \
                helpbase.cpp,\
                http.cpp,\
                iconbndl.cpp,\
                helpbase.cpp,\
                http.cpp,\
                iconbndl.cpp,\

+               init.cpp,\

                imagall.cpp,\
                imagbmp.cpp,\
                image.cpp,\
                imagall.cpp,\
                imagbmp.cpp,\
                image.cpp,\


@@ -260,6 +275,7 @@ SOURCES = \
                process.cpp,\
                protocol.cpp,\
                quantize.cpp,\
                process.cpp,\
                protocol.cpp,\
                quantize.cpp,\

+               rendcmn.cpp,\

                rgncmn.cpp,\
                sckaddr.cpp,\
                sckfile.cpp,\
                rgncmn.cpp,\
                sckaddr.cpp,\
                sckfile.cpp,\


@@ -269,6 +285,8 @@ SOURCES = \
                socket.cpp,\
                settcmn.cpp,\
                statbar.cpp,\
                socket.cpp,\
                settcmn.cpp,\
                statbar.cpp,\

+               stdpbase.cpp,\
+               stockitem.cpp,\

                stopwatch.cpp,\
                strconv.cpp,\
                stream.cpp,\
                stopwatch.cpp,\
                strconv.cpp,\
                stream.cpp,\


@@ -283,7 +301,6 @@ SOURCES = \
                toplvcmn.cpp,\
                treebase.cpp,\
                txtstrm.cpp,\
                toplvcmn.cpp,\
                treebase.cpp,\
                txtstrm.cpp,\

-               unzip.c,\

                url.cpp,\
                utilscmn.cpp,\
                valgen.cpp,\
                url.cpp,\
                utilscmn.cpp,\
                valgen.cpp,\


@@ -295,7 +312,25 @@ SOURCES = \
                wxchar.cpp,\
                xpmdecod.cpp,\
                zipstrm.cpp,\
                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,\
+               uri.cpp,\
+               xti.cpp,\
+               xtistrm.cpp,\
+               xtixml.cpp

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


@@ -309,14 +344,16 @@ all : $(SOURCES)
        library [--.lib]libwx_motif.olb $(OBJECTS_MOTIF)
 .else
 .ifdef __WXGTK__
        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)
        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
 .endif
 .endif
 .endif


@@ -326,6 +363,7 @@ appcmn.obj : appcmn.cpp
 artprov.obj : artprov.cpp
 artstd.obj : artstd.cpp
 bmpbase.obj : bmpbase.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
 choiccmn.obj : choiccmn.cpp
 clipcmn.obj : clipcmn.cpp
 clntdata.obj : clntdata.cpp


@@ -355,6 +393,7 @@ encconv.obj : encconv.cpp
 event.obj : event.cpp
 extended.obj : extended.c
 ffile.obj : ffile.cpp
 event.obj : event.cpp
 extended.obj : extended.c
 ffile.obj : ffile.cpp

+fddlgcmn.obj : fddlgcmn.cpp

 file.obj : file.cpp
 fileconf.obj : fileconf.cpp
 filefn.obj : filefn.cpp
 file.obj : file.cpp
 fileconf.obj : fileconf.cpp
 filefn.obj : filefn.cpp


@@ -376,6 +415,7 @@ hashmap.obj : hashmap.cpp
 helpbase.obj : helpbase.cpp
 http.obj : http.cpp
 iconbndl.obj : iconbndl.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
 imagall.obj : imagall.cpp
 imagbmp.obj : imagbmp.cpp
 image.obj : image.cpp


@@ -409,6 +449,7 @@ prntbase.obj : prntbase.cpp
 process.obj : process.cpp
 protocol.obj : protocol.cpp
 quantize.obj : quantize.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
 rgncmn.obj : rgncmn.cpp
 sckaddr.obj : sckaddr.cpp
 sckfile.obj : sckfile.cpp


@@ -418,6 +459,8 @@ sizer.obj : sizer.cpp
 socket.obj : socket.cpp
 settcmn.obj : settcmn.cpp
 statbar.obj : statbar.cpp
 socket.obj : socket.cpp
 settcmn.obj : settcmn.cpp
 statbar.obj : statbar.cpp

+stdpbase.obj : stdpbase.cpp
+stockitem.obj : stockitem.cpp

 stopwatch.obj : stopwatch.cpp
 strconv.obj : strconv.cpp
 stream.obj : stream.cpp
 stopwatch.obj : stopwatch.cpp
 strconv.obj : strconv.cpp
 stream.obj : stream.cpp


@@ -432,7 +475,6 @@ tokenzr.obj : tokenzr.cpp
 toplvcmn.obj : toplvcmn.cpp
 treebase.obj : treebase.cpp
 txtstrm.obj : txtstrm.cpp
 toplvcmn.obj : toplvcmn.cpp
 treebase.obj : treebase.cpp
 txtstrm.obj : txtstrm.cpp

-unzip.obj : unzip.c

 url.obj : url.cpp
 utilscmn.obj : utilscmn.cpp
 valgen.obj : valgen.cpp
 url.obj : url.cpp
 utilscmn.obj : utilscmn.cpp
 valgen.obj : valgen.cpp


@@ -445,3 +487,21 @@ wxchar.obj : wxchar.cpp
 xpmdecod.obj : xpmdecod.cpp
 zipstrm.obj : zipstrm.cpp
 zstream.obj : zstream.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
+uri.obj : uri.cpp