Skip to content

Commit 3be622c

Browse files
committed
Fixed some minor OSX build issues.
1 parent 64f5d5e commit 3be622c

File tree

3 files changed

+4
-5
lines changed

3 files changed

+4
-5
lines changed

Makefile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -96,8 +96,8 @@ endif
9696
#
9797
ifeq ($(OS),Darwin)
9898
COMMON_SRCS+=PosixSerialPort.cpp OSXPortFactory.cpp
99-
COMMON_CXXFLAGS=-arch i386 -arch x86_64 -mmacosx-version-min=10.5
100-
COMMON_LDFLAGS=-arch i386 -arch x86_64 -mmacosx-version-min=10.5
99+
COMMON_CXXFLAGS=-arch x86_64 -mmacosx-version-min=10.9
100+
COMMON_LDFLAGS=-arch x86_64 -mmacosx-version-min=10.9
101101
APP=BOSSA.app
102102
DMG=bossa-$(VERSION).dmg
103103
VOLUME=BOSSA

install/dmgwin.osa

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ tell application "Finder"
44
set current view of container window to icon view
55
set toolbar visible of container window to false
66
set statusbar visible of container window to false
7-
set the bounds of container window to {400, 100, 893, 412}
7+
set the bounds of container window to {400, 100, 893, 432}
88
set theViewOptions to the icon view options of container window
99
set arrangement of theViewOptions to not arranged
1010
set icon size of theViewOptions to 64

src/Flasher.h

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -91,7 +91,7 @@ class FlasherInfo
9191
class Flasher
9292
{
9393
public:
94-
Flasher(Samba& samba, Device& device, FlasherObserver& observer) : _samba(samba), _device(device), _flash(device.getFlash()), _observer(observer) {}
94+
Flasher(Samba& samba, Device& device, FlasherObserver& observer) : _samba(samba), _flash(device.getFlash()), _observer(observer) {}
9595
virtual ~Flasher() {}
9696

9797
void erase();
@@ -103,7 +103,6 @@ class Flasher
103103

104104
private:
105105
Samba& _samba;
106-
Device& _device;
107106
Device::FlashPtr& _flash;
108107
FlasherObserver& _observer;
109108
};

0 commit comments

Comments
 (0)