Browse Source

Merged revisions 7414,7416 via svnmerge from
svn+ssh://[email protected]/FPC/svn/fpc/trunk

........
r7414 | joost | 2007-05-21 22:39:27 +0200 (Mon, 21 May 2007) | 1 line

* Enabled compilation of TODBCConnection for win64
........
r7416 | joost | 2007-05-21 23:20:52 +0200 (Mon, 21 May 2007) | 1 line

* Enabled compilation of TMySQLxxConnection for win64
........

git-svn-id: branches/fixes_2_2@7425 -

joost 18 years ago
parent
commit
8298c4e956
2 changed files with 6 additions and 2 deletions
  1. 5 1
      packages/fcl-db/src/sqldb/Makefile
  2. 1 1
      packages/fcl-db/src/sqldb/Makefile.fpc

+ 5 - 1
packages/fcl-db/src/sqldb/Makefile

@@ -287,7 +287,7 @@ ifeq ($(FULL_TARGET),x86_64-freebsd)
 override TARGET_DIRS+=interbase postgres mysql odbc oracle
 endif
 ifeq ($(FULL_TARGET),x86_64-win64)
-override TARGET_DIRS+=interbase
+override TARGET_DIRS+=interbase odbc mysql
 endif
 ifeq ($(FULL_TARGET),arm-linux)
 override TARGET_DIRS+=interbase postgres mysql odbc oracle
@@ -1759,6 +1759,8 @@ endif
 ifeq ($(FULL_TARGET),x86_64-win64)
 REQUIRE_PACKAGES_RTL=1
 REQUIRE_PACKAGES_IBASE=1
+REQUIRE_PACKAGES_ODBC=1
+REQUIRE_PACKAGES_MYSQL=1
 endif
 ifeq ($(FULL_TARGET),x86_64-embedded)
 REQUIRE_PACKAGES_RTL=1
@@ -2575,6 +2577,8 @@ TARGET_DIRS_ORACLE=1
 endif
 ifeq ($(FULL_TARGET),x86_64-win64)
 TARGET_DIRS_INTERBASE=1
+TARGET_DIRS_ODBC=1
+TARGET_DIRS_MYSQL=1
 endif
 ifeq ($(FULL_TARGET),arm-linux)
 TARGET_DIRS_INTERBASE=1

+ 1 - 1
packages/fcl-db/src/sqldb/Makefile.fpc

@@ -12,7 +12,7 @@ dirs_darwin=interbase postgres mysql odbc oracle
 dirs_netbsd=interbase postgres mysql odbc oracle
 dirs_openbsd=interbase postgres mysql odbc oracle
 dirs_win32=interbase postgres mysql odbc oracle
-dirs_win64=interbase
+dirs_win64=interbase odbc mysql
 dirs_wince=interbase postgres 
 units=sqldb
 rsts=sqldb