paweld/fpc
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/fpc/source.git synced 2025-11-04 11:59:41 +01:00
Code Issues Packages Projects Releases Wiki Activity

* Enable 64-bit compilation

Browse Source 
git-svn-id: trunk@22607 -
This commit is contained in:
michael 2012-10-10 07:20:06 +00:00
parent 82cc913b06
commit 3928be7f4d
2 changed files with 8 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
packages/fcl-db/fpmake.pp
View File

@ -15,7 +15,7 @@ const
DBaseOSes = [aix,beos,haiku,linux,freebsd,darwin,iphonesim,netbsd,openbsd,solaris,win32,win64,wince];
MSSQLOSes = [beos,haiku,linux,freebsd,netbsd,openbsd,solaris,win32,win64];
SqldbWithoutOracleOSes = [win64];
SqldbWithoutPostgresOSes = [win64];
Var
P : TPackage;
@ -41,7 +41,7 @@ begin
P.SourcePath.Add('src/base');
P.SourcePath.Add('src/paradox', ParadoxOSes);
P.SourcePath.Add('src/sqldb');
P.SourcePath.Add('src/sqldb/postgres', SqldbConnectionOSes-SqldbWithoutPostgresOSes);
P.SourcePath.Add('src/sqldb/postgres', SqldbConnectionOSes);
P.SourcePath.Add('src/sqldb/sqlite', SqldbConnectionOSes);
P.SourcePath.Add('src/sqldb/interbase', SqldbConnectionOSes);
P.SourcePath.Add('src/sqldb/mysql', SqldbConnectionOSes);
@ -59,7 +59,7 @@ begin
P.SourcePath.Add('src/dbase');
P.IncludePath.Add('src/base');
P.IncludePath.Add('src/sqldb');
P.IncludePath.Add('src/sqldb/postgres', SqldbConnectionOSes-SqldbWithoutPostgresOSes);
P.IncludePath.Add('src/sqldb/postgres', SqldbConnectionOSes);
P.IncludePath.Add('src/sqldb/mysql', SqldbConnectionOSes);
P.IncludePath.Add('src/sdf');
P.IncludePath.Add('src/memds');
@ -73,7 +73,7 @@ begin
P.Dependencies.Add('mysql', SqldbConnectionOSes);
P.Dependencies.Add('odbc', SqldbConnectionOSes);
P.Dependencies.Add('oracle', SqldbConnectionOSes-SqldbWithoutOracleOSes);
P.Dependencies.Add('postgres', SqldbConnectionOSes-SqldbWithoutPostgresOSes);
P.Dependencies.Add('postgres', SqldbConnectionOSes);
P.Dependencies.Add('sqlite', SqldbConnectionOSes+SqliteOSes);
P.Dependencies.Add('dblib', MSSQLOSes);
P.Dependencies.Add('pxlib',ParadoxOSes);
@ -428,7 +428,7 @@ begin
AddUnit('fpddsqldb');
AddUnit('oracleconnection');
end;
T:=P.Targets.AddUnit('fpddpq.pp', DatadictOSes-SqldbWithoutPostgresOSes);
T:=P.Targets.AddUnit('fpddpq.pp', DatadictOSes);
with T.Dependencies do
begin
AddUnit('sqldb');
@ -436,7 +436,7 @@ begin
AddUnit('fpddsqldb');
AddUnit('pqconnection');
end;
T:=P.Targets.AddUnit('fpddregstd.pp', DatadictOSes-SqldbWithoutPostgresOSes);
T:=P.Targets.AddUnit('fpddregstd.pp', DatadictOSes-SqldbWithoutOracleOSes);
with T.Dependencies do
begin
AddUnit('fpdatadict');
@ -654,7 +654,7 @@ begin
AddUnit('db');
AddUnit('bufdataset_parser');
end;
T:=P.Targets.AddUnit('pqconnection.pp', SqldbConnectionOSes-SqldbWithoutPostgresOSes);
T:=P.Targets.AddUnit('pqconnection.pp', SqldbConnectionOSes);
T.ResourceStrings:=true;
with T.Dependencies do
begin
@ -663,7 +663,7 @@ begin
AddUnit('dbconst');
AddUnit('bufdataset');
end;
T:=P.Targets.AddUnit('pqeventmonitor.pp', SqldbConnectionOSes-SqldbWithoutPostgresOSes);
T:=P.Targets.AddUnit('pqeventmonitor.pp', SqldbConnectionOSes);
with T.Dependencies do
begin
AddUnit('sqldb');

5
packages/fcl-db/tests/sqldbtoolsunit.pas
View File

@ -9,10 +9,7 @@ uses
,db, sqldb
,mysql40conn, mysql41conn, mysql50conn, mysql51conn, mysql55conn
,ibconnection
{$IFNDEF WIN64}
{See packages\fcl-db\src\sqldb\postgres\fpmake.pp: postgres connector won't be present on Win64}
,pqconnection
{$ENDIF WIN64}
,odbcconn
{$IFNDEF WIN64}
{See packages\fcl-db\fpmake.pp: Oracle connector is not built if PostgreSQL connectoris not built}
@ -153,7 +150,6 @@ begin
FieldtypeDefinitions[ftVarBytes] := 'VARBINARY(10)';
FieldtypeDefinitions[ftMemo] := 'CLOB'; //or TEXT SQLite supports both, but CLOB is sql standard (TEXT not)
end;
{$IFNDEF Win64}
if SQLDbType = POSTGRESQL then
begin
Fconnection := tPQConnection.Create(nil);
@ -162,7 +158,6 @@ begin
FieldtypeDefinitions[ftMemo] := 'TEXT';
FieldtypeDefinitions[ftGraphic] := '';
end;
{$ENDIF Win64}
if SQLDbType = INTERBASE then
begin
Fconnection := tIBConnection.Create(nil);