X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/f49676ee8c0ed60d99582cc0b5f23ff7a7d5b970..6443de026310552cacd68a6d0318e73d14929680:/src/common/descrip.mms?ds=sidebyside diff --git a/src/common/descrip.mms b/src/common/descrip.mms index 00060a8061..132ebfbc38 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,7 +35,7 @@ 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,\ @@ -36,6 +45,7 @@ OBJECTS = \ cmdline.obj,\ cmndata.obj,\ config.obj,\ + cshelp.obj,\ ctrlcmn.obj,\ ctrlsub.obj,\ datetime.obj,\ @@ -55,6 +65,7 @@ OBJECTS = \ ffile.obj,\ file.obj,\ fileconf.obj,\ + filename.obj,\ filefn.obj,\ filesys.obj,\ fontcmn.obj,\ @@ -78,6 +89,7 @@ OBJECTS1=framecmn.obj,\ imagpng.obj,\ imagpnm.obj,\ imagtiff.obj,\ + imagxpm.obj,\ intl.obj,\ ipcbase.obj,\ layout.obj,\ @@ -90,6 +102,7 @@ OBJECTS1=framecmn.obj,\ mimecmn.obj,\ module.obj,\ mstream.obj,\ + nbkbase.obj,\ object.obj,\ objstrm.obj,\ paper.obj,\ @@ -107,11 +120,13 @@ OBJECTS1=framecmn.obj,\ strconv.obj,\ stream.obj,\ string.obj,\ + sysopt.obj,\ tbarbase.obj,\ textcmn.obj,\ textfile.obj,\ timercmn.obj,\ tokenzr.obj,\ + treebase.obj,\ txtstrm.obj,\ unzip.obj,\ url.obj,\ @@ -124,6 +139,7 @@ OBJECTS1=framecmn.obj,\ wincmn.obj,\ wxchar.obj,\ wxexpr.obj,\ + xpmdecod.obj,\ zipstrm.obj,\ zstream.obj @@ -135,6 +151,7 @@ SOURCES = \ cmdline.cpp,\ cmndata.cpp,\ config.cpp,\ + cshelp.cpp,\ ctrlcmn.cpp,\ ctrlsub.cpp,\ datetime.cpp,\ @@ -154,6 +171,7 @@ SOURCES = \ ffile.cpp,\ file.cpp,\ fileconf.cpp,\ + filename.cpp,\ filefn.cpp,\ filesys.cpp,\ fontcmn.cpp,\ @@ -176,6 +194,7 @@ SOURCES = \ imagpng.cpp,\ imagpnm.cpp,\ imagtiff.cpp,\ + imagxpm.cpp,\ intl.cpp,\ ipcbase.cpp,\ layout.cpp,\ @@ -188,6 +207,7 @@ SOURCES = \ mimecmn.cpp,\ module.cpp,\ mstream.cpp,\ + nbkbase.cpp,\ object.cpp,\ objstrm.cpp,\ paper.cpp,\ @@ -204,12 +224,14 @@ SOURCES = \ socket.cpp,\ strconv.cpp,\ stream.cpp,\ + sysopt.cpp,\ string.cpp,\ tbarbase.cpp,\ textcmn.cpp,\ textfile.cpp,\ timercmn.cpp,\ tokenzr.cpp,\ + treebase.cpp,\ txtstrm.cpp,\ unzip.c,\ url.cpp,\ @@ -222,6 +244,7 @@ SOURCES = \ wincmn.cpp,\ wxchar.cpp,\ wxexpr.cpp,\ + xpmdecod.cpp,\ zipstrm.cpp,\ zstream.cpp @@ -231,6 +254,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 @@ -258,6 +286,7 @@ 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 @@ -278,6 +307,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 @@ -299,6 +329,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 @@ -311,6 +342,7 @@ menucmn.obj : menucmn.cpp mimecmn.obj : mimecmn.cpp module.obj : module.cpp mstream.obj : mstream.cpp +nbkbase.obj : nbkbase.cpp object.obj : object.cpp objstrm.obj : objstrm.cpp paper.obj : paper.cpp @@ -327,12 +359,14 @@ sizer.obj : sizer.cpp socket.obj : socket.cpp strconv.obj : strconv.cpp stream.obj : stream.cpp +sysopt.obj : sysopt.cpp string.obj : string.cpp tbarbase.obj : tbarbase.cpp 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 @@ -345,5 +379,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