X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/07518267d1ccd4f16e1871d72e6f9d79b9fc29f3..6170c108a1adc39f002462697d5e0b6c801e74eb:/src/motif/descrip.mms

diff --git a/src/motif/descrip.mms b/src/motif/descrip.mms
index 0e001317ee..6e86386049 100644
--- a/src/motif/descrip.mms
+++ b/src/motif/descrip.mms
@@ -9,7 +9,9 @@
 	define wx [--.include.wx]
 
 .ifdef __WXMOTIF__
-CXX_DEFINE = /define=(__WXMOTIF__=1)
+CXX_DEFINE = /define=(__WXMOTIF__=1)/name=(as_is,short)\
+	   /assume=(nostdnew,noglobal_array_new)
+CC_DEFINE = /define=(__WXMOTIF__=1)/name=(as_is,short)
 .else
 CXX_DEFINE =
 .endif
@@ -19,15 +21,14 @@ CXX_DEFINE =
 .cpp.obj :
 	cxx $(CXXFLAGS)$(CXX_DEFINE) $(MMS$TARGET_NAME).cpp
 .c.obj :
-	cc $(CFLAGS)$(CXX_DEFINE) $(MMS$TARGET_NAME).c
+	cc $(CFLAGS)$(CC_DEFINE) $(MMS$TARGET_NAME).c
 
 OBJECTS = \
 		xmcombo.obj,\
 		accel.obj,\
 		app.obj,\
-		bitmap.obj,\
 		bmpbuttn.obj,\
-		brush.obj,\
+		bmpmotif.obj,\
 		button.obj,\
 		checkbox.obj,\
 		checklst.obj,\
@@ -44,11 +45,13 @@ OBJECTS = \
 		dcmemory.obj,\
 		dcscreen.obj,\
 		dialog.obj,\
+		evtloop.obj,\
 		filedlg.obj,\
 		font.obj,\
 		frame.obj,\
 		gauge.obj,\
 		gdiobj.obj,\
+		glcanvas.obj,\
 		gsockmot.obj,\
 		icon.obj,\
 		listbox.obj,\
@@ -59,10 +62,8 @@ OBJECTS = \
 		minifram.obj,\
 		msgdlg.obj,\
 		palette.obj,\
-		pen.obj,\
 		radiobox.obj,\
 		radiobut.obj,\
-		region.obj,\
 		scrolbar.obj,\
 		settings.obj,\
 		slider.obj,\
@@ -71,6 +72,7 @@ OBJECTS = \
 		statbox.obj,\
 		stattext.obj,\
 		textctrl.obj,\
+		toplevel.obj,\
 		timer.obj,\
 		toolbar.obj,\
 		utils.obj,\
@@ -79,9 +81,8 @@ OBJECTS = \
 SOURCES = \
 		accel.cpp,\
 		app.cpp,\
-		bitmap.cpp,\
 		bmpbuttn.cpp,\
-		brush.cpp,\
+		bmpmotif.cpp,\
 		button.cpp,\
 		checkbox.cpp,\
 		checklst.cpp,\
@@ -98,11 +99,13 @@ SOURCES = \
 		dcmemory.cpp,\
 		dcscreen.cpp,\
 		dialog.cpp,\
+		evtloop.cpp,\
 		filedlg.cpp,\
 		font.cpp,\
 		frame.cpp,\
 		gauge.cpp,\
 		gdiobj.cpp,\
+		glcanvas.cpp,\
 		gsockmot.c,\
 		icon.cpp,\
 		listbox.cpp,\
@@ -113,10 +116,8 @@ SOURCES = \
 		minifram.cpp,\
 		msgdlg.cpp,\
 		palette.cpp,\
-		pen.cpp,\
 		radiobox.cpp,\
 		radiobut.cpp,\
-		region.cpp,\
 		scrolbar.cpp,\
 		settings.cpp,\
 		slider.cpp,\
@@ -125,6 +126,7 @@ SOURCES = \
 		statbox.cpp,\
 		stattext.cpp,\
 		textctrl.cpp,\
+		toplevel.cpp,\
 		timer.cpp,\
 		toolbar.cpp,\
 		utils.cpp,\
@@ -138,13 +140,12 @@ all : $(SOURCES)
 .endif
 
 xmcombo.obj : [.xmcombo]xmcombo.c
-	cc $(CFLAGS)$(CXX_DEFINE) [.xmcombo]xmcombo.c
+	cc $(CFLAGS)$(CC_DEFINE) [.xmcombo]xmcombo.c
 
 accel.obj : accel.cpp
 app.obj : app.cpp
-bitmap.obj : bitmap.cpp
 bmpbuttn.obj : bmpbuttn.cpp
-brush.obj : brush.cpp
+bmpmotif.obj : bmpmotif.cpp
 button.obj : button.cpp
 checkbox.obj : checkbox.cpp
 checklst.obj : checklst.cpp
@@ -161,11 +162,13 @@ dcclient.obj : dcclient.cpp
 dcmemory.obj : dcmemory.cpp
 dcscreen.obj : dcscreen.cpp
 dialog.obj : dialog.cpp
+evtloop.obj : evtloop.cpp
 filedlg.obj : filedlg.cpp
 font.obj : font.cpp
 frame.obj : frame.cpp
 gauge.obj : gauge.cpp
 gdiobj.obj : gdiobj.cpp
+glcanvas.obj : glcanvas.cpp
 gsockmot.obj : gsockmot.c
 icon.obj : icon.cpp
 listbox.obj : listbox.cpp
@@ -176,10 +179,8 @@ menuitem.obj : menuitem.cpp
 minifram.obj : minifram.cpp
 msgdlg.obj : msgdlg.cpp
 palette.obj : palette.cpp
-pen.obj : pen.cpp
 radiobox.obj : radiobox.cpp
 radiobut.obj : radiobut.cpp
-region.obj : region.cpp
 scrolbar.obj : scrolbar.cpp
 settings.obj : settings.cpp
 slider.obj : slider.cpp
@@ -188,6 +189,7 @@ statbmp.obj : statbmp.cpp
 statbox.obj : statbox.cpp
 stattext.obj : stattext.cpp
 textctrl.obj : textctrl.cpp
+toplevel.obj : toplevel.cpp
 timer.obj : timer.cpp
 toolbar.obj : toolbar.cpp
 utils.obj : utils.cpp