Merge branch 'master' of git@ettus.sourcerepo.com:ettus/uhd into usrp2

3 files changed, 72 insertions, 51 deletions

diff --git a/host/README b/host/README
index cdca42cd0..cbf18dbf7 100644
--- a/host/README
+++ b/host/README
@@ -17,9 +17,54 @@ LF RX
 LF TX
 
 ########################################################################
-# CMake Instructions
+# Dependencies
 ########################################################################
-cd uhd/host
+Unix Notes:
+    These dependencies can be acquired through the package manager.
+Windows Notes:
+    These dependencies can be acquired through installable exe files.
+    Usually, the windows installer can be found on the project's website.
+    Some projects do not host windows installers, and if this is the case,
+    follow the auxiliary download url for the windows installer (below).
+
+Git:
+    Required to check out the repository (not needed for source downloads).
+    On windows, install cygwin with git support to checkout the repository.
+
+C++:
+    On unix, this is GCC 4.0 and above. On windows, this is MSVC 2008.
+    Other compilers have not been tested yet or confirmed working.
+
+CMake:
+    Version: at least 2.8
+    Required for: build time
+    Download URL: http://www.cmake.org/cmake/resources/software.html
+
+Boost:
+    Version: at least 3.6 unix, at least 4.0 windows
+    Required for: build time + run time
+    Download URL: http://www.boost.org/users/download/
+    Download URL (windows installer): http://www.boostpro.com/download
+
+Python:
+    Version: at least 2.6
+    Required for: build time
+    Download URL: http://www.python.org/download/
+
+Cheetah:
+    Version: at least 2.0
+    Required for: build time
+    Download URL: http://www.cheetahtemplate.org/download.html
+    Download URL (windows installer): http://feisley.com/python/cheetah/
+
+Doxygen:
+    Required for: build time (optional)
+    Download URL: http://www.stack.nl/~dimitri/doxygen/download.html#latestsrc
+
+########################################################################
+# Build Instructions (unix)
+########################################################################
+cd <uhd-repo-path>/host
 mkdir build
 cd build
 cmake ../
@@ -28,3 +73,28 @@ make test
 sudo make install
 
 For a custom prefix, use: cmake -DCMAKE_INSTALL_PREFIX=<myprefix> ../
+
+########################################################################
+# Build Instructions (windows)
+########################################################################
+
+##### Generate the project with cmake #####
+Open the cmake gui program.
+Set the path to the source code: <uhd-repo-path>/host
+Set the path to the build directory: <uhd-repo-path>/host/build
+Make sure that the paths do not contain spaces.
+Click configure and select the MSVC compiler.
+Set the build variables and click configure again.
+Click generate and a project file will be created in the build directory.
+
+##### Build the project in MSVC #####
+Open the generated project file in MSVC.
+Select the build all target, right click, and choose build.
+Select the install target, right click, and choose build.
+    Note: you may not have permission to build the install target.
+    You need to be an administrator or to run MSVC as administrator.
+
+##### Setup the PATH environment variable #####
+Add the boost library path and uhd library path to your %PATH%.
+Usually c:\program files\boost\<version>\lib and c:\program files\uhd\lib
+
diff --git a/host/include/uhd/usrp/CMakeLists.txt b/host/include/uhd/usrp/CMakeLists.txt
index 7815a4fb9..9140d98ca 100644
--- a/host/include/uhd/usrp/CMakeLists.txt
+++ b/host/include/uhd/usrp/CMakeLists.txt
@@ -31,7 +31,6 @@ INSTALL(FILES
     dboard_manager.hpp
 
     ### usrp headers ###
-    usrp1e.hpp
     usrp2.hpp
 
     ### utilities ###
diff --git a/host/include/uhd/usrp/usrp1e.hpp b/host/include/uhd/usrp/usrp1e.hpp
deleted file mode 100644
index cee9dc3d5..000000000
--- a/host/include/uhd/usrp/usrp1e.hpp
+++ /dev/null
@@ -1,48 +0,0 @@
-//
-// Copyright 2010 Ettus Research LLC
-//
-// This program is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-//
-// This program is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-//
-// You should have received a copy of the GNU General Public License
-// along with this program.  If not, see <http://www.gnu.org/licenses/>.
-//
-
-#ifndef INCLUDED_UHD_USRP_USRP1E_HPP
-#define INCLUDED_UHD_USRP_USRP1E_HPP
-
-#include <uhd/config.hpp>
-#include <uhd/device.hpp>
-
-namespace uhd{ namespace usrp{
-
-/*!
- * The usrp1e device class.
- */
-class UHD_API usrp1e : public device{
-public:
-    /*!
-     * Find usrp1e devices on the system via the device node.
-     * \param hint a device addr with the usrp1e address filled in
-     * \return a vector of device addresses for all usrp1es found
-     */
-    static device_addrs_t find(const device_addr_t &hint);
-
-    /*!
-     * Make a usrp1e from a device address.
-     * \param addr the device address
-     * \return a device sptr to a new usrp1e
-     */
-    static device::sptr make(const device_addr_t &addr);
-};
-
-}} //namespace
-
-#endif /* INCLUDED_UHD_USRP_USRP1E_HPP */