Skip to content

Commit 3848527

Browse files
bugginsbuggins
committed
x64 build suppor under windows
1 parent 8b12e2d commit 3848527

File tree

7 files changed

+427
-9
lines changed

7 files changed

+427
-9
lines changed

‎ddbc.sln

+11-4
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,9 @@ Project("{002A2DE9-8BB6-484D-9802-7E4AD4084715}") = "ddbctest", "test\ddbctest\d
1111
EndProjectSection
1212
EndProject
1313
Project("{002A2DE9-8BB6-484D-9802-7E4AD4084715}") = "pgsql_test", "examples\pgsql_test\pgsql_test.visualdproj", "{9398E775-3E49-4795-9D70-4A6D4932A069}"
14+
ProjectSection(ProjectDependencies) = postProject
15+
{73F0CBE2-F09C-4141-866B-352226CA8029} = {73F0CBE2-F09C-4141-866B-352226CA8029}
16+
EndProjectSection
1417
EndProject
1518
Global
1619
GlobalSection(SolutionConfigurationPlatforms) = preSolution
@@ -22,16 +25,20 @@ Global
2225
GlobalSection(ProjectConfigurationPlatforms) = postSolution
2326
{73F0CBE2-F09C-4141-866B-352226CA8029}.Debug|Win32.ActiveCfg = Debug|Win32
2427
{73F0CBE2-F09C-4141-866B-352226CA8029}.Debug|Win32.Build.0 = Debug|Win32
25-
{73F0CBE2-F09C-4141-866B-352226CA8029}.Debug|x64.ActiveCfg = Debug|Win32
28+
{73F0CBE2-F09C-4141-866B-352226CA8029}.Debug|x64.ActiveCfg = Debug|x64
29+
{73F0CBE2-F09C-4141-866B-352226CA8029}.Debug|x64.Build.0 = Debug|x64
2630
{73F0CBE2-F09C-4141-866B-352226CA8029}.Release|Win32.ActiveCfg = Release|Win32
2731
{73F0CBE2-F09C-4141-866B-352226CA8029}.Release|Win32.Build.0 = Release|Win32
28-
{73F0CBE2-F09C-4141-866B-352226CA8029}.Release|x64.ActiveCfg = Release|Win32
32+
{73F0CBE2-F09C-4141-866B-352226CA8029}.Release|x64.ActiveCfg = Release|x64
33+
{73F0CBE2-F09C-4141-866B-352226CA8029}.Release|x64.Build.0 = Release|x64
2934
{2D9D91AB-FB57-41E6-9769-A82E95235A40}.Debug|Win32.ActiveCfg = Debug|Win32
3035
{2D9D91AB-FB57-41E6-9769-A82E95235A40}.Debug|Win32.Build.0 = Debug|Win32
31-
{2D9D91AB-FB57-41E6-9769-A82E95235A40}.Debug|x64.ActiveCfg = Debug|Win32
36+
{2D9D91AB-FB57-41E6-9769-A82E95235A40}.Debug|x64.ActiveCfg = Debug|x64
37+
{2D9D91AB-FB57-41E6-9769-A82E95235A40}.Debug|x64.Build.0 = Debug|x64
3238
{2D9D91AB-FB57-41E6-9769-A82E95235A40}.Release|Win32.ActiveCfg = Release|Win32
3339
{2D9D91AB-FB57-41E6-9769-A82E95235A40}.Release|Win32.Build.0 = Release|Win32
34-
{2D9D91AB-FB57-41E6-9769-A82E95235A40}.Release|x64.ActiveCfg = Release|Win32
40+
{2D9D91AB-FB57-41E6-9769-A82E95235A40}.Release|x64.ActiveCfg = Release|x64
41+
{2D9D91AB-FB57-41E6-9769-A82E95235A40}.Release|x64.Build.0 = Release|x64
3542
{9398E775-3E49-4795-9D70-4A6D4932A069}.Debug|Win32.ActiveCfg = Debug|Win32
3643
{9398E775-3E49-4795-9D70-4A6D4932A069}.Debug|Win32.Build.0 = Debug|Win32
3744
{9398E775-3E49-4795-9D70-4A6D4932A069}.Debug|x64.ActiveCfg = Debug|x64

‎ddbc.visualdproj

+204
Original file line numberDiff line numberDiff line change
@@ -204,6 +204,210 @@
204204
<postBuildCommand />
205205
<filesToClean>*.obj;*.cmd;*.build;*.json;*.dep</filesToClean>
206206
</Config>
207+
<Config name="Debug" platform="x64">
208+
<obj>0</obj>
209+
<link>0</link>
210+
<lib>1</lib>
211+
<subsystem>0</subsystem>
212+
<multiobj>0</multiobj>
213+
<singleFileCompilation>0</singleFileCompilation>
214+
<oneobj>0</oneobj>
215+
<mscoff>0</mscoff>
216+
<trace>0</trace>
217+
<quiet>0</quiet>
218+
<verbose>0</verbose>
219+
<vtls>0</vtls>
220+
<vgc>0</vgc>
221+
<symdebug>1</symdebug>
222+
<optimize>0</optimize>
223+
<cpu>0</cpu>
224+
<isX86_64>1</isX86_64>
225+
<isLinux>0</isLinux>
226+
<isOSX>0</isOSX>
227+
<isWindows>0</isWindows>
228+
<isFreeBSD>0</isFreeBSD>
229+
<isSolaris>0</isSolaris>
230+
<scheduler>0</scheduler>
231+
<useDeprecated>0</useDeprecated>
232+
<errDeprecated>0</errDeprecated>
233+
<useAssert>0</useAssert>
234+
<useInvariants>0</useInvariants>
235+
<useIn>0</useIn>
236+
<useOut>0</useOut>
237+
<useArrayBounds>0</useArrayBounds>
238+
<noboundscheck>0</noboundscheck>
239+
<useSwitchError>0</useSwitchError>
240+
<useUnitTests>0</useUnitTests>
241+
<useInline>0</useInline>
242+
<release>0</release>
243+
<preservePaths>0</preservePaths>
244+
<warnings>0</warnings>
245+
<infowarnings>0</infowarnings>
246+
<checkProperty>0</checkProperty>
247+
<genStackFrame>0</genStackFrame>
248+
<pic>0</pic>
249+
<cov>0</cov>
250+
<nofloat>0</nofloat>
251+
<Dversion>2</Dversion>
252+
<ignoreUnsupportedPragmas>0</ignoreUnsupportedPragmas>
253+
<allinst>0</allinst>
254+
<stackStomp>0</stackStomp>
255+
<compiler>0</compiler>
256+
<otherDMD>0</otherDMD>
257+
<cccmd>$(CC) -c</cccmd>
258+
<ccTransOpt>1</ccTransOpt>
259+
<program>$(DMDInstallDir)windows\bin\dmd.exe</program>
260+
<imppath />
261+
<fileImppath />
262+
<outdir>$(ConfigurationName)</outdir>
263+
<objdir>$(OutDir)</objdir>
264+
<objname />
265+
<libname />
266+
<doDocComments>0</doDocComments>
267+
<docdir />
268+
<docname />
269+
<modules_ddoc />
270+
<ddocfiles />
271+
<doHdrGeneration>0</doHdrGeneration>
272+
<hdrdir />
273+
<hdrname />
274+
<doXGeneration>1</doXGeneration>
275+
<xfilename>$(IntDir)\$(TargetName).json</xfilename>
276+
<debuglevel>0</debuglevel>
277+
<debugids />
278+
<versionlevel>0</versionlevel>
279+
<versionids>USE_SQLITE USE_MYSQL USE_PGSQL</versionids>
280+
<dump_source>0</dump_source>
281+
<mapverbosity>0</mapverbosity>
282+
<createImplib>0</createImplib>
283+
<defaultlibname />
284+
<debuglibname />
285+
<moduleDepsFile />
286+
<run>0</run>
287+
<runargs />
288+
<runCv2pdb>1</runCv2pdb>
289+
<pathCv2pdb>$(VisualDInstallDir)cv2pdb\cv2pdb.exe</pathCv2pdb>
290+
<cv2pdbPre2043>0</cv2pdbPre2043>
291+
<cv2pdbNoDemangle>0</cv2pdbNoDemangle>
292+
<cv2pdbEnumType>0</cv2pdbEnumType>
293+
<cv2pdbOptions />
294+
<objfiles />
295+
<linkswitches />
296+
<libfiles>sqlite3.lib</libfiles>
297+
<libpaths>libs/win64</libpaths>
298+
<deffile />
299+
<resfile />
300+
<exefile>$(OutDir)\$(ProjectName).lib</exefile>
301+
<useStdLibPath>1</useStdLibPath>
302+
<cRuntime>2</cRuntime>
303+
<privatePhobos>0</privatePhobos>
304+
<additionalOptions />
305+
<preBuildCommand />
306+
<postBuildCommand />
307+
<filesToClean>*.obj;*.cmd;*.build;*.json;*.dep</filesToClean>
308+
</Config>
309+
<Config name="Release" platform="x64">
310+
<obj>0</obj>
311+
<link>0</link>
312+
<lib>1</lib>
313+
<subsystem>0</subsystem>
314+
<multiobj>0</multiobj>
315+
<singleFileCompilation>0</singleFileCompilation>
316+
<oneobj>0</oneobj>
317+
<mscoff>0</mscoff>
318+
<trace>0</trace>
319+
<quiet>0</quiet>
320+
<verbose>0</verbose>
321+
<vtls>0</vtls>
322+
<vgc>0</vgc>
323+
<symdebug>0</symdebug>
324+
<optimize>0</optimize>
325+
<cpu>0</cpu>
326+
<isX86_64>1</isX86_64>
327+
<isLinux>0</isLinux>
328+
<isOSX>0</isOSX>
329+
<isWindows>0</isWindows>
330+
<isFreeBSD>0</isFreeBSD>
331+
<isSolaris>0</isSolaris>
332+
<scheduler>0</scheduler>
333+
<useDeprecated>0</useDeprecated>
334+
<errDeprecated>0</errDeprecated>
335+
<useAssert>0</useAssert>
336+
<useInvariants>0</useInvariants>
337+
<useIn>0</useIn>
338+
<useOut>0</useOut>
339+
<useArrayBounds>0</useArrayBounds>
340+
<noboundscheck>0</noboundscheck>
341+
<useSwitchError>0</useSwitchError>
342+
<useUnitTests>0</useUnitTests>
343+
<useInline>0</useInline>
344+
<release>1</release>
345+
<preservePaths>0</preservePaths>
346+
<warnings>0</warnings>
347+
<infowarnings>0</infowarnings>
348+
<checkProperty>0</checkProperty>
349+
<genStackFrame>0</genStackFrame>
350+
<pic>0</pic>
351+
<cov>0</cov>
352+
<nofloat>0</nofloat>
353+
<Dversion>2</Dversion>
354+
<ignoreUnsupportedPragmas>0</ignoreUnsupportedPragmas>
355+
<allinst>0</allinst>
356+
<stackStomp>0</stackStomp>
357+
<compiler>0</compiler>
358+
<otherDMD>0</otherDMD>
359+
<cccmd>$(CC) -c</cccmd>
360+
<ccTransOpt>1</ccTransOpt>
361+
<program>$(DMDInstallDir)windows\bin\dmd.exe</program>
362+
<imppath />
363+
<fileImppath />
364+
<outdir>$(ConfigurationName)</outdir>
365+
<objdir>$(OutDir)</objdir>
366+
<objname />
367+
<libname />
368+
<doDocComments>0</doDocComments>
369+
<docdir />
370+
<docname />
371+
<modules_ddoc />
372+
<ddocfiles />
373+
<doHdrGeneration>0</doHdrGeneration>
374+
<hdrdir />
375+
<hdrname />
376+
<doXGeneration>1</doXGeneration>
377+
<xfilename>$(IntDir)\$(TargetName).json</xfilename>
378+
<debuglevel>0</debuglevel>
379+
<debugids />
380+
<versionlevel>0</versionlevel>
381+
<versionids>USE_SQLITE USE_MYSQL USE_PGSQL</versionids>
382+
<dump_source>0</dump_source>
383+
<mapverbosity>0</mapverbosity>
384+
<createImplib>0</createImplib>
385+
<defaultlibname />
386+
<debuglibname />
387+
<moduleDepsFile />
388+
<run>0</run>
389+
<runargs />
390+
<runCv2pdb>0</runCv2pdb>
391+
<pathCv2pdb>$(VisualDInstallDir)cv2pdb\cv2pdb.exe</pathCv2pdb>
392+
<cv2pdbPre2043>0</cv2pdbPre2043>
393+
<cv2pdbNoDemangle>0</cv2pdbNoDemangle>
394+
<cv2pdbEnumType>0</cv2pdbEnumType>
395+
<cv2pdbOptions />
396+
<objfiles />
397+
<linkswitches />
398+
<libfiles>sqlite3.lib</libfiles>
399+
<libpaths>libs/win64</libpaths>
400+
<deffile />
401+
<resfile />
402+
<exefile>$(OutDir)\$(ProjectName).lib</exefile>
403+
<useStdLibPath>1</useStdLibPath>
404+
<cRuntime>2</cRuntime>
405+
<privatePhobos>0</privatePhobos>
406+
<additionalOptions />
407+
<preBuildCommand />
408+
<postBuildCommand />
409+
<filesToClean>*.obj;*.cmd;*.build;*.json;*.dep</filesToClean>
410+
</Config>
207411
<Folder name="ddbc">
208412
<Folder name="deps">
209413
<Folder name="DerelictPQ">

‎dub.json

+4-1
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,8 @@
1818
"libs-posix": ["sqlite3"],
1919
"libs-windows": ["sqlite3"],
2020
"copyFiles-windows-x86": [ "libs/win32/sqlite3.dll", "libs/win32/libpq.dll"],
21-
"copyFiles-windows-x86_64": [ "libs/win64/libpq.dll"],
21+
"copyFiles-windows-x86_64": [ "libs/win64/libpq.dll", "libs/win64/sqlite3.dll"],
22+
"sourceFiles-windows-x86_64" : [ "libs/win64/sqlite3.lib" ],
2223
"sourceFiles-windows-x86" : [ "libs/win32/sqlite3.lib"]
2324
},
2425
{
@@ -34,6 +35,8 @@
3435
"libs-posix": ["sqlite3"],
3536
"libs-windows": ["sqlite3"],
3637
"copyFiles-windows-x86": [ "libs/win32/sqlite3.dll" ],
38+
"copyFiles-windows-x86_64": [ "libs/win64/sqlite3.dll" ],
39+
"sourceFiles-windows-x86_64" : [ "libs/win64/sqlite3.lib" ],
3740
"sourceFiles-windows-x86" : [ "libs/win32/sqlite3.lib" ]
3841
},
3942
{

‎examples/pgsql_test/pgsql_test.visualdproj

+4-4
Original file line numberDiff line numberDiff line change
@@ -293,8 +293,8 @@
293293
<cv2pdbOptions />
294294
<objfiles />
295295
<linkswitches />
296-
<libfiles>sqlite3.lib</libfiles>
297-
<libpaths>$(SolutionDir)/../ddbc/libs/win32</libpaths>
296+
<libfiles />
297+
<libpaths>$(SolutionDir)/../ddbc/libs/win64</libpaths>
298298
<deffile />
299299
<resfile />
300300
<exefile>$(OutDir)\$(ProjectName).exe</exefile>
@@ -395,8 +395,8 @@
395395
<cv2pdbOptions />
396396
<objfiles />
397397
<linkswitches />
398-
<libfiles>sqlite3.lib</libfiles>
399-
<libpaths>$(SolutionDir)/../ddbc/libs/win32</libpaths>
398+
<libfiles />
399+
<libpaths>$(SolutionDir)/../ddbc/libs/win64</libpaths>
400400
<deffile />
401401
<resfile />
402402
<exefile>$(OutDir)\$(ProjectName).exe</exefile>

‎libs/win64/sqlite3.dll

1.61 MB
Binary file not shown.

‎libs/win64/sqlite3.lib

54.1 KB
Binary file not shown.

0 commit comments

Comments
 (0)