From aad38263cf327ab374b2f9cacc5a94d2401ea65d Mon Sep 17 00:00:00 2001 From: William Whitehead Date: Mon, 9 Mar 2015 09:19:55 -0400 Subject: [PATCH] ODBC-17 Minor changes needed for 32/64 builds There are a few changes needed to the build process to ensure the 32 and 64 bit builds don't collide with each other. Specifically the drivers will install in folders with the architecture (32/64) as part of the path name Signed-off-by: William Whitehead --- hpcc_odbc.vcproj | 8 ++++---- package_hpcc_odbc64.bat | 2 +- progress/32bit/custom.ini | 2 +- progress/64bit/custom.ini | 2 +- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/hpcc_odbc.vcproj b/hpcc_odbc.vcproj index 58ceab4..ca256a7 100644 --- a/hpcc_odbc.vcproj +++ b/hpcc_odbc.vcproj @@ -184,10 +184,10 @@ AdditionalLibraryDirectories="..\HPCC-Lib64\;C:\Program Files\Progress\DataDirect\oaodbclocal72\ip\lib" ManifestFile="./Release_x64\$(TargetFileName).intermediate.manifest" ModuleDefinitionFile=".\src\hpccodbc.def" - ProgramDatabaseFile=".\Release_x64/hpcc_odbc_32.pdb" + ProgramDatabaseFile=".\Release_x64/hpcc_odbc_64.pdb" RandomizedBaseAddress="1" DataExecutionPrevention="0" - ImportLibrary=".\Release_x64/hpcc_odbc_32.lib" + ImportLibrary=".\Release_x64/hpcc_odbc_64.lib" TargetMachine="17" /> diff --git a/package_hpcc_odbc64.bat b/package_hpcc_odbc64.bat index 60d27d6..f723526 100644 --- a/package_hpcc_odbc64.bat +++ b/package_hpcc_odbc64.bat @@ -1,6 +1,6 @@ if "%PROGRESS_SDK64_DIR%".=="". set PROGRESS_SDK64_DIR=C:\Program Files\Progress\DataDirect\oaodbclocal72 if "%HPCCODBC_SRC_DIR%".=="". set HPCCODBC_SRC_DIR=C:\hpcc\HPCC-ODBC -if "%HPCC_BUILD_DIR_64%".=="". set HPCC_BUILD_DIR_64=C:\hpcc\HPCC-Lib +if "%HPCC_BUILD_DIR_64%".=="". set HPCC_BUILD_DIR_64=C:\hpcc\HPCC-Lib64 @echo on @echo =============================================================================== diff --git a/progress/32bit/custom.ini b/progress/32bit/custom.ini index 78329ee..7d49d69 100644 --- a/progress/32bit/custom.ini +++ b/progress/32bit/custom.ini @@ -29,7 +29,7 @@ ProductUpdateURL=http://hpccsystems.com/download ;Specific Installation information ;---------------------------------------------------------- FolderName=HPCC Systems\HPCC-ODBC32 Connector -AppBasePath=${Program Files}\HPCCSystems\HPCC-ODBC Connector +AppBasePath=${Program Files}\HPCCSystems\HPCC-ODBC32 Connector ;UnInstallLocation= ;---------------------------------------------------------- diff --git a/progress/64bit/custom.ini b/progress/64bit/custom.ini index 60e15c7..64716cc 100644 --- a/progress/64bit/custom.ini +++ b/progress/64bit/custom.ini @@ -29,7 +29,7 @@ ProductUpdateURL=http://hpccsystems.com/download ;Specific Installation information ;---------------------------------------------------------- FolderName=HPCC Systems\HPCC-ODBC64 Connector -AppBasePath=${Program Files}\HPCCSystems\HPCC-ODBC Connector +AppBasePath=${Program Files}\HPCCSystems\HPCC-ODBC64 Connector ;UnInstallLocation= ;----------------------------------------------------------