X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/1696c17801e10ea87246508ff7da37aa2f6d79ff..29149a64916d6fdc53e445adca9ef83bc58fb6c3:/src/common/descrip.mms?ds=sidebyside

diff --git a/src/common/descrip.mms b/src/common/descrip.mms
index bc51d1812d..9d93baa3c3 100644
--- a/src/common/descrip.mms
+++ b/src/common/descrip.mms
@@ -10,9 +10,18 @@
 	set command $disk2:[joukj.com]bison.cld
 
 .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
 
 YACC=bison/yacc
@@ -26,15 +35,17 @@ LEX=flex
 .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 = \
 		parser.obj,\
 		appcmn.obj,\
 		choiccmn.obj,\
 		clipcmn.obj,\
+		cmdline.obj,\
 		cmndata.obj,\
 		config.obj,\
+		cshelp.obj,\
 		ctrlcmn.obj,\
 		ctrlsub.obj,\
 		datetime.obj,\
@@ -54,6 +65,7 @@ OBJECTS = \
 		ffile.obj,\
 		file.obj,\
 		fileconf.obj,\
+		filename.obj,\
 		filefn.obj,\
 		filesys.obj,\
 		fontcmn.obj,\
@@ -77,6 +89,7 @@ OBJECTS1=framecmn.obj,\
 		imagpng.obj,\
 		imagpnm.obj,\
 		imagtiff.obj,\
+		imagxpm.obj,\
 		intl.obj,\
 		ipcbase.obj,\
 		layout.obj,\
@@ -86,7 +99,7 @@ OBJECTS1=framecmn.obj,\
 		longlong.obj,\
 		memory.obj,\
 		menucmn.obj,\
-		mimetype.obj,\
+		mimecmn.obj,\
 		module.obj,\
 		mstream.obj,\
 		object.obj,\
@@ -111,6 +124,7 @@ OBJECTS1=framecmn.obj,\
 		textfile.obj,\
 		timercmn.obj,\
 		tokenzr.obj,\
+		treebase.obj,\
 		txtstrm.obj,\
 		unzip.obj,\
 		url.obj,\
@@ -123,6 +137,7 @@ OBJECTS1=framecmn.obj,\
 		wincmn.obj,\
 		wxchar.obj,\
 		wxexpr.obj,\
+		xpmdecod.obj,\
 		zipstrm.obj,\
 		zstream.obj
 
@@ -131,8 +146,10 @@ SOURCES = \
 		appcmn.cpp,\
 		choiccmn.cpp,\
 		clipcmn.cpp,\
+		cmdline.cpp,\
 		cmndata.cpp,\
 		config.cpp,\
+		cshelp.cpp,\
 		ctrlcmn.cpp,\
 		ctrlsub.cpp,\
 		datetime.cpp,\
@@ -152,6 +169,7 @@ SOURCES = \
 		ffile.cpp,\
 		file.cpp,\
 		fileconf.cpp,\
+		filename.cpp,\
 		filefn.cpp,\
 		filesys.cpp,\
 		fontcmn.cpp,\
@@ -174,6 +192,7 @@ SOURCES = \
 		imagpng.cpp,\
 		imagpnm.cpp,\
 		imagtiff.cpp,\
+		imagxpm.cpp,\
 		intl.cpp,\
 		ipcbase.cpp,\
 		layout.cpp,\
@@ -183,7 +202,7 @@ SOURCES = \
 		longlong.cpp,\
 		memory.cpp,\
 		menucmn.cpp,\
-		mimetype.cpp,\
+		mimecmn.cpp,\
 		module.cpp,\
 		mstream.cpp,\
 		object.cpp,\
@@ -208,6 +227,7 @@ SOURCES = \
 		textfile.cpp,\
 		timercmn.cpp,\
 		tokenzr.cpp,\
+		treebase.cpp,\
 		txtstrm.cpp,\
 		unzip.c,\
 		url.cpp,\
@@ -220,6 +240,7 @@ SOURCES = \
 		wincmn.cpp,\
 		wxchar.cpp,\
 		wxexpr.cpp,\
+		xpmdecod.cpp,\
 		zipstrm.cpp,\
 		zstream.cpp
 
@@ -229,6 +250,11 @@ all : $(SOURCES)
 .ifdef __WXMOTIF__
 	library [--.lib]libwx_motif.olb $(OBJECTS)
 	library [--.lib]libwx_motif.olb $(OBJECTS1)
+.else
+.ifdef __WXGTK__
+	library [--.lib]libwx_gtk.olb $(OBJECTS)
+	library [--.lib]libwx_gtk.olb $(OBJECTS1)
+.endif
 .endif
 
 parser.obj : parser.c lexer.c
@@ -254,7 +280,9 @@ appcmn.obj : appcmn.cpp
 choiccmn.obj : choiccmn.cpp
 clipcmn.obj : clipcmn.cpp
 cmndata.obj : cmndata.cpp
+cmdline.obj : cmdline.cpp
 config.obj : config.cpp
+cshelp.obj : cshelp.cpp
 ctrlcmn.obj : ctrlcmn.cpp
 ctrlsub.obj : ctrlsub.cpp
 datetime.obj : datetime.cpp
@@ -275,6 +303,7 @@ ffile.obj : ffile.cpp
 file.obj : file.cpp
 fileconf.obj : fileconf.cpp
 filefn.obj : filefn.cpp
+filename.obj : filename.cpp
 filesys.obj : filesys.cpp
 fontcmn.obj : fontcmn.cpp
 fontmap.obj : fontmap.cpp
@@ -296,6 +325,7 @@ imagpcx.obj : imagpcx.cpp
 imagpng.obj : imagpng.cpp
 imagpnm.obj : imagpnm.cpp
 imagtiff.obj : imagtiff.cpp
+imagxpm.obj : imagxpm.cpp
 intl.obj : intl.cpp
 ipcbase.obj : ipcbase.cpp
 layout.obj : layout.cpp
@@ -305,7 +335,7 @@ log.obj : log.cpp
 longlong.obj : longlong.cpp
 memory.obj : memory.cpp
 menucmn.obj : menucmn.cpp
-mimetype.obj : mimetype.cpp
+mimecmn.obj : mimecmn.cpp
 module.obj : module.cpp
 mstream.obj : mstream.cpp
 object.obj : object.cpp
@@ -330,6 +360,7 @@ textcmn.obj : textcmn.cpp
 textfile.obj : textfile.cpp
 timercmn.obj : timercmn.cpp
 tokenzr.obj : tokenzr.cpp
+treebase.obj : treebase.cpp
 txtstrm.obj : txtstrm.cpp
 unzip.obj : unzip.c
 url.obj : url.cpp
@@ -342,5 +373,6 @@ wfstream.obj : wfstream.cpp
 wincmn.obj : wincmn.cpp
 wxchar.obj : wxchar.cpp
 wxexpr.obj : wxexpr.cpp
+xpmdecod.obj : xpmdecod.cpp
 zipstrm.obj : zipstrm.cpp
 zstream.obj : zstream.cpp