From 9c436f72cd065c172b04bcefcca71e80591059c6 Mon Sep 17 00:00:00 2001
From: Josh Blum <josh@joshknows.com>
Date: Thu, 18 Mar 2010 21:50:56 -0800
Subject: compiling under msvc (no idea if it works)

---
 host/CMakeLists.txt               | 12 +-----------
 host/include/uhd/config.hpp       |  0
 host/include/uhd/gain_handler.hpp |  2 +-
 3 files changed, 2 insertions(+), 12 deletions(-)
 mode change 100755 => 100644 host/include/uhd/config.hpp

diff --git a/host/CMakeLists.txt b/host/CMakeLists.txt
index d8947a441..29d721464 100644
--- a/host/CMakeLists.txt
+++ b/host/CMakeLists.txt
@@ -65,6 +65,7 @@ IF(WIN32)
     ADD_DEFINITIONS(-D_WIN32_WINNT=0x0501) #as requested by vs
     ADD_DEFINITIONS(-DNOMINMAX) #disables stupidity and enables std::min and std::max
     ADD_DEFINITIONS(-D_SCL_SECURE_NO_WARNINGS) #avoid warnings from boost::split
+    ADD_DEFINITIONS(-DBOOST_ALL_DYN_LINK) #setup boost auto-linking in msvc
 ENDIF(WIN32)
 
 ########################################################################
@@ -84,17 +85,6 @@ FIND_PACKAGE(Boost 1.36 REQUIRED
 INCLUDE_DIRECTORIES(${Boost_INCLUDE_DIRS})
 LINK_DIRECTORIES(${Boost_LIBRARY_DIRS})
 
-IF(WIN32)
-    #force dynamic linking (otherwise automatic linking fails in msvs)
-    ADD_DEFINITIONS(-DBOOST_DATE_TIME_DYN_DLL)
-    ADD_DEFINITIONS(-DBOOST_FILESYSTEM_DYN_DLL)
-    ADD_DEFINITIONS(-DBOOST_PROGRAM_OPTIONS_DYN_DLL)
-    ADD_DEFINITIONS(-DBOOST_REGEX_DYN_DLL)
-    ADD_DEFINITIONS(-DBOOST_SYSTEM_DYN_DLL)
-    ADD_DEFINITIONS(-DBOOST_THREAD_DYN_DLL)
-    ADD_DEFINITIONS(-DBOOST_UNIT_TEST_FRAMEWORK_DYN_DLL)
-ENDIF(WIN32)
-
 ########################################################################
 # Setup Endianess
 ########################################################################
diff --git a/host/include/uhd/config.hpp b/host/include/uhd/config.hpp
old mode 100755
new mode 100644
diff --git a/host/include/uhd/gain_handler.hpp b/host/include/uhd/gain_handler.hpp
index faf932324..65d6cecf9 100644
--- a/host/include/uhd/gain_handler.hpp
+++ b/host/include/uhd/gain_handler.hpp
@@ -33,7 +33,7 @@ public:
     /*!
      * A set of properties for dealing with gains.
      */
-    struct props_t{
+    struct UHD_API props_t{
         wax::obj value, range, names;
         props_t(void); //default constructor
     };
-- 
cgit v1.2.3