ForkMaster/netgen
1
0
Fork 0
mirror of https://github.com/NGSolve/netgen.git synced 2025-01-13 14:40:35 +05:00
Code Issues Packages Projects Releases Wiki Activity

Windows build fixes

Browse Source
This commit is contained in:
Matthias Hochsteger 2024-05-06 13:21:32 +02:00
parent 2e539e50de
commit ae719d58c4
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
libsrc/core/utils.cpp
View File

@ -179,7 +179,7 @@ namespace ngcore
lib_name = lib_name_; lib_name = lib_name_;
#ifdef WIN32 #ifdef WIN32
lib = LoadLibrary(lib_name.wstring().c_str()); lib = LoadLibrary(lib_name.wstring().c_str());
if (!lib) throw std::runtime_error(std::wstring("Could not load library ") + lib_name.wstring()); if (!lib) throw std::runtime_error(std::string("Could not load library ") + lib_name.string());
#else // WIN32 #else // WIN32
auto flags = RTLD_NOW; auto flags = RTLD_NOW;
if (global) flags |= RTLD_GLOBAL; if (global) flags |= RTLD_GLOBAL;
@ -205,7 +205,7 @@ namespace ngcore
#ifdef WIN32 #ifdef WIN32
void* func = GetProcAddress((HMODULE)lib, func_name.c_str()); void* func = GetProcAddress((HMODULE)lib, func_name.c_str());
if(func == nullptr) if(func == nullptr)
throw std::runtime_error(string("Could not find function ") + func_name + " in library " + lib_name.string()); throw std::runtime_error(std::string("Could not find function ") + func_name + " in library " + lib_name.string());
#else // WIN32 #else // WIN32
void* func = dlsym(lib, func_name.c_str()); void* func = dlsym(lib, func_name.c_str());
if(func == nullptr) if(func == nullptr)
@ -217,10 +217,11 @@ namespace ngcore
void* GetRawSymbol( std::string func_name ) void* GetRawSymbol( std::string func_name )
{ {
void * func = nullptr;
#ifdef WIN32 #ifdef WIN32
throw std::runtime_error("GetRawSymbol not implemented on WIN32"); throw std::runtime_error("GetRawSymbol not implemented on WIN32");
#else // WIN32 #else // WIN32
void* func = dlsym(RTLD_DEFAULT, func_name.c_str()); func = dlsym(RTLD_DEFAULT, func_name.c_str());
if(func == nullptr) if(func == nullptr)
throw std::runtime_error(dlerror()); throw std::runtime_error(dlerror());
#endif // WIN32 #endif // WIN32