X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/0f02d3d0ec5c415e222929d9fe587a603772fade..2d956b58023a4955313a1c1531bc70a0deb0b831:/src/gtk1/descrip.mms

diff --git a/src/gtk1/descrip.mms b/src/gtk1/descrip.mms
index b66c42069e..c87ecab7ae 100644
--- a/src/gtk1/descrip.mms
+++ b/src/gtk1/descrip.mms
@@ -8,9 +8,16 @@
 .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
+.endif
 
 .suffixes : .cpp
 
@@ -22,16 +29,9 @@ CC_DEFINE = /define=(__WXGTK__=1)/float=ieee/name=(as_is,short)/iee=denorm
 OBJECTS = \
 	app.obj,\
 	bitmap.obj,\
-        bmpbuttn.obj,\
 	brush.obj,\
-	button.obj,\
-	checkbox.obj,\
-	checklst.obj,\
-	choice.obj,\
 	clipbrd.obj,\
 	colour.obj,\
-        combobox.obj,\
-	control.obj,\
 	cursor.obj,\
 	data.obj,\
 	dataobj.obj,\
@@ -39,29 +39,46 @@ OBJECTS = \
 	dcclient.obj,\
 	dcmemory.obj,\
 	dcscreen.obj,\
-	dialog.obj,\
         dnd.obj,\
 	font.obj,\
-	fontdlg.obj,\
-	frame.obj,\
-	gauge.obj,\
 	gdiobj.obj,\
         glcanvas.obj,\
 	gsockgtk.obj,\
         icon.obj,\
-	listbox.obj,\
 	main.obj,\
+	minifram.obj,\
+	pen.obj,\
+	popupwin.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,\
-	minifram.obj,\
 	notebook.obj,\
-	pen.obj,\
 	radiobox.obj,\
 	radiobut.obj,\
-	region.obj,\
 	scrolbar.obj,\
 	scrolwin.obj,\
-	settings.obj,\
 	slider.obj,\
         spinbutt.obj,\
 	spinctrl.obj,\
@@ -71,13 +88,7 @@ OBJECTS = \
 	stattext.obj,\
 	tbargtk.obj,\
 	textctrl.obj,\
-	tglbtn.obj,\
-	timer.obj,\
-	tooltip.obj,\
-	utilsgtk.obj,\
-	utilsres.obj,\
-        win_gtk.obj,\
-	window.obj
+	tglbtn.obj
 
 SOURCES =\
 	app.cpp,\
@@ -116,6 +127,7 @@ SOURCES =\
 	minifram.cpp,\
 	notebook.cpp,\
 	pen.cpp,\
+	popupwin.cpp,\
 	radiobox.cpp,\
 	radiobut.cpp,\
 	region.cpp,\
@@ -134,6 +146,7 @@ SOURCES =\
 	tglbtn.cpp,\
 	timer.cpp,\
 	tooltip.cpp,\
+	toplevel.cpp,\
 	utilsgtk.cpp,\
 	utilsres.cpp,\
         win_gtk.c,\
@@ -141,7 +154,13 @@ SOURCES =\
    
 all : $(SOURCES)
 	$(MMS)$(MMSQUALIFIERS) $(OBJECTS)
+.ifdef __WXUNIVERSAL__
+	library [--.lib]libwx_gtk_univ.olb $(OBJECTS)
+.else
 	library [--.lib]libwx_gtk.olb $(OBJECTS)
+	$(MMS)$(MMSQUALIFIERS) $(OBJECTS0)
+	library [--.lib]libwx_gtk.olb $(OBJECTS0)
+.endif
 
 app.obj : app.cpp
 bitmap.obj : bitmap.cpp
@@ -179,6 +198,7 @@ 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
 region.obj : region.cpp
@@ -197,6 +217,7 @@ textctrl.obj : textctrl.cpp
 tglbtn.obj : tglbtn.cpp
 timer.obj : timer.cpp
 tooltip.obj : tooltip.cpp
+toplevel.obj : toplevel.cpp
 utilsgtk.obj : utilsgtk.cpp
 utilsres.obj : utilsres.cpp
 win_gtk.obj : win_gtk.c