Skip to content

Commit 226ee20

Browse files
rsjaffersjaffe
committed
Merge branch 'develop'
2 parents b26822a + 7d1ce78 commit 226ee20

File tree

14 files changed

+164
-52
lines changed

14 files changed

+164
-52
lines changed

‎MIDI2LR.jucer

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22

3-
<JUCERPROJECT id="jqaeel" name="MIDI2LR" projectType="guiapp" version="3.5.0.1"
3+
<JUCERPROJECT id="jqaeel" name="MIDI2LR" projectType="guiapp" version="3.5.0.2"
44
bundleIdentifier="com.rsjaffe.MIDI2LR" includeBinaryInAppConfig="1"
55
companyWebsite="http://rsjaffe.github.io/MIDI2LR/" companyEmail="[email protected]"
66
displaySplashScreen="0" reportAppUsage="0" splashScreenColour="Dark"

‎build/MacOS/Info-App.plist

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,9 +20,9 @@
2020
<key>CFBundleSignature</key>
2121
<string>????</string>
2222
<key>CFBundleShortVersionString</key>
23-
<string>3.5.0.1</string>
23+
<string>3.5.0.2</string>
2424
<key>CFBundleVersion</key>
25-
<string>3.5.0.1</string>
25+
<string>3.5.0.2</string>
2626
<key>NSHumanReadableCopyright</key>
2727
<string></string>
2828
<key>NSHighResolutionCapable</key>

‎build/MacOS/MIDI2LR.xcodeproj/project.pbxproj

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1020,8 +1020,8 @@
10201020
"DEBUG=1",
10211021
"GSL_THROW_ON_CONTRACT_VIOLATION=1",
10221022
"JUCER_XCODE_MAC_46BB2872=1",
1023-
"JUCE_APP_VERSION=3.5.0.1",
1024-
"JUCE_APP_VERSION_HEX=0x3050001",
1023+
"JUCE_APP_VERSION=3.5.0.2",
1024+
"JUCE_APP_VERSION_HEX=0x3050002",
10251025
"JucePlugin_Build_VST=0",
10261026
"JucePlugin_Build_VST3=0",
10271027
"JucePlugin_Build_AU=0",
@@ -1100,8 +1100,8 @@
11001100
"NDEBUG=1",
11011101
"GSL_UNENFORCED_ON_CONTRACT_VIOLATION=1",
11021102
"JUCER_XCODE_MAC_46BB2872=1",
1103-
"JUCE_APP_VERSION=3.5.0.1",
1104-
"JUCE_APP_VERSION_HEX=0x3050001",
1103+
"JUCE_APP_VERSION=3.5.0.2",
1104+
"JUCE_APP_VERSION_HEX=0x3050002",
11051105
"JucePlugin_Build_VST=0",
11061106
"JucePlugin_Build_VST3=0",
11071107
"JucePlugin_Build_AU=0",

‎build/Windows/MIDI2LR_App.vcxproj

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@
6464
<Optimization>Disabled</Optimization>
6565
<DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
6666
<AdditionalIncludeDirectories>..\..\external\JuceLibraryCode;..\..\external\JuceLibraryCode\modules;../../external/;../../external/asio/;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
67-
<PreprocessorDefinitions>_CRT_SECURE_NO_WARNINGS;WIN32;_WINDOWS;DEBUG;_DEBUG;GSL_THROW_ON_CONTRACT_VIOLATION=1;_WIN32_WINNT=0x0601;JUCER_VS2019_A3DCEFC2=1;JUCE_APP_VERSION=3.5.0.1;JUCE_APP_VERSION_HEX=0x3050001;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;JucePlugin_Build_Unity=0;JUCE_DISPLAY_SPLASH_SCREEN=0;JUCE_USE_DARK_SPLASH_SCREEN=1;JUCE_PROJUCER_VERSION=0x60001;JUCE_MODULE_AVAILABLE_juce_audio_basics=1;JUCE_MODULE_AVAILABLE_juce_audio_devices=1;JUCE_MODULE_AVAILABLE_juce_core=1;JUCE_MODULE_AVAILABLE_juce_data_structures=1;JUCE_MODULE_AVAILABLE_juce_events=1;JUCE_MODULE_AVAILABLE_juce_graphics=1;JUCE_MODULE_AVAILABLE_juce_gui_basics=1;JUCE_GLOBAL_MODULE_SETTINGS_INCLUDED=1;JUCE_USE_WINRT_MIDI=0;JUCE_ASIO=0;JUCE_WASAPI=0;JUCE_WASAPI_EXCLUSIVE=0;JUCE_DIRECTSOUND=0;JUCE_ALSA=0;JUCE_JACK=0;JUCE_BELA=0;JUCE_USE_ANDROID_OBOE=0;JUCE_USE_ANDROID_OPENSLES=0;JUCE_DISABLE_AUDIO_MIXING_WITH_OTHER_APPS=0;JUCE_FORCE_DEBUG=0;JUCE_LOG_ASSERTIONS=0;JUCE_CATCH_UNHANDLED_EXCEPTIONS=1;JUCE_ALLOW_STATIC_NULL_VARIABLES=0;JUCE_STRICT_REFCOUNTEDPOINTER=1;JUCE_STANDALONE_APPLICATION=1;%(PreprocessorDefinitions)</PreprocessorDefinitions>
67+
<PreprocessorDefinitions>_CRT_SECURE_NO_WARNINGS;WIN32;_WINDOWS;DEBUG;_DEBUG;GSL_THROW_ON_CONTRACT_VIOLATION=1;_WIN32_WINNT=0x0601;JUCER_VS2019_A3DCEFC2=1;JUCE_APP_VERSION=3.5.0.2;JUCE_APP_VERSION_HEX=0x3050002;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;JucePlugin_Build_Unity=0;JUCE_DISPLAY_SPLASH_SCREEN=0;JUCE_USE_DARK_SPLASH_SCREEN=1;JUCE_PROJUCER_VERSION=0x60001;JUCE_MODULE_AVAILABLE_juce_audio_basics=1;JUCE_MODULE_AVAILABLE_juce_audio_devices=1;JUCE_MODULE_AVAILABLE_juce_core=1;JUCE_MODULE_AVAILABLE_juce_data_structures=1;JUCE_MODULE_AVAILABLE_juce_events=1;JUCE_MODULE_AVAILABLE_juce_graphics=1;JUCE_MODULE_AVAILABLE_juce_gui_basics=1;JUCE_GLOBAL_MODULE_SETTINGS_INCLUDED=1;JUCE_USE_WINRT_MIDI=0;JUCE_ASIO=0;JUCE_WASAPI=0;JUCE_WASAPI_EXCLUSIVE=0;JUCE_DIRECTSOUND=0;JUCE_ALSA=0;JUCE_JACK=0;JUCE_BELA=0;JUCE_USE_ANDROID_OBOE=0;JUCE_USE_ANDROID_OPENSLES=0;JUCE_DISABLE_AUDIO_MIXING_WITH_OTHER_APPS=0;JUCE_FORCE_DEBUG=0;JUCE_LOG_ASSERTIONS=0;JUCE_CATCH_UNHANDLED_EXCEPTIONS=1;JUCE_ALLOW_STATIC_NULL_VARIABLES=0;JUCE_STRICT_REFCOUNTEDPOINTER=1;JUCE_STANDALONE_APPLICATION=1;%(PreprocessorDefinitions)</PreprocessorDefinitions>
6868
<RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
6969
<RuntimeTypeInfo>true</RuntimeTypeInfo>
7070
<PrecompiledHeader/>
@@ -105,7 +105,7 @@
105105
<ClCompile>
106106
<Optimization>Full</Optimization>
107107
<AdditionalIncludeDirectories>..\..\external\JuceLibraryCode;..\..\external\JuceLibraryCode\modules;../../external/;../../external/asio/;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
108-
<PreprocessorDefinitions>_CRT_SECURE_NO_WARNINGS;WIN32;_WINDOWS;NDEBUG;GSL_UNENFORCED_ON_CONTRACT_VIOLATION=1;_WIN32_WINNT=0x0601;JUCER_VS2019_A3DCEFC2=1;JUCE_APP_VERSION=3.5.0.1;JUCE_APP_VERSION_HEX=0x3050001;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;JucePlugin_Build_Unity=0;JUCE_DISPLAY_SPLASH_SCREEN=0;JUCE_USE_DARK_SPLASH_SCREEN=1;JUCE_PROJUCER_VERSION=0x60001;JUCE_MODULE_AVAILABLE_juce_audio_basics=1;JUCE_MODULE_AVAILABLE_juce_audio_devices=1;JUCE_MODULE_AVAILABLE_juce_core=1;JUCE_MODULE_AVAILABLE_juce_data_structures=1;JUCE_MODULE_AVAILABLE_juce_events=1;JUCE_MODULE_AVAILABLE_juce_graphics=1;JUCE_MODULE_AVAILABLE_juce_gui_basics=1;JUCE_GLOBAL_MODULE_SETTINGS_INCLUDED=1;JUCE_USE_WINRT_MIDI=0;JUCE_ASIO=0;JUCE_WASAPI=0;JUCE_WASAPI_EXCLUSIVE=0;JUCE_DIRECTSOUND=0;JUCE_ALSA=0;JUCE_JACK=0;JUCE_BELA=0;JUCE_USE_ANDROID_OBOE=0;JUCE_USE_ANDROID_OPENSLES=0;JUCE_DISABLE_AUDIO_MIXING_WITH_OTHER_APPS=0;JUCE_FORCE_DEBUG=0;JUCE_LOG_ASSERTIONS=0;JUCE_CATCH_UNHANDLED_EXCEPTIONS=1;JUCE_ALLOW_STATIC_NULL_VARIABLES=0;JUCE_STRICT_REFCOUNTEDPOINTER=1;JUCE_STANDALONE_APPLICATION=1;%(PreprocessorDefinitions)</PreprocessorDefinitions>
108+
<PreprocessorDefinitions>_CRT_SECURE_NO_WARNINGS;WIN32;_WINDOWS;NDEBUG;GSL_UNENFORCED_ON_CONTRACT_VIOLATION=1;_WIN32_WINNT=0x0601;JUCER_VS2019_A3DCEFC2=1;JUCE_APP_VERSION=3.5.0.2;JUCE_APP_VERSION_HEX=0x3050002;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;JucePlugin_Build_Unity=0;JUCE_DISPLAY_SPLASH_SCREEN=0;JUCE_USE_DARK_SPLASH_SCREEN=1;JUCE_PROJUCER_VERSION=0x60001;JUCE_MODULE_AVAILABLE_juce_audio_basics=1;JUCE_MODULE_AVAILABLE_juce_audio_devices=1;JUCE_MODULE_AVAILABLE_juce_core=1;JUCE_MODULE_AVAILABLE_juce_data_structures=1;JUCE_MODULE_AVAILABLE_juce_events=1;JUCE_MODULE_AVAILABLE_juce_graphics=1;JUCE_MODULE_AVAILABLE_juce_gui_basics=1;JUCE_GLOBAL_MODULE_SETTINGS_INCLUDED=1;JUCE_USE_WINRT_MIDI=0;JUCE_ASIO=0;JUCE_WASAPI=0;JUCE_WASAPI_EXCLUSIVE=0;JUCE_DIRECTSOUND=0;JUCE_ALSA=0;JUCE_JACK=0;JUCE_BELA=0;JUCE_USE_ANDROID_OBOE=0;JUCE_USE_ANDROID_OPENSLES=0;JUCE_DISABLE_AUDIO_MIXING_WITH_OTHER_APPS=0;JUCE_FORCE_DEBUG=0;JUCE_LOG_ASSERTIONS=0;JUCE_CATCH_UNHANDLED_EXCEPTIONS=1;JUCE_ALLOW_STATIC_NULL_VARIABLES=0;JUCE_STRICT_REFCOUNTEDPOINTER=1;JUCE_STANDALONE_APPLICATION=1;%(PreprocessorDefinitions)</PreprocessorDefinitions>
109109
<RuntimeLibrary>MultiThreaded</RuntimeLibrary>
110110
<RuntimeTypeInfo>true</RuntimeTypeInfo>
111111
<PrecompiledHeader/>

‎build/Windows/resources.rc

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,16 +9,16 @@
99
#include <windows.h>
1010

1111
VS_VERSION_INFO VERSIONINFO
12-
FILEVERSION 3,5,0,1
12+
FILEVERSION 3,5,0,2
1313
BEGIN
1414
BLOCK "StringFileInfo"
1515
BEGIN
1616
BLOCK "040904E4"
1717
BEGIN
1818
VALUE "FileDescription", "MIDI2LR\0"
19-
VALUE "FileVersion", "3.5.0.1\0"
19+
VALUE "FileVersion", "3.5.0.2\0"
2020
VALUE "ProductName", "MIDI2LR\0"
21-
VALUE "ProductVersion", "3.5.0.1\0"
21+
VALUE "ProductVersion", "3.5.0.2\0"
2222
END
2323
END
2424

0 commit comments

Comments
 (0)