Skip to content

Commit c4401ee

Browse files
rsjaffersjaffe
committed
Merge branch 'develop'
2 parents 7494c8d + 1eaa496 commit c4401ee

31 files changed

+1747
-1069
lines changed

‎Builds/MacOSX/Info-App.plist‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,9 +18,9 @@
1818
<key>CFBundleSignature</key>
1919
<string>????</string>
2020
<key>CFBundleShortVersionString</key>
21-
<string>2.9.1.1</string>
21+
<string>2.9.2.0</string>
2222
<key>CFBundleVersion</key>
23-
<string>2.9.1.1</string>
23+
<string>2.9.2.0</string>
2424
<key>NSHumanReadableCopyright</key>
2525
<string></string>
2626
<key>NSHighResolutionCapable</key>

‎Builds/MacOSX/MIDI2LR.xcodeproj/project.pbxproj‎

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -281,8 +281,8 @@
281281
"U_STATIC_IMPLEMENTATION=1",
282282
"GSL_THROW_ON_CONTRACT_VIOLATION=1",
283283
"JUCER_XCODE_MAC_F6D2F4CF=1",
284-
"JUCE_APP_VERSION=2.9.1.1",
285-
"JUCE_APP_VERSION_HEX=0x2090101",
284+
"JUCE_APP_VERSION=2.9.2.0",
285+
"JUCE_APP_VERSION_HEX=0x2090200",
286286
"JucePlugin_Build_VST=0",
287287
"JucePlugin_Build_VST3=0",
288288
"JucePlugin_Build_AU=0",
@@ -295,7 +295,6 @@
295295
INFOPLIST_FILE = Info-App.plist;
296296
INFOPLIST_PREPROCESS = NO;
297297
INSTALL_PATH = "$(HOME)/Applications";
298-
LLVM_LTO = YES;
299298
MACOSX_DEPLOYMENT_TARGET = 10.9;
300299
MACOSX_DEPLOYMENT_TARGET_ppc = 10.4;
301300
PRODUCT_BUNDLE_IDENTIFIER = com.rsjaffe.MIDI2LR;
@@ -316,8 +315,8 @@
316315
"U_STATIC_IMPLEMENTATION=1",
317316
"GSL_UNENFORCED_ON_CONTRACT_VIOLATION=1",
318317
"JUCER_XCODE_MAC_F6D2F4CF=1",
319-
"JUCE_APP_VERSION=2.9.1.1",
320-
"JUCE_APP_VERSION_HEX=0x2090101",
318+
"JUCE_APP_VERSION=2.9.2.0",
319+
"JUCE_APP_VERSION_HEX=0x2090200",
321320
"JucePlugin_Build_VST=0",
322321
"JucePlugin_Build_VST3=0",
323322
"JucePlugin_Build_AU=0",

‎Builds/VisualStudio2017/MIDI2LR_App.vcxproj‎

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -75,8 +75,8 @@
7575
<Optimization>Disabled</Optimization>
7676
<DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
7777
<AdditionalIncludeDirectories>..\..\JuceLibraryCode;..\..\JuceLibraryCode\modules;../../;../../icu/source/common/;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
78-
<PreprocessorDefinitions>_CRT_SECURE_NO_WARNINGS;WIN32;_WINDOWS;DEBUG;_DEBUG;U_STATIC_IMPLEMENTATION=1;GSL_THROW_ON_CONTRACT_VIOLATION=1;JUCER_VS2017_78A5024=1;JUCE_APP_VERSION=2.9.1.1;JUCE_APP_VERSION_HEX=0x2090101;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>
79-
<RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
78+
<PreprocessorDefinitions>_CRT_SECURE_NO_WARNINGS;WIN32;_WINDOWS;DEBUG;_DEBUG;U_STATIC_IMPLEMENTATION=1;GSL_THROW_ON_CONTRACT_VIOLATION=1;JUCER_VS2017_78A5024=1;JUCE_APP_VERSION=2.9.2.0;JUCE_APP_VERSION_HEX=0x2090200;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>
79+
<RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
8080
<RuntimeTypeInfo>true</RuntimeTypeInfo>
8181
<PrecompiledHeader/>
8282
<AssemblerListingLocation>$(IntDir)\</AssemblerListingLocation>
@@ -116,7 +116,7 @@
116116
<ClCompile>
117117
<Optimization>Full</Optimization>
118118
<AdditionalIncludeDirectories>..\..\JuceLibraryCode;..\..\JuceLibraryCode\modules;../../;../../icu/source/common/;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
119-
<PreprocessorDefinitions>_CRT_SECURE_NO_WARNINGS;WIN32;_WINDOWS;NDEBUG;U_STATIC_IMPLEMENTATION=1;GSL_UNENFORCED_ON_CONTRACT_VIOLATION=1;JUCER_VS2017_78A5024=1;JUCE_APP_VERSION=2.9.1.1;JUCE_APP_VERSION_HEX=0x2090101;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>
119+
<PreprocessorDefinitions>_CRT_SECURE_NO_WARNINGS;WIN32;_WINDOWS;NDEBUG;U_STATIC_IMPLEMENTATION=1;GSL_UNENFORCED_ON_CONTRACT_VIOLATION=1;JUCER_VS2017_78A5024=1;JUCE_APP_VERSION=2.9.2.0;JUCE_APP_VERSION_HEX=0x2090200;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>
120120
<RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
121121
<RuntimeTypeInfo>true</RuntimeTypeInfo>
122122
<PrecompiledHeader/>
@@ -147,6 +147,9 @@
147147
<OutputFile>$(IntDir)\MIDI2LR.bsc</OutputFile>
148148
</Bscmake>
149149
<Lib/>
150+
<PostBuildEvent>
151+
<Command>$(SolutionDir)luacompile.bat</Command>
152+
</PostBuildEvent>
150153
</ItemDefinitionGroup>
151154
<ItemGroup>
152155
<ClCompile Include="..\..\icu\source\common\appendable.cpp"/>

‎Builds/VisualStudio2017/luacompile.bat‎

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
2+
REM To compile lua files, obtain/build version 5.1.4 of luac.exe and place in parent of Source directory.
3+
SETLOCAL ENABLEEXTENSIONS
4+
IF EXIST ..\..\luac.exe (
5+
IF NOT EXIST Source\LRPlugin\MIDI2LR.lrplugin\compiled\ mkdir Source\LRPlugin\MIDI2LR.lrplugin\compiled\
6+
PUSHD ..\..\Source\LRPlugin\MIDI2LR.lrplugin\
7+
FOR %%a IN (*.lua) DO ..\..\..\luac -o compiled/%%a %%a
8+
POPD
9+
) ELSE (
10+
ECHO luac.exe not found, lua files not compiled.
11+
ECHO
12+
)

‎Builds/VisualStudio2017/resources.rc‎

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

99
VS_VERSION_INFO VERSIONINFO
10-
FILEVERSION 2,9,1,1
10+
FILEVERSION 2,9,2,0
1111
BEGIN
1212
BLOCK "StringFileInfo"
1313
BEGIN
1414
BLOCK "040904E4"
1515
BEGIN
1616
VALUE "FileDescription", "MIDI2LR\0"
17-
VALUE "FileVersion", "2.9.1.1\0"
17+
VALUE "FileVersion", "2.9.2.0\0"
1818
VALUE "ProductName", "MIDI2LR\0"
19-
VALUE "ProductVersion", "2.9.1.1\0"
19+
VALUE "ProductVersion", "2.9.2.0\0"
2020
END
2121
END
2222

‎DoxyGen/Midi2lr.Doxyfile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ PROJECT_NAME = MIDI2LR
3838
# could be handy for archiving the generated documentation or if some version
3939
# control system is used.
4040

41-
PROJECT_NUMBER = 2.9.1.1
41+
PROJECT_NUMBER = 2.9.2.0
4242

4343
# Using the PROJECT_BRIEF tag one can provide an optional one line description
4444
# for a project that appears at the top of each page and should give viewer a

0 commit comments

Comments
 (0)