diff options
| author | Josh Blum <josh@joshknows.com> | 2011-04-05 16:32:48 -0700 |
|---|---|---|
| committer | Josh Blum <josh@joshknows.com> | 2011-04-05 16:32:48 -0700 |
| commit | dbfbc497a8e0a144e0db2b8daa0f4baba5284775 (patch) | |
| tree | 91e52b36dc45eea92974449105c79f1048edaf10 /host/lib | |
| parent | 6a2fbe07e7674794a883a7062ce2225781cf5193 (diff) | |
| download | uhd-dbfbc497a8e0a144e0db2b8daa0f4baba5284775.tar.gz uhd-dbfbc497a8e0a144e0db2b8daa0f4baba5284775.tar.bz2 uhd-dbfbc497a8e0a144e0db2b8daa0f4baba5284775.zip | |
uhd: tweaks for cygwin/mingw, always link winsock2, findusb1, __USE_W32_SOCKETS
Diffstat (limited to 'host/lib')
| -rw-r--r-- | host/lib/CMakeLists.txt | 8 | ||||
| -rw-r--r-- | host/lib/transport/CMakeLists.txt | 4 |
2 files changed, 4 insertions, 8 deletions
diff --git a/host/lib/CMakeLists.txt b/host/lib/CMakeLists.txt index 268f05df6..8ca7c7dca 100644 --- a/host/lib/CMakeLists.txt +++ b/host/lib/CMakeLists.txt @@ -69,14 +69,6 @@ MACRO(INCLUDE_SUBDIRECTORY subdir) ENDMACRO(INCLUDE_SUBDIRECTORY) ######################################################################## -# Cygwin special -######################################################################## -IF(CYGWIN) - ADD_DEFINITIONS(-D__USE_W32_SOCKETS) #boost asio says we need this - LIBUHD_APPEND_LIBS(ws2_32) -ENDIF(CYGWIN) - -######################################################################## # Include subdirectories (different than add) ######################################################################## INCLUDE_SUBDIRECTORY(ic_reg_maps) diff --git a/host/lib/transport/CMakeLists.txt b/host/lib/transport/CMakeLists.txt index a5bf9c5f1..30f8db48a 100644 --- a/host/lib/transport/CMakeLists.txt +++ b/host/lib/transport/CMakeLists.txt @@ -79,6 +79,10 @@ SET_SOURCE_FILES_PROPERTIES( PROPERTIES COMPILE_DEFINITIONS "${IF_ADDRS_DEFS}" ) +IF(WIN32 AND UNIX) #MinGW/Cygwin needs winsock2 + LIBUHD_APPEND_LIBS(ws2_32) +ENDIF() + ######################################################################## # Append to the list of sources for lib uhd ######################################################################## |