Merge pull request #15 from RussWhitehead/32and64bit

ODBC-17 Minor changes needed for 32/64 builds Reviewed-By: Rodrigo Pastrana <[email protected]> Reviewed-By: Richard Chapman <[email protected]>
hpcc-systems · Mar 9, 2015 · 2f586f8 · 2f586f8
2 parents b711d13 + aad3826
commit 2f586f8
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 7 deletions.
diff --git a/hpcc_odbc.vcproj b/hpcc_odbc.vcproj
@@ -186,10 +186,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"
 			/>
 			<Tool
@@ -393,10 +393,10 @@
 				ManifestFile=".\Debug_x64/$(TargetFileName).intermediate.manifest"
 				ModuleDefinitionFile=".\src\hpccodbc.def"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile=".\Debug_x64/hpcc_odbc_32.pdb"
+				ProgramDatabaseFile=".\Debug_x64/hpcc_odbc_64.pdb"
 				RandomizedBaseAddress="1"
 				DataExecutionPrevention="0"
-				ImportLibrary=".\Debug_x64/hpcc_odbc_32.lib"
+				ImportLibrary=".\Debug_x64/hpcc_odbc_64.lib"
 				TargetMachine="17"
 				CLRThreadAttribute="0"
 			/>

diff --git 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
@@ -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
@@ -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=
 
 ;----------------------------------------------------------