X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/36cc39686ab0774ac2049ccfdea39e3fcfecafb2..29149a64916d6fdc53e445adca9ef83bc58fb6c3:/src/common/descrip.mms?ds=sidebyside diff --git a/src/common/descrip.mms b/src/common/descrip.mms index 08d2cc9434..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,18 +35,20 @@ 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,\ - date.obj,\ + datetime.obj,\ datstrm.obj,\ db.obj,\ dbtable.obj,\ @@ -48,11 +59,13 @@ OBJECTS = \ docview.obj,\ dynarray.obj,\ dynlib.obj,\ + encconv.obj,\ event.obj,\ extended.obj,\ ffile.obj,\ file.obj,\ fileconf.obj,\ + filename.obj,\ filefn.obj,\ filesys.obj,\ fontcmn.obj,\ @@ -76,15 +89,17 @@ OBJECTS1=framecmn.obj,\ imagpng.obj,\ imagpnm.obj,\ imagtiff.obj,\ + imagxpm.obj,\ intl.obj,\ ipcbase.obj,\ layout.obj,\ lboxcmn.obj,\ list.obj,\ log.obj,\ + longlong.obj,\ memory.obj,\ menucmn.obj,\ - mimetype.obj,\ + mimecmn.obj,\ module.obj,\ mstream.obj,\ object.obj,\ @@ -105,12 +120,11 @@ OBJECTS1=framecmn.obj,\ stream.obj,\ string.obj,\ tbarbase.obj,\ - tbarsmpl.obj,\ textcmn.obj,\ textfile.obj,\ - time.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,11 +146,13 @@ SOURCES = \ appcmn.cpp,\ choiccmn.cpp,\ clipcmn.cpp,\ + cmdline.cpp,\ cmndata.cpp,\ config.cpp,\ + cshelp.cpp,\ ctrlcmn.cpp,\ ctrlsub.cpp,\ - date.cpp,\ + datetime.cpp,\ datstrm.cpp,\ db.cpp,\ dbtable.cpp,\ @@ -146,11 +163,13 @@ SOURCES = \ docview.cpp,\ dynarray.cpp,\ dynlib.cpp,\ + encconv.cpp,\ event.cpp,\ extended.c,\ ffile.cpp,\ file.cpp,\ fileconf.cpp,\ + filename.cpp,\ filefn.cpp,\ filesys.cpp,\ fontcmn.cpp,\ @@ -173,15 +192,17 @@ SOURCES = \ imagpng.cpp,\ imagpnm.cpp,\ imagtiff.cpp,\ + imagxpm.cpp,\ intl.cpp,\ ipcbase.cpp,\ layout.cpp,\ lboxcmn.cpp,\ list.cpp,\ log.cpp,\ + longlong.cpp,\ memory.cpp,\ menucmn.cpp,\ - mimetype.cpp,\ + mimecmn.cpp,\ module.cpp,\ mstream.cpp,\ object.cpp,\ @@ -202,12 +223,11 @@ SOURCES = \ stream.cpp,\ string.cpp,\ tbarbase.cpp,\ - tbarsmpl.cpp,\ textcmn.cpp,\ textfile.cpp,\ - time.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,10 +280,12 @@ 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 -date.obj : date.cpp +datetime.obj : datetime.cpp datstrm.obj : datstrm.cpp db.obj : db.cpp dbtable.obj : dbtable.cpp @@ -268,12 +296,14 @@ docmdi.obj : docmdi.cpp docview.obj : docview.cpp dynarray.obj : dynarray.cpp dynlib.obj : dynlib.cpp +encconv.obj : encconv.cpp event.obj : event.cpp extended.obj : extended.c 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 @@ -295,15 +325,17 @@ 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 lboxcmn.obj : lboxcmn.cpp list.obj : list.cpp 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 @@ -324,12 +356,11 @@ strconv.obj : strconv.cpp stream.obj : stream.cpp string.obj : string.cpp tbarbase.obj : tbarbase.cpp -tbarsmpl.obj : tbarsmpl.cpp textcmn.obj : textcmn.cpp textfile.obj : textfile.cpp -time.obj : time.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