Skip to content

Commit

Permalink
Merge branch 'hotfixes'
Browse files Browse the repository at this point in the history
  • Loading branch information
balandinodidonato committed Dec 7, 2017
2 parents 0311bd4 + e81e31a commit ae30525
Show file tree
Hide file tree
Showing 18 changed files with 189 additions and 184 deletions.
4 changes: 2 additions & 2 deletions MyoMapper/Builds/MacOSX/Info-App.plist
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,9 +18,9 @@
<key>CFBundleSignature</key>
<string>????</string>
<key>CFBundleShortVersionString</key>
<string>3.1.5</string>
<string>3.1.6</string>
<key>CFBundleVersion</key>
<string>3.1.5</string>
<string>3.1.6</string>
<key>NSHumanReadableCopyright</key>
<string>Balandino Di Donato - 2017</string>
<key>NSHighResolutionCapable</key>
Expand Down
40 changes: 20 additions & 20 deletions MyoMapper/Builds/MacOSX/MyoMapper.xcodeproj/project.pbxproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,10 +21,10 @@
2DDF3D6B66671A4C35A871DA /* Application.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 6A2F9BBCFDC750D4E34238B9 /* Application.cpp */; };
2EA91483B878C0FF5DD75119 /* ScaleValues.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 08E2AF547C64DF07847A2A99 /* ScaleValues.cpp */; };
30AE49EF264B38DA117A77C7 /* WindowDrawer.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DE54F4F83D39BB4F9FA59A11 /* WindowDrawer.cpp */; };
323A03581FD9BF2D00BAEFAD /* myo.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 323A03571FD9BF2D00BAEFAD /* myo.framework */; };
323A03591FD9BF3200BAEFAD /* myo.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 323A03571FD9BF2D00BAEFAD /* myo.framework */; };
323A035A1FD9BF3200BAEFAD /* myo.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = 323A03571FD9BF2D00BAEFAD /* myo.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; };
3241BB551AF7B80A02389059 /* include_juce_osc.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 77FCFB967B0413872AB7D756 /* include_juce_osc.cpp */; };
327BC31C1FDA041000771783 /* myo.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 327BC31B1FDA041000771783 /* myo.framework */; };
327BC31D1FDA041200771783 /* myo.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 327BC31B1FDA041000771783 /* myo.framework */; };
327BC31E1FDA041200771783 /* myo.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = 327BC31B1FDA041000771783 /* myo.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; };
3941F47C568D722FCCAF407F /* HelpWindow.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 630CC8393DBDC58513DA027A /* HelpWindow.cpp */; };
395070209AB1F4B1098D5BB5 /* include_juce_graphics.mm in Sources */ = {isa = PBXBuildFile; fileRef = C5F124CD026F1046BA83D694 /* include_juce_graphics.mm */; };
470E1D58127B8552268E162F /* Mav.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 0FBD7B57E2B7CBA61532A05F /* Mav.cpp */; };
Expand All @@ -34,7 +34,6 @@
6A9BE3ECAC10B96143BD3458 /* FirstOrderDifference.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 325B30514F5198958D9DA487 /* FirstOrderDifference.cpp */; };
6AB90C5CE10D08EBB5994026 /* OrScaling.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 5AFFD83C8D06526E5736CF69 /* OrScaling.cpp */; };
6C6D3380F13E917987586D9B /* Rescale.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 8541AEC35FE73816586E3C7C /* Rescale.cpp */; };
768DA9505B851AB1AD8577E3 /* DataSelectorWindow.cpp in Sources */ = {isa = PBXBuildFile; fileRef = FA7ED0C5C51DBC3299D7ACFE /* DataSelectorWindow.cpp */; };
808C19E032283899C075FEFF /* QuartzCore.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = EEF39C81C7C79A4A39C8C86A /* QuartzCore.framework */; };
8347916F2C9412026BEAB654 /* VisualsWindow.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 7AEB4DF25FE05E5514C4140F /* VisualsWindow.cpp */; };
8C8F9A92519A4EA918581B03 /* RecentFilesMenuTemplate.nib in Resources */ = {isa = PBXBuildFile; fileRef = 362301F4D9F3494F257A83B1 /* RecentFilesMenuTemplate.nib */; };
Expand All @@ -48,20 +47,21 @@
D6B1435E336D3D5A66FCF16B /* Carbon.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 175332EA85B1F4026F148E47 /* Carbon.framework */; };
D6C0628A4ADA8248CD9EA1FF /* MyoManager.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 617E16C7B231A93A6174CADC /* MyoManager.cpp */; };
D9502AF143551775FE12AA56 /* Pose.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 59457377F12F5467D3131C35 /* Pose.cpp */; };
E00621EA48D9C65300AC382F /* OscDataSelectorWindow.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 8E1F85AFA7A7F822764DCD14 /* OscDataSelectorWindow.cpp */; };
E0E2975352C263B3304FB06D /* BinaryData.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E63FB5683F3DD5CB2F45DCF6 /* BinaryData.cpp */; };
E3062B6C46B26C7AB9125585 /* MovingAverage.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 09054499FC47F9722A05AF21 /* MovingAverage.cpp */; };
EA6B6B9A2254D93F7BE9742B /* Cocoa.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 64200BD72BE5B8158B73877B /* Cocoa.framework */; };
F9A2468BA8A175E78F1A8D6D /* MyoListener.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 3F7EFCC1DF1732FF95075D6F /* MyoListener.cpp */; };
/* End PBXBuildFile section */

/* Begin PBXCopyFilesBuildPhase section */
323A035B1FD9BF3300BAEFAD /* Embed Frameworks */ = {
327BC31F1FDA041200771783 /* Embed Frameworks */ = {
isa = PBXCopyFilesBuildPhase;
buildActionMask = 2147483647;
dstPath = "";
dstSubfolderSpec = 10;
files = (
323A035A1FD9BF3200BAEFAD /* myo.framework in Embed Frameworks */,
327BC31E1FDA041200771783 /* myo.framework in Embed Frameworks */,
);
name = "Embed Frameworks";
runOnlyForDeploymentPostprocessing = 0;
Expand All @@ -88,12 +88,11 @@
20E9C88336BF4382FBE1C1E5 /* SecondOrderDifference.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = SecondOrderDifference.cpp; path = ../../Source/Features/SecondOrderDifference.cpp; sourceTree = SOURCE_ROOT; };
2B2F9DF77312BF8D3359ABF6 /* juce_osc */ = {isa = PBXFileReference; lastKnownFileType = folder; name = juce_osc; path = ../../JuceLibraryCode/modules/juce_osc; sourceTree = SOURCE_ROOT; };
30C2807D73F026BDA4DBC97C /* Application.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = Application.h; path = ../../Source/Application.h; sourceTree = SOURCE_ROOT; };
323A03571FD9BF2D00BAEFAD /* myo.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = myo.framework; path = ../../../../../../Library/Frameworks/myo.framework; sourceTree = "<group>"; };
325B30514F5198958D9DA487 /* FirstOrderDifference.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = FirstOrderDifference.cpp; path = ../../Source/Features/FirstOrderDifference.cpp; sourceTree = SOURCE_ROOT; };
327BC31B1FDA041000771783 /* myo.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = myo.framework; path = ../../../../../../Library/Frameworks/myo.framework; sourceTree = "<group>"; };
34549BDEAEF79A8B5E01A4D5 /* JuceHeader.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = JuceHeader.h; path = ../../JuceLibraryCode/JuceHeader.h; sourceTree = SOURCE_ROOT; };
362301F4D9F3494F257A83B1 /* RecentFilesMenuTemplate.nib */ = {isa = PBXFileReference; lastKnownFileType = file.nib; path = RecentFilesMenuTemplate.nib; sourceTree = SOURCE_ROOT; };
374F0149F402FB7BA8DE3AAB /* include_juce_opengl.mm */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.objcpp; name = include_juce_opengl.mm; path = ../../JuceLibraryCode/include_juce_opengl.mm; sourceTree = SOURCE_ROOT; };
3774C207AF1D810B658FFD32 /* DataSelectorWindow.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = DataSelectorWindow.h; path = ../../Source/UI/Windows/DataSelectorWindow.h; sourceTree = SOURCE_ROOT; };
382FA0B1212BB77E747D28E1 /* ZeroCrossingRate.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = ZeroCrossingRate.h; path = ../../Source/Features/ZeroCrossingRate.h; sourceTree = SOURCE_ROOT; };
3F7EFCC1DF1732FF95075D6F /* MyoListener.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = MyoListener.cpp; path = ../../Source/Myo/MyoListener.cpp; sourceTree = SOURCE_ROOT; };
40A7AEE27559C18635A92AB9 /* Myo Mapper.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = "Myo Mapper.app"; sourceTree = BUILT_PRODUCTS_DIR; };
Expand All @@ -120,6 +119,7 @@
82F5BBD408198762B1176F1E /* MyoData.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = MyoData.h; path = ../../Source/Myo/MyoData.h; sourceTree = SOURCE_ROOT; };
8541AEC35FE73816586E3C7C /* Rescale.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = Rescale.cpp; path = ../../Source/UI/Windows/Rescale.cpp; sourceTree = SOURCE_ROOT; };
86C356C7346E9A26CFB4EB15 /* OscValueTreeItem.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = OscValueTreeItem.cpp; path = ../../Source/UI/OscValueTreeItem.cpp; sourceTree = SOURCE_ROOT; };
8E1F85AFA7A7F822764DCD14 /* OscDataSelectorWindow.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = OscDataSelectorWindow.cpp; path = ../../Source/UI/Windows/OscDataSelectorWindow.cpp; sourceTree = SOURCE_ROOT; };
9395100959E99B42FD9C5DBF /* juce_gui_extra */ = {isa = PBXFileReference; lastKnownFileType = folder; name = juce_gui_extra; path = ../../JuceLibraryCode/modules/juce_gui_extra; sourceTree = SOURCE_ROOT; };
997638AE85D608FB5123497D /* Roboto-Thin.ttf */ = {isa = PBXFileReference; lastKnownFileType = file.ttf; name = "Roboto-Thin.ttf"; path = "../../Source/BinaryResources/Roboto-Thin.ttf"; sourceTree = SOURCE_ROOT; };
9A53CB3D62B82E7840F81B2F /* SettingsWindow.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = SettingsWindow.h; path = ../../Source/UI/Windows/SettingsWindow.h; sourceTree = SOURCE_ROOT; };
Expand All @@ -129,6 +129,7 @@
A6B4AF3B2C67F4A54D912DAA /* juce_graphics */ = {isa = PBXFileReference; lastKnownFileType = folder; name = juce_graphics; path = ../../JuceLibraryCode/modules/juce_graphics; sourceTree = SOURCE_ROOT; };
A8A1FC4A9849A0CD872CDCF5 /* MyoMapperLookAndFeel.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = MyoMapperLookAndFeel.h; path = ../../Source/UI/MyoMapperLookAndFeel.h; sourceTree = SOURCE_ROOT; };
AAC622D91CDBA8EEEB4EF571 /* MinMax.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = MinMax.cpp; path = ../../Source/Features/MinMax.cpp; sourceTree = SOURCE_ROOT; };
B201FE8719D2E5268325D34F /* OscDataSelectorWindow.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = OscDataSelectorWindow.h; path = ../../Source/UI/Windows/OscDataSelectorWindow.h; sourceTree = SOURCE_ROOT; };
B45BCCAF5D0552B62F8ADC0C /* WebKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = WebKit.framework; path = System/Library/Frameworks/WebKit.framework; sourceTree = SDKROOT; };
B467E7047B3B06A9199E6467 /* HelpWindow.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = HelpWindow.h; path = ../../Source/UI/Windows/HelpWindow.h; sourceTree = SOURCE_ROOT; };
B554FC049EC7392498FD7110 /* MyoListener.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = MyoListener.h; path = ../../Source/Myo/MyoListener.h; sourceTree = SOURCE_ROOT; };
Expand All @@ -153,7 +154,6 @@
EEF39C81C7C79A4A39C8C86A /* QuartzCore.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = QuartzCore.framework; path = System/Library/Frameworks/QuartzCore.framework; sourceTree = SDKROOT; };
F1079B78708D8A832525D725 /* Orientation.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = Orientation.cpp; path = ../../Source/UI/Orientation.cpp; sourceTree = SOURCE_ROOT; };
F89CEB00FDE42784CBA9F564 /* include_juce_gui_extra.mm */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.objcpp; name = include_juce_gui_extra.mm; path = ../../JuceLibraryCode/include_juce_gui_extra.mm; sourceTree = SOURCE_ROOT; };
FA7ED0C5C51DBC3299D7ACFE /* DataSelectorWindow.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = DataSelectorWindow.cpp; path = ../../Source/UI/Windows/DataSelectorWindow.cpp; sourceTree = SOURCE_ROOT; };
/* End PBXFileReference section */

/* Begin PBXFrameworksBuildPhase section */
Expand All @@ -166,8 +166,8 @@
C116BA0C6679EE33707BA158 /* IOKit.framework in Frameworks */,
00C21076546BD3C41BE3490C /* OpenGL.framework in Frameworks */,
808C19E032283899C075FEFF /* QuartzCore.framework in Frameworks */,
323A03581FD9BF2D00BAEFAD /* myo.framework in Frameworks */,
323A03591FD9BF3200BAEFAD /* myo.framework in Frameworks */,
327BC31C1FDA041000771783 /* myo.framework in Frameworks */,
327BC31D1FDA041200771783 /* myo.framework in Frameworks */,
6507943995181A90AF2AB700 /* WebKit.framework in Frameworks */,
);
runOnlyForDeploymentPostprocessing = 0;
Expand Down Expand Up @@ -246,10 +246,10 @@
6C2636955E4B777E70B210DC /* Windows */ = {
isa = PBXGroup;
children = (
8E1F85AFA7A7F822764DCD14 /* OscDataSelectorWindow.cpp */,
B201FE8719D2E5268325D34F /* OscDataSelectorWindow.h */,
BCE10FBCD216607F1CF77DB0 /* AboutWindowContent.cpp */,
7F990EABCBFA470B16EF39E6 /* AboutWindowContent.h */,
FA7ED0C5C51DBC3299D7ACFE /* DataSelectorWindow.cpp */,
3774C207AF1D810B658FFD32 /* DataSelectorWindow.h */,
630CC8393DBDC58513DA027A /* HelpWindow.cpp */,
B467E7047B3B06A9199E6467 /* HelpWindow.h */,
8541AEC35FE73816586E3C7C /* Rescale.cpp */,
Expand Down Expand Up @@ -340,7 +340,7 @@
A8B8923DE26E7730A43A9AFD /* Frameworks */ = {
isa = PBXGroup;
children = (
323A03571FD9BF2D00BAEFAD /* myo.framework */,
327BC31B1FDA041000771783 /* myo.framework */,
175332EA85B1F4026F148E47 /* Carbon.framework */,
64200BD72BE5B8158B73877B /* Cocoa.framework */,
C4CC130375FB18D502CFB639 /* IOKit.framework */,
Expand Down Expand Up @@ -390,7 +390,7 @@
04585E7B6D39EA4D1DA7CF92 /* Sources */,
EDA380A82341BC06E239D3AD /* Frameworks */,
128EAE48529CD020F3D877A3 /* Post-build script */,
323A035B1FD9BF3300BAEFAD /* Embed Frameworks */,
327BC31F1FDA041200771783 /* Embed Frameworks */,
);
buildRules = (
);
Expand Down Expand Up @@ -476,8 +476,8 @@
isa = PBXSourcesBuildPhase;
buildActionMask = 2147483647;
files = (
E00621EA48D9C65300AC382F /* OscDataSelectorWindow.cpp in Sources */,
61153513959CE7DF94DFBA62 /* AboutWindowContent.cpp in Sources */,
768DA9505B851AB1AD8577E3 /* DataSelectorWindow.cpp in Sources */,
3941F47C568D722FCCAF407F /* HelpWindow.cpp in Sources */,
6C6D3380F13E917987586D9B /* Rescale.cpp in Sources */,
C5F7EDE7137F1EAA160DBE99 /* SettingsWindow.cpp in Sources */,
Expand Down Expand Up @@ -534,8 +534,8 @@
"_DEBUG=1",
"DEBUG=1",
"JUCER_XCODE_MAC_F6D2F4CF=1",
"JUCE_APP_VERSION=3.1.5",
"JUCE_APP_VERSION_HEX=0x30105",
"JUCE_APP_VERSION=3.1.6",
"JUCE_APP_VERSION_HEX=0x30106",
"JucePlugin_Build_VST=0",
"JucePlugin_Build_VST3=0",
"JucePlugin_Build_AU=0",
Expand Down Expand Up @@ -580,8 +580,8 @@
"_NDEBUG=1",
"NDEBUG=1",
"JUCER_XCODE_MAC_F6D2F4CF=1",
"JUCE_APP_VERSION=3.1.5",
"JUCE_APP_VERSION_HEX=0x30105",
"JUCE_APP_VERSION=3.1.6",
"JUCE_APP_VERSION_HEX=0x30106",
"JucePlugin_Build_VST=0",
"JucePlugin_Build_VST3=0",
"JucePlugin_Build_AU=0",
Expand Down
Loading

0 comments on commit ae30525

Please sign in to comment.