diff options
| author | Josh Blum <josh@joshknows.com> | 2010-03-26 15:56:04 -0800 |
|---|---|---|
| committer | Josh Blum <josh@joshknows.com> | 2010-03-26 15:56:04 -0800 |
| commit | 72927d983f1f84127e83bf2d80db6b8ee882bad7 (patch) | |
| tree | 7b06abec256e6e2d555462a8e37a17218451d834 /host/lib | |
| parent | d1e67602d21bcf97dbea28206659f3ee1146cf4a (diff) | |
| download | uhd-72927d983f1f84127e83bf2d80db6b8ee882bad7.tar.gz uhd-72927d983f1f84127e83bf2d80db6b8ee882bad7.tar.bz2 uhd-72927d983f1f84127e83bf2d80db6b8ee882bad7.zip | |
library loading on windows, status message tweaks, warning tweaks
Diffstat (limited to 'host/lib')
| -rw-r--r-- | host/lib/CMakeLists.txt | 20 | ||||
| -rw-r--r-- | host/lib/load_modules.cpp | 4 |
2 files changed, 14 insertions, 10 deletions
diff --git a/host/lib/CMakeLists.txt b/host/lib/CMakeLists.txt index 4dd638336..a0bfd6d0a 100644 --- a/host/lib/CMakeLists.txt +++ b/host/lib/CMakeLists.txt @@ -60,31 +60,35 @@ LIST(APPEND libuhd_sources ######################################################################## # Setup defines for module loading ######################################################################## +MESSAGE(STATUS "Configuring module loading...") + INCLUDE(CheckIncludeFileCXX) CHECK_INCLUDE_FILE_CXX(dlfcn.h HAVE_DLFCN_H) -CHECK_INCLUDE_FILE_CXX(Winbase.h HAVE_WINBASE_H) +CHECK_INCLUDE_FILE_CXX(Windows.h HAVE_WINDOWS_H) IF(HAVE_DLFCN_H) - MESSAGE(STATUS "Module loading supported through dlopen...") + MESSAGE(STATUS " Module loading supported through dlopen.") ADD_DEFINITIONS(-DHAVE_DLFCN_H) -ELSEIF(HAVE_WINBASE_H) - MESSAGE(STATUS "Module loading supported through LoadLibrary...") - ADD_DEFINITIONS(-DHAVE_WINBASE_H) +ELSEIF(HAVE_WINDOWS_H) + MESSAGE(STATUS " Module loading supported through LoadLibrary.") + ADD_DEFINITIONS(-DHAVE_WINDOWS_H) ELSE(HAVE_DLFCN_H) - MESSAGE(STATUS "Module loading not supported...") + MESSAGE(STATUS " Module loading not supported.") ENDIF(HAVE_DLFCN_H) ######################################################################## # Setup defines for interface address discovery ######################################################################## +MESSAGE(STATUS "Configuring interface address discovery...") + INCLUDE(CheckIncludeFileCXX) CHECK_INCLUDE_FILE_CXX(ifaddrs.h HAVE_IFADDRS_H) IF(HAVE_IFADDRS_H) - MESSAGE(STATUS "Interface address discovery supported through getifaddrs...") + MESSAGE(STATUS " Interface address discovery supported through getifaddrs.") ADD_DEFINITIONS(-DHAVE_IFADDRS_H) ELSE(HAVE_IFADDRS_H) - MESSAGE(STATUS "Interface address discovery not supported...") + MESSAGE(STATUS " Interface address discovery not supported.") ENDIF(HAVE_IFADDRS_H) ######################################################################## diff --git a/host/lib/load_modules.cpp b/host/lib/load_modules.cpp index 700afcd3f..bcdff98a6 100644 --- a/host/lib/load_modules.cpp +++ b/host/lib/load_modules.cpp @@ -40,8 +40,8 @@ static void load_module(const std::string &file_name){ } } -#elif HAVE_WINBASE_H -#include <Winbase.h> +#elif HAVE_WINDOWS_H +#include <Windows.h> static void load_module(const std::string &file_name){ if (LoadLibrary(file_name.c_str()) == NULL){ |