X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/27df579a6fee15c771a6020ec856dff64422151f..2fe212b0336512aac9eace69fab09ce856b0bf4b:/src/generic/descrip.mms diff --git a/src/generic/descrip.mms b/src/generic/descrip.mms index 2aeaa0fe8c..7207131da3 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,14 +27,18 @@ CXX_DEFINE = .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,\ @@ -44,7 +53,6 @@ OBJECTS = \ msgdlgg.obj,\ numdlgg.obj,\ panelg.obj,\ - plot.obj,\ printps.obj,\ prntdlgg.obj,\ progdlgg.obj,\ @@ -52,23 +60,25 @@ 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,\ @@ -84,8 +94,8 @@ SOURCES = \ msgdlgg.cpp,\ notebook.cpp,\ numdlgg.cpp,\ + paletteg.cpp,\ panelg.cpp,\ - plot.cpp,\ printps.cpp,\ prntdlgg.cpp,\ progdlgg.cpp,\ @@ -93,7 +103,6 @@ SOURCES = \ propform.cpp,\ proplist.cpp,\ sashwin.cpp,\ - scrolwin.cpp,\ splitter.cpp,\ statline.cpp,\ statusbr.cpp,\ @@ -101,15 +110,15 @@ 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 - +OBJECTS0=,filedlgg.obj,paletteg.obj .endif all : $(SOURCES) @@ -122,12 +131,14 @@ all : $(SOURCES) .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 @@ -143,8 +154,8 @@ 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 @@ -152,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 @@ -160,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