From 3be622ca0aa6214a2fc51c1ec682c4a58a423d62 Mon Sep 17 00:00:00 2001
From: Scott Shumate <scott@esquilo.io>
Date: Sun, 21 May 2017 23:32:47 -0500
Subject: [PATCH] Fixed some minor OSX build issues.

---
 Makefile           | 4 ++--
 install/dmgwin.osa | 2 +-
 src/Flasher.h      | 3 +--
 3 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/Makefile b/Makefile
index 6bdc492b..ce882c1d 100644
--- a/Makefile
+++ b/Makefile
@@ -96,8 +96,8 @@ endif
 #
 ifeq ($(OS),Darwin)
 COMMON_SRCS+=PosixSerialPort.cpp OSXPortFactory.cpp
-COMMON_CXXFLAGS=-arch i386 -arch x86_64 -mmacosx-version-min=10.5
-COMMON_LDFLAGS=-arch i386 -arch x86_64 -mmacosx-version-min=10.5
+COMMON_CXXFLAGS=-arch x86_64 -mmacosx-version-min=10.9
+COMMON_LDFLAGS=-arch x86_64 -mmacosx-version-min=10.9
 APP=BOSSA.app
 DMG=bossa-$(VERSION).dmg
 VOLUME=BOSSA
diff --git a/install/dmgwin.osa b/install/dmgwin.osa
index e8eca263..5934b207 100644
--- a/install/dmgwin.osa
+++ b/install/dmgwin.osa
@@ -4,7 +4,7 @@ tell application "Finder"
         set current view of container window to icon view
         set toolbar visible of container window to false
         set statusbar visible of container window to false
-        set the bounds of container window to {400, 100, 893, 412}
+        set the bounds of container window to {400, 100, 893, 432}
         set theViewOptions to the icon view options of container window
         set arrangement of theViewOptions to not arranged
         set icon size of theViewOptions to 64
diff --git a/src/Flasher.h b/src/Flasher.h
index ec7b6f50..c7ad2294 100644
--- a/src/Flasher.h
+++ b/src/Flasher.h
@@ -91,7 +91,7 @@ class FlasherInfo
 class Flasher
 {
 public:
-    Flasher(Samba& samba, Device& device, FlasherObserver& observer) : _samba(samba), _device(device), _flash(device.getFlash()), _observer(observer) {}
+    Flasher(Samba& samba, Device& device, FlasherObserver& observer) : _samba(samba), _flash(device.getFlash()), _observer(observer) {}
     virtual ~Flasher() {}
 
     void erase();
@@ -103,7 +103,6 @@ class Flasher
 
 private:
     Samba& _samba;
-    Device& _device;
     Device::FlashPtr& _flash;
     FlasherObserver& _observer;
 };