comicsansg/CubicSDR
comicsansg
/
CubicSDR
mirror of https://github.com/cjcliffe/CubicSDR.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

OSX now compiling and working

This commit is contained in:
Charles J. Cliffe 2014-10-27 23:52:25 -04:00
parent a81889a61b
commit 0e25cbcc1a
3 changed files with 17 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
CMakeLists.txt
View File

@ -46,6 +46,8 @@ SET( CMAKE_RUNTIME_OUTPUT_DIRECTORY_RELEASE ${PROJECT_BINARY_DIR})
#include_directories ( ${PROJECT_SOURCE_DIR}/../CubicVR-2/build/include )
#link_directories ( ${PROJECT_SOURCE_DIR}/../CubicVR-2/build/lib )
find_package(OpenGL REQUIRED)
set(wxWidgets_CONFIGURATION mswu)
@ -55,8 +57,18 @@ include(${wxWidgets_USE_FILE})
# include_directories ( ${PROJECT_SOURCE_DIR}/../CubicVR-2/build/include )
# link_directories ( ${PROJECT_SOURCE_DIR}/../CubicVR-2/build/lib ${OPENGL_INCLUDE_DIR})
include_directories ( ${PROJECT_SOURCE_DIR}/external/rtl-sdr-release )
link_directories ( ${PROJECT_SOURCE_DIR}/external/rtl-sdr-release/x32 )
if (DEFINED WIN32)
include_directories ( ${PROJECT_SOURCE_DIR}/external/rtl-sdr-release )
link_directories ( ${PROJECT_SOURCE_DIR}/external/rtl-sdr-release/x32 )
else (DEFINED WIN32)
set(RTLSDR_INCLUDE "/opt/local/include" CACHE FILEPATH "RTL-SDR Include Path")
set(RTLSDR_LIB "/opt/local/lib" CACHE FILEPATH "RTL-SDR Lib Path")
include_directories(${RTLSDR_INCLUDE})
link_directories(${RTLSDR_LIB})
endif (DEFINED WIN32)
SET (cubicsdr_sources
src/CubicSDR.cpp

2
src/AppFrame.cpp
View File

@ -20,7 +20,7 @@ AppFrame::AppFrame() :
new TestGLCanvas(this, NULL);
SetIcon(wxICON(sample));
// SetIcon(wxICON(sample));
// Make a menubar
wxMenu *menu = new wxMenu;

4
src/SDRThread.cpp
View File

@ -81,11 +81,11 @@ void SDRThread::enumerate_rtl() {
}
wxThread::ExitCode SDRThread::Entry() {
__int8 *buf = (__int8 *) malloc(BUF_SIZE);
signed char *buf = (signed char *) malloc(BUF_SIZE);
enumerate_rtl();
rtlsdr_open(&dev, 4);
rtlsdr_open(&dev, 0);
rtlsdr_set_sample_rate(dev, 2500000);
rtlsdr_set_center_freq(dev, 105700000);
rtlsdr_reset_buffer(dev);