github/CoolProp
1
1
Fork 0
mirror of https://github.com/CoolProp/CoolProp.git synced 2026-02-09 05:15:45 -05:00
Code Issues Packages Projects Releases Wiki Activity

check both versions of REFPROP on windows always

Browse Source 
Signed-off-by: Ian Bell <ian.h.bell@gmail.com>
This commit is contained in:
Ian Bell
2014-08-12 08:50:14 +02:00
parent 299a85111c
commit 79eca1d58e
1 changed files with 15 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
src/Backends/REFPROP/REFPROPMixtureBackend.cpp
View File

@@ -361,18 +361,22 @@ bool load_REFPROP()
{
// Load it
#if defined(__ISWINDOWS__)
#if defined(ENV64BIT)
// 64-bit code here.
TCHAR refpropdllstring[100] = TEXT("refprp64.dll");
RefpropdllInstance = LoadLibrary(refpropdllstring);
#elif defined (ENV32BIT)
/* We need this logic on windows because if you use the bitness
* macros it requires that the build bitness and the target bitness
* are the same which is in general not the case. Therefore, checking
* both is safe
*/
// First try to load the 64-bit version
// 64-bit code here.
TCHAR refpropdllstring[100] = TEXT("refprp64.dll");
RefpropdllInstance = LoadLibrary(refpropdllstring);
if (RefpropdllInstance==NULL){
// That didn't work, let's try the 32-bit version
// 32-bit code here.
TCHAR refpropdllstring[100] = TEXT("refprop.dll");
RefpropdllInstance = LoadLibrary(refpropdllstring);
#else
// INCREASE ROBUSTNESS. ALWAYS THROW AN ERROR ON THE ELSE.
#error "Must define either ENV32BIT or ENV64BIT"
#endif
TCHAR refpropdllstring32[100] = TEXT("refprop.dll");
RefpropdllInstance = LoadLibrary(refpropdllstring32);
}
#elif defined(__ISLINUX__)
RefpropdllInstance = dlopen ("librefprop.so", RTLD_LAZY);