diff --git a/Builds/MacOSX/HelloWorldDemo.xcodeproj/project.pbxproj b/Builds/MacOSX/HelloWorldDemo.xcodeproj/project.pbxproj index 5e8486b..c71b566 100644 --- a/Builds/MacOSX/HelloWorldDemo.xcodeproj/project.pbxproj +++ b/Builds/MacOSX/HelloWorldDemo.xcodeproj/project.pbxproj @@ -16,8 +16,8 @@ 58F81FF61B2E3330A4DC84D5 /* Foundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = FD1AE6443A798B33984E52C9 /* Foundation.framework */; }; 5B5A2F3BA0ADA4C6C0FCB89A /* IOKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 4379C7B6AFDC3C5B757D5764 /* IOKit.framework */; }; 5C4FFCDF8D6FDF200EC517F5 /* Security.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = A95C42174C07FAA2B2B65C4C /* Security.framework */; }; + 8A2AC4C62A858ADD00296B3E /* libusb-1.0.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 8A2AC4C52A858AD000296B3E /* libusb-1.0.a */; }; 8A4DDBE72A850D4F0032C112 /* libch341eeprom.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 8A4DDBE62A850D190032C112 /* libch341eeprom.a */; }; - 8A4DDBE82A850D660032C112 /* libusb-1.0.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 8A4DDBE52A850BFC0032C112 /* libusb-1.0.a */; }; 8A92C8982A85735700923F81 /* libfvhex2bin.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 8A1882DE2A85625700E34232 /* libfvhex2bin.a */; }; A237F9B254E95B3173479FF5 /* Main.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E7DABA4EA84ACAB407A52BAE /* Main.cpp */; }; F7500DD6050381FC1C00196C /* QuartzCore.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 0050B1C17FE29F9C95B64D51 /* QuartzCore.framework */; }; @@ -37,6 +37,7 @@ 6FC6928C1E798507B5702338 /* RecentFilesMenuTemplate.nib */ = {isa = PBXFileReference; lastKnownFileType = file.nib; path = RecentFilesMenuTemplate.nib; sourceTree = SOURCE_ROOT; }; 800D138984C3A1FF22A52A42 /* juce_gui_basics */ = {isa = PBXFileReference; lastKnownFileType = folder; name = juce_gui_basics; path = "~/JUCE/modules/juce_gui_basics"; sourceTree = ""; }; 8A1882DE2A85625700E34232 /* libfvhex2bin.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libfvhex2bin.a; path = ../../../heck_fv_hex2bin/src/libfvhex2bin.a; sourceTree = ""; }; + 8A2AC4C52A858AD000296B3E /* libusb-1.0.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = "libusb-1.0.a"; path = "../../res/libusb-1.0.a"; sourceTree = ""; }; 8A4DDBE52A850BFC0032C112 /* libusb-1.0.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = "libusb-1.0.a"; path = "../../../../../../../opt/local/lib/libusb-1.0.a"; sourceTree = ""; }; 8A4DDBE62A850D190032C112 /* libch341eeprom.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libch341eeprom.a; path = ../../../../heck_fvflash/src/libch341eeprom.a; sourceTree = ""; }; 957408F71F4B186C7A55CAA4 /* juce_events */ = {isa = PBXFileReference; lastKnownFileType = folder; name = juce_events; path = "~/JUCE/modules/juce_events"; sourceTree = ""; }; @@ -56,12 +57,12 @@ isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( + 8A2AC4C62A858ADD00296B3E /* libusb-1.0.a in Frameworks */, 8A92C8982A85735700923F81 /* libfvhex2bin.a in Frameworks */, 50FE42A5C0417BF97C544A26 /* Cocoa.framework in Frameworks */, 8A4DDBE72A850D4F0032C112 /* libch341eeprom.a in Frameworks */, 58F81FF61B2E3330A4DC84D5 /* Foundation.framework in Frameworks */, 5B5A2F3BA0ADA4C6C0FCB89A /* IOKit.framework in Frameworks */, - 8A4DDBE82A850D660032C112 /* libusb-1.0.a in Frameworks */, F7500DD6050381FC1C00196C /* QuartzCore.framework in Frameworks */, 5C4FFCDF8D6FDF200EC517F5 /* Security.framework in Frameworks */, ); @@ -128,6 +129,7 @@ F0AEE2DC91681642918BB3F7 /* Frameworks */ = { isa = PBXGroup; children = ( + 8A2AC4C52A858AD000296B3E /* libusb-1.0.a */, 8A1882DE2A85625700E34232 /* libfvhex2bin.a */, 8A4DDBE62A850D190032C112 /* libch341eeprom.a */, 8A4DDBE52A850BFC0032C112 /* libusb-1.0.a */, @@ -361,7 +363,7 @@ LIBRARY_SEARCH_PATHS = ( /Users/heck/src/heck_fv_hex2bin/src, /Users/heck/src/heck_fvflash/src, - /opt/local/lib, + ../../res, ); MACOSX_DEPLOYMENT_TARGET = 10.13; MTL_HEADER_SEARCH_PATHS = "$(SRCROOT)/../../JuceLibraryCode $(HOME)/JUCE/modules"; @@ -435,7 +437,7 @@ LIBRARY_SEARCH_PATHS = ( /Users/heck/src/heck_fv_hex2bin/src, /Users/heck/src/heck_fvflash/src, - /opt/local/lib, + ../../res, ); LLVM_LTO = YES; MACOSX_DEPLOYMENT_TARGET = 10.13; diff --git a/Builds/MacOSX/HelloWorldDemo.xcodeproj/project.xcworkspace/xcuserdata/heck.xcuserdatad/UserInterfaceState.xcuserstate b/Builds/MacOSX/HelloWorldDemo.xcodeproj/project.xcworkspace/xcuserdata/heck.xcuserdatad/UserInterfaceState.xcuserstate index d6f5410..4d6e0b2 100644 Binary files a/Builds/MacOSX/HelloWorldDemo.xcodeproj/project.xcworkspace/xcuserdata/heck.xcuserdatad/UserInterfaceState.xcuserstate and b/Builds/MacOSX/HelloWorldDemo.xcodeproj/project.xcworkspace/xcuserdata/heck.xcuserdatad/UserInterfaceState.xcuserstate differ diff --git a/Builds/MacOSX/build/Debug/HelloWorldDemo.app/Contents/MacOS/HelloWorldDemo b/Builds/MacOSX/build/Debug/HelloWorldDemo.app/Contents/MacOS/HelloWorldDemo index 61f7db5..c10283a 100755 Binary files a/Builds/MacOSX/build/Debug/HelloWorldDemo.app/Contents/MacOS/HelloWorldDemo and b/Builds/MacOSX/build/Debug/HelloWorldDemo.app/Contents/MacOS/HelloWorldDemo differ diff --git a/Source/HelloWorldDemo.h b/Source/HelloWorldDemo.h index ac80a3d..1191ccb 100644 --- a/Source/HelloWorldDemo.h +++ b/Source/HelloWorldDemo.h @@ -83,7 +83,7 @@ public: false, // is for saving, {}, // browser wildcard suffix, {}, // enforced suffix, - "Drop fv-1 program \n\nHere\n\nto upload (hex file)")); // text when nothing selected + "Drop fv-1 program \n\nHere\nHere\nHere\n\nto upload\n(.hex and .bin files are supported)")); // text when nothing selected addAndMakeVisible (fileComp.get()); fileComp->addListener (this); @@ -126,7 +126,7 @@ public: //============================================================================== void paint (Graphics& g) override { - g.fillAll (Colour (0,0,0)); + g.fillAll (Colour (200,200,0)); } @@ -152,6 +152,7 @@ public: // Convert status_label.setText("Converting hex2bin...", juce::NotificationType::dontSendNotification); + int status = heckfv_hex2bin(infilename.data(), outfilename.data()); if (status != 0) { diff --git a/dist/FV1-FUN.app/Contents/Info.plist b/dist/FV1-FUN.app/Contents/Info.plist new file mode 100644 index 0000000..01d35f7 --- /dev/null +++ b/dist/FV1-FUN.app/Contents/Info.plist @@ -0,0 +1,50 @@ + + + + + BuildMachineOSBuild + 21G72 + CFBundleDisplayName + HelloWorldDemo + CFBundleExecutable + HelloWorldDemo + CFBundleIdentifier + live.heck.fv1fun + CFBundleName + HelloWorldDemo + CFBundlePackageType + APPL + CFBundleShortVersionString + 1.0.0 + CFBundleSignature + ???? + CFBundleSupportedPlatforms + + MacOSX + + CFBundleVersion + 1.0.0 + DTCompiler + com.apple.compilers.llvm.clang.1_0 + DTPlatformBuild + 13F100 + DTPlatformName + macosx + DTPlatformVersion + 12.3 + DTSDKBuild + 21E226 + DTSDKName + macosx12.3 + DTXcode + 1341 + DTXcodeBuild + 13F100 + LSMinimumSystemVersion + 10.13 + NSHighResolutionCapable + + NSHumanReadableCopyright + + + diff --git a/dist/FV1-FUN.app/Contents/MacOS/HelloWorldDemo b/dist/FV1-FUN.app/Contents/MacOS/HelloWorldDemo new file mode 100755 index 0000000..86516ea Binary files /dev/null and b/dist/FV1-FUN.app/Contents/MacOS/HelloWorldDemo differ diff --git a/dist/FV1-FUN.app/Contents/PkgInfo b/dist/FV1-FUN.app/Contents/PkgInfo new file mode 100644 index 0000000..bd04210 --- /dev/null +++ b/dist/FV1-FUN.app/Contents/PkgInfo @@ -0,0 +1 @@ +APPL???? \ No newline at end of file diff --git a/dist/FV1-FUN.app/Contents/Resources/RecentFilesMenuTemplate.nib b/dist/FV1-FUN.app/Contents/Resources/RecentFilesMenuTemplate.nib new file mode 100644 index 0000000..cec7f7c Binary files /dev/null and b/dist/FV1-FUN.app/Contents/Resources/RecentFilesMenuTemplate.nib differ diff --git a/dist/FV1-FUN.app/Contents/_CodeSignature/CodeResources b/dist/FV1-FUN.app/Contents/_CodeSignature/CodeResources new file mode 100644 index 0000000..5349bbb --- /dev/null +++ b/dist/FV1-FUN.app/Contents/_CodeSignature/CodeResources @@ -0,0 +1,128 @@ + + + + + files + + Resources/RecentFilesMenuTemplate.nib + + 4cEN55flubpq9bxeGSBG3zMPYQw= + + + files2 + + Resources/RecentFilesMenuTemplate.nib + + hash2 + + cY60xaOlVk3YMq6aNs9knz7yV86JbdkhaT7rYQG9AIo= + + + + rules + + ^Resources/ + + ^Resources/.*\.lproj/ + + optional + + weight + 1000 + + ^Resources/.*\.lproj/locversion.plist$ + + omit + + weight + 1100 + + ^Resources/Base\.lproj/ + + weight + 1010 + + ^version.plist$ + + + rules2 + + .*\.dSYM($|/) + + weight + 11 + + ^(.*/)?\.DS_Store$ + + omit + + weight + 2000 + + ^(Frameworks|SharedFrameworks|PlugIns|Plug-ins|XPCServices|Helpers|MacOS|Library/(Automator|Spotlight|LoginItems))/ + + nested + + weight + 10 + + ^.* + + ^Info\.plist$ + + omit + + weight + 20 + + ^PkgInfo$ + + omit + + weight + 20 + + ^Resources/ + + weight + 20 + + ^Resources/.*\.lproj/ + + optional + + weight + 1000 + + ^Resources/.*\.lproj/locversion.plist$ + + omit + + weight + 1100 + + ^Resources/Base\.lproj/ + + weight + 1010 + + ^[^/]+$ + + nested + + weight + 10 + + ^embedded\.provisionprofile$ + + weight + 20 + + ^version\.plist$ + + weight + 20 + + + + diff --git a/dist/FV1-Fun.app.zip b/dist/FV1-Fun.app.zip index 357c7b4..fb7d30e 100644 Binary files a/dist/FV1-Fun.app.zip and b/dist/FV1-Fun.app.zip differ diff --git a/res/libusb-1.0.a b/res/libusb-1.0.a new file mode 100644 index 0000000..d7aa671 Binary files /dev/null and b/res/libusb-1.0.a differ