Skip to content

Commit 7527a01

Browse files
shooSingingBush
authored andcommitted
Fix #90 - sqlite3: cannot link on windows-x86-ldc with LNK1136
1 parent 3f9f5ae commit 7527a01

File tree

3 files changed

+29
-6
lines changed

3 files changed

+29
-6
lines changed

dub.json

+27-5
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,20 @@
2424
"copyFiles-windows-x86": [ "libs/win32/sqlite3.dll", "libs/win32/libpq.dll"],
2525
"copyFiles-windows-x86_64": [ "libs/win64/libpq.dll", "libs/win64/sqlite3.dll"],
2626
"sourceFiles-windows-x86_64" : [ "libs/win64/sqlite3.lib" ],
27-
"sourceFiles-windows-x86" : [ "libs/win32/sqlite3.lib"]
27+
"sourceFiles-windows-x86-ldc" : [ "libs/win32-mscoff/sqlite3.lib"],
28+
"sourceFiles-windows-x86-dmd" : [ "libs/win32/sqlite3.lib"]
29+
},
30+
{
31+
"name": "full-mscoff",
32+
"platforms": ["windows-x86"],
33+
"versions": ["USE_MYSQL", "USE_SQLITE", "USE_PGSQL", "USE_ODBC"],
34+
"dependencies": {
35+
"mysql-native": "~>3.0.0",
36+
"derelict-pq": "~>2.2.0"
37+
},
38+
"libs-windows": ["odbc"],
39+
"copyFiles-windows-x86": [ "libs/win32/sqlite3.dll", "libs/win32/libpq.dll"],
40+
"sourceFiles-windows-x86" : [ "libs/win32-mscoff/sqlite3.lib"]
2841
},
2942
{
3043
"name": "MySQL",
@@ -37,12 +50,19 @@
3750
"name": "SQLite",
3851
"versions": ["USE_SQLITE"],
3952
"libs-posix": ["sqlite3"],
40-
"libs-windows": ["sqlite3"],
4153
"lflags-osx": ["-L/usr/local/opt/sqlite3/lib/"],
4254
"copyFiles-windows-x86": [ "libs/win32/sqlite3.dll" ],
4355
"copyFiles-windows-x86_64": [ "libs/win64/sqlite3.dll" ],
4456
"sourceFiles-windows-x86_64" : [ "libs/win64/sqlite3.lib" ],
45-
"sourceFiles-windows-x86" : [ "libs/win32/sqlite3.lib" ]
57+
"sourceFiles-windows-x86-ldc" : [ "libs/win32-mscoff/sqlite3.lib" ],
58+
"sourceFiles-windows-x86-dmd" : [ "libs/win32/sqlite3.lib" ]
59+
},
60+
{
61+
"name": "SQLite-mscoff",
62+
"platforms": ["windows-x86"],
63+
"versions": ["USE_SQLITE"],
64+
"copyFiles-windows-x86": [ "libs/win32/sqlite3.dll" ],
65+
"sourceFiles-windows-x86" : [ "libs/win32-mscoff/sqlite3.lib" ]
4666
},
4767
{
4868
"name": "PGSQL",
@@ -73,10 +93,12 @@
7393
"targetType": "executable",
7494
"versions": ["USE_SQLITE"],
7595
"libs-posix": ["sqlite3"],
76-
"libs-windows": ["sqlite3"],
7796
"lflags-osx": ["-L/usr/local/opt/sqlite3/lib/"],
7897
"copyFiles-windows-x86": [ "libs/win32/sqlite3.dll" ],
79-
"sourceFiles-windows-x86" : [ "libs/win32/sqlite3.lib" ]
98+
"copyFiles-windows-x86_64": [ "libs/win64/sqlite3.dll" ],
99+
"sourceFiles-windows-x86_64" : [ "libs/win64/sqlite3.lib" ],
100+
"sourceFiles-windows-x86-ldc" : [ "libs/win32-mscoff/sqlite3.lib" ],
101+
"sourceFiles-windows-x86-dmd" : [ "libs/win32/sqlite3.lib" ]
80102
}
81103
]
82104
}

libs/win32-mscoff/sqlite3.lib

63 KB
Binary file not shown.

source/ddbc/drivers/sqliteddbc.d

+2-1
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,8 @@ version(USE_SQLITE) {
5555

5656

5757
version (Windows) {
58-
pragma (lib, "sqlite3");
58+
// manually link in dub.json
59+
//pragma (lib, "sqlite3");
5960
} else version (linux) {
6061
pragma (lib, "sqlite3");
6162
} else version (OSX) {

0 commit comments

Comments
 (0)