diff options
| author | Josh Blum <josh@joshknows.com> | 2010-06-25 19:54:08 -0700 |
|---|---|---|
| committer | Josh Blum <josh@joshknows.com> | 2010-06-25 19:54:08 -0700 |
| commit | 0a57031a8a2eee5c490350484b32ac3ccb000b2f (patch) | |
| tree | b3feee4a5f38879ce83e716087c8641e1cbd6b7b /host | |
| parent | 51cb8da5837adacbc626ee20aa58264e1b4b7a78 (diff) | |
| download | uhd-0a57031a8a2eee5c490350484b32ac3ccb000b2f.tar.gz uhd-0a57031a8a2eee5c490350484b32ac3ccb000b2f.tar.bz2 uhd-0a57031a8a2eee5c490350484b32ac3ccb000b2f.zip | |
uhd: fix for windows warning, tweaks for msvc optimization flags
Diffstat (limited to 'host')
| -rw-r--r-- | host/CMakeLists.txt | 13 | ||||
| -rw-r--r-- | host/lib/usrp/usrp2/mboard_impl.cpp | 4 |
2 files changed, 11 insertions, 6 deletions
diff --git a/host/CMakeLists.txt b/host/CMakeLists.txt index a8b89d6c5..2979b4279 100644 --- a/host/CMakeLists.txt +++ b/host/CMakeLists.txt @@ -55,7 +55,7 @@ MACRO(UHD_ADD_OPTIONAL_CXX_COMPILER_FLAG flag have) ENDIF(${have}) ENDMACRO(UHD_ADD_OPTIONAL_CXX_COMPILER_FLAG) -IF(UNIX) +IF(CMAKE_COMPILER_IS_GNUCXX) UHD_ADD_OPTIONAL_CXX_COMPILER_FLAG(-Wall HAVE_WALL) UHD_ADD_OPTIONAL_CXX_COMPILER_FLAG(-Wextra HAVE_WEXTRA) UHD_ADD_OPTIONAL_CXX_COMPILER_FLAG(-pedantic HAVE_PEDANTIC) @@ -63,14 +63,19 @@ IF(UNIX) #only export symbols that are declared to be part of the uhd api: UHD_ADD_OPTIONAL_CXX_COMPILER_FLAG(-fvisibility=hidden HAVE_VISIBILITY_HIDDEN) UHD_ADD_OPTIONAL_CXX_COMPILER_FLAG(-O3 HAVE_O3) #have some optimizations -ENDIF(UNIX) +ENDIF(CMAKE_COMPILER_IS_GNUCXX) -IF(WIN32) +IF(MSVC) + #Set the predefined cxx debug flags to have only the debug flags + #because the default flags disable optimization which we want to have. + #Setting CMAKE_BUILD_TYPE to "release" does not seem to fix this issue. + SET(CMAKE_CXX_FLAGS_DEBUG "/D_DEBUG /MDd") #FIXME better way to do this? ADD_DEFINITIONS(-D_WIN32_WINNT=0x0501) #minimum version required is windows xp 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) + ADD_DEFINITIONS(/arch:SSE2 /G7 /O2 /fp:fast) #optimization flags +ENDIF(MSVC) ######################################################################## # Setup Boost diff --git a/host/lib/usrp/usrp2/mboard_impl.cpp b/host/lib/usrp/usrp2/mboard_impl.cpp index 1a0f9916b..2c900b328 100644 --- a/host/lib/usrp/usrp2/mboard_impl.cpp +++ b/host/lib/usrp/usrp2/mboard_impl.cpp @@ -91,7 +91,7 @@ void usrp2_impl::set_time_spec(const time_spec_t &time_spec, bool now){ _iface->poke32(U2_REG_TIME64_IMM, imm_flags); //set the seconds (latches in all 3 registers) - _iface->poke32(U2_REG_TIME64_SECS, time_spec.get_full_secs()); + _iface->poke32(U2_REG_TIME64_SECS, boost::uint32_t(time_spec.get_full_secs())); } void usrp2_impl::issue_ddc_stream_cmd(const stream_cmd_t &stream_cmd){ @@ -118,7 +118,7 @@ void usrp2_impl::issue_ddc_stream_cmd(const stream_cmd_t &stream_cmd){ (inst_chain)? 1 : 0, (inst_reload)? 1 : 0 )); - _iface->poke32(U2_REG_RX_CTRL_TIME_SECS, stream_cmd.time_spec.get_full_secs()); + _iface->poke32(U2_REG_RX_CTRL_TIME_SECS, boost::uint32_t(stream_cmd.time_spec.get_full_secs())); _iface->poke32(U2_REG_RX_CTRL_TIME_TICKS, stream_cmd.time_spec.get_tick_count(get_master_clock_freq())); } |