X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/135ce19c6765c1163b63071ed84443da989cac7a..f7df21aadf1e921b76e34cd7f78ba5db33301a13:/src/generic/descrip.mms

diff --git a/src/generic/descrip.mms b/src/generic/descrip.mms
index e1006262e5..3ae317bf36 100644
--- a/src/generic/descrip.mms
+++ b/src/generic/descrip.mms
@@ -18,10 +18,17 @@ 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
 .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
 
@@ -41,10 +48,9 @@ OBJECTS = \
 		dirdlgg.obj,\
 		fontdlgg.obj,\
 		grid.obj,\
+		gridctrl.obj,\
+		gridsel.obj,\
 		helpext.obj,\
-		helphtml.obj,\
-		helpwxht.obj,\
-		helpxlp.obj,\
 		imaglist.obj,\
 		laywin.obj,\
 		listctrl.obj,\
@@ -52,18 +58,13 @@ OBJECTS = \
 		msgdlgg.obj,\
 		numdlgg.obj,\
 		panelg.obj,\
-		plot.obj,\
 		printps.obj,\
 		prntdlgg.obj,\
 		progdlgg.obj,\
-		prop.obj,\
-		propform.obj,\
-		proplist.obj,\
+		renderg.obj,\
 		sashwin.obj,\
-		scrolwin.obj,\
+		selstore.obj,\
 		splitter.obj,\
-		statusbr.obj,\
-		tbarsmpl.obj,\
 		tabg.obj,\
 		textdlgg.obj,\
 		tipdlg.obj,\
@@ -72,6 +73,7 @@ OBJECTS = \
 		wizard.obj
 
 SOURCES = \
+		accel.cpp,\
 		busyinfo.cpp,\
 		calctrl.cpp,\
 		caret.cpp,\
@@ -83,10 +85,9 @@ SOURCES = \
 		filedlgg.cpp,\
 		fontdlgg.cpp,\
 		grid.cpp,\
+		gridctrl.cpp,\
+		gridsel.cpp,\
 		helpext.cpp,\
-		helphtml.cpp,\
-		helpwxht.cpp,\
-		helpxlp.cpp,\
 		imaglist.cpp,\
 		laywin.cpp,\
 		listctrl.cpp,\
@@ -94,33 +95,45 @@ SOURCES = \
 		msgdlgg.cpp,\
 		notebook.cpp,\
 		numdlgg.cpp,\
+		paletteg.cpp,\
 		panelg.cpp,\
-		plot.cpp,\
 		printps.cpp,\
 		prntdlgg.cpp,\
 		progdlgg.cpp,\
-		prop.cpp,\
-		propform.cpp,\
-		proplist.cpp,\
+		renderg.cpp,\
 		sashwin.cpp,\
-		scrolwin.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=,statline.obj,\
-		notebook.obj
+OBJECTS0=,statusbr.obj,statline.obj,notebook.obj,scrlwing.obj,spinctlg.obj
 .else
-OBJECTS0=,filedlgg.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
 .endif
 
 all : $(SOURCES)
@@ -130,9 +143,14 @@ all : $(SOURCES)
 .else
 .ifdef __WXGTK__
 	library/crea [--.lib]libwx_gtk.olb $(OBJECTS)$(OBJECTS0)
+.else
+.ifdef __WXX11__
+	library/crea [--.lib]libwx_x11_univ.olb $(OBJECTS)$(OBJECTS0)
+.endif
 .endif
 .endif
 
+accel.obj : accel.cpp
 busyinfo.obj : busyinfo.cpp
 calctrl.obj : calctrl.cpp
 caret.obj : caret.cpp
@@ -144,10 +162,9 @@ dirdlgg.obj : dirdlgg.cpp
 filedlgg.obj : filedlgg.cpp
 fontdlgg.obj : fontdlgg.cpp
 grid.obj : grid.cpp
+gridctrl.obj : gridctrl.cpp
+gridsel.obj : gridsel.cpp
 helpext.obj : helpext.cpp
-helphtml.obj : helphtml.cpp
-helpwxht.obj : helpwxht.cpp
-helpxlp.obj : helpxlp.cpp
 imaglist.obj : imaglist.cpp
 laywin.obj : laywin.cpp
 listctrl.obj : listctrl.cpp
@@ -155,23 +172,33 @@ logg.obj : logg.cpp
 msgdlgg.obj : msgdlgg.cpp
 notebook.obj : notebook.cpp
 numdlgg.obj : numdlgg.cpp
+paletteg.obj : paletteg.cpp
 panelg.obj : panelg.cpp
-plot.obj : plot.cpp
 printps.obj : printps.cpp
 prntdlgg.obj : prntdlgg.cpp
 progdlgg.obj : progdlgg.cpp
-prop.obj : prop.cpp
-propform.obj : propform.cpp
-proplist.obj : proplist.cpp
+scrlwing.obj : scrlwing.cpp
+spinctlg.obj : spinctlg.cpp
+renderg.obj : renderg.cpp
 sashwin.obj : sashwin.cpp
-scrolwin.obj : scrolwin.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