Skip to content

Commit

Permalink
Merge branch 'release'
Browse files Browse the repository at this point in the history
  • Loading branch information
balandinodidonato committed Nov 12, 2017
2 parents ea11d13 + 7e17d7b commit f112123
Show file tree
Hide file tree
Showing 962 changed files with 336,702 additions and 10,136 deletions.
1 change: 1 addition & 0 deletions .gitignore
View file
Original file line number Diff line number Diff line change
Expand Up @@ -67,6 +67,7 @@ xcuserdata/
*.moved-aside
*.xccheckout
*.xcscmblueprint
/ToDo.md
>>>>>>> release-2
>>>>>>> develop
Myo Mapper/Builds/MacOSX/Myo Mapper.xcodeproj/project.pbxproj
Expand Down
Binary file added Myo Mapper/Builds/MacOSX/Brandon_thin_it.otf
View file
Binary file not shown.
23 changes: 20 additions & 3 deletions Myo Mapper/Builds/MacOSX/Info-App.plist
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
<key>CFBundleIconFile</key>
<string>Icon.icns</string>
<key>CFBundleIdentifier</key>
<string>$(PRODUCT_BUNDLE_IDENTIFIER)</string>
<string>com.balandinodidonato.MyoMapper</string>
<key>CFBundleName</key>
<string>Myo Mapper</string>
<key>CFBundleDisplayName</key>
Expand All @@ -18,12 +18,29 @@
<key>CFBundleSignature</key>
<string>????</string>
<key>CFBundleShortVersionString</key>
<string>2.5.13</string>
<string>3.0</string>
<key>CFBundleVersion</key>
<string>2.5.13</string>
<string>3.0</string>
<key>NSHumanReadableCopyright</key>
<string>Balandino Di Donato</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>
2,061 changes: 0 additions & 2,061 deletions Myo Mapper/Builds/MacOSX/Myo Mapper.xcodeproj/project.pbxproj
View file

This file was deleted.

23 changes: 8 additions & 15 deletions Myo Mapper/Builds/VisualStudio2015/Myo Mapper.sln
View file
Original file line number Diff line number Diff line change
@@ -1,25 +1,18 @@
Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio 14
VisualStudioVersion = 14.0.25420.1
MinimumVisualStudioVersion = 10.0.40219.1
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Myo Mapper", "Myo Mapper.vcxproj", "{53CF9A0C-3977-0649-0FEA-4F74FAC5378C}"
EndProject
Project("{54435603-DBB4-11D2-8724-00A0C9A8B90C}") = "Myo Mapper 2.5.12 - Win32", "Setup\Myo Mapper - Win32\Myo Mapper - Win32.vdproj", "{0C5299F4-DAE2-4099-9ADE-02F21AFE374D}"
Microsoft Visual Studio Solution File, Format Version 11.00
# Visual Studio 2015

Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Myo Mapper - App", "Myo Mapper_App.vcxproj", "{2ECF32B2-7253-CAED-8531-5BB03F368FED}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Win32 = Debug|Win32
Release|Win32 = Release|Win32
EndGlobalSection
GlobalSection(ProjectConfigurationPlatforms) = postSolution
{53CF9A0C-3977-0649-0FEA-4F74FAC5378C}.Debug|Win32.ActiveCfg = Debug|Win32
{53CF9A0C-3977-0649-0FEA-4F74FAC5378C}.Debug|Win32.Build.0 = Debug|Win32
{53CF9A0C-3977-0649-0FEA-4F74FAC5378C}.Release|Win32.ActiveCfg = Release|Win32
{53CF9A0C-3977-0649-0FEA-4F74FAC5378C}.Release|Win32.Build.0 = Release|Win32
{0C5299F4-DAE2-4099-9ADE-02F21AFE374D}.Debug|Win32.ActiveCfg = Debug
{0C5299F4-DAE2-4099-9ADE-02F21AFE374D}.Debug|Win32.Build.0 = Debug
{0C5299F4-DAE2-4099-9ADE-02F21AFE374D}.Release|Win32.ActiveCfg = Release
{0C5299F4-DAE2-4099-9ADE-02F21AFE374D}.Release|Win32.Build.0 = Release
{2ECF32B2-7253-CAED-8531-5BB03F368FED}.Debug|Win32.ActiveCfg = Debug|Win32
{2ECF32B2-7253-CAED-8531-5BB03F368FED}.Debug|Win32.Build.0 = Debug|Win32
{2ECF32B2-7253-CAED-8531-5BB03F368FED}.Release|Win32.ActiveCfg = Release|Win32
{2ECF32B2-7253-CAED-8531-5BB03F368FED}.Release|Win32.Build.0 = Release|Win32
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
Expand Down
1,603 changes: 797 additions & 806 deletions Myo Mapper/Builds/VisualStudio2015/Myo Mapper.vcxproj
View file

Large diffs are not rendered by default.

1,701 changes: 849 additions & 852 deletions Myo Mapper/Builds/VisualStudio2015/Myo Mapper.vcxproj.filters
View file

Large diffs are not rendered by default.

1,838 changes: 1,838 additions & 0 deletions Myo Mapper/Builds/VisualStudio2015/Myo Mapper_App.vcxproj
View file

Large diffs are not rendered by default.

2,996 changes: 2,996 additions & 0 deletions Myo Mapper/Builds/VisualStudio2015/Myo Mapper_App.vcxproj.filters
View file

Large diffs are not rendered by default.

7 changes: 4 additions & 3 deletions Myo Mapper/Builds/VisualStudio2015/resources.rc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,17 +7,18 @@
#include <windows.h>

VS_VERSION_INFO VERSIONINFO
FILEVERSION 2,5,13,0
FILEVERSION 3,0,0,0
BEGIN
BLOCK "StringFileInfo"
BEGIN
BLOCK "040904E4"
BEGIN
VALUE "CompanyName", "Balandino Di Donato\0"
VALUE "LegalCopyright", "Balandino Di Donato\0"
VALUE "FileDescription", "Myo Mapper\0"
VALUE "FileVersion", "2.5.13\0"
VALUE "FileVersion", "3.0\0"
VALUE "ProductName", "Myo Mapper\0"
VALUE "ProductVersion", "2.5.13\0"
VALUE "ProductVersion", "3.0\0"
END
END

Expand Down
89 changes: 59 additions & 30 deletions Myo Mapper/JuceLibraryCode/AppConfig.h
100755 → 100644
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,7 @@
*/

#ifndef __JUCE_APPCONFIG_M7UYPJ__
#define __JUCE_APPCONFIG_M7UYPJ__
#pragma once

//==============================================================================
// [BEGIN_USER_CODE_SECTION]
Expand All @@ -21,6 +20,33 @@

// [END_USER_CODE_SECTION]

/*
==============================================================================
In accordance with the terms of the JUCE 5 End-Use License Agreement, the
JUCE Code in SECTION A cannot be removed, changed or otherwise rendered
ineffective unless you have a JUCE Indie or Pro license, or are using JUCE
under the GPL v3 license.
End User License Agreement: www.juce.com/juce-5-licence
==============================================================================
*/

// BEGIN SECTION A

#ifndef JUCE_DISPLAY_SPLASH_SCREEN
#define JUCE_DISPLAY_SPLASH_SCREEN 0
#endif

#ifndef JUCE_REPORT_APP_USAGE
#define JUCE_REPORT_APP_USAGE 0
#endif


// END SECTION A

#define JUCE_USE_DARK_SPLASH_SCREEN 1

//==============================================================================
#define JUCE_MODULE_AVAILABLE_juce_core 1
#define JUCE_MODULE_AVAILABLE_juce_data_structures 1
Expand All @@ -31,92 +57,95 @@
#define JUCE_MODULE_AVAILABLE_juce_opengl 1
#define JUCE_MODULE_AVAILABLE_juce_osc 1

//==============================================================================
#ifndef JUCE_STANDALONE_APPLICATION
#ifdef JucePlugin_Build_Standalone
#define JUCE_STANDALONE_APPLICATION JucePlugin_Build_Standalone
#else
#define JUCE_STANDALONE_APPLICATION 1
#endif
#endif

#define JUCE_GLOBAL_MODULE_SETTINGS_INCLUDED 1

//==============================================================================
// juce_core flags:

#ifndef JUCE_FORCE_DEBUG
//#define JUCE_FORCE_DEBUG
//#define JUCE_FORCE_DEBUG 1
#endif

#ifndef JUCE_LOG_ASSERTIONS
//#define JUCE_LOG_ASSERTIONS
//#define JUCE_LOG_ASSERTIONS 1
#endif

#ifndef JUCE_CHECK_MEMORY_LEAKS
//#define JUCE_CHECK_MEMORY_LEAKS
//#define JUCE_CHECK_MEMORY_LEAKS 1
#endif

#ifndef JUCE_DONT_AUTOLINK_TO_WIN32_LIBRARIES
//#define JUCE_DONT_AUTOLINK_TO_WIN32_LIBRARIES
//#define JUCE_DONT_AUTOLINK_TO_WIN32_LIBRARIES 1
#endif

#ifndef JUCE_INCLUDE_ZLIB_CODE
//#define JUCE_INCLUDE_ZLIB_CODE
//#define JUCE_INCLUDE_ZLIB_CODE 1
#endif

#ifndef JUCE_USE_CURL
//#define JUCE_USE_CURL
//#define JUCE_USE_CURL 1
#endif

#ifndef JUCE_CATCH_UNHANDLED_EXCEPTIONS
//#define JUCE_CATCH_UNHANDLED_EXCEPTIONS
//#define JUCE_CATCH_UNHANDLED_EXCEPTIONS 1
#endif

#ifndef JUCE_ALLOW_STATIC_NULL_VARIABLES
//#define JUCE_ALLOW_STATIC_NULL_VARIABLES
//#define JUCE_ALLOW_STATIC_NULL_VARIABLES 1
#endif

//==============================================================================
// juce_events flags:

#ifndef JUCE_EXECUTE_APP_SUSPEND_ON_IOS_BACKGROUND_TASK
//#define JUCE_EXECUTE_APP_SUSPEND_ON_IOS_BACKGROUND_TASK 1
#endif

//==============================================================================
// juce_graphics flags:

#ifndef JUCE_USE_COREIMAGE_LOADER
//#define JUCE_USE_COREIMAGE_LOADER
//#define JUCE_USE_COREIMAGE_LOADER 1
#endif

#ifndef JUCE_USE_DIRECTWRITE
//#define JUCE_USE_DIRECTWRITE
//#define JUCE_USE_DIRECTWRITE 1
#endif

//==============================================================================
// juce_gui_basics flags:

#ifndef JUCE_ENABLE_REPAINT_DEBUGGING
//#define JUCE_ENABLE_REPAINT_DEBUGGING
//#define JUCE_ENABLE_REPAINT_DEBUGGING 1
#endif

#ifndef JUCE_USE_XSHM
//#define JUCE_USE_XSHM
//#define JUCE_USE_XSHM 1
#endif

#ifndef JUCE_USE_XRENDER
//#define JUCE_USE_XRENDER
//#define JUCE_USE_XRENDER 1
#endif

#ifndef JUCE_USE_XCURSOR
//#define JUCE_USE_XCURSOR
//#define JUCE_USE_XCURSOR 1
#endif

//==============================================================================
// juce_gui_extra flags:

#ifndef JUCE_WEB_BROWSER
//#define JUCE_WEB_BROWSER
//#define JUCE_WEB_BROWSER 1
#endif

#ifndef JUCE_ENABLE_LIVE_CONSTANT_EDITOR
//#define JUCE_ENABLE_LIVE_CONSTANT_EDITOR
//#define JUCE_ENABLE_LIVE_CONSTANT_EDITOR 1
#endif
//==============================================================================
#ifndef JUCE_STANDALONE_APPLICATION
#if defined(JucePlugin_Name) && defined(JucePlugin_Build_Standalone)
#define JUCE_STANDALONE_APPLICATION JucePlugin_Build_Standalone
#else
#define JUCE_STANDALONE_APPLICATION 1
#endif
#endif


#endif // __JUCE_APPCONFIG_M7UYPJ__
Loading

0 comments on commit f112123

Please sign in to comment.