X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/6804a3f7197d4720e4c2fc812af2ae364986c07b..8add533eb22ba0756f5b426f77ee593bc1aa6fcd:/src/generic/descrip.mms

diff --git a/src/generic/descrip.mms b/src/generic/descrip.mms
index 08eb79db17..fd9489e653 100644
--- a/src/generic/descrip.mms
+++ b/src/generic/descrip.mms
@@ -14,21 +14,21 @@ CXX_DEFINE = /define=(__WXMOTIF__=1)/name=(as_is,short)\
 CC_DEFINE = /define=(__WXMOTIF__=1)/name=(as_is,short)
 .else
 .ifdef __WXGTK__
-.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)/ieee=denorm\
 	   /assume=(nostdnew,noglobal_array_new)
 CC_DEFINE = /define=(__WXGTK__=1)/float=ieee/name=(as_is,short)/ieee=denorm
-.endif
+.else
+.ifdef __WXX11__
+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)
 .else
 CXX_DEFINE =
 CC_DEFINE =
 .endif
 .endif
+.endif
 
 .suffixes : .cpp
 
@@ -43,15 +43,16 @@ OBJECTS = \
 		caret.obj,\
 		choicdgg.obj,\
 		colrdlgg.obj,\
+		datectlg.obj,\
 		dcpsg.obj,\
 		dirctrlg.obj,\
 		dirdlgg.obj,\
+		fdrepdlg.obj,\
 		fontdlgg.obj,\
 		grid.obj,\
 		gridctrl.obj,\
 		gridsel.obj,\
 		helpext.obj,\
-		helphtml.obj,\
 		imaglist.obj,\
 		laywin.obj,\
 		listctrl.obj,\
@@ -62,9 +63,10 @@ OBJECTS = \
 		printps.obj,\
 		prntdlgg.obj,\
 		progdlgg.obj,\
+		renderg.obj,\
 		sashwin.obj,\
+		selstore.obj,\
 		splitter.obj,\
-		tbarsmpl.obj,\
 		tabg.obj,\
 		textdlgg.obj,\
 		tipdlg.obj,\
@@ -79,16 +81,17 @@ SOURCES = \
 		caret.cpp,\
 		choicdgg.cpp,\
 		colrdlgg.cpp,\
+		datectlg.cpp,\
 		dcpsg.cpp,\
 		dirctrlg.cpp,\
 		dirdlgg.cpp,\
 		filedlgg.cpp,\
+		fdrepdlg.cpp,\
 		fontdlgg.cpp,\
 		grid.cpp,\
 		gridctrl.cpp,\
 		gridsel.cpp,\
 		helpext.cpp,\
-		helphtml.cpp,\
 		imaglist.cpp,\
 		laywin.cpp,\
 		listctrl.cpp,\
@@ -101,23 +104,37 @@ SOURCES = \
 		printps.cpp,\
 		prntdlgg.cpp,\
 		progdlgg.cpp,\
+		renderg.cpp,\
 		sashwin.cpp,\
+		selstore.cpp,\
 		splitter.cpp,\
 		statline.cpp,\
 		statusbr.cpp,\
-		tbarsmpl.cpp,\
 		tabg.cpp,\
 		textdlgg.cpp,\
 		tipdlg.cpp,\
 		tipwin.cpp,\
 		treectlg.cpp,\
-		wizard.cpp
+		wizard.cpp,\
+		dragimgg.cpp,\
+		fdrepdlg.cpp,\
+		htmllbox.cpp,\
+		listbkg.cpp,\
+		mdig.cpp,\
+		scrlwing.cpp,\
+		spinctlg.cpp,\
+		splash.cpp,\
+		timer.cpp,\
+		vlbox.cpp,\
+		vscroll.cpp
 
 .ifdef __WXMOTIF__
 OBJECTS0=,statusbr.obj,statline.obj,notebook.obj,scrlwing.obj,spinctlg.obj
 .else
-.ifdef __WXUNIVERSAL__
-OBJECTS0=,accel.obj,filedlgg.obj,paletteg.obj
+.ifdef __WXX11__
+OBJECTS0=,accel.obj,filedlgg.obj,dragimgg.obj,fdrepdlg.obj,htmllbox.obj,\
+	listbkg.obj,mdig.obj,scrlwing.obj,spinctlg.obj,splash.obj,timer.obj,\
+	vlbox.obj,vscroll.obj
 .else
 OBJECTS0=,accel.obj,statusbr.obj,filedlgg.obj,paletteg.obj
 .endif
@@ -129,10 +146,10 @@ all : $(SOURCES)
 	library/crea [--.lib]libwx_motif.olb $(OBJECTS)$(OBJECTS0)
 .else
 .ifdef __WXGTK__
-.ifdef __WXUNIVERSAL__
-	library/crea [--.lib]libwx_gtk_univ.olb $(OBJECTS)$(OBJECTS0)
-.else
 	library/crea [--.lib]libwx_gtk.olb $(OBJECTS)$(OBJECTS0)
+.else
+.ifdef __WXX11__
+	library/crea [--.lib]libwx_x11_univ.olb $(OBJECTS)$(OBJECTS0)
 .endif
 .endif
 .endif
@@ -143,16 +160,17 @@ calctrl.obj : calctrl.cpp
 caret.obj : caret.cpp
 choicdgg.obj : choicdgg.cpp
 colrdlgg.obj : colrdlgg.cpp
+datectlg.obj : datectlg.cpp
 dcpsg.obj : dcpsg.cpp
 dirctrlg.obj : dirctrlg.cpp
 dirdlgg.obj : dirdlgg.cpp
 filedlgg.obj : filedlgg.cpp
 fontdlgg.obj : fontdlgg.cpp
+fdrepdlg.obj : fdrepdlg.cpp
 grid.obj : grid.cpp
 gridctrl.obj : gridctrl.cpp
 gridsel.obj : gridsel.cpp
 helpext.obj : helpext.cpp
-helphtml.obj : helphtml.cpp
 imaglist.obj : imaglist.cpp
 laywin.obj : laywin.cpp
 listctrl.obj : listctrl.cpp
@@ -167,14 +185,26 @@ prntdlgg.obj : prntdlgg.cpp
 progdlgg.obj : progdlgg.cpp
 scrlwing.obj : scrlwing.cpp
 spinctlg.obj : spinctlg.cpp
+renderg.obj : renderg.cpp
 sashwin.obj : sashwin.cpp
+selstore.obj : selstore.cpp
 splitter.obj : splitter.cpp
 statline.obj : statline.cpp
 statusbr.obj : statusbr.cpp
-tbarsmpl.obj : tbarsmpl.cpp
 tabg.obj : tabg.cpp
 textdlgg.obj : textdlgg.cpp
 tipdlg.obj : tipdlg.cpp
 tipwin.obj : tipwin.cpp
 treectlg.obj : treectlg.cpp
 wizard.obj : wizard.cpp
+dragimgg.obj : dragimgg.cpp
+fdrepdlg.obj : fdrepdlg.cpp
+htmllbox.obj : htmllbox.cpp
+listbkg.obj : listbkg.cpp
+mdig.obj : mdig.cpp
+scrlwing.obj : scrlwing.cpp
+spinctlg.obj : spinctlg.cpp
+splash.obj : splash.cpp
+timer.obj : timer.cpp
+vlbox.obj : vlbox.cpp
+vscroll.obj : vscroll.cpp