mirror of
https://github.com/mdbtools/mdbtools.git
synced 2025-04-05 17:31:11 +08:00
Move the ODBC wide support in its own file
Enabling wide functions can break ascii one, like DriveConnect()
This commit is contained in:
parent
c908a4f4de
commit
a021708dae
4
NEWS
4
NEWS
@ -1,3 +1,7 @@
|
||||
Version 0.7.1
|
||||
=============
|
||||
An experimental version of ODBC driver is now available: libmdbodbcW.so
|
||||
|
||||
Version 0.3
|
||||
===========
|
||||
The organization of the project files has changed a bit from that last release.
|
||||
|
@ -138,6 +138,8 @@ if test "x$HAVE_ODBC" = "xtrue"; then
|
||||
OPTDIRS="$OPTDIRS odbc"
|
||||
fi
|
||||
|
||||
dnl Conditionally build odbc wide version
|
||||
AM_CONDITIONAL(ICONV, test "$am_cv_func_iconv" = "yes")
|
||||
|
||||
dnl check for glib/gtk/gnome
|
||||
PKG_CHECK_MODULES(GLIB, glib-2.0, ,
|
||||
|
@ -1,8 +1,15 @@
|
||||
noinst_PROGRAMS = unittest
|
||||
lib_LTLIBRARIES = libmdbodbc.la
|
||||
AM_CPPFLAGS = -I$(top_srcdir)/include $(GLIB_CFLAGS) $(ODBC_CFLAGS)
|
||||
libmdbodbc_la_SOURCES= odbc.c connectparams.c mdbodbc.h connectparams.h
|
||||
libmdbodbc_la_LIBADD= ../libmdb/libmdb.la ../sql/libmdbsql.la
|
||||
libmdbodbc_la_LDFLAGS = -avoid-version -export-symbols-regex '^(SQL|ODBCINST)'
|
||||
libmdbodbc_la_SOURCES = odbc.c connectparams.c mdbodbc.h connectparams.h
|
||||
libmdbodbc_la_LIBADD = ../libmdb/libmdb.la ../sql/libmdbsql.la
|
||||
libmdbodbc_la_LDFLAGS = -avoid-version -export-symbols-regex '^(SQL|ODBCINST)'
|
||||
if ICONV
|
||||
lib_LTLIBRARIES += libmdbodbcW.la
|
||||
libmdbodbcW_la_SOURCES = $(libmdbodbc_la_SOURCES)
|
||||
libmdbodbcW_la_LIBADD = $(libmdbodbc_la_LIBADD)
|
||||
libmdbodbcW_la_LDFLAGS = $(libmdbodbc_la_LDFLAGS)
|
||||
libmdbodbcW_la_CFLAGS = -D ENABLE_ODBC_W=1
|
||||
endif
|
||||
LIBS = @LEXLIB@ $(GLIB_LIBS) $(ODBC_LIBS)
|
||||
unittest_LDADD = libmdbodbc.la ../libmdb/libmdb.la ../sql/libmdbsql.la
|
||||
|
@ -16,11 +16,6 @@
|
||||
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
|
||||
*/
|
||||
|
||||
#ifdef HAVE_ICONV
|
||||
/* Disable ODBC wide char if iconv is not available */
|
||||
#define ENABLE_ODBC_W
|
||||
#endif
|
||||
|
||||
#ifdef ENABLE_ODBC_W
|
||||
#define SQL_NOUNICODEMAP
|
||||
#define UNICODE
|
||||
|
Loading…
Reference in New Issue
Block a user