This reverts commit 3fb4f96bb7.

This reverts commit 1772222cb3.
reorder include dirs
gr3.6
Hoernchen 10 years ago
parent 3fb4f96bb7
commit 69e0003407
  1. 4
      lib/CMakeLists.txt
  2. 2
      lib/miri/miri_source_c.cc
  3. 2
      lib/osmosdr/osmosdr_snk_c.cc
  4. 2
      lib/osmosdr/osmosdr_src_c.cc
  5. 2
      lib/osmosdr_device.cc
  6. 2
      lib/osmosdr_sink_c_impl.cc
  7. 9
      lib/osmosdr_source_c_impl.cc
  8. 2
      lib/rtl/rtl_source_c.cc

@ -128,10 +128,10 @@ endif(ENABLE_MIRI)
# Setup configuration file
########################################################################
ADD_DEFINITIONS(-DHAVE_CONFIG_H=1)
include_directories(APPEND ${CMAKE_CURRENT_BINARY_DIR})
include_directories(BEFORE ${CMAKE_CURRENT_BINARY_DIR})
CONFIGURE_FILE(
${CMAKE_CURRENT_SOURCE_DIR}/config.h.in
${CMAKE_CURRENT_BINARY_DIR}/gr_osmosdr_config.h
${CMAKE_CURRENT_BINARY_DIR}/config.h
@ONLY)
########################################################################

@ -25,7 +25,7 @@
* file included in your .cc file.
*/
#ifdef HAVE_CONFIG_H
#include "gr_osmosdr_config.h"
#include "config.h"
#endif
#include "miri_source_c.h"

@ -24,7 +24,7 @@
* file included in your .cc file.
*/
#ifdef HAVE_CONFIG_H
#include "gr_osmosdr_config.h"
#include "config.h"
#endif
#include "osmosdr_snk_c.h"

@ -24,7 +24,7 @@
* file included in your .cc file.
*/
#ifdef HAVE_CONFIG_H
#include "gr_osmosdr_config.h"
#include "config.h"
#endif
#include "osmosdr_src_c.h"

@ -27,7 +27,7 @@
#include <sstream>
#ifdef HAVE_CONFIG_H
#include "gr_osmosdr_config.h"
#include "config.h"
#endif
/*
#define ENABLE_OSMOSDR

@ -24,7 +24,7 @@
* file included in your .cc file.
*/
#ifdef HAVE_CONFIG_H
#include "gr_osmosdr_config.h"
#include "config.h"
#endif
#include <osmosdr_sink_c_impl.h>

@ -24,8 +24,7 @@
* file included in your .cc file.
*/
#ifdef HAVE_CONFIG_H
// FIXME: make it config.h again when they've fixed gnuradio master
#include "gr_osmosdr_config.h"
#include "config.h"
#endif
#include <osmosdr_source_c_impl.h>
@ -114,9 +113,9 @@ osmosdr_source_c_impl::osmosdr_source_c_impl (const std::string &args)
dev_types.push_back("miri");
#endif
std::cerr << "gr-osmosdr "
<< "(" << GR_OSMOSDR_VERSION << " / " << GR_OSMOSDR_LIBVER << ") "
<< "supported device types:" << std::endl;
std::cerr << "gr-osmosdr ("
<< GR_OSMOSDR_VERSION << " / " << GR_OSMOSDR_LIBVER
<< ") supported device types:" << std::endl;
std::cerr << " " << std::flush;
BOOST_FOREACH(std::string dev_type, dev_types)
std::cerr << dev_type << " ";

@ -24,7 +24,7 @@
* file included in your .cc file.
*/
#ifdef HAVE_CONFIG_H
#include "gr_osmosdr_config.h"
#include "config.h"
#endif
#include "rtl_source_c.h"

Loading…
Cancel
Save