X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/62edfd9e59716fff99be8ee669b784333fb99cd5..11a2ce5ad289cb21b35cc21131b46f75dd4af060:/src/unix/descrip.mms?ds=inline diff --git a/src/unix/descrip.mms b/src/unix/descrip.mms index 3370b6deba..2b3d08c452 100644 --- a/src/unix/descrip.mms +++ b/src/unix/descrip.mms @@ -9,9 +9,25 @@ 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__ +.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 = +.endif .endif .suffixes : .cpp @@ -19,33 +35,50 @@ CXX_DEFINE = .cpp.obj : cxx $(CXXFLAGS)$(CXX_DEFINE) $(MMS$TARGET_NAME).cpp .c.obj : - cc $(CFLAGS)$(CXX_DEFINE) $(MMS$TARGET_NAME).c + cc $(CFLAGS)$(CC_DEFINE) $(MMS$TARGET_NAME).c OBJECTS = \ dialup.obj,\ + dir.obj,\ fontenum.obj,\ fontutil.obj,\ gsocket.obj,\ + mimetype.obj,\ threadpsx.obj,\ - utilsunx.obj + utilsunx.obj,\ + utilsx11.obj SOURCES = \ dialup.cpp,\ + dir.cpp,\ fontenum.cpp,\ fontutil.cpp,\ gsocket.c,\ + mimetype.cpp,\ threadpsx.cpp,\ - utilsunx.cpp + utilsunx.cpp,\ + utilsx11.cpp all : $(SOURCES) $(MMS)$(MMSQUALIFIERS) $(OBJECTS) .ifdef __WXMOTIF__ library [--.lib]libwx_motif.olb $(OBJECTS) +.else +.ifdef __WXGTK__ +.ifdef __WXUNIVERSAL__ + library [--.lib]libwx_gtk_univ.olb $(OBJECTS) +.else + library [--.lib]libwx_gtk.olb $(OBJECTS) +.endif +.endif .endif dialup.obj : dialup.cpp +dir.obj : dir.cpp fontenum.obj : fontenum.cpp fontutil.obj : fontutil.cpp gsocket.obj : gsocket.c +mimetype.obj : mimetype.cpp threadpsx.obj : threadpsx.cpp utilsunx.obj : utilsunx.cpp +utilsx11.obj : utilsx11.cpp