Swiftdiff options
Diffstat (limited to '3rdParty/SQLite')
| -rw-r--r-- | 3rdParty/SQLite/SConscript | 4 | ||||
| -rw-r--r-- | 3rdParty/SQLite/sqlite3.c | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/3rdParty/SQLite/SConscript b/3rdParty/SQLite/SConscript index 9b9fead..ffa8946 100644 --- a/3rdParty/SQLite/SConscript +++ b/3rdParty/SQLite/SConscript @@ -11,5 +11,4 @@ if env.get("SQLITE_BUNDLED", False) : "CPPPATH": [Dir(".")], "LIBPATH": [Dir(".")], - "LIBS": ["SQLite"], } @@ -17,3 +16,4 @@ if env.get("SQLITE_BUNDLED", False) : myenv = env.Clone() myenv.Replace(CCFLAGS = [flag for flag in env["CCFLAGS"] if flag not in ["-W", "-Wall"]]) - myenv.StaticLibrary("SQLite", ["sqlite3.c"], CPPPATH = ["."]) + myenv.Append(CPPPATH = ["."]) + env["SQLITE_OBJECTS"] = myenv.SwiftenObject(["sqlite3.c"]) diff --git a/3rdParty/SQLite/sqlite3.c b/3rdParty/SQLite/sqlite3.c index 3c7c57f..f11bd5d 100644 --- a/3rdParty/SQLite/sqlite3.c +++ b/3rdParty/SQLite/sqlite3.c @@ -289,5 +289,5 @@ * platforms. */ -#define SQLITE_INT_TO_PTR(X) ((void*)&((char*)0)[X]) +#define SQLITE_INT_TO_PTR(X) ((void*)(X)) #define SQLITE_PTR_TO_INT(X) ((int)(((char*)X)-(char*)0)) |