Skip to content

Commit dfd1373

Browse files
author
ericP
committed
+ windows support for postgresql
1 parent 428dcea commit dfd1373

File tree

4 files changed

+64
-4
lines changed

4 files changed

+64
-4
lines changed

SPARQL_msi/SPARQL_msi.vdproj

+54-1
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,18 @@
2525
"OwnerKey" = "8:_UNDEFINED"
2626
"MsmSig" = "8:_UNDEFINED"
2727
}
28+
"Entry"
29+
{
30+
"MsmKey" = "8:_A045B5D9C95E4C07B6C214B066E02EF1"
31+
"OwnerKey" = "8:_UNDEFINED"
32+
"MsmSig" = "8:_UNDEFINED"
33+
}
34+
"Entry"
35+
{
36+
"MsmKey" = "8:_A045B5D9C95E4C07B6C214B066E02EF2"
37+
"OwnerKey" = "8:_UNDEFINED"
38+
"MsmSig" = "8:_UNDEFINED"
39+
}
2840
}
2941
"Configurations"
3042
{
@@ -144,7 +156,8 @@
144156
}
145157
"{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_A045B5D9C95E4C07B6C214B066E02EF0"
146158
{
147-
"SourcePath" = "8:C:\\Program Files (x86)\\MySQL\\MySQL Server 5.5\\lib\\libmysql.dll"
159+
"SourcePath" = "8:C:\\Program Files (x86)\\MySQL\\MySQL Connector C 6.1\\lib\\libmysql.dll"
160+
"SourcePath999" = "8:C:\\Program Files (x86)\\MySQL\\MySQL Server 5.5\\lib\\libmysql.dll"
148161
"TargetName" = "8:libmysql.dll"
149162
"Tag" = "8:"
150163
"Folder" = "8:_254D809D339C4917BAC94D2F90C58B4B"
@@ -162,6 +175,46 @@
162175
"IsDependency" = "11:FALSE"
163176
"IsolateTo" = "8:"
164177
}
178+
"{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_A045B5D9C95E4C07B6C214B066E02EF1"
179+
{
180+
"SourcePath" = "8:h:/dev/pgsql/bin/libintl.dll"
181+
"TargetName" = "8:libintl.dll"
182+
"Tag" = "8:"
183+
"Folder" = "8:_254D809D339C4917BAC94D2F90C58B4B"
184+
"Condition" = "8:"
185+
"Transitive" = "11:FALSE"
186+
"Vital" = "11:TRUE"
187+
"ReadOnly" = "11:FALSE"
188+
"Hidden" = "11:FALSE"
189+
"System" = "11:FALSE"
190+
"Permanent" = "11:FALSE"
191+
"SharedLegacy" = "11:FALSE"
192+
"PackageAs" = "3:1"
193+
"Register" = "3:1"
194+
"Exclude" = "11:FALSE"
195+
"IsDependency" = "11:FALSE"
196+
"IsolateTo" = "8:"
197+
}
198+
"{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_A045B5D9C95E4C07B6C214B066E02EF2"
199+
{
200+
"SourcePath" = "8:h:/dev/pgsql/bin/libpq.dll"
201+
"TargetName" = "8:libpq.dll"
202+
"Tag" = "8:"
203+
"Folder" = "8:_254D809D339C4917BAC94D2F90C58B4B"
204+
"Condition" = "8:"
205+
"Transitive" = "11:FALSE"
206+
"Vital" = "11:TRUE"
207+
"ReadOnly" = "11:FALSE"
208+
"Hidden" = "11:FALSE"
209+
"System" = "11:FALSE"
210+
"Permanent" = "11:FALSE"
211+
"SharedLegacy" = "11:FALSE"
212+
"PackageAs" = "3:1"
213+
"Register" = "3:1"
214+
"Exclude" = "11:FALSE"
215+
"IsDependency" = "11:FALSE"
216+
"IsolateTo" = "8:"
217+
}
165218
}
166219
"FileType"
167220
{

interface/SQLclient_Postgres.hpp

+5-1
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,11 @@
1515
#endif /* NEEDDEF_W3C_SW_SQLCLIENT */
1616

1717
#include <stdexcept>
18-
#include <postgresql/libpq-fe.h>
18+
#ifdef _MSC_VER
19+
# include <pgsql/include/libpq-fe.h>
20+
#else
21+
# include <postgresql/libpq-fe.h>
22+
#endif
1923

2024
namespace w3c_sw {
2125

win/SPARQL/SPARQL.vcxproj

+2-2
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@
6161
<DebugInformationFormat>EditAndContinue</DebugInformationFormat>
6262
</ClCompile>
6363
<Link>
64-
<AdditionalDependencies>libmysql.lib;db-lib.lib;%(AdditionalDependencies)</AdditionalDependencies>
64+
<AdditionalDependencies>libpq.lib;libmysql.lib;db-lib.lib;%(AdditionalDependencies)</AdditionalDependencies>
6565
<GenerateDebugInformation>true</GenerateDebugInformation>
6666
<SubSystem>Console</SubSystem>
6767
<RandomizedBaseAddress>false</RandomizedBaseAddress>
@@ -82,7 +82,7 @@
8282
<DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
8383
</ClCompile>
8484
<Link>
85-
<AdditionalDependencies>libmysql.lib;db-lib.lib;Rpcrt4.lib;%(AdditionalDependencies)</AdditionalDependencies>
85+
<AdditionalDependencies>libpq.lib;libmysql.lib;db-lib.lib;Rpcrt4.lib;%(AdditionalDependencies)</AdditionalDependencies>
8686
<GenerateDebugInformation>true</GenerateDebugInformation>
8787
<SubSystem>Console</SubSystem>
8888
<OptimizeReferences>true</OptimizeReferences>

win/config.h

+3
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,9 @@
2323
#define HTTP_CLIENT SWOb_ASIO
2424
#define HTTP_SERVER SWOb_ASIO
2525
#define SQL_CLIENT SWOb_MYSQL
26+
#define SQL_CLIENT_MYSQL
27+
#define SQL_CLIENT_POSTGRES
28+
#define SQL_CLIENT_MSSQL
2629

2730
#ifdef _DEBUG
2831
/* Debug builds can use the dynamic libs as you probably installed them

0 commit comments

Comments
 (0)