Committing in .

 OpenVMS compile issues

 Modified Files:
 	wxWindows/include/wx/db.h wxWindows/src/common/descrip.mms
 	wxWindows/src/generic/descrip.mms
 ----------------------------------------------------------------------

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

diff --git a/include/wx/db.h b/include/wx/db.h
index a781b94cc33eeb4bd7a9f78c58d2543cc0e20a8d..16d239a63b75f52a8192178a6083cc2a6232b3ae 100644 (file)
--- a/include/wx/db.h
+++ b/include/wx/db.h
@@ -77,6 +77,12 @@
     #include "sql.h"
     #include "sqlext.h"
     #include "odbcinst.h"
+#elif defined( __VMS )
+// For OpenVMS use the ones from the library
+extern "C" {
+    #include <isql.h>
+    #include <isqlext.h>
+}
 #else
 extern "C" {
     #include "wx/isql.h"

diff --git a/src/common/descrip.mms b/src/common/descrip.mms
index 4d56e26f5f28fe8e9d68d5b2dd33c33d12c6d6f5..f462285d3789c726b735eb9e84aa41ae4788e59b 100644 (file)
--- a/src/common/descrip.mms
+++ b/src/common/descrip.mms
@@ -47,6 +47,8 @@ LEX=flex
 OBJECTS = \
                parser.obj,\
                appcmn.obj,\
+               artprov.obj,\
+               artstd.obj,\
                choiccmn.obj,\
                clipcmn.obj,\
                clntdata.obj,\
@@ -164,6 +166,8 @@ OBJECTS2=utilscmn.obj,\
 SOURCES = \
                parser.y,\
                appcmn.cpp,\
+               artprov.cpp,\
+               artstd.cpp,\
                choiccmn.cpp,\
                clipcmn.cpp,\
                clntdata.cpp,\
@@ -318,6 +322,8 @@ lexer.c : lexer.l
        delete lexyy.c;*
 
 appcmn.obj : appcmn.cpp
+artprov.obj : artprov.cpp
+artstd.obj : artstd.cpp
 choiccmn.obj : choiccmn.cpp
 clipcmn.obj : clipcmn.cpp
 clntdata.obj : clntdata.cpp

diff --git a/src/generic/descrip.mms b/src/generic/descrip.mms
index 6bc9788ed20b24d128ebdc0cb4277b616581a775..ccee2b72ea3f6f6b8707bf9b2e2cf643dc9cb932 100644 (file)
--- a/src/generic/descrip.mms
+++ b/src/generic/descrip.mms
@@ -52,7 +52,6 @@ OBJECTS = \
                gridsel.obj,\
                helpext.obj,\
                helphtml.obj,\
-               helpwxht.obj,\
                imaglist.obj,\
                laywin.obj,\
                listctrl.obj,\
@@ -93,7 +92,6 @@ SOURCES = \
                gridsel.cpp,\
                helpext.cpp,\
                helphtml.cpp,\
-               helpwxht.cpp,\
                imaglist.cpp,\
                laywin.cpp,\
                listctrl.cpp,\
@@ -161,7 +159,6 @@ gridctrl.obj : gridctrl.cpp
 gridsel.obj : gridsel.cpp
 helpext.obj : helpext.cpp
 helphtml.obj : helphtml.cpp
-helpwxht.obj : helpwxht.cpp
 imaglist.obj : imaglist.cpp
 laywin.obj : laywin.cpp
 listctrl.obj : listctrl.cpp