diff --git a/MacMiner.xcodeproj/project.pbxproj b/MacMiner.xcodeproj/project.pbxproj index d300594..2f6a003 100644 --- a/MacMiner.xcodeproj/project.pbxproj +++ b/MacMiner.xcodeproj/project.pbxproj @@ -8,6 +8,7 @@ /* Begin PBXBuildFile section */ 228BE0431F65370700DB92A7 /* destijlad2.png in Resources */ = {isa = PBXBuildFile; fileRef = 228BE0421F65370700DB92A7 /* destijlad2.png */; }; + 2295264B2170F7FA005481C6 /* ukeukuleletunerad.png in Resources */ = {isa = PBXBuildFile; fileRef = 2295264A2170F7FA005481C6 /* ukeukuleletunerad.png */; }; 8400E7C51826F5A1009668D0 /* apiaccess in Resources */ = {isa = PBXBuildFile; fileRef = 8400E7C41826F5A1009668D0 /* apiaccess */; }; 84055A141861A24200D95B95 /* mobileminer.png in Resources */ = {isa = PBXBuildFile; fileRef = 84055A131861A24200D95B95 /* mobileminer.png */; }; 840BEF52185CED95000596D2 /* driverfiles in Resources */ = {isa = PBXBuildFile; fileRef = 840BEF51185CED95000596D2 /* driverfiles */; }; @@ -33,7 +34,6 @@ 842D569D17585AA600B5A62A /* bfgurls.conf in Resources */ = {isa = PBXBuildFile; fileRef = 842D569117585AA600B5A62A /* bfgurls.conf */; }; 842D56A217585AA600B5A62A /* libblkmaker in Resources */ = {isa = PBXBuildFile; fileRef = 842D569617585AA600B5A62A /* libblkmaker */; }; 842D56A417585AA600B5A62A /* ltcurls.conf in Resources */ = {isa = PBXBuildFile; fileRef = 842D569817585AA600B5A62A /* ltcurls.conf */; }; - 843F059D1878E843000A594A /* libmicrohttpd in Resources */ = {isa = PBXBuildFile; fileRef = 843F059B1878E843000A594A /* libmicrohttpd */; }; 844ABB2118ABB34900D74BE8 /* fabric.png in Resources */ = {isa = PBXBuildFile; fileRef = 844ABB2018ABB34900D74BE8 /* fabric.png */; }; 844ABB2318ABB43900D74BE8 /* pool.png in Resources */ = {isa = PBXBuildFile; fileRef = 844ABB2218ABB43900D74BE8 /* pool.png */; }; 844ABB2518AC1ACB00D74BE8 /* minerd in Resources */ = {isa = PBXBuildFile; fileRef = 844ABB2418AC1ACB00D74BE8 /* minerd */; }; @@ -57,11 +57,13 @@ 84681C222035B898001A7E2A /* openssl in Resources */ = {isa = PBXBuildFile; fileRef = 84681C212035B897001A7E2A /* openssl */; }; 84681C242035CD9D001A7E2A /* cpuminermulti in Resources */ = {isa = PBXBuildFile; fileRef = 84681C232035CD9D001A7E2A /* cpuminermulti */; }; 84681C262039FE2D001A7E2A /* cgminer in Resources */ = {isa = PBXBuildFile; fileRef = 84681C252039FE2D001A7E2A /* cgminer */; }; + 846B383A203C803E002A4DC4 /* ccminer in Resources */ = {isa = PBXBuildFile; fileRef = 846B3839203C803E002A4DC4 /* ccminer */; }; 846CAF171FF7D127000761E8 /* ethminer in Resources */ = {isa = PBXBuildFile; fileRef = 846CAF161FF7D125000761E8 /* ethminer */; }; 84806619201E50DA00ACE847 /* sgminergm in Resources */ = {isa = PBXBuildFile; fileRef = 84806618201E50DA00ACE847 /* sgminergm */; }; 848B67AF174EB774002C2BC1 /* autoConfigViewViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 848B67AE174EB774002C2BC1 /* autoConfigViewViewController.m */; }; 848B67B1174EBAC4002C2BC1 /* welcomeback.jpg in Resources */ = {isa = PBXBuildFile; fileRef = 848B67B0174EBAC4002C2BC1 /* welcomeback.jpg */; }; 848B67B3174ECBC5002C2BC1 /* minerbackground.jpg in Resources */ = {isa = PBXBuildFile; fileRef = 848B67B2174ECBC5002C2BC1 /* minerbackground.jpg */; }; + 8491F768203C633B00076351 /* libmicrohttpd in Resources */ = {isa = PBXBuildFile; fileRef = 8491F767203C633A00076351 /* libmicrohttpd */; }; 849BEBE41D4819B1000AF24A /* cpumultiminer in Resources */ = {isa = PBXBuildFile; fileRef = 849BEBE21D4819B1000AF24A /* cpumultiminer */; }; 84A88D0A1755580B00DB1A8B /* Avenir_Next.ttc in Resources */ = {isa = PBXBuildFile; fileRef = 84A88D081755580B00DB1A8B /* Avenir_Next.ttc */; }; 84A88D10175562B200DB1A8B /* bfgminer.conf in Resources */ = {isa = PBXBuildFile; fileRef = 84A88D0E175562B200DB1A8B /* bfgminer.conf */; }; @@ -80,6 +82,7 @@ 84C3316C19632A970037C289 /* poolercpu in Resources */ = {isa = PBXBuildFile; fileRef = 84C3316A19632A970037C289 /* poolercpu */; }; 84C3316D19632A970037C289 /* vtccpu in Resources */ = {isa = PBXBuildFile; fileRef = 84C3316B19632A970037C289 /* vtccpu */; }; 84C6DD711F31703A00151387 /* sgminer in Resources */ = {isa = PBXBuildFile; fileRef = 84C6DD701F31703A00151387 /* sgminer */; }; + 84D2C6B2205088590028A2E0 /* sgminerphi in Resources */ = {isa = PBXBuildFile; fileRef = 84D2C6B1205088590028A2E0 /* sgminerphi */; }; 84E414D717A7FD8A00FEC9C3 /* apiaccess.1 in Resources */ = {isa = PBXBuildFile; fileRef = 84E414D617A7FD8A00FEC9C3 /* apiaccess.1 */; }; 84F852ED1780A6C100FDE916 /* asicDock.png in Resources */ = {isa = PBXBuildFile; fileRef = 84F852EC1780A6C100FDE916 /* asicDock.png */; }; 84FA2A041BBB31480012256C /* sketchad.png in Resources */ = {isa = PBXBuildFile; fileRef = 84FA2A031BBB31480012256C /* sketchad.png */; }; @@ -113,6 +116,7 @@ /* Begin PBXFileReference section */ 228BE0421F65370700DB92A7 /* destijlad2.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = destijlad2.png; sourceTree = ""; }; + 2295264A2170F7FA005481C6 /* ukeukuleletunerad.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = ukeukuleletunerad.png; sourceTree = ""; }; 8400E7C41826F5A1009668D0 /* apiaccess */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.executable"; path = apiaccess; sourceTree = ""; }; 84055A131861A24200D95B95 /* mobileminer.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = mobileminer.png; sourceTree = ""; }; 840BEF51185CED95000596D2 /* driverfiles */ = {isa = PBXFileReference; lastKnownFileType = folder; path = driverfiles; sourceTree = ""; }; @@ -146,7 +150,6 @@ 842D569117585AA600B5A62A /* bfgurls.conf */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = bfgurls.conf; sourceTree = ""; }; 842D569617585AA600B5A62A /* libblkmaker */ = {isa = PBXFileReference; lastKnownFileType = folder; path = libblkmaker; sourceTree = ""; }; 842D569817585AA600B5A62A /* ltcurls.conf */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = ltcurls.conf; sourceTree = ""; }; - 843F059B1878E843000A594A /* libmicrohttpd */ = {isa = PBXFileReference; lastKnownFileType = folder; path = libmicrohttpd; sourceTree = ""; }; 844ABB2018ABB34900D74BE8 /* fabric.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = fabric.png; sourceTree = ""; }; 844ABB2218ABB43900D74BE8 /* pool.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = pool.png; sourceTree = ""; }; 844ABB2418AC1ACB00D74BE8 /* minerd */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.executable"; path = minerd; sourceTree = ""; }; @@ -174,12 +177,14 @@ 84681C212035B897001A7E2A /* openssl */ = {isa = PBXFileReference; lastKnownFileType = folder; path = openssl; sourceTree = ""; }; 84681C232035CD9D001A7E2A /* cpuminermulti */ = {isa = PBXFileReference; lastKnownFileType = folder; path = cpuminermulti; sourceTree = ""; }; 84681C252039FE2D001A7E2A /* cgminer */ = {isa = PBXFileReference; lastKnownFileType = folder; path = cgminer; sourceTree = ""; }; + 846B3839203C803E002A4DC4 /* ccminer */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.executable"; path = ccminer; sourceTree = ""; }; 846CAF161FF7D125000761E8 /* ethminer */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.executable"; path = ethminer; sourceTree = ""; }; 84806618201E50DA00ACE847 /* sgminergm */ = {isa = PBXFileReference; lastKnownFileType = folder; path = sgminergm; sourceTree = ""; }; 848B67AD174EB774002C2BC1 /* autoConfigViewViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = autoConfigViewViewController.h; sourceTree = ""; }; 848B67AE174EB774002C2BC1 /* autoConfigViewViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = autoConfigViewViewController.m; sourceTree = ""; }; 848B67B0174EBAC4002C2BC1 /* welcomeback.jpg */ = {isa = PBXFileReference; lastKnownFileType = image.jpeg; path = welcomeback.jpg; sourceTree = ""; }; 848B67B2174ECBC5002C2BC1 /* minerbackground.jpg */ = {isa = PBXFileReference; lastKnownFileType = image.jpeg; path = minerbackground.jpg; sourceTree = ""; }; + 8491F767203C633A00076351 /* libmicrohttpd */ = {isa = PBXFileReference; lastKnownFileType = folder; path = libmicrohttpd; sourceTree = ""; }; 849BEBE21D4819B1000AF24A /* cpumultiminer */ = {isa = PBXFileReference; lastKnownFileType = folder; path = cpumultiminer; sourceTree = ""; }; 84A88D081755580B00DB1A8B /* Avenir_Next.ttc */ = {isa = PBXFileReference; lastKnownFileType = file; path = Avenir_Next.ttc; sourceTree = ""; }; 84A88D0E175562B200DB1A8B /* bfgminer.conf */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = bfgminer.conf; sourceTree = ""; }; @@ -199,6 +204,7 @@ 84C3316A19632A970037C289 /* poolercpu */ = {isa = PBXFileReference; lastKnownFileType = folder; path = poolercpu; sourceTree = ""; }; 84C3316B19632A970037C289 /* vtccpu */ = {isa = PBXFileReference; lastKnownFileType = folder; path = vtccpu; sourceTree = ""; }; 84C6DD701F31703A00151387 /* sgminer */ = {isa = PBXFileReference; lastKnownFileType = folder; name = sgminer; path = MacMiner/sgminer; sourceTree = ""; }; + 84D2C6B1205088590028A2E0 /* sgminerphi */ = {isa = PBXFileReference; lastKnownFileType = folder; path = sgminerphi; sourceTree = ""; }; 84DD810F201FC38100B00923 /* Instructions.rtf */ = {isa = PBXFileReference; lastKnownFileType = text.rtf; name = Instructions.rtf; path = driverfiles/Instructions.rtf; sourceTree = ""; }; 84E414D417A7FD8A00FEC9C3 /* config.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = config.h; path = MacMiner/config.h; sourceTree = ""; }; 84E414D517A7FD8A00FEC9C3 /* compat.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = compat.h; path = MacMiner/compat.h; sourceTree = ""; }; @@ -235,6 +241,7 @@ isa = PBXGroup; children = ( 228BE0421F65370700DB92A7 /* destijlad2.png */, + 2295264A2170F7FA005481C6 /* ukeukuleletunerad.png */, 84BBBCAB18AFC8C0004503C8 /* menu2.png */, 842B80C81CF9493500BA9F69 /* sfad.png */, 842B80C91CF9493500BA9F69 /* meerkatad.png */, @@ -268,13 +275,13 @@ 84296C2F171F5870006DA9D5 /* macminer.iconset */, 84296C2D171F5419006DA9D5 /* icon.icns */, 84E414D617A7FD8A00FEC9C3 /* apiaccess.1 */, + 8491F767203C633A00076351 /* libmicrohttpd */, 84681C1D20350339001A7E2A /* bfgminer */, 84681C1E20350339001A7E2A /* libevent */, 84681C062034E40C001A7E2A /* libidn */, 84681C042034E2F9001A7E2A /* libunistring */, 84BBBCB418B00AC2004503C8 /* jansson */, 84BBBCB518B00AC2004503C8 /* libusb */, - 843F059B1878E843000A594A /* libmicrohttpd */, 840BEF51185CED95000596D2 /* driverfiles */, 84E414D417A7FD8A00FEC9C3 /* config.h */, 84E414D517A7FD8A00FEC9C3 /* compat.h */, @@ -285,7 +292,9 @@ 841181FD18B45DE3005D725B /* maxminer */, 84BBBCB918B00B3F004503C8 /* maxcgminer */, 844ABB2418AC1ACB00D74BE8 /* minerd */, + 846B3839203C803E002A4DC4 /* ccminer */, 846CAF161FF7D125000761E8 /* ethminer */, + 84D2C6B1205088590028A2E0 /* sgminerphi */, 84806618201E50DA00ACE847 /* sgminergm */, 841181FF18B5A106005D725B /* pooler-minerd */, 84BBBCA918AFB583004503C8 /* maxcoincpu */, @@ -436,7 +445,7 @@ 8410F2E4170AF5AD001191E3 /* Project object */ = { isa = PBXProject; attributes = { - LastUpgradeCheck = 0920; + LastUpgradeCheck = 1000; ORGANIZATIONNAME = fabulouspanda; TargetAttributes = { 8410F2EB170AF5AD001191E3 = { @@ -482,6 +491,7 @@ 84C3316C19632A970037C289 /* poolercpu in Resources */, 8410F300170AF5AD001191E3 /* Credits.rtf in Resources */, 846CAF171FF7D127000761E8 /* ethminer in Resources */, + 84D2C6B2205088590028A2E0 /* sgminerphi in Resources */, 84681C1F20350339001A7E2A /* bfgminer in Resources */, 8410F306170AF5AD001191E3 /* MainMenu.xib in Resources */, 844ABB2518AC1ACB00D74BE8 /* minerd in Resources */, @@ -505,12 +515,15 @@ 84681C262039FE2D001A7E2A /* cgminer in Resources */, 84806619201E50DA00ACE847 /* sgminergm in Resources */, 84FA2A041BBB31480012256C /* sketchad.png in Resources */, + 8491F768203C633B00076351 /* libmicrohttpd in Resources */, 84BBBCB718B00AC2004503C8 /* jansson in Resources */, 84A88D10175562B200DB1A8B /* bfgminer.conf in Resources */, + 2295264B2170F7FA005481C6 /* ukeukuleletunerad.png in Resources */, 8400E7C51826F5A1009668D0 /* apiaccess in Resources */, 84A88D12175562B200DB1A8B /* litecoin.conf in Resources */, 842D569D17585AA600B5A62A /* bfgurls.conf in Resources */, 84681C242035CD9D001A7E2A /* cpuminermulti in Resources */, + 846B383A203C803E002A4DC4 /* ccminer in Resources */, 84130C6518C94527006A4A12 /* gridseedcpu4 in Resources */, 842D56A217585AA600B5A62A /* libblkmaker in Resources */, 84681C012034D8F8001A7E2A /* cpuminermultiallium in Resources */, @@ -531,7 +544,6 @@ 84E414D717A7FD8A00FEC9C3 /* apiaccess.1 in Resources */, 8411820018B5A106005D725B /* pooler-minerd in Resources */, 841181FE18B45DE3005D725B /* maxminer in Resources */, - 843F059D1878E843000A594A /* libmicrohttpd in Resources */, 84681C032034DEF0001A7E2A /* curl in Resources */, 84BBBCAC18AFC8C0004503C8 /* menu2.png in Resources */, 84681C2020350339001A7E2A /* libevent in Resources */, @@ -643,11 +655,13 @@ CLANG_WARN_BOOL_CONVERSION = YES; CLANG_WARN_COMMA = YES; CLANG_WARN_CONSTANT_CONVERSION = YES; + CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES; CLANG_WARN_EMPTY_BODY = YES; CLANG_WARN_ENUM_CONVERSION = YES; CLANG_WARN_INFINITE_RECURSION = YES; CLANG_WARN_INT_CONVERSION = YES; CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES; + CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES; CLANG_WARN_OBJC_LITERAL_CONVERSION = YES; CLANG_WARN_RANGE_LOOP_ANALYSIS = YES; CLANG_WARN_STRICT_PROTOTYPES = YES; @@ -692,11 +706,13 @@ CLANG_WARN_BOOL_CONVERSION = YES; CLANG_WARN_COMMA = YES; CLANG_WARN_CONSTANT_CONVERSION = YES; + CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES; CLANG_WARN_EMPTY_BODY = YES; CLANG_WARN_ENUM_CONVERSION = YES; CLANG_WARN_INFINITE_RECURSION = YES; CLANG_WARN_INT_CONVERSION = YES; CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES; + CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES; CLANG_WARN_OBJC_LITERAL_CONVERSION = YES; CLANG_WARN_RANGE_LOOP_ANALYSIS = YES; CLANG_WARN_STRICT_PROTOTYPES = YES; diff --git a/MacMiner.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist b/MacMiner.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist new file mode 100644 index 0000000..18d9810 --- /dev/null +++ b/MacMiner.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist @@ -0,0 +1,8 @@ + + + + + IDEDidComputeMac32BitWarning + + + diff --git a/MacMiner/AppDelegate.m b/MacMiner/AppDelegate.m index 8904a3a..732c673 100644 --- a/MacMiner/AppDelegate.m +++ b/MacMiner/AppDelegate.m @@ -462,7 +462,7 @@ - (IBAction)displaySite:(id)sender - (IBAction)displayMeerkat:(id)sender { - [[NSWorkspace sharedWorkspace] openURL:[NSURL URLWithString:@"https://itunes.apple.com/app/wheres-the-meerkat/id1100443945?mt=8&at=1000lnXM"]]; + [[NSWorkspace sharedWorkspace] openURL:[NSURL URLWithString:@"https://geo.itunes.apple.com/app/uke-ukulele-tuner/id1382916607?mt=12&at=1000lnXM"]]; } - (IBAction)displaySketchFighter:(id)sender diff --git a/MacMiner/MacMiner-Info.plist b/MacMiner/MacMiner-Info.plist index 96b137e..e37f558 100644 --- a/MacMiner/MacMiner-Info.plist +++ b/MacMiner/MacMiner-Info.plist @@ -17,11 +17,11 @@ CFBundlePackageType APPL CFBundleShortVersionString - 1.5.62 + 1.6 CFBundleSignature ???? CFBundleVersion - 1562 + 1566 LSMinimumSystemVersion ${MACOSX_DEPLOYMENT_TARGET} NSAppTransportSecurity diff --git a/MacMiner/en.lproj/MainMenu.xib b/MacMiner/en.lproj/MainMenu.xib index 7e7fe29..b9727b4 100644 --- a/MacMiner/en.lproj/MainMenu.xib +++ b/MacMiner/en.lproj/MainMenu.xib @@ -1,8 +1,8 @@ - + - + @@ -579,11 +579,11 @@ - + - + @@ -608,7 +608,7 @@ - + @@ -665,7 +665,7 @@ - + @@ -681,7 +681,7 @@ - + @@ -689,7 +689,7 @@ - + @@ -700,23 +700,23 @@ - + - + - + - + - + - + - + + - + - - - + - + - + - + - + - + + - + - - - + @@ -1182,7 +1183,7 @@ - + @@ -1202,7 +1203,7 @@ - + @@ -1794,7 +1795,7 @@ - + @@ -1818,22 +1819,22 @@ - + - + - + @@ -1841,7 +1842,7 @@ - + @@ -2010,7 +2011,7 @@ Gw - + @@ -2170,40 +2171,40 @@ Gw - + - + - + - + - + + - + - - - + - + @@ -2308,15 +2309,15 @@ Gw - + - + - + @@ -2347,14 +2348,14 @@ Gw - + @@ -2482,18 +2483,18 @@ Gw - + - + - + @@ -2745,7 +2746,7 @@ Gw - + @@ -2753,7 +2754,7 @@ Gw - + @@ -2866,11 +2867,11 @@ Gw - + - + @@ -2896,7 +2897,7 @@ Gw - + - + - + + - + - - - + - +