X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/de5fadb41534fca448bd68d3ff942f80efa87f76..d5e64615977c6839abe565919e8da50ffda40604:/src/univ/descrip.mms

diff --git a/src/univ/descrip.mms b/src/univ/descrip.mms
index 15c8062486..f45dbf040f 100644
--- a/src/univ/descrip.mms
+++ b/src/univ/descrip.mms
@@ -8,10 +8,10 @@
 .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
 
@@ -27,20 +27,16 @@ OBJECTS = \
 		checklst.obj,\
 		choice.obj,\
 		colschem.obj,\
-		combobox.obj,\
 		control.obj,\
 		dialog.obj,\
 		framuniv.obj,\
 		gauge.obj,\
-		gtk.obj,\
 		inpcons.obj,\
 		inphand.obj,\
 		listbox.obj,\
 		menu.obj,\
 		notebook.obj,\
-		radiobox.obj,\
 		radiobut.obj,\
-		renderer.obj,\
 		scrarrow.obj,\
 		scrolbar.obj,\
 		scrthumb.obj,\
@@ -55,7 +51,14 @@ OBJECTS = \
 		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 \
@@ -64,20 +67,16 @@ SOURCES =\
 		checklst.cpp \
 		choice.cpp \
 		colschem.cpp \
-		combobox.cpp \
 		control.cpp \
 		dialog.cpp \
 		framuniv.cpp \
 		gauge.cpp \
-		[.themes]gtk.cpp \
 		inpcons.cpp \
 		inphand.cpp \
 		listbox.cpp \
 		menu.cpp \
 		notebook.cpp \
-		radiobox.cpp \
 		radiobut.cpp \
-		renderer.cpp \
 		scrarrow.cpp \
 		scrolbar.cpp \
 		scrthumb.cpp \
@@ -92,11 +91,18 @@ SOURCES =\
 		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)
-	library [--.lib]libwx_gtk_univ.olb $(OBJECTS)
+	library [--.lib]libwx_x11_univ.olb $(OBJECTS)
 
 bmpbuttn.obj : bmpbuttn.cpp
 button.obj : button.cpp
@@ -104,21 +110,16 @@ 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
-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
-radiobox.obj : radiobox.cpp
 radiobut.obj : radiobut.cpp
-renderer.obj : renderer.cpp
 scrarrow.obj : scrarrow.cpp
 scrolbar.obj : scrolbar.cpp
 scrthumb.obj : scrthumb.cpp
@@ -134,3 +135,13 @@ 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) [.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