Committing in .

 Updated OpenVMS compile support

 Modified Files:
 	wxWindows/setup.h_vms wxWindows/src/common/descrip.mms
 	wxWindows/src/motif/descrip.mms wxWindows/src/unix/descrip.mms
 ----------------------------------------------------------------------

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@21509 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/setup.h_vms b/setup.h_vms
index d9aea207ec09af18024c86006431ab839634bc41..26fe021becefa61617dfdcb259ce982686709595 100644 (file)
--- a/setup.h_vms
+++ b/setup.h_vms
@@ -225,6 +225,9 @@
  */
 #define wxUSE_NOGUI 0
 
  */
 #define wxUSE_NOGUI 0
 

+#define wxUSE_BASE 1
+#define __WXBASE__ 1
+

 /*
  * Catch fatal program exceptions
  */
 /*
  * Catch fatal program exceptions
  */

diff --git a/src/common/descrip.mms b/src/common/descrip.mms
index 68702d4d98697e692ed7213670a4d1d918628cef..12a7b076300ee443781b6825ba87179366b86eda 100644 (file)
--- a/src/common/descrip.mms
+++ b/src/common/descrip.mms
@@ -44,6 +44,7 @@ LEX=flex
        cc $(CFLAGS)$(CC_DEFINE) $(MMS$TARGET_NAME).c
 
 OBJECTS = \
        cc $(CFLAGS)$(CC_DEFINE) $(MMS$TARGET_NAME).c
 
 OBJECTS = \

+               appbase.obj,\

                appcmn.obj,\
                artprov.obj,\
                artstd.obj,\
                appcmn.obj,\
                artprov.obj,\
                artstd.obj,\


@@ -81,6 +82,8 @@ OBJECTS = \
                filename.obj,\
                filefn.obj,\
                filesys.obj,\
                filename.obj,\
                filefn.obj,\
                filesys.obj,\

+               fldlgcmn.obj,\
+               fmapbase.obj,\

                fontcmn.obj,\
                fontmap.obj,\
                framecmn.obj
                fontcmn.obj,\
                fontmap.obj,\
                framecmn.obj


@@ -136,6 +139,7 @@ OBJECTS1=fs_inet.obj,\
                socket.obj,\
                settcmn.obj,\
                statbar.obj,\
                socket.obj,\
                settcmn.obj,\
                statbar.obj,\

+               stopwatch.obj,\

                strconv.obj,\
                stream.obj,\
                string.obj,\
                strconv.obj,\
                stream.obj,\
                string.obj,\


@@ -168,6 +172,7 @@ OBJECTS2=utilscmn.obj,\
 OBJECTS_MOTIF=bmpbase.obj,gaugecmn.obj
 
 SOURCES = \
 OBJECTS_MOTIF=bmpbase.obj,gaugecmn.obj
 
 SOURCES = \

+               appbase.cpp,\

                appcmn.cpp,\
                artprov.cpp,\
                artstd.cpp,\
                appcmn.cpp,\
                artprov.cpp,\
                artstd.cpp,\


@@ -206,6 +211,8 @@ SOURCES = \
                filename.cpp,\
                filefn.cpp,\
                filesys.cpp,\
                filename.cpp,\
                filefn.cpp,\
                filesys.cpp,\

+               fldlgcmn.cpp,\
+               fmapbase.cpp,\

                fontcmn.cpp,\
                fontmap.cpp,\
                framecmn.cpp,\
                fontcmn.cpp,\
                fontmap.cpp,\
                framecmn.cpp,\


@@ -262,6 +269,7 @@ SOURCES = \
                socket.cpp,\
                settcmn.cpp,\
                statbar.cpp,\
                socket.cpp,\
                settcmn.cpp,\
                statbar.cpp,\

+               stopwatch.cpp,\

                strconv.cpp,\
                stream.cpp,\
                sysopt.cpp,\
                strconv.cpp,\
                stream.cpp,\
                sysopt.cpp,\


@@ -313,6 +321,7 @@ all : $(SOURCES)
 .endif
 .endif
 
 .endif
 .endif
 

+appbase.obj : appbase.cpp

 appcmn.obj : appcmn.cpp
 artprov.obj : artprov.cpp
 artstd.obj : artstd.cpp
 appcmn.obj : appcmn.cpp
 artprov.obj : artprov.cpp
 artstd.obj : artstd.cpp


@@ -351,6 +360,8 @@ fileconf.obj : fileconf.cpp
 filefn.obj : filefn.cpp
 filename.obj : filename.cpp
 filesys.obj : filesys.cpp
 filefn.obj : filefn.cpp
 filename.obj : filename.cpp
 filesys.obj : filesys.cpp

+fldlgcmn.obj : fldlgcmn.cpp
+fmapbase.obj : fmapbase.cpp

 fontcmn.obj : fontcmn.cpp
 fontmap.obj : fontmap.cpp
 framecmn.obj : framecmn.cpp
 fontcmn.obj : fontcmn.cpp
 fontmap.obj : fontmap.cpp
 framecmn.obj : framecmn.cpp


@@ -407,6 +418,7 @@ sizer.obj : sizer.cpp
 socket.obj : socket.cpp
 settcmn.obj : settcmn.cpp
 statbar.obj : statbar.cpp
 socket.obj : socket.cpp
 settcmn.obj : settcmn.cpp
 statbar.obj : statbar.cpp

+stopwatch.obj : stopwatch.cpp

 strconv.obj : strconv.cpp
 stream.obj : stream.cpp
 sysopt.obj : sysopt.cpp
 strconv.obj : strconv.cpp
 stream.obj : stream.cpp
 sysopt.obj : sysopt.cpp

diff --git a/src/motif/descrip.mms b/src/motif/descrip.mms
index 6e86386049b0b8a751823c4b81d398758dcf046b..b872442739f2a4d75808f99930919e49e130263e 100644 (file)
--- a/src/motif/descrip.mms
+++ b/src/motif/descrip.mms
@@ -75,7 +75,6 @@ OBJECTS = \
                toplevel.obj,\
                timer.obj,\
                toolbar.obj,\
                toplevel.obj,\
                timer.obj,\
                toolbar.obj,\

-               utils.obj,\

                window.obj
 
 SOURCES = \
                window.obj
 
 SOURCES = \


@@ -129,7 +128,6 @@ SOURCES = \
                toplevel.cpp,\
                timer.cpp,\
                toolbar.cpp,\
                toplevel.cpp,\
                timer.cpp,\
                toolbar.cpp,\

-               utils.cpp,\

                window.cpp,\
                [.xmcombo]xmcombo.c\
 
                window.cpp,\
                [.xmcombo]xmcombo.c\
 


@@ -192,5 +190,4 @@ textctrl.obj : textctrl.cpp
 toplevel.obj : toplevel.cpp
 timer.obj : timer.cpp
 toolbar.obj : toolbar.cpp
 toplevel.obj : toplevel.cpp
 timer.obj : timer.cpp
 toolbar.obj : toolbar.cpp

-utils.obj : utils.cpp

 window.obj : window.cpp
 window.obj : window.cpp

diff --git a/src/unix/descrip.mms b/src/unix/descrip.mms
index 2b3d08c45291aa03ca67ce858536269bddfec736..561a7927a21b75099220131b6ffd065a27aefe94 100644 (file)
--- a/src/unix/descrip.mms
+++ b/src/unix/descrip.mms
@@ -37,7 +37,7 @@ CC_DEFINE =
 .c.obj :
        cc $(CFLAGS)$(CC_DEFINE) $(MMS$TARGET_NAME).c
 
 .c.obj :
        cc $(CFLAGS)$(CC_DEFINE) $(MMS$TARGET_NAME).c
 

-OBJECTS = \
+OBJECTS =       baseunix.obj,\

                dialup.obj,\
                dir.obj,\
                fontenum.obj,\
                dialup.obj,\
                dir.obj,\
                fontenum.obj,\


@@ -48,7 +48,7 @@ OBJECTS = \
                utilsunx.obj,\
                utilsx11.obj
 
                utilsunx.obj,\
                utilsx11.obj
 

-SOURCES = \
+SOURCES =       baseunix.cpp,\

                dialup.cpp,\
                dir.cpp,\
                fontenum.cpp,\
                dialup.cpp,\
                dir.cpp,\
                fontenum.cpp,\


@@ -73,6 +73,7 @@ all : $(SOURCES)
 .endif
 .endif
 
 .endif
 .endif
 

+baseunix.obj : baseunix.cpp

 dialup.obj : dialup.cpp
 dir.obj : dir.cpp
 fontenum.obj : fontenum.cpp
 dialup.obj : dialup.cpp
 dir.obj : dir.cpp
 fontenum.obj : fontenum.cpp