X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/05e770c40ec1aef151a288bc1c22d9c4c73e4325..cf9d0f93011fc1dd1dbcb97860f0d735b2295e75:/src/x11/descrip.mms diff --git a/src/x11/descrip.mms b/src/x11/descrip.mms index 477769d33f..dee58df16b 100644 --- a/src/x11/descrip.mms +++ b/src/x11/descrip.mms @@ -13,8 +13,15 @@ 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 __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 = .endif +.endif .suffixes : .cpp @@ -31,18 +38,75 @@ OBJECTS = \ region.obj,\ utilsx.obj +OBJECTS_X11=app.obj,dc.obj,\ + dcclient.obj,\ + dcmemory.obj,\ + dcscreen.obj,\ + evtloop.obj,\ + font.obj,\ + gdiobj.obj,\ + gsockx11.obj,\ + icon.obj,\ + main.obj,\ + minifram.obj,\ + nanox.obj,\ + palette.obj,\ + popupwin.obj,\ + reparent.obj,\ + settings.obj,\ + toplevel.obj,\ + utils.obj,\ + window.obj,\ + colour.obj,\ + cursor.obj,\ + data.obj,\ + dataobj.obj,\ + clipbrd.obj + + SOURCES = \ + app.cpp,\ bitmap.cpp,\ brush.cpp,\ glcanvas.cpp,\ pen.cpp,\ region.cpp,\ - utilsx.cpp + utilsx.cpp,\ + dc.cpp,\ + dcclient.cpp,\ + dcmemory.cpp,\ + dcscreen.cpp,\ + evtloop.cpp,\ + font.cpp,\ + gdiobj.cpp,\ + gsockx11.cpp,\ + icon.cpp,\ + main.cpp,\ + minifram.cpp,\ + nanox.c,\ + palette.cpp,\ + popupwin.cpp,\ + reparent.cpp,\ + settings.cpp,\ + toplevel.cpp,\ + utils.cpp,\ + window.cpp,\ + colour.cpp,\ + cursor.cpp,\ + data.cpp,\ + dataobj.cpp,\ + clipbrd.cpp all : $(SOURCES) $(MMS)$(MMSQUALIFIERS) $(OBJECTS) .ifdef __WXMOTIF__ library [--.lib]libwx_motif.olb $(OBJECTS) +.else +.ifdef __WXX11__ + library [--.lib]libwx_x11_univ.olb $(OBJECTS) + $(MMS)$(MMSQUALIFIERS) $(OBJECTS_X11) + library [--.lib]libwx_x11_univ.olb $(OBJECTS_X11) +.endif .endif bitmap.obj : bitmap.cpp @@ -51,3 +115,28 @@ glcanvas.obj : glcanvas.cpp pen.obj : pen.cpp region.obj : region.cpp utilsx.obj : utilsx.cpp +dc.obj : dc.cpp +dcclient.obj : dcclient.cpp +dcmemory.obj : dcmemory.cpp +dcscreen.obj : dcscreen.cpp +evtloop.obj : evtloop.cpp +font.obj : font.cpp +gdiobj.obj : gdiobj.cpp +gsockx11.obj : gsockx11.cpp +icon.obj : icon.cpp +main.obj : main.cpp +minifram.obj : minifram.cpp +nanox.obj : nanox.c +palette.obj : palette.cpp +popupwin.obj : popupwin.cpp +reparent.obj : reparent.cpp +settings.obj : settings.cpp +toplevel.obj : toplevel.cpp +utils.obj : utils.cpp +window.obj : window.cpp +colour.obj : colour.cpp +app.obj : app.cpp +cursor.obj : cursor.cpp +data.obj : data.cpp +dataobj.obj : dataobj.cpp +clipbrd.obj : clipbrd.cpp