X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/abfcca57dd0d805ceec9e19c4be207614d79252a..d40a56d0db2e5249a65087b6af7d1ff7bfb378a6:/src/generic/descrip.mms diff --git a/src/generic/descrip.mms b/src/generic/descrip.mms index 669c314783..fd9489e653 100644 --- a/src/generic/descrip.mms +++ b/src/generic/descrip.mms @@ -18,10 +18,17 @@ 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 +.ifdef __WXX11__ +CXX_DEFINE = /define=(__WXX11__=1,__WXUNIVERSAL__==1)/float=ieee\ + /name=(as_is,short)/assume=(nostdnew,noglobal_array_new) +CC_DEFINE = /define=(__WXX11__=1,__WXUNIVERSAL__==1)/float=ieee\ + /name=(as_is,short) +.else CXX_DEFINE = CC_DEFINE = .endif .endif +.endif .suffixes : .cpp @@ -31,23 +38,21 @@ CC_DEFINE = cc $(CFLAGS)$(CC_DEFINE) $(MMS$TARGET_NAME).c OBJECTS = \ - accel.obj,\ busyinfo.obj,\ calctrl.obj,\ caret.obj,\ choicdgg.obj,\ colrdlgg.obj,\ + datectlg.obj,\ dcpsg.obj,\ dirctrlg.obj,\ dirdlgg.obj,\ + fdrepdlg.obj,\ fontdlgg.obj,\ grid.obj,\ gridctrl.obj,\ gridsel.obj,\ helpext.obj,\ - helphtml.obj,\ - helpwxht.obj,\ - helpxlp.obj,\ imaglist.obj,\ laywin.obj,\ listctrl.obj,\ @@ -58,13 +63,10 @@ OBJECTS = \ printps.obj,\ prntdlgg.obj,\ progdlgg.obj,\ - prop.obj,\ - propform.obj,\ - proplist.obj,\ + renderg.obj,\ sashwin.obj,\ + selstore.obj,\ splitter.obj,\ - statusbr.obj,\ - tbarsmpl.obj,\ tabg.obj,\ textdlgg.obj,\ tipdlg.obj,\ @@ -79,18 +81,17 @@ SOURCES = \ caret.cpp,\ choicdgg.cpp,\ colrdlgg.cpp,\ + datectlg.cpp,\ dcpsg.cpp,\ dirctrlg.cpp,\ dirdlgg.cpp,\ filedlgg.cpp,\ + fdrepdlg.cpp,\ fontdlgg.cpp,\ grid.cpp,\ gridctrl.cpp,\ gridsel.cpp,\ helpext.cpp,\ - helphtml.cpp,\ - helpwxht.cpp,\ - helpxlp.cpp,\ imaglist.cpp,\ laywin.cpp,\ listctrl.cpp,\ @@ -103,26 +104,40 @@ SOURCES = \ printps.cpp,\ prntdlgg.cpp,\ progdlgg.cpp,\ - prop.cpp,\ - propform.cpp,\ - proplist.cpp,\ + renderg.cpp,\ sashwin.cpp,\ + selstore.cpp,\ splitter.cpp,\ statline.cpp,\ statusbr.cpp,\ - tbarsmpl.cpp,\ tabg.cpp,\ textdlgg.cpp,\ tipdlg.cpp,\ tipwin.cpp,\ treectlg.cpp,\ - wizard.cpp + wizard.cpp,\ + dragimgg.cpp,\ + fdrepdlg.cpp,\ + htmllbox.cpp,\ + listbkg.cpp,\ + mdig.cpp,\ + scrlwing.cpp,\ + spinctlg.cpp,\ + splash.cpp,\ + timer.cpp,\ + vlbox.cpp,\ + vscroll.cpp .ifdef __WXMOTIF__ -OBJECTS0=,statline.obj,\ - notebook.obj +OBJECTS0=,statusbr.obj,statline.obj,notebook.obj,scrlwing.obj,spinctlg.obj +.else +.ifdef __WXX11__ +OBJECTS0=,accel.obj,filedlgg.obj,dragimgg.obj,fdrepdlg.obj,htmllbox.obj,\ + listbkg.obj,mdig.obj,scrlwing.obj,spinctlg.obj,splash.obj,timer.obj,\ + vlbox.obj,vscroll.obj .else -OBJECTS0=,filedlgg.obj,paletteg.obj +OBJECTS0=,accel.obj,statusbr.obj,filedlgg.obj,paletteg.obj +.endif .endif all : $(SOURCES) @@ -132,6 +147,10 @@ all : $(SOURCES) .else .ifdef __WXGTK__ library/crea [--.lib]libwx_gtk.olb $(OBJECTS)$(OBJECTS0) +.else +.ifdef __WXX11__ + library/crea [--.lib]libwx_x11_univ.olb $(OBJECTS)$(OBJECTS0) +.endif .endif .endif @@ -141,18 +160,17 @@ calctrl.obj : calctrl.cpp caret.obj : caret.cpp choicdgg.obj : choicdgg.cpp colrdlgg.obj : colrdlgg.cpp +datectlg.obj : datectlg.cpp dcpsg.obj : dcpsg.cpp dirctrlg.obj : dirctrlg.cpp dirdlgg.obj : dirdlgg.cpp filedlgg.obj : filedlgg.cpp fontdlgg.obj : fontdlgg.cpp +fdrepdlg.obj : fdrepdlg.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 @@ -165,17 +183,28 @@ panelg.obj : panelg.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 +renderg.obj : renderg.cpp sashwin.obj : sashwin.cpp +selstore.obj : selstore.cpp splitter.obj : splitter.cpp statline.obj : statline.cpp statusbr.obj : statusbr.cpp -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 +dragimgg.obj : dragimgg.cpp +fdrepdlg.obj : fdrepdlg.cpp +htmllbox.obj : htmllbox.cpp +listbkg.obj : listbkg.cpp +mdig.obj : mdig.cpp +scrlwing.obj : scrlwing.cpp +spinctlg.obj : spinctlg.cpp +splash.obj : splash.cpp +timer.obj : timer.cpp +vlbox.obj : vlbox.cpp +vscroll.obj : vscroll.cpp