X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/392555bb0faa513980f45db7a80d45e13bbbfe6e..caa2490c0fb8053b1d416117a9619695d75af9e4:/src/gtk1/descrip.mms

diff --git a/src/gtk1/descrip.mms b/src/gtk1/descrip.mms
index c14b0b89dd..a4d74a08ca 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
 
@@ -20,19 +27,11 @@ CC_DEFINE = /define=(__WXGTK__=1)/float=ieee/name=(as_is,short)/iee=denorm
 	cc $(CFLAGS)$(CC_DEFINE) $(MMS$TARGET_NAME).c
 
 OBJECTS = \
-	accel.obj,\
 	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,\
@@ -40,29 +39,49 @@ OBJECTS = \
 	dcclient.obj,\
 	dcmemory.obj,\
 	dcscreen.obj,\
-	dialog.obj,\
         dnd.obj,\
+        evtloop.obj,\
+	filedlg.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,\
+	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,\
-	minifram.obj,\
 	notebook.obj,\
-	palette.obj,\
-	pen.obj,\
 	radiobox.obj,\
 	radiobut.obj,\
-	region.obj,\
 	scrolbar.obj,\
-	settings.obj,\
+	scrolwin.obj,\
 	slider.obj,\
         spinbutt.obj,\
 	spinctrl.obj,\
@@ -73,15 +92,9 @@ OBJECTS = \
 	tbargtk.obj,\
 	textctrl.obj,\
 	tglbtn.obj,\
-	timer.obj,\
-	tooltip.obj,\
-	utilsgtk.obj,\
-	utilsres.obj,\
-        win_gtk.obj,\
-	window.obj
+	msgdlg.obj
 
 SOURCES =\
-	accel.cpp,\
 	app.cpp,\
 	bitmap.cpp,\
         bmpbuttn.cpp,\
@@ -103,26 +116,31 @@ SOURCES =\
 	dcscreen.cpp,\
 	dialog.cpp,\
         dnd.cpp,\
+        evtloop.cpp,\
+	filedlg.cpp,\
 	font.cpp,\
 	fontdlg.cpp,\
 	frame.cpp,\
 	gauge.cpp,\
 	gdiobj.cpp,\
         glcanvas.cpp,\
-	gsockgtk.c,\
+	gsockgtk.cpp,\
         icon.cpp,\
 	listbox.cpp,\
 	main.cpp,\
 	mdi.cpp,\
 	menu.cpp,\
 	minifram.cpp,\
+	msgdlg.cpp,\
 	notebook.cpp,\
-	palette.cpp,\
 	pen.cpp,\
+	popupwin.cpp,\
 	radiobox.cpp,\
 	radiobut.cpp,\
+	renderer.cpp,\
 	region.cpp,\
 	scrolbar.cpp,\
+	scrolwin.cpp,\
 	settings.cpp,\
 	slider.cpp,\
         spinbutt.cpp,\
@@ -136,6 +154,7 @@ SOURCES =\
 	tglbtn.cpp,\
 	timer.cpp,\
 	tooltip.cpp,\
+	toplevel.cpp,\
 	utilsgtk.cpp,\
 	utilsres.cpp,\
         win_gtk.c,\
@@ -143,9 +162,16 @@ SOURCES =\
    
 all : $(SOURCES)
 	$(MMS)$(MMSQUALIFIERS) $(OBJECTS)
+.ifdef __WXUNIVERSAL__
+	library [--.lib]libwx_gtk_univ.olb $(OBJECTS)
+	library [--.lib]libwx_gtk_univ.olb [.CXX_REPOSITORY]*.obj
+.else
 	library [--.lib]libwx_gtk.olb $(OBJECTS)
+	library [--.lib]libwx_gtk.olb [.CXX_REPOSITORY]*.obj
+	$(MMS)$(MMSQUALIFIERS) $(OBJECTS0)
+	library [--.lib]libwx_gtk.olb $(OBJECTS0)
+.endif
 
-accel.obj : accel.cpp
 app.obj : app.cpp
 bitmap.obj : bitmap.cpp
 bmpbuttn.obj : bmpbuttn.cpp
@@ -167,26 +193,31 @@ dcmemory.obj : dcmemory.cpp
 dcscreen.obj : dcscreen.cpp
 dialog.obj : dialog.cpp
 dnd.obj : dnd.cpp
+evtloop.obj : evtloop.cpp
+filedlg.obj : filedlg.cpp
 font.obj : font.cpp
 fontdlg.obj : fontdlg.cpp
 frame.obj : frame.cpp
 gauge.obj : gauge.cpp
 gdiobj.obj : gdiobj.cpp
 glcanvas.obj : glcanvas.cpp
-gsockgtk.obj : gsockgtk.c
+gsockgtk.obj : gsockgtk.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
-palette.obj : palette.cpp
 pen.obj : pen.cpp
+popupwin.obj : popupwin.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
 settings.obj : settings.cpp
 slider.obj : slider.cpp
 spinbutt.obj : spinbutt.cpp
@@ -200,6 +231,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