X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/3fa056ab78be920eacac56e51864fe7a45d1a31a..cb7acf9cc78c309026bed1038631f2663cd90bda:/src/generic/descrip.mms?ds=sidebyside diff --git a/src/generic/descrip.mms b/src/generic/descrip.mms index aa0b2f263c..00474ef579 100644 --- a/src/generic/descrip.mms +++ b/src/generic/descrip.mms @@ -9,12 +9,17 @@ 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) +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 @@ -22,6 +27,8 @@ CXX_DEFINE = .cpp.obj : cxx $(CXXFLAGS)$(CXX_DEFINE) $(MMS$TARGET_NAME).cpp +.c.obj : + cc $(CFLAGS)$(CC_DEFINE) $(MMS$TARGET_NAME).c OBJECTS = \ busyinfo.obj,\ @@ -30,13 +37,15 @@ OBJECTS = \ choicdgg.obj,\ colrdlgg.obj,\ dcpsg.obj,\ + dirctrlg.obj,\ dirdlgg.obj,\ fontdlgg.obj,\ grid.obj,\ + gridctrl.obj,\ + gridsel.obj,\ helpext.obj,\ helphtml.obj,\ helpwxht.obj,\ - helpxlp.obj,\ imaglist.obj,\ laywin.obj,\ listctrl.obj,\ @@ -44,7 +53,6 @@ OBJECTS = \ msgdlgg.obj,\ numdlgg.obj,\ panelg.obj,\ - plot.obj,\ printps.obj,\ prntdlgg.obj,\ progdlgg.obj,\ @@ -52,30 +60,34 @@ OBJECTS = \ propform.obj,\ proplist.obj,\ sashwin.obj,\ - scrolwin.obj,\ splitter.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,\ + gridctrl.cpp,\ + gridsel.cpp,\ helpext.cpp,\ helphtml.cpp,\ helpwxht.cpp,\ - helpxlp.cpp,\ imaglist.cpp,\ laywin.cpp,\ listctrl.cpp,\ @@ -83,8 +95,8 @@ SOURCES = \ msgdlgg.cpp,\ notebook.cpp,\ numdlgg.cpp,\ + paletteg.cpp,\ panelg.cpp,\ - plot.cpp,\ printps.cpp,\ prntdlgg.cpp,\ progdlgg.cpp,\ @@ -92,7 +104,6 @@ SOURCES = \ propform.cpp,\ proplist.cpp,\ sashwin.cpp,\ - scrolwin.cpp,\ splitter.cpp,\ statline.cpp,\ statusbr.cpp,\ @@ -100,14 +111,14 @@ SOURCES = \ tabg.cpp,\ textdlgg.cpp,\ tipdlg.cpp,\ - treectrl.cpp,\ + tipwin.cpp,\ + treectlg.cpp,\ wizard.cpp .ifdef __WXMOTIF__ -OBJECTS0=,statline.obj,\ - notebook.obj +OBJECTS0=,statline.obj,notebook.obj,scrlwing.obj,spinctlg.obj .else -OBJECTS0= +OBJECTS0=,accel.obj,filedlgg.obj,paletteg.obj .endif all : $(SOURCES) @@ -116,23 +127,27 @@ all : $(SOURCES) library/crea [--.lib]libwx_motif.olb $(OBJECTS)$(OBJECTS0) .else .ifdef __WXGTK__ - library/crea [--.lib]libwx_gtk.olb $(OBJECTS) + 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 +gridctrl.obj : gridctrl.cpp +gridsel.obj : gridsel.cpp helpext.obj : helpext.cpp helphtml.obj : helphtml.cpp helpwxht.obj : helpwxht.cpp -helpxlp.obj : helpxlp.cpp imaglist.obj : imaglist.cpp laywin.obj : laywin.cpp listctrl.obj : listctrl.cpp @@ -140,16 +155,17 @@ logg.obj : logg.cpp msgdlgg.obj : msgdlgg.cpp notebook.obj : notebook.cpp numdlgg.obj : numdlgg.cpp +paletteg.obj : paletteg.cpp panelg.obj : panelg.cpp -plot.obj : plot.cpp printps.obj : printps.cpp prntdlgg.obj : prntdlgg.cpp progdlgg.obj : progdlgg.cpp prop.obj : prop.cpp propform.obj : propform.cpp proplist.obj : proplist.cpp +scrlwing.obj : scrlwing.cpp +spinctlg.obj : spinctlg.cpp sashwin.obj : sashwin.cpp -scrolwin.obj : scrolwin.cpp splitter.obj : splitter.cpp statline.obj : statline.cpp statusbr.obj : statusbr.cpp @@ -157,5 +173,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