X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/f49676ee8c0ed60d99582cc0b5f23ff7a7d5b970..895f5af7535f262f849a98b776a6350beda18d77:/src/generic/descrip.mms diff --git a/src/generic/descrip.mms b/src/generic/descrip.mms index 0b2b86e7e2..f95426fa7d 100644 --- a/src/generic/descrip.mms +++ b/src/generic/descrip.mms @@ -9,15 +9,26 @@ 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)/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 .suffixes : .cpp .cpp.obj : cxx $(CXXFLAGS)$(CXX_DEFINE) $(MMS$TARGET_NAME).cpp +.c.obj : + cc $(CFLAGS)$(CC_DEFINE) $(MMS$TARGET_NAME).c OBJECTS = \ busyinfo.obj,\ @@ -26,6 +37,7 @@ OBJECTS = \ choicdgg.obj,\ colrdlgg.obj,\ dcpsg.obj,\ + dirctrlg.obj,\ dirdlgg.obj,\ fontdlgg.obj,\ grid.obj,\ @@ -38,10 +50,8 @@ OBJECTS = \ listctrl.obj,\ logg.obj,\ msgdlgg.obj,\ - notebook.obj,\ numdlgg.obj,\ panelg.obj,\ - plot.obj,\ printps.obj,\ prntdlgg.obj,\ progdlgg.obj,\ @@ -51,13 +61,13 @@ OBJECTS = \ sashwin.obj,\ scrolwin.obj,\ splitter.obj,\ - statline.obj,\ statusbr.obj,\ tbarsmpl.obj,\ tabg.obj,\ textdlgg.obj,\ tipdlg.obj,\ - treectrl.obj,\ + tipwin.obj,\ + treectlg.obj,\ wizard.obj SOURCES = \ @@ -67,7 +77,9 @@ SOURCES = \ choicdgg.cpp,\ colrdlgg.cpp,\ dcpsg.cpp,\ + dirctrlg.cpp,\ dirdlgg.cpp,\ + filedlgg.cpp,\ fontdlgg.cpp,\ grid.cpp,\ helpext.cpp,\ @@ -82,7 +94,6 @@ SOURCES = \ notebook.cpp,\ numdlgg.cpp,\ panelg.cpp,\ - plot.cpp,\ printps.cpp,\ prntdlgg.cpp,\ progdlgg.cpp,\ @@ -98,14 +109,26 @@ 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 + +.endif all : $(SOURCES) - $(MMS)$(MMSQUALIFIERS) $(OBJECTS) + $(MMS)$(MMSQUALIFIERS) $(OBJECTS)$(OBJECTS0) .ifdef __WXMOTIF__ - library/crea [--.lib]libwx_motif.olb $(OBJECTS) + library/crea [--.lib]libwx_motif.olb $(OBJECTS)$(OBJECTS0) +.else +.ifdef __WXGTK__ + library/crea [--.lib]libwx_gtk.olb $(OBJECTS)$(OBJECTS0) +.endif .endif busyinfo.obj : busyinfo.cpp @@ -114,7 +137,9 @@ 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 helpext.obj : helpext.cpp @@ -129,7 +154,6 @@ msgdlgg.obj : msgdlgg.cpp notebook.obj : notebook.cpp numdlgg.obj : numdlgg.cpp panelg.obj : panelg.cpp -plot.obj : plot.cpp printps.obj : printps.cpp prntdlgg.obj : prntdlgg.cpp progdlgg.obj : progdlgg.cpp @@ -145,5 +169,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