diff --git a/include/dynloader.h b/include/dynloader.h index f8217bb4e..ddb647f2d 100644 --- a/include/dynloader.h +++ b/include/dynloader.h @@ -8,24 +8,14 @@ #include -#ifdef _WIN -#include -#else #include #if defined (__APPLE__) #include #endif // __APPLE__ -#endif // _WIN -#ifdef _WIN -hc_dynlib_t hc_dlopen (LPCSTR lpLibFileName); -BOOL hc_dlclose (hc_dynlib_t hLibModule); -hc_dynfunc_t hc_dlsym (hc_dynlib_t hModule, LPCSTR lpProcName); -#else hc_dynlib_t hc_dlopen (const char *filename); int hc_dlclose (hc_dynlib_t handle); hc_dynfunc_t hc_dlsym (hc_dynlib_t handle, const char *symbol); -#endif #define HC_LOAD_FUNC2(ptr,name,type,var,libname,noerr) \ do { \ diff --git a/src/Makefile b/src/Makefile index 1cd440645..f878fc93c 100644 --- a/src/Makefile +++ b/src/Makefile @@ -387,6 +387,7 @@ LFLAGS_NATIVE += -Wl,--dynamicbase LFLAGS_NATIVE += -Wl,--nxcompat LFLAGS_NATIVE += -lpsapi LFLAGS_NATIVE += -liconv +LFLAGS_NATIVE += -ldl LFLAGS_NATIVE += -lws2_32 LFLAGS_NATIVE += -lpowrprof endif # MSYS2 diff --git a/src/dynloader.c b/src/dynloader.c index a86070048..8c63a5bcb 100644 --- a/src/dynloader.c +++ b/src/dynloader.c @@ -7,25 +7,6 @@ #include "types.h" #include "dynloader.h" -#ifdef _WIN - -hc_dynlib_t hc_dlopen (LPCSTR lpLibFileName) -{ - return LoadLibraryA (lpLibFileName); -} - -BOOL hc_dlclose (hc_dynlib_t hLibModule) -{ - return FreeLibrary (hLibModule); -} - -hc_dynfunc_t hc_dlsym (hc_dynlib_t hModule, LPCSTR lpProcName) -{ - return GetProcAddress (hModule, lpProcName); -} - -#else - hc_dynlib_t hc_dlopen (const char *filename) { return dlopen (filename, RTLD_NOW); @@ -40,5 +21,3 @@ hc_dynfunc_t hc_dlsym (hc_dynlib_t handle, const char *symbol) { return dlsym (handle, symbol); } - -#endif