X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/3fa056ab78be920eacac56e51864fe7a45d1a31a..a63d48fa138e9eaa3079172ace9a804ba5b0415e:/src/unix/descrip.mms diff --git a/src/unix/descrip.mms b/src/unix/descrip.mms index 338d2e82f0..eba15815b7 100644 --- a/src/unix/descrip.mms +++ b/src/unix/descrip.mms @@ -9,12 +9,24 @@ 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 +.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 @@ -23,9 +35,9 @@ 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 = \ +OBJECTS = baseunix.obj,\ dialup.obj,\ dir.obj,\ fontenum.obj,\ @@ -33,9 +45,15 @@ OBJECTS = \ gsocket.obj,\ mimetype.obj,\ threadpsx.obj,\ - utilsunx.obj + utilsunx.obj,\ + utilsx11.obj,\ + joystick.obj,\ + snglinst.obj,\ + sound.obj,\ + sound_sdl.obj,\ + taskbarx11.obj -SOURCES = \ +SOURCES = baseunix.cpp,\ dialup.cpp,\ dir.cpp,\ fontenum.cpp,\ @@ -43,7 +61,13 @@ SOURCES = \ gsocket.c,\ mimetype.cpp,\ threadpsx.cpp,\ - utilsunx.cpp + utilsunx.cpp,\ + utilsx11.cpp,\ + joystick.cpp,\ + snglinst.cpp,\ + sound.cpp,\ + sound_sdl.cpp,\ + taskbarx11.cpp all : $(SOURCES) $(MMS)$(MMSQUALIFIERS) $(OBJECTS) @@ -52,9 +76,14 @@ all : $(SOURCES) .else .ifdef __WXGTK__ library [--.lib]libwx_gtk.olb $(OBJECTS) +.else +.ifdef __WXX11__ + library [--.lib]libwx_x11_univ.olb $(OBJECTS) +.endif .endif .endif +baseunix.obj : baseunix.cpp dialup.obj : dialup.cpp dir.obj : dir.cpp fontenum.obj : fontenum.cpp @@ -63,3 +92,9 @@ gsocket.obj : gsocket.c mimetype.obj : mimetype.cpp threadpsx.obj : threadpsx.cpp utilsunx.obj : utilsunx.cpp +utilsx11.obj : utilsx11.cpp +joystick.obj : joystick.cpp +snglinst.obj : snglinst.cpp +sound.obj : sound.cpp +sound_sdl.obj : sound_sdl.cpp +taskbarx11.obj : taskbarx11.cpp