diff options
| author | Tom Rondeau <trondeau@vt.edu> | 2012-09-06 12:01:23 -0400 |
|---|---|---|
| committer | Tom Rondeau <trondeau@vt.edu> | 2012-09-06 12:01:23 -0400 |
| commit | c9dc582402d2551ead29a60256fdf64a1d43534c (patch) | |
| tree | 4e9fe56c173a8e080c84c4c113a5ac5c5f1c236c /gr-audio | |
| parent | 1300d48af4752037feac4fae7c3c64187cc0a5a8 (diff) | |
| parent | a4e2e8a9a2c8a6bbd6d676a17b0e2732e11af09f (diff) | |
Merge branch 'master' into gr_log
Conflicts:
CMakeLists.txt
cmake/Modules/GrMiscUtils.cmake
docs/doxygen/other/build_guide.dox
gnuradio-core/CMakeLists.txt
gr-digital/lib/CMakeLists.txt
Diffstat (limited to 'gr-audio')
| -rw-r--r-- | gr-audio/lib/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | gr-audio/lib/osx/audio_osx.h | 3 | ||||
| -rw-r--r-- | gr-audio/swig/CMakeLists.txt | 2 |
3 files changed, 5 insertions, 2 deletions
diff --git a/gr-audio/lib/CMakeLists.txt b/gr-audio/lib/CMakeLists.txt index 9172c13f21..a42ee63308 100644 --- a/gr-audio/lib/CMakeLists.txt +++ b/gr-audio/lib/CMakeLists.txt @@ -153,4 +153,4 @@ add_library(gnuradio-audio SHARED ${gr_audio_sources}) target_link_libraries(gnuradio-audio ${gr_audio_libs}) GR_LIBRARY_FOO(gnuradio-audio RUNTIME_COMPONENT "audio_runtime" DEVEL_COMPONENT "audio_devel") -install(FILES ${gr_audio_confs} DESTINATION ${GR_PKG_CONF_DIR} COMPONENT "audio_runtime") +install(FILES ${gr_audio_confs} DESTINATION ${GR_PREFSDIR} COMPONENT "audio_runtime") diff --git a/gr-audio/lib/osx/audio_osx.h b/gr-audio/lib/osx/audio_osx.h index 0a98b71efc..8c9543d0d6 100644 --- a/gr-audio/lib/osx/audio_osx.h +++ b/gr-audio/lib/osx/audio_osx.h @@ -51,7 +51,8 @@ fflush (stderr); \ } -#ifdef WORDS_BIGENDIAN +#include <boost/detail/endian.hpp> //BOOST_BIG_ENDIAN +#ifdef BOOST_BIG_ENDIAN #define GR_PCM_ENDIANNESS kLinearPCMFormatFlagIsBigEndian #else #define GR_PCM_ENDIANNESS 0 diff --git a/gr-audio/swig/CMakeLists.txt b/gr-audio/swig/CMakeLists.txt index 4997ca3f7d..fab3666609 100644 --- a/gr-audio/swig/CMakeLists.txt +++ b/gr-audio/swig/CMakeLists.txt @@ -23,6 +23,8 @@ include(GrPython) include(GrSwig) +set(GR_SWIG_TARGET_DEPS core_swig) + set(GR_SWIG_INCLUDE_DIRS ${GR_AUDIO_INCLUDE_DIRS} ${GNURADIO_CORE_SWIG_INCLUDE_DIRS} |