Skip to content

Commit

Permalink
Merge branch 'develop'
Browse files Browse the repository at this point in the history
# Conflicts:
#	MyoMapper/Builds/MacOSX/MyoMapper.xcodeproj/project.pbxproj
  • Loading branch information
balandinodidonato committed Jan 28, 2018
2 parents 19fd0c7 + 8ae1db0 commit 4cfb55b
Show file tree
Hide file tree
Showing 22 changed files with 484 additions and 359 deletions.
93 changes: 46 additions & 47 deletions MyoMapper/Builds/MacOSX/Info-App.plist
Original file line number Diff line number Diff line change
@@ -1,47 +1,46 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
<plist version="1.0">
<dict>
<key>CFBundleDisplayName</key>
<string>MyoMapper</string>
<key>CFBundleDocumentTypes</key>
<array>
<dict>
<key>CFBundleTypeExtensions</key>
<array>
<string>mapper</string>
</array>
<key>CFBundleTypeIconFile</key>
<string>Icon</string>
<key>CFBundleTypeName</key>
<string>mapper</string>
<key>CFBundleTypeRole</key>
<string>Editor</string>
<key>NSPersistentStoreTypeKey</key>
<string>XML</string>
</dict>
</array>
<key>CFBundleExecutable</key>
<string>${EXECUTABLE_NAME}</string>
<key>CFBundleIconFile</key>
<string>Icon.icns</string>
<key>CFBundleIdentifier</key>
<string>com.balandinodidonato.MyoMapper</string>
<key>CFBundleName</key>
<string>MyoMapper</string>
<key>CFBundlePackageType</key>
<string>APPL</string>
<key>CFBundleShortVersionString</key>
<string>3.1.7</string>
<key>CFBundleSignature</key>
<string>????</string>
<key>CFBundleVersion</key>
<string>3.1.7</string>
<key>LSApplicationCategoryType</key>
<string>public.app-category.developer-tools</string>
<key>NSHighResolutionCapable</key>
<true/>
<key>NSHumanReadableCopyright</key>
<string>Balandino Di Donato - 2017</string>
</dict>
</plist>
<?xml version="1.0" encoding="UTF-8"?>

<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
<plist>
<dict>
<key>CFBundleExecutable</key>
<string>${EXECUTABLE_NAME}</string>
<key>CFBundleIconFile</key>
<string>Icon.icns</string>
<key>CFBundleIdentifier</key>
<string>com.balandinodidonato.MyoMapper</string>
<key>CFBundleName</key>
<string>MyoMapper</string>
<key>CFBundleDisplayName</key>
<string>MyoMapper</string>
<key>CFBundlePackageType</key>
<string>APPL</string>
<key>CFBundleSignature</key>
<string>????</string>
<key>CFBundleShortVersionString</key>
<string>3.1.9</string>
<key>CFBundleVersion</key>
<string>3.1.9</string>
<key>NSHumanReadableCopyright</key>
<string>Balandino Di Donato - 2018</string>
<key>NSHighResolutionCapable</key>
<true/>
<key>CFBundleDocumentTypes</key>
<array>
<dict>
<key>CFBundleTypeExtensions</key>
<array>
<string>mapper</string>
</array>
<key>CFBundleTypeName</key>
<string>mapper</string>
<key>CFBundleTypeRole</key>
<string>Editor</string>
<key>CFBundleTypeIconFile</key>
<string>Icon</string>
<key>NSPersistentStoreTypeKey</key>
<string>XML</string>
</dict>
</array>
</dict>
</plist>
33 changes: 29 additions & 4 deletions MyoMapper/Builds/MacOSX/MyoMapper.xcodeproj/project.pbxproj
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,9 @@
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 */; };
3210066B201E97AE002B4664 /* myo.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 3210066A201E97AE002B4664 /* myo.framework */; };
3210066C201E97B0002B4664 /* myo.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 3210066A201E97AE002B4664 /* myo.framework */; };
3210066D201E97B0002B4664 /* myo.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = 3210066A201E97AE002B4664 /* myo.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; };
3241BB551AF7B80A02389059 /* include_juce_osc.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 77FCFB967B0413872AB7D756 /* include_juce_osc.cpp */; };
32BC23BC1FED2B6700FBA2F5 /* myo.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 32BC23BB1FED2B6600FBA2F5 /* myo.framework */; };
32BC23BD1FED2B7600FBA2F5 /* myo.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 32BC23BB1FED2B6600FBA2F5 /* myo.framework */; };
Expand Down Expand Up @@ -56,13 +59,21 @@
/* End PBXBuildFile section */

/* Begin PBXCopyFilesBuildPhase section */
<<<<<<< HEAD
32BC23BA1FED2B1300FBA2F5 /* Embed Frameworks */ = {
=======
3210066E201E97B0002B4664 /* Embed Frameworks */ = {
>>>>>>> develop
isa = PBXCopyFilesBuildPhase;
buildActionMask = 2147483647;
dstPath = "";
dstSubfolderSpec = 10;
files = (
<<<<<<< HEAD
32BC23BE1FED2B7600FBA2F5 /* myo.framework in Embed Frameworks */,
=======
3210066D201E97B0002B4664 /* myo.framework in Embed Frameworks */,
>>>>>>> develop
);
name = "Embed Frameworks";
runOnlyForDeploymentPostprocessing = 0;
Expand Down Expand Up @@ -90,6 +101,7 @@
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; };
3210066A201E97AE002B4664 /* 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; };
32BC23BB1FED2B6600FBA2F5 /* 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; };
Expand Down Expand Up @@ -169,8 +181,13 @@
C116BA0C6679EE33707BA158 /* IOKit.framework in Frameworks */,
00C21076546BD3C41BE3490C /* OpenGL.framework in Frameworks */,
808C19E032283899C075FEFF /* QuartzCore.framework in Frameworks */,
<<<<<<< HEAD
32BC23BC1FED2B6700FBA2F5 /* myo.framework in Frameworks */,
32BC23BD1FED2B7600FBA2F5 /* myo.framework in Frameworks */,
=======
3210066B201E97AE002B4664 /* myo.framework in Frameworks */,
3210066C201E97B0002B4664 /* myo.framework in Frameworks */,
>>>>>>> develop
6507943995181A90AF2AB700 /* WebKit.framework in Frameworks */,
);
runOnlyForDeploymentPostprocessing = 0;
Expand Down Expand Up @@ -342,7 +359,11 @@
A8B8923DE26E7730A43A9AFD /* Frameworks */ = {
isa = PBXGroup;
children = (
<<<<<<< HEAD
32BC23BB1FED2B6600FBA2F5 /* myo.framework */,
=======
3210066A201E97AE002B4664 /* myo.framework */,
>>>>>>> develop
175332EA85B1F4026F148E47 /* Carbon.framework */,
64200BD72BE5B8158B73877B /* Cocoa.framework */,
C4CC130375FB18D502CFB639 /* IOKit.framework */,
Expand Down Expand Up @@ -403,7 +424,11 @@
04585E7B6D39EA4D1DA7CF92 /* Sources */,
EDA380A82341BC06E239D3AD /* Frameworks */,
128EAE48529CD020F3D877A3 /* Post-build script */,
<<<<<<< HEAD
32BC23BA1FED2B1300FBA2F5 /* Embed Frameworks */,
=======
3210066E201E97B0002B4664 /* Embed Frameworks */,
>>>>>>> develop
);
buildRules = (
);
Expand Down Expand Up @@ -548,8 +573,8 @@
"_DEBUG=1",
"DEBUG=1",
"JUCER_XCODE_MAC_F6D2F4CF=1",
"JUCE_APP_VERSION=3.1.7",
"JUCE_APP_VERSION_HEX=0x30107",
"JUCE_APP_VERSION=3.1.9",
"JUCE_APP_VERSION_HEX=0x30109",
"JucePlugin_Build_VST=0",
"JucePlugin_Build_VST3=0",
"JucePlugin_Build_AU=0",
Expand Down Expand Up @@ -594,8 +619,8 @@
"_NDEBUG=1",
"NDEBUG=1",
"JUCER_XCODE_MAC_F6D2F4CF=1",
"JUCE_APP_VERSION=3.1.7",
"JUCE_APP_VERSION_HEX=0x30107",
"JUCE_APP_VERSION=3.1.9",
"JUCE_APP_VERSION_HEX=0x30109",
"JucePlugin_Build_VST=0",
"JucePlugin_Build_VST3=0",
"JucePlugin_Build_AU=0",
Expand Down
4 changes: 2 additions & 2 deletions MyoMapper/Builds/VisualStudio2015/MyoMapper_App.vcxproj
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,7 @@
<Optimization>Disabled</Optimization>
<DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
<AdditionalIncludeDirectories>..\..\JuceLibraryCode;..\..\JuceLibraryCode\modules;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>_CRT_SECURE_NO_WARNINGS;WIN32;_WINDOWS;DEBUG;_DEBUG;JUCER_VS2015_78A5022=1;JUCE_APP_VERSION=3.1.7;JUCE_APP_VERSION_HEX=0x30107;JucePlugin_Build_VST=0;JucePlugin_Build_VST3=0;JucePlugin_Build_AU=0;JucePlugin_Build_AUv3=0;JucePlugin_Build_RTAS=0;JucePlugin_Build_AAX=0;JucePlugin_Build_Standalone=0;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<PreprocessorDefinitions>_CRT_SECURE_NO_WARNINGS;WIN32;_WINDOWS;DEBUG;_DEBUG;JUCER_VS2015_78A5022=1;JUCE_APP_VERSION=3.1.9;JUCE_APP_VERSION_HEX=0x30109;JucePlugin_Build_VST=0;JucePlugin_Build_VST3=0;JucePlugin_Build_AU=0;JucePlugin_Build_AUv3=0;JucePlugin_Build_RTAS=0;JucePlugin_Build_AAX=0;JucePlugin_Build_Standalone=0;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
<RuntimeTypeInfo>true</RuntimeTypeInfo>
<PrecompiledHeader/>
Expand Down Expand Up @@ -116,7 +116,7 @@
<ClCompile>
<Optimization>Full</Optimization>
<AdditionalIncludeDirectories>..\..\JuceLibraryCode;..\..\JuceLibraryCode\modules;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>_CRT_SECURE_NO_WARNINGS;WIN32;_WINDOWS;NDEBUG;JUCER_VS2015_78A5022=1;JUCE_APP_VERSION=3.1.7;JUCE_APP_VERSION_HEX=0x30107;JucePlugin_Build_VST=0;JucePlugin_Build_VST3=0;JucePlugin_Build_AU=0;JucePlugin_Build_AUv3=0;JucePlugin_Build_RTAS=0;JucePlugin_Build_AAX=0;JucePlugin_Build_Standalone=0;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<PreprocessorDefinitions>_CRT_SECURE_NO_WARNINGS;WIN32;_WINDOWS;NDEBUG;JUCER_VS2015_78A5022=1;JUCE_APP_VERSION=3.1.9;JUCE_APP_VERSION_HEX=0x30109;JucePlugin_Build_VST=0;JucePlugin_Build_VST3=0;JucePlugin_Build_AU=0;JucePlugin_Build_AUv3=0;JucePlugin_Build_RTAS=0;JucePlugin_Build_AAX=0;JucePlugin_Build_Standalone=0;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<RuntimeLibrary>MultiThreaded</RuntimeLibrary>
<RuntimeTypeInfo>true</RuntimeTypeInfo>
<PrecompiledHeader/>
Expand Down
8 changes: 4 additions & 4 deletions MyoMapper/Builds/VisualStudio2015/resources.rc
Original file line number Diff line number Diff line change
Expand Up @@ -7,18 +7,18 @@
#include <windows.h>

VS_VERSION_INFO VERSIONINFO
FILEVERSION 3,1,7,0
FILEVERSION 3,1,9,0
BEGIN
BLOCK "StringFileInfo"
BEGIN
BLOCK "040904E4"
BEGIN
VALUE "CompanyName", "Balandino Di Donato\0"
VALUE "LegalCopyright", "Balandino Di Donato - 2017\0"
VALUE "LegalCopyright", "Balandino Di Donato - 2018\0"
VALUE "FileDescription", "MyoMapper\0"
VALUE "FileVersion", "3.1.7\0"
VALUE "FileVersion", "3.1.9\0"
VALUE "ProductName", "MyoMapper\0"
VALUE "ProductVersion", "3.1.7\0"
VALUE "ProductVersion", "3.1.9\0"
END
END

Expand Down
4 changes: 2 additions & 2 deletions MyoMapper/Builds/VisualStudio2017/MyoMapper_App.vcxproj
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,7 @@
<Optimization>Disabled</Optimization>
<DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
<AdditionalIncludeDirectories>..\..\JuceLibraryCode;..\..\JuceLibraryCode\modules;C:\SDK\MyoSDK\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>_CRT_SECURE_NO_WARNINGS;WIN32;_WINDOWS;DEBUG;_DEBUG;JUCER_VS2017_78A5024=1;JUCE_APP_VERSION=3.1.7;JUCE_APP_VERSION_HEX=0x30107;JucePlugin_Build_VST=0;JucePlugin_Build_VST3=0;JucePlugin_Build_AU=0;JucePlugin_Build_AUv3=0;JucePlugin_Build_RTAS=0;JucePlugin_Build_AAX=0;JucePlugin_Build_Standalone=0;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<PreprocessorDefinitions>_CRT_SECURE_NO_WARNINGS;WIN32;_WINDOWS;DEBUG;_DEBUG;JUCER_VS2017_78A5024=1;JUCE_APP_VERSION=3.1.9;JUCE_APP_VERSION_HEX=0x30109;JucePlugin_Build_VST=0;JucePlugin_Build_VST3=0;JucePlugin_Build_AU=0;JucePlugin_Build_AUv3=0;JucePlugin_Build_RTAS=0;JucePlugin_Build_AAX=0;JucePlugin_Build_Standalone=0;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
<RuntimeTypeInfo>true</RuntimeTypeInfo>
<PrecompiledHeader/>
Expand Down Expand Up @@ -124,7 +124,7 @@ COPY &quot;C:\SDK\MyoSDK\bin\myo64.dll&quot; &quot;$(OutDir)&quot;</Command>
<ClCompile>
<Optimization>Full</Optimization>
<AdditionalIncludeDirectories>..\..\JuceLibraryCode;..\..\JuceLibraryCode\modules;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>_CRT_SECURE_NO_WARNINGS;WIN32;_WINDOWS;NDEBUG;JUCER_VS2017_78A5024=1;JUCE_APP_VERSION=3.1.7;JUCE_APP_VERSION_HEX=0x30107;JucePlugin_Build_VST=0;JucePlugin_Build_VST3=0;JucePlugin_Build_AU=0;JucePlugin_Build_AUv3=0;JucePlugin_Build_RTAS=0;JucePlugin_Build_AAX=0;JucePlugin_Build_Standalone=0;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<PreprocessorDefinitions>_CRT_SECURE_NO_WARNINGS;WIN32;_WINDOWS;NDEBUG;JUCER_VS2017_78A5024=1;JUCE_APP_VERSION=3.1.9;JUCE_APP_VERSION_HEX=0x30109;JucePlugin_Build_VST=0;JucePlugin_Build_VST3=0;JucePlugin_Build_AU=0;JucePlugin_Build_AUv3=0;JucePlugin_Build_RTAS=0;JucePlugin_Build_AAX=0;JucePlugin_Build_Standalone=0;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<RuntimeLibrary>MultiThreaded</RuntimeLibrary>
<RuntimeTypeInfo>true</RuntimeTypeInfo>
<PrecompiledHeader/>
Expand Down
8 changes: 4 additions & 4 deletions MyoMapper/Builds/VisualStudio2017/resources.rc
Original file line number Diff line number Diff line change
Expand Up @@ -7,18 +7,18 @@
#include <windows.h>

VS_VERSION_INFO VERSIONINFO
FILEVERSION 3,1,7,0
FILEVERSION 3,1,9,0
BEGIN
BLOCK "StringFileInfo"
BEGIN
BLOCK "040904E4"
BEGIN
VALUE "CompanyName", "Balandino Di Donato\0"
VALUE "LegalCopyright", "Balandino Di Donato - 2017\0"
VALUE "LegalCopyright", "Balandino Di Donato - 2018\0"
VALUE "FileDescription", "MyoMapper\0"
VALUE "FileVersion", "3.1.7\0"
VALUE "FileVersion", "3.1.9\0"
VALUE "ProductName", "MyoMapper\0"
VALUE "ProductVersion", "3.1.7\0"
VALUE "ProductVersion", "3.1.9\0"
END
END

Expand Down
4 changes: 2 additions & 2 deletions MyoMapper/JuceLibraryCode/JuceHeader.h
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@
namespace ProjectInfo
{
const char* const projectName = "MyoMapper";
const char* const versionString = "3.1.7";
const int versionNumber = 0x30107;
const char* const versionString = "3.1.9";
const int versionNumber = 0x30109;
}
#endif
4 changes: 2 additions & 2 deletions MyoMapper/MyoMapper.jucer
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
<?xml version="1.0" encoding="UTF-8"?>

<JUCERPROJECT id="m7UYPj" name="MyoMapper" projectType="guiapp" version="3.1.7"
<JUCERPROJECT id="m7UYPj" name="MyoMapper" projectType="guiapp" version="3.1.9"
bundleIdentifier="com.balandinodidonato.MyoMapper" includeBinaryInAppConfig="1"
jucerVersion="5.2.0" companyName="Balandino Di Donato" companyWebsite="http://www.balandinodidonato.com/myomapper"
companyEmail="[email protected]" displaySplashScreen="0"
reportAppUsage="0" splashScreenColour="Dark" cppLanguageStandard="11"
companyCopyright="Balandino Di Donato - 2017">
companyCopyright="Balandino Di Donato - 2018">
<MAINGROUP id="G7OLDm" name="MyoMapper">
<GROUP id="{A855A8B0-1BF1-10A8-F066-98F2E790D7DC}" name="Source">
<GROUP id="{4206F9A6-3428-D059-A986-AD282226E07A}" name="UI">
Expand Down
Loading

0 comments on commit 4cfb55b

Please sign in to comment.