Fixed some minor OSX build issues.

shumatech · May 22, 2017 · 3be622c · 3be622c
1 parent 64f5d5e
commit 3be622c
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 5 deletions.
diff --git 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
@@ -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
@@ -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;
 };