From 0e25cbcc1a33528be2fbf41a8f28399c0d3f767f Mon Sep 17 00:00:00 2001
From: "Charles J. Cliffe" <cj@cubicproductions.com>
Date: Mon, 27 Oct 2014 23:52:25 -0400
Subject: [PATCH] OSX now compiling and working

---
 CMakeLists.txt    | 16 ++++++++++++++--
 src/AppFrame.cpp  |  2 +-
 src/SDRThread.cpp |  4 ++--
 3 files changed, 17 insertions(+), 5 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index a53a478..6aaa249 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -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
diff --git a/src/AppFrame.cpp b/src/AppFrame.cpp
index 3a48577..493ce88 100644
--- a/src/AppFrame.cpp
+++ b/src/AppFrame.cpp
@@ -20,7 +20,7 @@ AppFrame::AppFrame() :
 
     new TestGLCanvas(this, NULL);
 
-    SetIcon(wxICON(sample));
+//    SetIcon(wxICON(sample));
 
     // Make a menubar
     wxMenu *menu = new wxMenu;
diff --git a/src/SDRThread.cpp b/src/SDRThread.cpp
index b5a13b9..2d021c1 100644
--- a/src/SDRThread.cpp
+++ b/src/SDRThread.cpp
@@ -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);