Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

builtin iODBC build fixes

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@23139 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Václav Slavík
2003-08-23 12:45:34 +00:00
parent 0a3f5f5767
commit 0bdb08e7ef
4 changed files with 23 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
configure vendored
View File

File diff suppressed because one or more lines are too long

3
configure.in
View File

@@ -2922,6 +2922,9 @@ if test "$TOOLKIT" != "MSW" ; then
fi fi
if test "$wxUSE_ODBC" != "no" ; then if test "$wxUSE_ODBC" != "no" ; then
AC_DEFINE(wxUSE_ODBC) AC_DEFINE(wxUSE_ODBC)
if test "$wxUSE_ODBC" = "builtin" ; then
AC_DEFINE(wxUSE_BUILTIN_IODBC)
fi
SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS db" SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS db"
dnl is this still necessary in 2.5? dnl is this still necessary in 2.5?

7
include/wx/db.h
View File

@@ -81,10 +81,15 @@
#include <windows.h> #include <windows.h>
#include "wx/msw/winundef.h" #include "wx/msw/winundef.h"
#endif #endif
// Use the ones from the library
extern "C" { extern "C" {
#if defined(wxUSE_BUILTIN_IODBC) && wxUSE_BUILTIN_IODBC
// Use the ones from the library
#include "wx/isql.h"
#include "wx/isqlext.h"
#else
#include <sql.h> #include <sql.h>
#include <sqlext.h> #include <sqlext.h>
#endif
} }
#endif #endif

1
setup.h.in
View File

@@ -198,6 +198,7 @@
* Use iODBC * Use iODBC
*/ */
#define wxUSE_ODBC 0 #define wxUSE_ODBC 0
#define wxUSE_BUILTIN_IODBC 0
#define wxODBC_FWD_ONLY_CURSORS 1 #define wxODBC_FWD_ONLY_CURSORS 1
#define wxODBC_BACKWARD_COMPATABILITY 0 #define wxODBC_BACKWARD_COMPATABILITY 0
/* /*