op25
/
op25-legacy
Archived
3
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fix some build problems. 

git-svn-id: http://op25.osmocom.org/svn/trunk@303 65a5c917-d112-43f1-993d-58c26a4786be
This commit is contained in:
stevie 2012-06-14 23:49:01 +00:00
parent 47eb8b0a01
commit ef6da136de
3 changed files with 12 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
blocks/INSTALL
View File

@ -1,8 +1,8 @@
Installation Instructions Installation Instructions
************************* *************************
Copyright (C) 1994, 1995, 1996, 1999, 2000, 2001, 2002, 2004, 2005, Copyright (C) 1994-1996, 1999-2002, 2004-2011 Free Software Foundation,
2006, 2007, 2008, 2009 Free Software Foundation, Inc. Inc.
Copying and distribution of this file, with or without modification, Copying and distribution of this file, with or without modification,
are permitted in any medium without royalty provided the copyright are permitted in any medium without royalty provided the copyright
@ -226,6 +226,11 @@ order to use an ANSI C compiler:
and if that doesn't work, install pre-built binaries of GCC for HP-UX. and if that doesn't work, install pre-built binaries of GCC for HP-UX.
HP-UX `make' updates targets which have the same time stamps as
their prerequisites, which makes it generally unusable when shipped
generated files such as `configure' are involved. Use GNU `make'
instead.
On OSF/1 a.k.a. Tru64, some versions of the default C compiler cannot On OSF/1 a.k.a. Tru64, some versions of the default C compiler cannot
parse its `<wchar.h>' header file. The option `-nodtk' can be used as parse its `<wchar.h>' header file. The option `-nodtk' can be used as
a workaround. If GNU CC is not installed, it is therefore recommended a workaround. If GNU CC is not installed, it is therefore recommended

5
blocks/Makefile.common
View File

@ -26,6 +26,9 @@ grincludedir = $(includedir)/gnuradio
# swig includes # swig includes
swigincludedir = $(grincludedir)/swig swigincludedir = $(grincludedir)/swig
# gruel includes
gruelincludedir = $(includedir)/gruel
# Install this stuff in the appropriate subdirectory # Install this stuff in the appropriate subdirectory
# This usually ends up at: # This usually ends up at:
# ${prefix}/lib/python${python_version}/site-packages/gnuradio # ${prefix}/lib/python${python_version}/site-packages/gnuradio
@ -35,7 +38,7 @@ grpyexecdir = $(pyexecdir)/gnuradio
# swig flags # swig flags
SWIGPYTHONFLAGS = -fvirtual -python -modern SWIGPYTHONFLAGS = -fvirtual -python -modern
SWIGGRFLAGS = -I$(GNURADIO_CORE_INCLUDEDIR)/swig -I$(GNURADIO_CORE_INCLUDEDIR) SWIGGRFLAGS = -I$(GNURADIO_CORE_INCLUDEDIR)/swig -I$(gruelincludedir)/swig -I$(GNURADIO_CORE_INCLUDEDIR)
# Don't assume that make predefines $(RM), because BSD make does # Don't assume that make predefines $(RM), because BSD make does
# not. We define it now in configure.ac using AM_PATH_PROG, but now # not. We define it now in configure.ac using AM_PATH_PROG, but now

2
blocks/src/lib/software_imbe_decoder.h
View File

@ -85,7 +85,7 @@ private:
uint32_t pngen15(uint32_t& pn); uint32_t pngen15(uint32_t& pn);
uint32_t pngen23(uint32_t& pn); uint32_t pngen23(uint32_t& pn);
uint32_t next_t(uint32_t u); uint32_t next_u(uint32_t u);
void decode_audio(uint8_t *); void decode_audio(uint8_t *);
void decode_spectral_amplitudes(int, int ); void decode_spectral_amplitudes(int, int );
void decode_vuv(int ); void decode_vuv(int );