X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/fb10f04c957b3712c04ddec92d083209e127b011..6443de026310552cacd68a6d0318e73d14929680:/src/generic/descrip.mms?ds=sidebyside

diff --git a/src/generic/descrip.mms b/src/generic/descrip.mms
index 986f8398b8..7207131da3 100644
--- a/src/generic/descrip.mms
+++ b/src/generic/descrip.mms
@@ -9,22 +9,36 @@
 	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
+.ifdef __WXGTK__
+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
 CXX_DEFINE =
+CC_DEFINE =
+.endif
 .endif
 
 .suffixes : .cpp
 
 .cpp.obj :
 	cxx $(CXXFLAGS)$(CXX_DEFINE) $(MMS$TARGET_NAME).cpp
+.c.obj :
+	cc $(CFLAGS)$(CC_DEFINE) $(MMS$TARGET_NAME).c
 
 OBJECTS = \
+		accel.obj,\
 		busyinfo.obj,\
+		calctrl.obj,\
 		caret.obj,\
 		choicdgg.obj,\
 		colrdlgg.obj,\
 		dcpsg.obj,\
+		dirctrlg.obj,\
 		dirdlgg.obj,\
 		fontdlgg.obj,\
 		grid.obj,\
@@ -37,7 +51,6 @@ OBJECTS = \
 		listctrl.obj,\
 		logg.obj,\
 		msgdlgg.obj,\
-		notebook.obj,\
 		numdlgg.obj,\
 		panelg.obj,\
 		printps.obj,\
@@ -47,24 +60,27 @@ OBJECTS = \
 		propform.obj,\
 		proplist.obj,\
 		sashwin.obj,\
-		scrolwin.obj,\
 		splitter.obj,\
-		statline.obj,\
 		statusbr.obj,\
 		tbarsmpl.obj,\
 		tabg.obj,\
 		textdlgg.obj,\
 		tipdlg.obj,\
-		treectrl.obj,\
+		tipwin.obj,\
+		treectlg.obj,\
 		wizard.obj
 
 SOURCES = \
+		accel.cpp,\
 		busyinfo.cpp,\
+		calctrl.cpp,\
 		caret.cpp,\
 		choicdgg.cpp,\
 		colrdlgg.cpp,\
 		dcpsg.cpp,\
+		dirctrlg.cpp,\
 		dirdlgg.cpp,\
+		filedlgg.cpp,\
 		fontdlgg.cpp,\
 		grid.cpp,\
 		helpext.cpp,\
@@ -78,6 +94,7 @@ SOURCES = \
 		msgdlgg.cpp,\
 		notebook.cpp,\
 		numdlgg.cpp,\
+		paletteg.cpp,\
 		panelg.cpp,\
 		printps.cpp,\
 		prntdlgg.cpp,\
@@ -86,7 +103,6 @@ SOURCES = \
 		propform.cpp,\
 		proplist.cpp,\
 		sashwin.cpp,\
-		scrolwin.cpp,\
 		splitter.cpp,\
 		statline.cpp,\
 		statusbr.cpp,\
@@ -94,22 +110,37 @@ SOURCES = \
 		tabg.cpp,\
 		textdlgg.cpp,\
 		tipdlg.cpp,\
-		treectrl.cpp,\
+		tipwin.cpp,\
+		treectlg.cpp,\
 		wizard.cpp
 
+.ifdef __WXMOTIF__
+OBJECTS0=,statline.obj,\
+		notebook.obj
+.else
+OBJECTS0=,filedlgg.obj,paletteg.obj
+.endif
 
 all : $(SOURCES)
-	$(MMS)$(MMSQUALIFIERS) $(OBJECTS)
+	$(MMS)$(MMSQUALIFIERS) $(OBJECTS)$(OBJECTS0)
 .ifdef __WXMOTIF__
-	library/crea [--.lib]libwx_motif.olb $(OBJECTS)
+	library/crea [--.lib]libwx_motif.olb $(OBJECTS)$(OBJECTS0)
+.else
+.ifdef __WXGTK__
+	library/crea [--.lib]libwx_gtk.olb $(OBJECTS)$(OBJECTS0)
+.endif
 .endif
 
+accel.obj : accel.cpp
 busyinfo.obj : busyinfo.cpp
+calctrl.obj : calctrl.cpp
 caret.obj : caret.cpp
 choicdgg.obj : choicdgg.cpp
 colrdlgg.obj : colrdlgg.cpp
 dcpsg.obj : dcpsg.cpp
+dirctrlg.obj : dirctrlg.cpp
 dirdlgg.obj : dirdlgg.cpp
+filedlgg.obj : filedlgg.cpp
 fontdlgg.obj : fontdlgg.cpp
 grid.obj : grid.cpp
 helpext.obj : helpext.cpp
@@ -123,6 +154,7 @@ logg.obj : logg.cpp
 msgdlgg.obj : msgdlgg.cpp
 notebook.obj : notebook.cpp
 numdlgg.obj : numdlgg.cpp
+paletteg.obj : paletteg.cpp
 panelg.obj : panelg.cpp
 printps.obj : printps.cpp
 prntdlgg.obj : prntdlgg.cpp
@@ -131,7 +163,6 @@ prop.obj : prop.cpp
 propform.obj : propform.cpp
 proplist.obj : proplist.cpp
 sashwin.obj : sashwin.cpp
-scrolwin.obj : scrolwin.cpp
 splitter.obj : splitter.cpp
 statline.obj : statline.cpp
 statusbr.obj : statusbr.cpp
@@ -139,5 +170,6 @@ tbarsmpl.obj : tbarsmpl.cpp
 tabg.obj : tabg.cpp
 textdlgg.obj : textdlgg.cpp
 tipdlg.obj : tipdlg.cpp
-treectrl.obj : treectrl.cpp
+tipwin.obj : tipwin.cpp
+treectlg.obj : treectlg.cpp
 wizard.obj : wizard.cpp