diff --git a/M33 Manager/Makefile b/M33 Manager/Makefile index 48b35e0..1f2e077 100755 --- a/M33 Manager/Makefile +++ b/M33 Manager/Makefile @@ -1,7 +1,7 @@ # Target platform options: WINDOWS32, WINDOWS64, MACOS, LINUX32, LINUX64 NAME = "M33 Manager" VERSION = 0.16 -TARGET_PLATFORM = LINUX64 +TARGET_PLATFORM = MACOS USE_GUI = TRUE IME_ROM_VERSION_STRING = 1900000125 M3D_ROM_VERSION_STRING = 2016040401 @@ -54,12 +54,12 @@ ifeq ($(TARGET_PLATFORM), MACOS) EXECUTABLE = "$(PROGRAM_NAME)" CC = "clang++" CCP = "clang++" - CFLAGS += -framework IOKit -framework CoreFoundation -stdlib=libc++ -arch i386 -arch x86_64 + CFLAGS += -framework IOKit -framework CoreFoundation -stdlib=libc++ CFLAGS_GENERIC += -stdlib=libc++ ARCHIVE = "$(PROGRAM_NAME) macOS.dmg" ifeq ($(USE_GUI), TRUE) SRCS += gui.cpp - LIBS += -D USE_GUI `wx-config --prefix=/usr --cxxflags --libs --static` + LIBS += -D USE_GUI `wx-config --cxxflags --libs` endif STRIP = "strip" endif diff --git a/M33 Manager/printer.cpp b/M33 Manager/printer.cpp index c50f7b1..3067d58 100755 --- a/M33 Manager/printer.cpp +++ b/M33 Manager/printer.cpp @@ -2788,7 +2788,7 @@ void Printer::updateAvailableSerialPorts() { if(classesToMatch) { // Set dictionary to match modem devices - CFDictionarySetValue(classesToMatch, CFSTR(kIOSerialBSDTypeKey), CFSTR(kIOSerialBSDModemType)); + CFDictionarySetValue(classesToMatch, CFSTR(kIOSerialBSDTypeKey), CFSTR(kIOSerialBSDAllTypes)); // Check if getting list of devices was successful io_iterator_t serialPortIterator;