From a843055617d0a70ade84647583eb54a4f2c4afc7 Mon Sep 17 00:00:00 2001 From: Jouk Jansen Date: Fri, 22 Sep 2006 13:04:18 +0000 Subject: [PATCH 1/1] Update OpenVMS make files Modified Files: wxWidgets/setup.h_vms wxWidgets/src/common/descrip.mms wxWidgets/src/gtk1/descrip.mms wxWidgets/src/motif/descrip.mms wxWidgets/src/univ/descrip.mms git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@41366 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- setup.h_vms | 4 ++-- src/common/descrip.mms | 7 +++++-- src/gtk1/descrip.mms | 8 +------- src/motif/descrip.mms | 5 +---- src/univ/descrip.mms | 7 +++++-- 5 files changed, 14 insertions(+), 17 deletions(-) diff --git a/setup.h_vms b/setup.h_vms index a0c00f34d2..249cf1a812 100644 --- a/setup.h_vms +++ b/setup.h_vms @@ -600,13 +600,13 @@ typedef pid_t GPid; /* * Define if the compiler supports variadic macros */ -#define HAVE_VARIADIC_MACROS 1 +#undef HAVE_VARIADIC_MACROS #if defined(__NAMESPACE_STD) && !defined(__NAMESPACE_STD_ONLY) /* * Define if your compiler has std::wstring */ -#deffine HAVE_STD_WSTRING 1 +#define HAVE_STD_WSTRING 1 /* * Define if your compiler has compliant std::string::compare */ diff --git a/src/common/descrip.mms b/src/common/descrip.mms index fca045f16f..4f6b5af6af 100644 --- a/src/common/descrip.mms +++ b/src/common/descrip.mms @@ -2,7 +2,7 @@ # * # Make file for VMS * # Author : J.Jansen (joukj@hrem.nano.tudelft.nl) * -# Date : 19 September 2006 * +# Date : 20 September 2006 * # * #***************************************************************************** .first @@ -193,7 +193,8 @@ OBJECTS2=tbarbase.obj,\ clrpickercmn.obj,\ filepickercmn.obj,\ fontpickercmn.obj,\ - pickerbase.obj + pickerbase.obj,\ + listctrlcmn.obj OBJECTS_MOTIF=radiocmn.obj @@ -285,6 +286,7 @@ SOURCES = \ layout.cpp,\ lboxcmn.cpp,\ list.cpp,\ + listctrlcmn.cpp,\ log.cpp,\ longlong.cpp,\ memory.cpp,\ @@ -558,3 +560,4 @@ clrpickercmn.obj : clrpickercmn.cpp filepickercmn.obj : filepickercmn.cpp fontpickercmn.obj : fontpickercmn.cpp pickerbase.obj : pickerbase.cpp +listctrlcmn.obj : listctrlcmn.cpp diff --git a/src/gtk1/descrip.mms b/src/gtk1/descrip.mms index eae2497583..72baf0f84e 100644 --- a/src/gtk1/descrip.mms +++ b/src/gtk1/descrip.mms @@ -2,7 +2,7 @@ # * # Make file for VMS * # Author : J.Jansen (joukj@hrem.nano.tudelft.nl) * -# Date : 19 September 2006 * +# Date : 20 September 2006 * # * #***************************************************************************** .first @@ -43,10 +43,8 @@ OBJECTS = \ evtloop.obj,\ filedlg.obj,\ font.obj,\ - gdiobj.obj,\ glcanvas.obj,\ gsockgtk.obj,\ - icon.obj,\ main.obj,\ minifram.obj,\ pen.obj,\ @@ -122,10 +120,8 @@ SOURCES =\ fontdlg.cpp,\ frame.cpp,\ gauge.cpp,\ - gdiobj.cpp,\ glcanvas.cpp,\ gsockgtk.cpp,\ - icon.cpp,\ listbox.cpp,\ main.cpp,\ mdi.cpp,\ @@ -199,10 +195,8 @@ font.obj : font.cpp fontdlg.obj : fontdlg.cpp frame.obj : frame.cpp gauge.obj : gauge.cpp -gdiobj.obj : gdiobj.cpp glcanvas.obj : glcanvas.cpp gsockgtk.obj : gsockgtk.cpp -icon.obj : icon.cpp listbox.obj : listbox.cpp main.obj : main.cpp msgdlg.obj : msgdlg.cpp diff --git a/src/motif/descrip.mms b/src/motif/descrip.mms index d7e26cc7a8..cf50c03596 100644 --- a/src/motif/descrip.mms +++ b/src/motif/descrip.mms @@ -2,7 +2,7 @@ # * # Make file for VMS * # Author : J.Jansen (joukj@hrem.nano.tudelft.nl) * -# Date : 19 September 2006 * +# Date : 21 September 2006 * # * #***************************************************************************** .first @@ -50,7 +50,6 @@ OBJECTS = \ font.obj,\ frame.obj,\ gauge.obj,\ - gdiobj.obj,\ gsockmot.obj,\ icon.obj,\ listbox.obj,\ @@ -103,7 +102,6 @@ SOURCES = \ font.cpp,\ frame.cpp,\ gauge.cpp,\ - gdiobj.cpp,\ gsockmot.cpp,\ icon.cpp,\ listbox.cpp,\ @@ -165,7 +163,6 @@ filedlg.obj : filedlg.cpp font.obj : font.cpp frame.obj : frame.cpp gauge.obj : gauge.cpp -gdiobj.obj : gdiobj.cpp gsockmot.obj : gsockmot.cpp icon.obj : icon.cpp listbox.obj : listbox.cpp diff --git a/src/univ/descrip.mms b/src/univ/descrip.mms index f45dbf040f..0f84915c9a 100644 --- a/src/univ/descrip.mms +++ b/src/univ/descrip.mms @@ -1,8 +1,8 @@ #***************************************************************************** # * # Make file for VMS * -# Author : J.Jansen (joukj@hrem.stm.tudelft.nl) * -# Date : 14 March 2002 * +# Author : J.Jansen (joukj@hrem.nano.tudelft.nl) * +# Date : 22 September 2006 * # * #***************************************************************************** .first @@ -47,6 +47,7 @@ OBJECTS = \ statline.obj,\ stattext.obj,\ statusbr.obj,\ + stdrend.obj,\ textctrl.obj,\ theme.obj,\ toolbar.obj,\ @@ -87,6 +88,7 @@ SOURCES =\ statline.cpp \ stattext.cpp \ statusbr.cpp \ + stdrend.cpp,\ textctrl.cpp \ theme.cpp \ toolbar.cpp \ @@ -130,6 +132,7 @@ statbox.obj : statbox.cpp statline.obj : statline.cpp stattext.obj : stattext.cpp statusbr.obj : statusbr.cpp +stdrend.obj : stdrend.cpp textctrl.obj : textctrl.cpp theme.obj : theme.cpp toolbar.obj : toolbar.cpp -- 2.47.2