fixing osx_carbon

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

diff --git a/src/univ/descrip.mms b/src/univ/descrip.mms
index 15c8062486539f05734ab656bfddf4f18508b7c3..c61454fe50287f4fce724fda15ede4e43962c511 100644 (file)
--- a/src/univ/descrip.mms
+++ b/src/univ/descrip.mms
@@ -1,17 +1,17 @@
 #*****************************************************************************
 #                                                                            *
 # Make file for VMS                                                          *
 #*****************************************************************************
 #                                                                            *
 # Make file for VMS                                                          *

-# Author : J.Jansen (joukj@hrem.stm.tudelft.nl)                              *
-# Date : 14 March 2002                                                       *
+# Author : J.Jansen (joukj@hrem.nano.tudelft.nl)                             *
+# Date : 4 November 2010                                                     *

 #                                                                            *
 #*****************************************************************************
 .first
        define wx [--.include.wx]
 
 #                                                                            *
 #*****************************************************************************
 .first
        define wx [--.include.wx]
 

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

 
 .suffixes : .cpp
 
 
 .suffixes : .cpp
 


@@ -26,24 +26,20 @@ OBJECTS = \
                checkbox.obj,\
                checklst.obj,\
                choice.obj,\
                checkbox.obj,\
                checklst.obj,\
                choice.obj,\

-               colschem.obj,\
-               combobox.obj,\

                control.obj,\
                dialog.obj,\
                framuniv.obj,\
                gauge.obj,\
                control.obj,\
                dialog.obj,\
                framuniv.obj,\
                gauge.obj,\

-               gtk.obj,\

                inpcons.obj,\
                inphand.obj,\
                listbox.obj,\
                menu.obj,\
                notebook.obj,\
                inpcons.obj,\
                inphand.obj,\
                listbox.obj,\
                menu.obj,\
                notebook.obj,\

-               radiobox.obj,\

                radiobut.obj,\
                radiobut.obj,\

-               renderer.obj,\

                scrarrow.obj,\
                scrolbar.obj,\
                scrthumb.obj,\
                scrarrow.obj,\
                scrolbar.obj,\
                scrthumb.obj,\

+               settingsuniv.obj,\

                slider.obj,\
                spinbutt.obj,\
                statbmp.obj,\
                slider.obj,\
                spinbutt.obj,\
                statbmp.obj,\


@@ -51,11 +47,19 @@ OBJECTS = \
                statline.obj,\
                stattext.obj,\
                statusbr.obj,\
                statline.obj,\
                stattext.obj,\
                statusbr.obj,\

+               stdrend.obj,\

                textctrl.obj,\
                theme.obj,\
                toolbar.obj,\
                topluniv.obj,\
                textctrl.obj,\
                theme.obj,\
                toolbar.obj,\
                topluniv.obj,\

-               winuniv.obj
+               winuniv.obj,\
+               combobox.obj,\
+               ctrlrend.obj,\
+               gtk.obj,\
+               metal.obj,\
+               radiobox.obj,\
+               scrthumb.obj,\
+               win32.obj

 
 SOURCES =\
                bmpbuttn.cpp \
 
 SOURCES =\
                bmpbuttn.cpp \


@@ -63,24 +67,20 @@ SOURCES =\
                checkbox.cpp \
                checklst.cpp \
                choice.cpp \
                checkbox.cpp \
                checklst.cpp \
                choice.cpp \

-               colschem.cpp \
-               combobox.cpp \

                control.cpp \
                dialog.cpp \
                framuniv.cpp \
                gauge.cpp \
                control.cpp \
                dialog.cpp \
                framuniv.cpp \
                gauge.cpp \

-               [.themes]gtk.cpp \

                inpcons.cpp \
                inphand.cpp \
                listbox.cpp \
                menu.cpp \
                notebook.cpp \
                inpcons.cpp \
                inphand.cpp \
                listbox.cpp \
                menu.cpp \
                notebook.cpp \

-               radiobox.cpp \

                radiobut.cpp \
                radiobut.cpp \

-               renderer.cpp \

                scrarrow.cpp \
                scrolbar.cpp \
                scrthumb.cpp \
                scrarrow.cpp \
                scrolbar.cpp \
                scrthumb.cpp \

+               settingsuniv.cpp \

                slider.cpp \
                spinbutt.cpp \
                statbmp.cpp \
                slider.cpp \
                spinbutt.cpp \
                statbmp.cpp \


@@ -88,40 +88,46 @@ SOURCES =\
                statline.cpp \
                stattext.cpp \
                statusbr.cpp \
                statline.cpp \
                stattext.cpp \
                statusbr.cpp \

+               stdrend.cpp,\

                textctrl.cpp \
                theme.cpp \
                toolbar.cpp \
                topluniv.cpp \
                textctrl.cpp \
                theme.cpp \
                toolbar.cpp \
                topluniv.cpp \

-               winuniv.cpp
+               winuniv.cpp \
+               combobox.cpp \
+               ctrlrend.cpp \
+               radiobox.cpp \
+               scrthumb.cpp \
+               [.themes]gtk.cpp \
+               [.themes]metal.cpp \
+               [.themes]win32.cpp

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

-       library [--.lib]libwx_gtk_univ.olb $(OBJECTS)
+       library [--.lib]libwx_x11_univ.olb $(OBJECTS)
+
+$(OBJECTS) : [--.include.wx]setup.h

 
 bmpbuttn.obj : bmpbuttn.cpp
 button.obj : button.cpp
 checkbox.obj : checkbox.cpp
 checklst.obj : checklst.cpp
 choice.obj : choice.cpp
 
 bmpbuttn.obj : bmpbuttn.cpp
 button.obj : button.cpp
 checkbox.obj : checkbox.cpp
 checklst.obj : checklst.cpp
 choice.obj : choice.cpp

-colschem.obj : colschem.cpp
-combobox.obj : combobox.cpp

 control.obj : control.cpp
 dialog.obj : dialog.cpp
 framuniv.obj : framuniv.cpp
 gauge.obj : gauge.cpp
 control.obj : control.cpp
 dialog.obj : dialog.cpp
 framuniv.obj : framuniv.cpp
 gauge.obj : gauge.cpp

-gtk.obj : [.themes]gtk.cpp
-       cxx/obj=[]gtk.obj$(CXXFLAGS)$(CXX_DEFINE) [.themes]gtk.cpp

 inpcons.obj : inpcons.cpp
 inphand.obj : inphand.cpp
 listbox.obj : listbox.cpp
 menu.obj : menu.cpp
 notebook.obj : notebook.cpp
 inpcons.obj : inpcons.cpp
 inphand.obj : inphand.cpp
 listbox.obj : listbox.cpp
 menu.obj : menu.cpp
 notebook.obj : notebook.cpp

-radiobox.obj : radiobox.cpp
+       cxx $(CXXFLAGS)$(CXX_DEFINE)/warn=disable=(INTSIGNCHANGE) notebook.cpp

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

-renderer.obj : renderer.cpp

 scrarrow.obj : scrarrow.cpp
 scrolbar.obj : scrolbar.cpp
 scrthumb.obj : scrthumb.cpp
 scrarrow.obj : scrarrow.cpp
 scrolbar.obj : scrolbar.cpp
 scrthumb.obj : scrthumb.cpp

+settingsuniv.obj : settingsuniv.cpp

 slider.obj : slider.cpp
 spinbutt.obj : spinbutt.cpp
 statbmp.obj : statbmp.cpp
 slider.obj : slider.cpp
 spinbutt.obj : spinbutt.cpp
 statbmp.obj : statbmp.cpp


@@ -129,8 +135,19 @@ statbox.obj : statbox.cpp
 statline.obj : statline.cpp
 stattext.obj : stattext.cpp
 statusbr.obj : statusbr.cpp
 statline.obj : statline.cpp
 stattext.obj : stattext.cpp
 statusbr.obj : statusbr.cpp

+stdrend.obj : stdrend.cpp

 textctrl.obj : textctrl.cpp
 theme.obj : theme.cpp
 toolbar.obj : toolbar.cpp
 topluniv.obj : topluniv.cpp
 winuniv.obj : winuniv.cpp
 textctrl.obj : textctrl.cpp
 theme.obj : theme.cpp
 toolbar.obj : toolbar.cpp
 topluniv.obj : topluniv.cpp
 winuniv.obj : winuniv.cpp

+combobox.obj : combobox.cpp
+ctrlrend.obj : ctrlrend.cpp
+gtk.obj : [.themes]gtk.cpp
+       cxx $(CXXFLAGS)$(CXX_DEFINE)/object=gtk.obj [.themes]gtk.cpp
+metal.obj : [.themes]metal.cpp
+       cxx $(CXXFLAGS)$(CXX_DEFINE) [.themes]metal.cpp
+radiobox.obj : radiobox.cpp
+scrthumb.obj : scrthumb.cpp
+win32.obj : [.themes]win32.cpp
+       cxx $(CXXFLAGS)$(CXX_DEFINE) [.themes]win32.cpp