-
-
Notifications
You must be signed in to change notification settings - Fork 79
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Update build files fixing issue #133
Under Windows a DLL build with autoconf/automake (MSYS) did not export the SQLite API properly. All Windows build files have been adjusted to use the symbol SQLITE_API to define the API to be exported from a DLL, instead of using a .def file (which could cause various problems).
- Loading branch information
Showing
33 changed files
with
135 additions
and
318 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -26,7 +26,8 @@ AM_CFLAGS = -I$(top_srcdir)/src | |
|
||
AM_CFLAGS += -std=c99 -DSQLITE_THREADSAFE=1 -DSQLITE_DQS=0 -DSQLITE_MAX_ATTACHED=10 -DSQLITE_SOUNDEX=1 -DSQLITE_ENABLE_COLUMN_METADATA=1 -DSQLITE_SECURE_DELETE=1 -DSQLITE_ENABLE_DESERIALIZE=1 -DSQLITE_ENABLE_FTS3=1 -DSQLITE_ENABLE_FTS3_PARENTHESIS=1 -DSQLITE_ENABLE_FTS4=1 -DSQLITE_ENABLE_FTS5=1 -DSQLITE_ENABLE_JSON1=1 -DSQLITE_ENABLE_RTREE=1 -DSQLITE_ENABLE_GEOPOLY=1 -DSQLITE_ENABLE_PREUPDATE_HOOK=1 -DSQLITE_ENABLE_SESSION=1 -DSQLITE_CORE=1 -DSQLITE_ENABLE_EXTFUNC=1 -DSQLITE_ENABLE_MATH_FUNCTIONS=1 -DSQLITE_ENABLE_CSV=1 -DSQLITE_ENABLE_SHA3=1 -DSQLITE_ENABLE_CARRAY=1 -DSQLITE_ENABLE_FILEIO=1 -DSQLITE_ENABLE_SERIES=1 -DSQLITE_ENABLE_UUID=1 -DSQLITE_ENABLE_REGEXP=1 -DSQLITE_TEMP_STORE=2 -DSQLITE_USE_URI=1 -DSQLITE_USER_AUTHENTICATION=1 $(X86_FLAGS) $(ARM_FLAGS) | ||
|
||
if USE_MSW | ||
if HOST_WINDOWS | ||
AM_CFLAGS += -DSQLITE_API=__declspec\(dllexport\) | ||
AM_LDFLAGS = | ||
else | ||
AM_LDFLAGS = -pthread -ldl -lm | ||
|
@@ -45,7 +46,7 @@ endif | |
|
||
LDADD = lib@[email protected] | ||
|
||
if USE_MSW | ||
if HOST_WINDOWS | ||
# Use old style suffix rule instead of the pattern one as automake only | ||
# recognizes this kind of rules. | ||
# | ||
|
@@ -71,7 +72,7 @@ lib_LTLIBRARIES = lib@[email protected] | |
lib@SQLITE3MC_LIBNAME@_la_SOURCES = \ | ||
src/sqlite3mc.c | ||
|
||
if USE_MSW | ||
if HOST_WINDOWS | ||
lib@SQLITE3MC_LIBNAME@_la_SOURCES += \ | ||
src/sqlite3mc.rc | ||
endif | ||
|
@@ -123,7 +124,7 @@ noinst_HEADERS = \ | |
src/test_windirent.h | ||
|
||
lib@SQLITE3MC_LIBNAME@_la_LDFLAGS = -no-undefined $(AM_LDFLAGS) | ||
if USE_MSW | ||
if HOST_WINDOWS | ||
lib@SQLITE3MC_LIBNAME@_la_LIBADD = src/sqlite3mc.res_o | ||
else | ||
lib@SQLITE3MC_LIBNAME@_la_LIBADD = -ldl -lm | ||
|
@@ -139,7 +140,7 @@ sqlite3shell_SOURCES = \ | |
|
||
sqlite3shell_CFLAGS = -I$(top_srcdir)/src -std=c99 -D_GNU_SOURCE -DSQLITE_THREADSAFE=1 -DSQLITE_DQS=0 -DSQLITE_MAX_ATTACHED=10 -DSQLITE_SOUNDEX=1 -DSQLITE_ENABLE_COLUMN_METADATA=1 -DSQLITE_SECURE_DELETE=1 -DSQLITE_ENABLE_DESERIALIZE=1 -DSQLITE_ENABLE_FTS3=1 -DSQLITE_ENABLE_FTS3_PARENTHESIS=1 -DSQLITE_ENABLE_FTS4=1 -DSQLITE_ENABLE_FTS5=1 -DSQLITE_ENABLE_JSON1=1 -DSQLITE_ENABLE_RTREE=1 -DSQLITE_ENABLE_GEOPOLY=1 -DSQLITE_ENABLE_PREUPDATE_HOOK=1 -DSQLITE_ENABLE_SESSION=1 -DSQLITE_CORE=1 -DSQLITE_ENABLE_EXTFUNC=1 -DSQLITE_ENABLE_MATH_FUNCTIONS=1 -DSQLITE_ENABLE_CSV=1 -DSQLITE_ENABLE_CARRAY=1 -DSQLITE_ENABLE_UUID=1 -DSQLITE_TEMP_STORE=2 -DSQLITE_USE_URI=1 -DSQLITE_USER_AUTHENTICATION=1 -DSQLITE_ENABLE_DBPAGE_VTAB=1 -DSQLITE_ENABLE_DBSTAT_VTAB=1 -DSQLITE_ENABLE_STMTVTAB=1 -DSQLITE_ENABLE_UNKNOWN_SQL_FUNCTION=1 $(X86_FLAGS) $(ARM_FLAGS) | ||
|
||
if USE_MSW | ||
if HOST_WINDOWS | ||
sqlite3shell_LDADD = | ||
sqlite3shell_LDFLAGS = | ||
else | ||
|
@@ -152,7 +153,7 @@ sqlite3shell_CFLAGS += -DSQLITE_HAVE_ZLIB=1 | |
sqlite3shell_LDADD += -lz | ||
endif | ||
|
||
if USE_MSW | ||
if HOST_WINDOWS | ||
sqlite3shell_SOURCES += src/sqlite3mc_shell.rc | ||
sqlite3shell_LDADD += src/sqlite3mc_shell.res_o | ||
CLEANFILES = src/sqlite3mc_shell.res_o | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.