From de5fadb41534fca448bd68d3ff942f80efa87f76 Mon Sep 17 00:00:00 2001 From: Jouk Jansen Date: Fri, 15 Mar 2002 09:02:01 +0000 Subject: [PATCH] Committing in . First try to compile wxUNIV (gtk-themes) on OpenVMS. Modified Files: wxWindows/descrip.mms wxWindows/src/common/descrip.mms wxWindows/src/generic/descrip.mms wxWindows/src/gtk/descrip.mms wxWindows/src/html/descrip.mms wxWindows/src/unix/descrip.mms Added Files: wxWindows/lib/vms_gtk_univ.opt wxWindows/src/univ/descrip.mms ---------------------------------------------------------------------- git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@14602 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- descrip.mms | 58 +++++++++++++++++ lib/vms_gtk_univ.opt | 14 +++++ src/common/descrip.mms | 23 +++++-- src/generic/descrip.mms | 18 +++++- src/gtk/descrip.mms | 65 +++++++++++-------- src/gtk1/descrip.mms | 65 +++++++++++-------- src/html/descrip.mms | 11 ++++ src/univ/descrip.mms | 136 ++++++++++++++++++++++++++++++++++++++++ src/unix/descrip.mms | 11 ++++ 9 files changed, 344 insertions(+), 57 deletions(-) create mode 100644 lib/vms_gtk_univ.opt create mode 100644 src/univ/descrip.mms diff --git a/descrip.mms b/descrip.mms index cc3843c9f2..a8c05ba901 100644 --- a/descrip.mms +++ b/descrip.mms @@ -20,6 +20,9 @@ all : make motif purge [...] delete [...]*.obj; + make univ + purge [...] + delete [...]*.obj; gtk : [.include.wx]setup.h set default [.src.generic] @@ -74,6 +77,61 @@ gtk : [.include.wx]setup.h $(MMS)$(MMSQUALIFIERS)/macro=(__WXGTK__=1) set default [--] +univ : [.include.wx]setup.h + set default [.src.generic] + $(MMS)$(MMSQUALIFIERS)/macro=(__WXGTK__=1,__WXUNIVERSAL__=1) + set default [-.common] + $(MMS)$(MMSQUALIFIERS)/macro=(__WXGTK__=1,__WXUNIVERSAL__=1) + set default [-.html] + $(MMS)$(MMSQUALIFIERS)/macro=(__WXGTK__=1,__WXUNIVERSAL__=1) + set default [-.unix] + $(MMS)$(MMSQUALIFIERS)/macro=(__WXGTK__=1,__WXUNIVERSAL__=1) + set default [-.gtk] + $(MMS)$(MMSQUALIFIERS)/macro=(__WXGTK__=1,__WXUNIVERSAL__=1) + set default [-.univ] + $(MMS)$(MMSQUALIFIERS)/macro=(__WXGTK__=1,__WXUNIVERSAL__=1) +# set default [--.demos.bombs] +# $(MMS)$(MMSQUALIFIERS)/macro=(__WXGTK__=1,__WXUNIVERSAL__=1) +# set default [--.samples.calendar] +# $(MMS)$(MMSQUALIFIERS)/macro=(__WXGTK__=1,__WXUNIVERSAL__=1) +# set default [-.caret] +# $(MMS)$(MMSQUALIFIERS)/macro=(__WXGTK__=1,__WXUNIVERSAL__=1) +# set default [-.checklst] +# $(MMS)$(MMSQUALIFIERS)/macro=(__WXGTK__=1,__WXUNIVERSAL__=1) +# set default [-.config] +# $(MMS)$(MMSQUALIFIERS)/macro=(__WXGTK__=1,__WXUNIVERSAL__=1) +# set default [-.controls] +# $(MMS)$(MMSQUALIFIERS)/macro=(__WXGTK__=1,__WXUNIVERSAL__=1) +# set default [-.db] +# $(MMS)$(MMSQUALIFIERS)/macro=(__WXGTK__=1,__WXUNIVERSAL__=1) +# set default [-.dialogs] +# $(MMS)$(MMSQUALIFIERS)/macro=(__WXGTK__=1,__WXUNIVERSAL__=1) +# set default [-.dialup] +# $(MMS)$(MMSQUALIFIERS)/macro=(__WXGTK__=1,__WXUNIVERSAL__=1) +# set default [-.dnd] +# $(MMS)$(MMSQUALIFIERS)/macro=(__WXGTK__=1,__WXUNIVERSAL__=1) +# set default [-.docview] +# $(MMS)$(MMSQUALIFIERS)/macro=(__WXGTK__=1,__WXUNIVERSAL__=1) +# set default [-.drawing] +# $(MMS)$(MMSQUALIFIERS)/macro=(__WXGTK__=1,__WXUNIVERSAL__=1) +# set default [-.font] +# $(MMS)$(MMSQUALIFIERS)/macro=(__WXGTK__=1,__WXUNIVERSAL__=1) +# set default [-.image] +# $(MMS)$(MMSQUALIFIERS)/macro=(__WXGTK__=1,__WXUNIVERSAL__=1) +# set default [-.mdi] +# $(MMS)$(MMSQUALIFIERS)/macro=(__WXGTK__=1,__WXUNIVERSAL__=1) +# set default [-.menu] +# $(MMS)$(MMSQUALIFIERS)/macro=(__WXGTK__=1,__WXUNIVERSAL__=1) +# set default [-.minimal] +# $(MMS)$(MMSQUALIFIERS)/macro=(__WXGTK__=1,__WXUNIVERSAL__=1) +# set default [-.resource] +# $(MMS)$(MMSQUALIFIERS)/macro=(__WXGTK__=1,__WXUNIVERSAL__=1) +# set default [-.richedit] +# $(MMS)$(MMSQUALIFIERS)/macro=(__WXGTK__=1,__WXUNIVERSAL__=1) +# set default [--.utils.dialoged.src] +# $(MMS)$(MMSQUALIFIERS)/macro=(__WXGTK__=1,__WXUNIVERSAL__=1) + set default [--] + motif : [.include.wx]setup.h set default [.src.generic] $(MMS)$(MMSQUALIFIERS)/macro=(__WXMOTIF__=1) diff --git a/lib/vms_gtk_univ.opt b/lib/vms_gtk_univ.opt new file mode 100644 index 0000000000..f278ed833b --- /dev/null +++ b/lib/vms_gtk_univ.opt @@ -0,0 +1,14 @@ +wx_root:[wxwindows.lib]libwx_gtk_univ.olb/lib +sys$library:gthread.obj +sys$library:libjpeg.olb/lib +sys$library:libpng.olb/lib +sys$library:libz.olb/lib +sys$library:tiff.olb/lib +X11:libxpm.olb/lib +sys$share:iodbc.exe/share +sys$share:libgtk.exe/share +sys$share:libgdk.exe/share +sys$share:libglib.exe/share +sys$share:vms_jackets.exe/share +sys$share:pthread$rtl.exe/share +sys$library:decw$xlibshr.exe/share diff --git a/src/common/descrip.mms b/src/common/descrip.mms index 15b0a84c4a..4d56e26f5f 100644 --- a/src/common/descrip.mms +++ b/src/common/descrip.mms @@ -15,9 +15,16 @@ CXX_DEFINE = /define=(__WXMOTIF__=1)/name=(as_is,short)\ 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 = @@ -139,8 +146,9 @@ OBJECTS1=fs_inet.obj,\ treebase.obj,\ txtstrm.obj,\ unzip.obj,\ - url.obj,\ - utilscmn.obj,\ + url.obj + +OBJECTS2=utilscmn.obj,\ valgen.obj,\ validate.obj,\ valtext.obj,\ @@ -148,9 +156,8 @@ OBJECTS1=fs_inet.obj,\ wfstream.obj,\ wincmn.obj,\ wxchar.obj,\ - wxexpr.obj - -OBJECTS2=xpmdecod.obj,\ + wxexpr.obj,\ + xpmdecod.obj,\ zipstrm.obj,\ zstream.obj @@ -279,11 +286,17 @@ all : $(SOURCES) library [--.lib]libwx_motif.olb $(OBJECTS2) .else .ifdef __WXGTK__ +.ifdef __WXUNIVERSAL__ + library [--.lib]libwx_gtk_univ.olb $(OBJECTS) + library [--.lib]libwx_gtk_univ.olb $(OBJECTS1) + library [--.lib]libwx_gtk_univ.olb $(OBJECTS2) +.else library [--.lib]libwx_gtk.olb $(OBJECTS) library [--.lib]libwx_gtk.olb $(OBJECTS1) library [--.lib]libwx_gtk.olb $(OBJECTS2) .endif .endif +.endif parser.obj : parser.c lexer.c parser.c : parser.y lexer.c diff --git a/src/generic/descrip.mms b/src/generic/descrip.mms index 00474ef579..6bc9788ed2 100644 --- a/src/generic/descrip.mms +++ b/src/generic/descrip.mms @@ -14,9 +14,16 @@ CXX_DEFINE = /define=(__WXMOTIF__=1)/name=(as_is,short)\ 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 = @@ -61,7 +68,6 @@ OBJECTS = \ proplist.obj,\ sashwin.obj,\ splitter.obj,\ - statusbr.obj,\ tbarsmpl.obj,\ tabg.obj,\ textdlgg.obj,\ @@ -116,9 +122,13 @@ SOURCES = \ wizard.cpp .ifdef __WXMOTIF__ -OBJECTS0=,statline.obj,notebook.obj,scrlwing.obj,spinctlg.obj +OBJECTS0=,statusbr.obj,statline.obj,notebook.obj,scrlwing.obj,spinctlg.obj .else +.ifdef __WXUNIVERSAL__ OBJECTS0=,accel.obj,filedlgg.obj,paletteg.obj +.else +OBJECTS0=,accel.obj,statusbr.obj,filedlgg.obj,paletteg.obj +.endif .endif all : $(SOURCES) @@ -127,9 +137,13 @@ all : $(SOURCES) library/crea [--.lib]libwx_motif.olb $(OBJECTS)$(OBJECTS0) .else .ifdef __WXGTK__ +.ifdef __WXUNIVERSAL__ + library/crea [--.lib]libwx_gtk_univ.olb $(OBJECTS)$(OBJECTS0) +.else library/crea [--.lib]libwx_gtk.olb $(OBJECTS)$(OBJECTS0) .endif .endif +.endif accel.obj : accel.cpp busyinfo.obj : busyinfo.cpp diff --git a/src/gtk/descrip.mms b/src/gtk/descrip.mms index af294b0c7d..c87ecab7ae 100644 --- a/src/gtk/descrip.mms +++ b/src/gtk/descrip.mms @@ -8,9 +8,16 @@ .first define wx [--.include.wx] +.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)/iee=denorm\ /assume=(nostdnew,noglobal_array_new) CC_DEFINE = /define=(__WXGTK__=1)/float=ieee/name=(as_is,short)/iee=denorm +.endif .suffixes : .cpp @@ -22,16 +29,9 @@ CC_DEFINE = /define=(__WXGTK__=1)/float=ieee/name=(as_is,short)/iee=denorm OBJECTS = \ app.obj,\ bitmap.obj,\ - bmpbuttn.obj,\ brush.obj,\ - button.obj,\ - checkbox.obj,\ - checklst.obj,\ - choice.obj,\ clipbrd.obj,\ colour.obj,\ - combobox.obj,\ - control.obj,\ cursor.obj,\ data.obj,\ dataobj.obj,\ @@ -39,30 +39,46 @@ OBJECTS = \ dcclient.obj,\ dcmemory.obj,\ dcscreen.obj,\ - dialog.obj,\ dnd.obj,\ font.obj,\ - fontdlg.obj,\ - frame.obj,\ - gauge.obj,\ gdiobj.obj,\ glcanvas.obj,\ gsockgtk.obj,\ icon.obj,\ - listbox.obj,\ main.obj,\ - mdi.obj,\ - menu.obj,\ minifram.obj,\ - notebook.obj,\ pen.obj,\ popupwin.obj,\ + region.obj,\ + settings.obj,\ + timer.obj,\ + tooltip.obj,\ + toplevel.obj,\ + utilsgtk.obj,\ + utilsres.obj,\ + win_gtk.obj,\ + window.obj + +OBJECTS0= \ + bmpbuttn.obj,\ + button.obj,\ + checkbox.obj,\ + checklst.obj,\ + choice.obj,\ + combobox.obj,\ + control.obj,\ + dialog.obj,\ + fontdlg.obj,\ + frame.obj,\ + gauge.obj,\ + listbox.obj,\ + mdi.obj,\ + menu.obj,\ + notebook.obj,\ radiobox.obj,\ radiobut.obj,\ - region.obj,\ scrolbar.obj,\ scrolwin.obj,\ - settings.obj,\ slider.obj,\ spinbutt.obj,\ spinctrl.obj,\ @@ -72,14 +88,7 @@ OBJECTS = \ stattext.obj,\ tbargtk.obj,\ textctrl.obj,\ - tglbtn.obj,\ - timer.obj,\ - tooltip.obj,\ - toplevel.obj,\ - utilsgtk.obj,\ - utilsres.obj,\ - win_gtk.obj,\ - window.obj + tglbtn.obj SOURCES =\ app.cpp,\ @@ -145,7 +154,13 @@ SOURCES =\ all : $(SOURCES) $(MMS)$(MMSQUALIFIERS) $(OBJECTS) +.ifdef __WXUNIVERSAL__ + library [--.lib]libwx_gtk_univ.olb $(OBJECTS) +.else library [--.lib]libwx_gtk.olb $(OBJECTS) + $(MMS)$(MMSQUALIFIERS) $(OBJECTS0) + library [--.lib]libwx_gtk.olb $(OBJECTS0) +.endif app.obj : app.cpp bitmap.obj : bitmap.cpp diff --git a/src/gtk1/descrip.mms b/src/gtk1/descrip.mms index af294b0c7d..c87ecab7ae 100644 --- a/src/gtk1/descrip.mms +++ b/src/gtk1/descrip.mms @@ -8,9 +8,16 @@ .first define wx [--.include.wx] +.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)/iee=denorm\ /assume=(nostdnew,noglobal_array_new) CC_DEFINE = /define=(__WXGTK__=1)/float=ieee/name=(as_is,short)/iee=denorm +.endif .suffixes : .cpp @@ -22,16 +29,9 @@ CC_DEFINE = /define=(__WXGTK__=1)/float=ieee/name=(as_is,short)/iee=denorm OBJECTS = \ app.obj,\ bitmap.obj,\ - bmpbuttn.obj,\ brush.obj,\ - button.obj,\ - checkbox.obj,\ - checklst.obj,\ - choice.obj,\ clipbrd.obj,\ colour.obj,\ - combobox.obj,\ - control.obj,\ cursor.obj,\ data.obj,\ dataobj.obj,\ @@ -39,30 +39,46 @@ OBJECTS = \ dcclient.obj,\ dcmemory.obj,\ dcscreen.obj,\ - dialog.obj,\ dnd.obj,\ font.obj,\ - fontdlg.obj,\ - frame.obj,\ - gauge.obj,\ gdiobj.obj,\ glcanvas.obj,\ gsockgtk.obj,\ icon.obj,\ - listbox.obj,\ main.obj,\ - mdi.obj,\ - menu.obj,\ minifram.obj,\ - notebook.obj,\ pen.obj,\ popupwin.obj,\ + region.obj,\ + settings.obj,\ + timer.obj,\ + tooltip.obj,\ + toplevel.obj,\ + utilsgtk.obj,\ + utilsres.obj,\ + win_gtk.obj,\ + window.obj + +OBJECTS0= \ + bmpbuttn.obj,\ + button.obj,\ + checkbox.obj,\ + checklst.obj,\ + choice.obj,\ + combobox.obj,\ + control.obj,\ + dialog.obj,\ + fontdlg.obj,\ + frame.obj,\ + gauge.obj,\ + listbox.obj,\ + mdi.obj,\ + menu.obj,\ + notebook.obj,\ radiobox.obj,\ radiobut.obj,\ - region.obj,\ scrolbar.obj,\ scrolwin.obj,\ - settings.obj,\ slider.obj,\ spinbutt.obj,\ spinctrl.obj,\ @@ -72,14 +88,7 @@ OBJECTS = \ stattext.obj,\ tbargtk.obj,\ textctrl.obj,\ - tglbtn.obj,\ - timer.obj,\ - tooltip.obj,\ - toplevel.obj,\ - utilsgtk.obj,\ - utilsres.obj,\ - win_gtk.obj,\ - window.obj + tglbtn.obj SOURCES =\ app.cpp,\ @@ -145,7 +154,13 @@ SOURCES =\ all : $(SOURCES) $(MMS)$(MMSQUALIFIERS) $(OBJECTS) +.ifdef __WXUNIVERSAL__ + library [--.lib]libwx_gtk_univ.olb $(OBJECTS) +.else library [--.lib]libwx_gtk.olb $(OBJECTS) + $(MMS)$(MMSQUALIFIERS) $(OBJECTS0) + library [--.lib]libwx_gtk.olb $(OBJECTS0) +.endif app.obj : app.cpp bitmap.obj : bitmap.cpp diff --git a/src/html/descrip.mms b/src/html/descrip.mms index 081d0bca6b..c03594367b 100644 --- a/src/html/descrip.mms +++ b/src/html/descrip.mms @@ -14,9 +14,16 @@ CXX_DEFINE = /define=(__WXMOTIF__=1)/name=(as_is,short)\ 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 = @@ -48,9 +55,13 @@ all : $(SOURCES) 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 helpctrl.obj : helpctrl.cpp helpdata.obj : helpdata.cpp diff --git a/src/univ/descrip.mms b/src/univ/descrip.mms new file mode 100644 index 0000000000..15c8062486 --- /dev/null +++ b/src/univ/descrip.mms @@ -0,0 +1,136 @@ +#***************************************************************************** +# * +# Make file for VMS * +# Author : J.Jansen (joukj@hrem.stm.tudelft.nl) * +# Date : 14 March 2002 * +# * +#***************************************************************************** +.first + define wx [--.include.wx] + +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 + +.suffixes : .cpp + +.cpp.obj : + cxx $(CXXFLAGS)$(CXX_DEFINE) $(MMS$TARGET_NAME).cpp +.c.obj : + cc $(CFLAGS)$(CC_DEFINE) $(MMS$TARGET_NAME).c + +OBJECTS = \ + bmpbuttn.obj,\ + button.obj,\ + checkbox.obj,\ + checklst.obj,\ + choice.obj,\ + colschem.obj,\ + combobox.obj,\ + control.obj,\ + dialog.obj,\ + framuniv.obj,\ + gauge.obj,\ + gtk.obj,\ + inpcons.obj,\ + inphand.obj,\ + listbox.obj,\ + menu.obj,\ + notebook.obj,\ + radiobox.obj,\ + radiobut.obj,\ + renderer.obj,\ + scrarrow.obj,\ + scrolbar.obj,\ + scrthumb.obj,\ + slider.obj,\ + spinbutt.obj,\ + statbmp.obj,\ + statbox.obj,\ + statline.obj,\ + stattext.obj,\ + statusbr.obj,\ + textctrl.obj,\ + theme.obj,\ + toolbar.obj,\ + topluniv.obj,\ + winuniv.obj + +SOURCES =\ + bmpbuttn.cpp \ + button.cpp \ + checkbox.cpp \ + checklst.cpp \ + choice.cpp \ + colschem.cpp \ + combobox.cpp \ + control.cpp \ + dialog.cpp \ + framuniv.cpp \ + gauge.cpp \ + [.themes]gtk.cpp \ + inpcons.cpp \ + inphand.cpp \ + listbox.cpp \ + menu.cpp \ + notebook.cpp \ + radiobox.cpp \ + radiobut.cpp \ + renderer.cpp \ + scrarrow.cpp \ + scrolbar.cpp \ + scrthumb.cpp \ + slider.cpp \ + spinbutt.cpp \ + statbmp.cpp \ + statbox.cpp \ + statline.cpp \ + stattext.cpp \ + statusbr.cpp \ + textctrl.cpp \ + theme.cpp \ + toolbar.cpp \ + topluniv.cpp \ + winuniv.cpp + +all : $(SOURCES) + $(MMS)$(MMSQUALIFIERS) $(OBJECTS) + library [--.lib]libwx_gtk_univ.olb $(OBJECTS) + +bmpbuttn.obj : bmpbuttn.cpp +button.obj : button.cpp +checkbox.obj : checkbox.cpp +checklst.obj : checklst.cpp +choice.obj : choice.cpp +colschem.obj : colschem.cpp +combobox.obj : combobox.cpp +control.obj : control.cpp +dialog.obj : dialog.cpp +framuniv.obj : framuniv.cpp +gauge.obj : gauge.cpp +gtk.obj : [.themes]gtk.cpp + cxx/obj=[]gtk.obj$(CXXFLAGS)$(CXX_DEFINE) [.themes]gtk.cpp +inpcons.obj : inpcons.cpp +inphand.obj : inphand.cpp +listbox.obj : listbox.cpp +menu.obj : menu.cpp +notebook.obj : notebook.cpp +radiobox.obj : radiobox.cpp +radiobut.obj : radiobut.cpp +renderer.obj : renderer.cpp +scrarrow.obj : scrarrow.cpp +scrolbar.obj : scrolbar.cpp +scrthumb.obj : scrthumb.cpp +slider.obj : slider.cpp +spinbutt.obj : spinbutt.cpp +statbmp.obj : statbmp.cpp +statbox.obj : statbox.cpp +statline.obj : statline.cpp +stattext.obj : stattext.cpp +statusbr.obj : statusbr.cpp +textctrl.obj : textctrl.cpp +theme.obj : theme.cpp +toolbar.obj : toolbar.cpp +topluniv.obj : topluniv.cpp +winuniv.obj : winuniv.cpp diff --git a/src/unix/descrip.mms b/src/unix/descrip.mms index 9affb525e6..ffc126bfe1 100644 --- a/src/unix/descrip.mms +++ b/src/unix/descrip.mms @@ -14,9 +14,16 @@ CXX_DEFINE = /define=(__WXMOTIF__=1)/name=(as_is,short)\ 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 = @@ -56,9 +63,13 @@ all : $(SOURCES) 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 -- 2.45.2