X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/14329e037b7e082fec4325f77214a2e42a2d2762..7948c0c24401c496c04da3c28f1f1f2f282ba327:/src/generic/descrip.mms?ds=sidebyside diff --git a/src/generic/descrip.mms b/src/generic/descrip.mms index 664d0d2e00..ccee2b72ea 100644 --- a/src/generic/descrip.mms +++ b/src/generic/descrip.mms @@ -9,13 +9,21 @@ define wx [--.include.wx] .ifdef __WXMOTIF__ -CXX_DEFINE = /define=(__WXMOTIF__=1) -CC_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__ +.ifdef __WXUNIVERSAL__ +CXX_DEFINE = /define=(__WXGTK__=1,__WXUNIVERSAL__==1)/float=ieee\ + /name=(as_is,short)/ieee=denorm/assume=(nostdnew,noglobal_array_new) +CC_DEFINE = /define=(__WXGTK__=1,__WXUNIVERSAL__==1)/float=ieee\ + /name=(as_is,short)/ieee=denorm +.else 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 +.endif .else CXX_DEFINE = CC_DEFINE = @@ -40,10 +48,10 @@ OBJECTS = \ dirdlgg.obj,\ fontdlgg.obj,\ grid.obj,\ + gridctrl.obj,\ + gridsel.obj,\ helpext.obj,\ helphtml.obj,\ - helpwxht.obj,\ - helpxlp.obj,\ imaglist.obj,\ laywin.obj,\ listctrl.obj,\ @@ -51,7 +59,6 @@ OBJECTS = \ msgdlgg.obj,\ numdlgg.obj,\ panelg.obj,\ - plot.obj,\ printps.obj,\ prntdlgg.obj,\ progdlgg.obj,\ @@ -59,17 +66,17 @@ OBJECTS = \ propform.obj,\ proplist.obj,\ sashwin.obj,\ - scrolwin.obj,\ splitter.obj,\ - statusbr.obj,\ tbarsmpl.obj,\ tabg.obj,\ textdlgg.obj,\ tipdlg.obj,\ + tipwin.obj,\ treectlg.obj,\ wizard.obj SOURCES = \ + accel.cpp,\ busyinfo.cpp,\ calctrl.cpp,\ caret.cpp,\ @@ -81,10 +88,10 @@ SOURCES = \ filedlgg.cpp,\ fontdlgg.cpp,\ grid.cpp,\ + gridctrl.cpp,\ + gridsel.cpp,\ helpext.cpp,\ helphtml.cpp,\ - helpwxht.cpp,\ - helpxlp.cpp,\ imaglist.cpp,\ laywin.cpp,\ listctrl.cpp,\ @@ -92,8 +99,8 @@ SOURCES = \ msgdlgg.cpp,\ notebook.cpp,\ numdlgg.cpp,\ + paletteg.cpp,\ panelg.cpp,\ - plot.cpp,\ printps.cpp,\ prntdlgg.cpp,\ progdlgg.cpp,\ @@ -101,7 +108,6 @@ SOURCES = \ propform.cpp,\ proplist.cpp,\ sashwin.cpp,\ - scrolwin.cpp,\ splitter.cpp,\ statline.cpp,\ statusbr.cpp,\ @@ -109,15 +115,18 @@ SOURCES = \ tabg.cpp,\ textdlgg.cpp,\ tipdlg.cpp,\ + tipwin.cpp,\ treectlg.cpp,\ wizard.cpp .ifdef __WXMOTIF__ -OBJECTS0=,statline.obj,\ - notebook.obj +OBJECTS0=,statusbr.obj,statline.obj,notebook.obj,scrlwing.obj,spinctlg.obj .else -OBJECTS0=,filedlgg.obj - +.ifdef __WXUNIVERSAL__ +OBJECTS0=,accel.obj,filedlgg.obj,paletteg.obj +.else +OBJECTS0=,accel.obj,statusbr.obj,filedlgg.obj,paletteg.obj +.endif .endif all : $(SOURCES) @@ -126,10 +135,15 @@ all : $(SOURCES) library/crea [--.lib]libwx_motif.olb $(OBJECTS)$(OBJECTS0) .else .ifdef __WXGTK__ +.ifdef __WXUNIVERSAL__ + library/crea [--.lib]libwx_gtk_univ.olb $(OBJECTS)$(OBJECTS0) +.else library/crea [--.lib]libwx_gtk.olb $(OBJECTS)$(OBJECTS0) .endif .endif +.endif +accel.obj : accel.cpp busyinfo.obj : busyinfo.cpp calctrl.obj : calctrl.cpp caret.obj : caret.cpp @@ -141,10 +155,10 @@ 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 @@ -152,16 +166,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 @@ -169,5 +184,6 @@ tbarsmpl.obj : tbarsmpl.cpp tabg.obj : tabg.cpp textdlgg.obj : textdlgg.cpp tipdlg.obj : tipdlg.cpp +tipwin.obj : tipwin.cpp treectlg.obj : treectlg.cpp wizard.obj : wizard.cpp