Cleanup

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

diff --git a/src/gtk1/descrip.mms b/src/gtk1/descrip.mms
index 2fd22a0eff10d377f71cb72097cf334f5764cee3..0321fb2e4d21bf38de3a082ffa6103230b728d19 100644 (file)
--- a/src/gtk1/descrip.mms
+++ b/src/gtk1/descrip.mms
@@ -8,9 +8,16 @@
 .first
        define wx [--.include.wx]
 
 .first
        define wx [--.include.wx]
 

+.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)/iee=denorm\
           /assume=(nostdnew,noglobal_array_new)
 CC_DEFINE = /define=(__WXGTK__=1)/float=ieee/name=(as_is,short)/iee=denorm
 CXX_DEFINE = /define=(__WXGTK__=1)/float=ieee/name=(as_is,short)/iee=denorm\
           /assume=(nostdnew,noglobal_array_new)
 CC_DEFINE = /define=(__WXGTK__=1)/float=ieee/name=(as_is,short)/iee=denorm

+.endif

 
 .suffixes : .cpp
 
 
 .suffixes : .cpp
 


@@ -22,16 +29,9 @@ CC_DEFINE = /define=(__WXGTK__=1)/float=ieee/name=(as_is,short)/iee=denorm
 OBJECTS = \
        app.obj,\
        bitmap.obj,\
 OBJECTS = \
        app.obj,\
        bitmap.obj,\

-        bmpbuttn.obj,\

        brush.obj,\
        brush.obj,\

-       button.obj,\
-       checkbox.obj,\
-       checklst.obj,\
-       choice.obj,\

        clipbrd.obj,\
        colour.obj,\
        clipbrd.obj,\
        colour.obj,\

-        combobox.obj,\
-       control.obj,\

        cursor.obj,\
        data.obj,\
        dataobj.obj,\
        cursor.obj,\
        data.obj,\
        dataobj.obj,\


@@ -39,29 +39,48 @@ OBJECTS = \
        dcclient.obj,\
        dcmemory.obj,\
        dcscreen.obj,\
        dcclient.obj,\
        dcmemory.obj,\
        dcscreen.obj,\

-       dialog.obj,\

         dnd.obj,\
         dnd.obj,\

+        evtloop.obj,\

        font.obj,\
        font.obj,\

-       fontdlg.obj,\
-       frame.obj,\
-       gauge.obj,\

        gdiobj.obj,\
         glcanvas.obj,\
        gsockgtk.obj,\
         icon.obj,\
        gdiobj.obj,\
         glcanvas.obj,\
        gsockgtk.obj,\
         icon.obj,\

-       listbox.obj,\

        main.obj,\
        main.obj,\

+       minifram.obj,\
+       pen.obj,\
+       popupwin.obj,\
+       renderer.obj,\
+       region.obj,\
+       settings.obj,\
+       timer.obj,\
+       tooltip.obj,\
+       toplevel.obj,\
+       utilsgtk.obj,\
+       utilsres.obj,\
+        win_gtk.obj,\
+       window.obj
+
+OBJECTS0= \
+        bmpbuttn.obj,\
+       button.obj,\
+       checkbox.obj,\
+       checklst.obj,\
+       choice.obj,\
+        combobox.obj,\
+       control.obj,\
+       dialog.obj,\
+       fontdlg.obj,\
+       frame.obj,\
+       gauge.obj,\
+       listbox.obj,\

        mdi.obj,\
        menu.obj,\
        mdi.obj,\
        menu.obj,\

-       minifram.obj,\

        notebook.obj,\
        notebook.obj,\

-       pen.obj,\

        radiobox.obj,\
        radiobut.obj,\
        radiobox.obj,\
        radiobut.obj,\

-       region.obj,\

        scrolbar.obj,\
        scrolwin.obj,\
        scrolbar.obj,\
        scrolwin.obj,\

-       settings.obj,\

        slider.obj,\
         spinbutt.obj,\
        spinctrl.obj,\
        slider.obj,\
         spinbutt.obj,\
        spinctrl.obj,\


@@ -72,13 +91,7 @@ OBJECTS = \
        tbargtk.obj,\
        textctrl.obj,\
        tglbtn.obj,\
        tbargtk.obj,\
        textctrl.obj,\
        tglbtn.obj,\

-       timer.obj,\
-       tooltip.obj,\
-       toplevel.obj,\
-       utilsgtk.obj,\
-       utilsres.obj,\
-        win_gtk.obj,\
-       window.obj
+       msgdlg.obj

 
 SOURCES =\
        app.cpp,\
 
 SOURCES =\
        app.cpp,\


@@ -102,6 +115,7 @@ SOURCES =\
        dcscreen.cpp,\
        dialog.cpp,\
         dnd.cpp,\
        dcscreen.cpp,\
        dialog.cpp,\
         dnd.cpp,\

+        evtloop.cpp,\

        font.cpp,\
        fontdlg.cpp,\
        frame.cpp,\
        font.cpp,\
        fontdlg.cpp,\
        frame.cpp,\


@@ -115,10 +129,13 @@ SOURCES =\
        mdi.cpp,\
        menu.cpp,\
        minifram.cpp,\
        mdi.cpp,\
        menu.cpp,\
        minifram.cpp,\

+       msgdlg.cpp,\

        notebook.cpp,\
        pen.cpp,\
        notebook.cpp,\
        pen.cpp,\

+       popupwin.cpp,\

        radiobox.cpp,\
        radiobut.cpp,\
        radiobox.cpp,\
        radiobut.cpp,\

+       renderer.cpp,\

        region.cpp,\
        scrolbar.cpp,\
        scrolwin.cpp,\
        region.cpp,\
        scrolbar.cpp,\
        scrolwin.cpp,\


@@ -143,7 +160,13 @@ SOURCES =\
    
 all : $(SOURCES)
        $(MMS)$(MMSQUALIFIERS) $(OBJECTS)
    
 all : $(SOURCES)
        $(MMS)$(MMSQUALIFIERS) $(OBJECTS)

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

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

+       $(MMS)$(MMSQUALIFIERS) $(OBJECTS0)
+       library [--.lib]libwx_gtk.olb $(OBJECTS0)
+.endif

 
 app.obj : app.cpp
 bitmap.obj : bitmap.cpp
 
 app.obj : app.cpp
 bitmap.obj : bitmap.cpp


@@ -166,6 +189,7 @@ dcmemory.obj : dcmemory.cpp
 dcscreen.obj : dcscreen.cpp
 dialog.obj : dialog.cpp
 dnd.obj : dnd.cpp
 dcscreen.obj : dcscreen.cpp
 dialog.obj : dialog.cpp
 dnd.obj : dnd.cpp

+evtloop.obj : evtloop.cpp

 font.obj : font.cpp
 fontdlg.obj : fontdlg.cpp
 frame.obj : frame.cpp
 font.obj : font.cpp
 fontdlg.obj : fontdlg.cpp
 frame.obj : frame.cpp


@@ -176,13 +200,16 @@ gsockgtk.obj : gsockgtk.c
 icon.obj : icon.cpp
 listbox.obj : listbox.cpp
 main.obj : main.cpp
 icon.obj : icon.cpp
 listbox.obj : listbox.cpp
 main.obj : main.cpp

+msgdlg.obj : msgdlg.cpp

 mdi.obj : mdi.cpp
 menu.obj : menu.cpp
 minifram.obj : minifram.cpp
 notebook.obj : notebook.cpp
 pen.obj : pen.cpp
 mdi.obj : mdi.cpp
 menu.obj : menu.cpp
 minifram.obj : minifram.cpp
 notebook.obj : notebook.cpp
 pen.obj : pen.cpp

+popupwin.obj : popupwin.cpp

 radiobox.obj : radiobox.cpp
 radiobut.obj : radiobut.cpp
 radiobox.obj : radiobox.cpp
 radiobut.obj : radiobut.cpp

+renderer.obj : renderer.cpp

 region.obj : region.cpp
 scrolbar.obj : scrolbar.cpp
 scrolwin.obj : scrolwin.cpp
 region.obj : region.cpp
 scrolbar.obj : scrolbar.cpp
 scrolwin.obj : scrolwin.cpp