From 87dfdc3cf8d9519ec6cbc7a0fbda31700fef56dc Mon Sep 17 00:00:00 2001
From: Martin Braun <martin.braun@ettus.com>
Date: Mon, 20 Apr 2015 12:48:01 -0700
Subject: Updated Images Package for 3.8.3

---
 host/CMakeLists.txt | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'host/CMakeLists.txt')

diff --git a/host/CMakeLists.txt b/host/CMakeLists.txt
index 9358b1156..e2f318056 100644
--- a/host/CMakeLists.txt
+++ b/host/CMakeLists.txt
@@ -268,8 +268,8 @@ UHD_INSTALL(FILES
 #{{{IMG_SECTION
 # This section is written automatically by /images/create_imgs_package.py
 # Any manual changes in here will be overwritten.
-SET(UHD_IMAGES_MD5SUM "8522b02386f5fe0bb51baa3ba0001ef0")
-SET(UHD_IMAGES_DOWNLOAD_SRC "uhd-images_003.008.003-rc1.zip")
+SET(UHD_IMAGES_MD5SUM "57c06338de0504f296a2431762725683")
+SET(UHD_IMAGES_DOWNLOAD_SRC "uhd-images_003.008.003-release.zip")
 #}}}
 
 ########################################################################
-- 
cgit v1.2.3


From 63ba4f76a76d9b04d8642abc71f002cb23a8759d Mon Sep 17 00:00:00 2001
From: Martin Braun <martin.braun@ettus.com>
Date: Mon, 20 Apr 2015 15:50:48 -0700
Subject: cmake: Improve usage of C modules

---
 host/CMakeLists.txt                  | 2 +-
 host/utils/CMakeLists.txt            | 2 --
 host/utils/usrp_x3xx_fpga_burner.cpp | 4 ----
 3 files changed, 1 insertion(+), 7 deletions(-)

(limited to 'host/CMakeLists.txt')

diff --git a/host/CMakeLists.txt b/host/CMakeLists.txt
index e2f318056..beb4d396f 100644
--- a/host/CMakeLists.txt
+++ b/host/CMakeLists.txt
@@ -24,7 +24,7 @@
 # Project setup
 ########################################################################
 CMAKE_MINIMUM_REQUIRED(VERSION 2.6)
-PROJECT(UHD CXX)
+PROJECT(UHD CXX C)
 ENABLE_TESTING()
 
 #make sure our local CMake Modules path comes first
diff --git a/host/utils/CMakeLists.txt b/host/utils/CMakeLists.txt
index ed8640187..e24b417c1 100644
--- a/host/utils/CMakeLists.txt
+++ b/host/utils/CMakeLists.txt
@@ -15,8 +15,6 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 
-SET(CMAKE_C_COMPILE_OBJECT ${CMAKE_CXX_COMPILE_OBJECT})
-
 ########################################################################
 # Utilities that get installed into the runtime path
 ########################################################################
diff --git a/host/utils/usrp_x3xx_fpga_burner.cpp b/host/utils/usrp_x3xx_fpga_burner.cpp
index e32e4d636..3c6225531 100644
--- a/host/utils/usrp_x3xx_fpga_burner.cpp
+++ b/host/utils/usrp_x3xx_fpga_burner.cpp
@@ -49,13 +49,9 @@
 #include <uhd/utils/safe_main.hpp>
 #include <uhd/utils/safe_call.hpp>
 
-#ifdef _MSC_VER
 extern "C" {
-#endif
 #include "cdecode.h"
-#ifdef _MSC_VER
 }
-#endif
 
 #define X300_FPGA_BIN_SIZE_BYTES 15877916
 #define X300_FPGA_BIT_MAX_SIZE_BYTES 15878022
-- 
cgit v1.2.3