Skip to content

Commit ed15a8a

Browse files
benkuperbenkuper
committed
Merge branch 'master' into juce8
2 parents 772e9f0 + dbf5df1 commit ed15a8a

File tree

36 files changed

+2406
-2330
lines changed

36 files changed

+2406
-2330
lines changed

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

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3722,6 +3722,7 @@
37223722
CLANG_WARN_SUSPICIOUS_MOVE = YES;
37233723
CLANG_WARN_UNREACHABLE_CODE = YES;
37243724
CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
3725+
CODE_SIGN_IDENTITY = "";
37253726
DEBUG_INFORMATION_FORMAT = dwarf;
37263727
ENABLE_STRICT_OBJC_MSGSEND = YES;
37273728
ENABLE_TESTABILITY = NO;
@@ -3770,6 +3771,7 @@
37703771
CLANG_WARN_SUSPICIOUS_MOVE = YES;
37713772
CLANG_WARN_UNREACHABLE_CODE = YES;
37723773
CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
3774+
CODE_SIGN_IDENTITY = "";
37733775
DEBUG_INFORMATION_FORMAT = dwarf;
37743776
ENABLE_STRICT_OBJC_MSGSEND = YES;
37753777
ENABLE_TESTABILITY = NO;
@@ -3819,6 +3821,7 @@
38193821
CLANG_WARN_SUSPICIOUS_MOVE = YES;
38203822
CLANG_WARN_UNREACHABLE_CODE = YES;
38213823
CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
3824+
CODE_SIGN_IDENTITY = "";
38223825
DEBUG_INFORMATION_FORMAT = dwarf;
38233826
ENABLE_STRICT_OBJC_MSGSEND = YES;
38243827
ENABLE_TESTABILITY = NO;
@@ -3851,6 +3854,7 @@
38513854
CLANG_CXX_LANGUAGE_STANDARD = "c++17";
38523855
CLANG_CXX_LIBRARY = "libc++";
38533856
CLANG_LINK_OBJC_RUNTIME = NO;
3857+
CODE_SIGN_IDENTITY = "";
38543858
COMBINE_HIDPI_IMAGES = YES;
38553859
CONFIGURATION_BUILD_DIR = "$(PROJECT_DIR)/build/$(CONFIGURATION)";
38563860
COPY_PHASE_STRIP = NO;
@@ -3931,6 +3935,7 @@
39313935
CLANG_CXX_LANGUAGE_STANDARD = "c++17";
39323936
CLANG_CXX_LIBRARY = "libc++";
39333937
CLANG_LINK_OBJC_RUNTIME = NO;
3938+
CODE_SIGN_IDENTITY = "";
39343939
COMBINE_HIDPI_IMAGES = YES;
39353940
CONFIGURATION_BUILD_DIR = "$(PROJECT_DIR)/build/$(CONFIGURATION)";
39363941
DEAD_CODE_STRIPPING = YES;
@@ -4028,6 +4033,7 @@
40284033
CLANG_WARN_SUSPICIOUS_MOVE = YES;
40294034
CLANG_WARN_UNREACHABLE_CODE = YES;
40304035
CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
4036+
CODE_SIGN_IDENTITY = "";
40314037
DEBUG_INFORMATION_FORMAT = dwarf;
40324038
ENABLE_STRICT_OBJC_MSGSEND = YES;
40334039
ENABLE_TESTABILITY = NO;
@@ -4061,6 +4067,7 @@
40614067
CLANG_CXX_LANGUAGE_STANDARD = "c++17";
40624068
CLANG_CXX_LIBRARY = "libc++";
40634069
CLANG_LINK_OBJC_RUNTIME = NO;
4070+
CODE_SIGN_IDENTITY = "";
40644071
COMBINE_HIDPI_IMAGES = YES;
40654072
CONFIGURATION_BUILD_DIR = "$(PROJECT_DIR)/build/$(CONFIGURATION)";
40664073
COPY_PHASE_STRIP = NO;
@@ -4141,6 +4148,7 @@
41414148
CLANG_CXX_LANGUAGE_STANDARD = "c++17";
41424149
CLANG_CXX_LIBRARY = "libc++";
41434150
CLANG_LINK_OBJC_RUNTIME = NO;
4151+
CODE_SIGN_IDENTITY = "";
41444152
COMBINE_HIDPI_IMAGES = YES;
41454153
CONFIGURATION_BUILD_DIR = "$(PROJECT_DIR)/build/$(CONFIGURATION)";
41464154
DEAD_CODE_STRIPPING = YES;

‎Builds/MacOSX_CI/Chataigne.xcodeproj/project.pbxproj‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3722,6 +3722,7 @@
37223722
CLANG_WARN_SUSPICIOUS_MOVE = YES;
37233723
CLANG_WARN_UNREACHABLE_CODE = YES;
37243724
CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
3725+
CODE_SIGN_IDENTITY = "";
37253726
DEBUG_INFORMATION_FORMAT = dwarf;
37263727
ENABLE_STRICT_OBJC_MSGSEND = YES;
37273728
ENABLE_TESTABILITY = NO;
@@ -3770,6 +3771,7 @@
37703771
CLANG_WARN_SUSPICIOUS_MOVE = YES;
37713772
CLANG_WARN_UNREACHABLE_CODE = YES;
37723773
CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
3774+
CODE_SIGN_IDENTITY = "";
37733775
DEBUG_INFORMATION_FORMAT = dwarf;
37743776
ENABLE_STRICT_OBJC_MSGSEND = YES;
37753777
ENABLE_TESTABILITY = NO;
@@ -3802,6 +3804,7 @@
38023804
CLANG_CXX_LANGUAGE_STANDARD = "c++17";
38033805
CLANG_CXX_LIBRARY = "libc++";
38043806
CLANG_LINK_OBJC_RUNTIME = NO;
3807+
CODE_SIGN_IDENTITY = "";
38053808
COMBINE_HIDPI_IMAGES = YES;
38063809
CONFIGURATION_BUILD_DIR = "$(SRCROOT)/../../Release";
38073810
DEAD_CODE_STRIPPING = YES;
@@ -3883,6 +3886,7 @@
38833886
CLANG_CXX_LANGUAGE_STANDARD = "c++17";
38843887
CLANG_CXX_LIBRARY = "libc++";
38853888
CLANG_LINK_OBJC_RUNTIME = NO;
3889+
CODE_SIGN_IDENTITY = "";
38863890
COMBINE_HIDPI_IMAGES = YES;
38873891
CONFIGURATION_BUILD_DIR = "$(SRCROOT)/../../Release";
38883892
DEAD_CODE_STRIPPING = YES;

‎Builds/VisualStudio2022/Chataigne_App.vcxproj‎

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -48,15 +48,11 @@
4848
<TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Chataigne</TargetName>
4949
<GenerateManifest Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</GenerateManifest>
5050
<LibraryPath Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(LibraryPath);../../External/kinect/lib;../../External/joycon/lib/win;../../External/servus/lib/win/x64/debug;../../External/dnssd/lib;../../External/sdl/lib/win;../../External/hidapi/lib/win/x64;../../External/mosquitto/lib/win;../../External/simpleble/lib/win/debug;..\..\Modules\juce_sharedtexture\libs\VisualStudio2022\$(Platform)\MDd;..\..\Modules\juce_simpleweb\libs\VisualStudio2022\$(Platform)\MDd</LibraryPath>
51-
<PreBuildEventUseInBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</PreBuildEventUseInBuild>
52-
<PostBuildEventUseInBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</PostBuildEventUseInBuild>
5351
<OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">.\..\..\Binaries\App\</OutDir>
5452
<IntDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(Platform)\$(Configuration)\App\</IntDir>
5553
<TargetName Condition="'$(Configuration)|$(Platform)'=='Release|x64'">Chataigne</TargetName>
5654
<GenerateManifest Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</GenerateManifest>
5755
<LibraryPath Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(LibraryPath);../../External/kinect/lib;../../External/joycon/lib/win;../../External/servus/lib/win/x64/release;../../External/dnssd/lib;../../External/sdl/lib/win;../../External/hidapi/lib/win/x64;../../External/mosquitto/lib/win;../../External/simpleble/lib/win/release;..\..\Modules\juce_sharedtexture\libs\VisualStudio2022\$(Platform)\MD;..\..\Modules\juce_simpleweb\libs\VisualStudio2022\$(Platform)\MD</LibraryPath>
58-
<PreBuildEventUseInBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</PreBuildEventUseInBuild>
59-
<PostBuildEventUseInBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</PostBuildEventUseInBuild>
6056
</PropertyGroup>
6157
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
6258
<Midl>
@@ -5083,8 +5079,8 @@
50835079
</ItemGroup>
50845080
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets"/>
50855081
<ImportGroup Label="ExtensionTargets">
5086-
<Import Project="packages\Microsoft.Web.WebView2.1.0.1901.177\build\native\Microsoft.Web.WebView2.targets"
5087-
Condition="Exists('packages\Microsoft.Web.WebView2.1.0.1901.177\build\native\Microsoft.Web.WebView2.targets')"/>
5082+
<Import Project="packages\Microsoft.Web.WebView2.1.0.902.49\build\native\Microsoft.Web.WebView2.targets"
5083+
Condition="Exists('packages\Microsoft.Web.WebView2.1.0.902.49\build\native\Microsoft.Web.WebView2.targets')"/>
50885084
</ImportGroup>
50895085
<PropertyGroup>
50905086
<WebView2LoaderPreference>Static</WebView2LoaderPreference>

‎Builds/VisualStudio2022_CI/Chataigne_App.vcxproj‎

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -48,15 +48,11 @@
4848
<TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Chataigne</TargetName>
4949
<GenerateManifest Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</GenerateManifest>
5050
<LibraryPath Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(LibraryPath);../../External/kinect/lib;../../External/joycon/lib/win;../../External/servus/lib/win/x64/debug;../../External/dnssd/lib;../../External/sdl/lib/win;../../External/hidapi/lib/win/x64;../../External/mosquitto/lib/win;..\..\Modules\juce_sharedtexture\libs\VisualStudio2022\$(Platform)\MDd;..\..\Modules\juce_simpleweb\libs\VisualStudio2022\$(Platform)\MDd</LibraryPath>
51-
<PreBuildEventUseInBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</PreBuildEventUseInBuild>
52-
<PostBuildEventUseInBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</PostBuildEventUseInBuild>
5351
<OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">.\..\..\Binaries\CI\App\</OutDir>
5452
<IntDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(Platform)\$(Configuration)\App\</IntDir>
5553
<TargetName Condition="'$(Configuration)|$(Platform)'=='Release|x64'">Chataigne</TargetName>
5654
<GenerateManifest Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</GenerateManifest>
5755
<LibraryPath Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(LibraryPath);../../External/kinect/lib;../../External/joycon/lib/win;../../External/servus/lib/win/x64/release;../../External/dnssd/lib;../../External/sdl/lib/win;../../External/hidapi/lib/win/x64;../../External/mosquitto/lib/win;..\..\Modules\juce_sharedtexture\libs\VisualStudio2022\$(Platform)\MD;..\..\Modules\juce_simpleweb\libs\VisualStudio2022\$(Platform)\MD</LibraryPath>
58-
<PreBuildEventUseInBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</PreBuildEventUseInBuild>
59-
<PostBuildEventUseInBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</PostBuildEventUseInBuild>
6056
</PropertyGroup>
6157
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
6258
<Midl>
@@ -5083,8 +5079,8 @@
50835079
</ItemGroup>
50845080
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets"/>
50855081
<ImportGroup Label="ExtensionTargets">
5086-
<Import Project="packages\Microsoft.Web.WebView2.1.0.1901.177\build\native\Microsoft.Web.WebView2.targets"
5087-
Condition="Exists('packages\Microsoft.Web.WebView2.1.0.1901.177\build\native\Microsoft.Web.WebView2.targets')"/>
5082+
<Import Project="packages\Microsoft.Web.WebView2.1.0.902.49\build\native\Microsoft.Web.WebView2.targets"
5083+
Condition="Exists('packages\Microsoft.Web.WebView2.1.0.902.49\build\native\Microsoft.Web.WebView2.targets')"/>
50885084
</ImportGroup>
50895085
<PropertyGroup>
50905086
<WebView2LoaderPreference>Static</WebView2LoaderPreference>

‎Builds/VisualStudio2022_CI/packages.config‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<packages>
3-
<package id="Microsoft.Web.WebView2" version="1.0.1901.177" />
3+
<package id="Microsoft.Web.WebView2" version="1.0.902.49" />
44
</packages>

‎Builds/VisualStudio2022_Win7CI/Chataigne_App.vcxproj‎

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -48,15 +48,11 @@
4848
<TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Chataigne</TargetName>
4949
<GenerateManifest Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</GenerateManifest>
5050
<LibraryPath Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(LibraryPath);../../External/joycon/lib/win;../../External/servus/lib/win/x64/debug;../../External/dnssd/lib;../../External/sdl/lib/win;../../External/hidapi/lib/win/x64;../../External/mosquitto/lib/win;..\..\Modules\juce_sharedtexture\libs\VisualStudio2022\$(Platform)\MDd;..\..\Modules\juce_simpleweb\libs\VisualStudio2022\$(Platform)\MDd</LibraryPath>
51-
<PreBuildEventUseInBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</PreBuildEventUseInBuild>
52-
<PostBuildEventUseInBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</PostBuildEventUseInBuild>
5351
<OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">.\..\..\Binaries\CI\App\</OutDir>
5452
<IntDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(Platform)\$(Configuration)\App\</IntDir>
5553
<TargetName Condition="'$(Configuration)|$(Platform)'=='Release|x64'">Chataigne</TargetName>
5654
<GenerateManifest Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</GenerateManifest>
5755
<LibraryPath Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(LibraryPath);../../External/joycon/lib/win;../../External/servus/lib/win/x64/release;../../External/dnssd/lib;../../External/sdl/lib/win;../../External/hidapi/lib/win/x64;../../External/mosquitto/lib/win;..\..\Modules\juce_sharedtexture\libs\VisualStudio2022\$(Platform)\MD;..\..\Modules\juce_simpleweb\libs\VisualStudio2022\$(Platform)\MD</LibraryPath>
58-
<PreBuildEventUseInBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</PreBuildEventUseInBuild>
59-
<PostBuildEventUseInBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</PostBuildEventUseInBuild>
6056
</PropertyGroup>
6157
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
6258
<Midl>
@@ -5082,8 +5078,8 @@
50825078
</ItemGroup>
50835079
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets"/>
50845080
<ImportGroup Label="ExtensionTargets">
5085-
<Import Project="packages\Microsoft.Web.WebView2.1.0.1901.177\build\native\Microsoft.Web.WebView2.targets"
5086-
Condition="Exists('packages\Microsoft.Web.WebView2.1.0.1901.177\build\native\Microsoft.Web.WebView2.targets')"/>
5081+
<Import Project="packages\Microsoft.Web.WebView2.1.0.902.49\build\native\Microsoft.Web.WebView2.targets"
5082+
Condition="Exists('packages\Microsoft.Web.WebView2.1.0.902.49\build\native\Microsoft.Web.WebView2.targets')"/>
50875083
</ImportGroup>
50885084
<PropertyGroup>
50895085
<WebView2LoaderPreference>Static</WebView2LoaderPreference>

‎Builds/VisualStudio2022_Win7CI/packages.config‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<packages>
3-
<package id="Microsoft.Web.WebView2" version="1.0.1901.177" />
3+
<package id="Microsoft.Web.WebView2" version="1.0.902.49" />
44
</packages>

‎JuceLibraryCode/AppConfig.h‎

Lines changed: 24 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,30 @@
2020

2121
// [END_USER_CODE_SECTION]
2222

23-
#define JUCE_PROJUCER_VERSION 0x80004
23+
/*
24+
==============================================================================
25+
26+
In accordance with the terms of the JUCE 7 End-Use License Agreement, the
27+
JUCE Code in SECTION A cannot be removed, changed or otherwise rendered
28+
ineffective unless you have a JUCE Indie or Pro license, or are using JUCE
29+
under the GPL v3 license.
30+
31+
End User License Agreement: www.juce.com/juce-7-licence
32+
33+
==============================================================================
34+
*/
35+
36+
// BEGIN SECTION A
37+
38+
#ifndef JUCE_DISPLAY_SPLASH_SCREEN
39+
#define JUCE_DISPLAY_SPLASH_SCREEN 0
40+
#endif
41+
42+
// END SECTION A
43+
44+
#define JUCE_USE_DARK_SPLASH_SCREEN 1
45+
46+
#define JUCE_PROJUCER_VERSION 0x7000c
2447

2548
//==============================================================================
2649
#define JUCE_MODULE_AVAILABLE_juce_audio_basics 1

‎README.md‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,6 @@ You can check the tutorials to better understand what and how you can use Chatai
4646
- Wiimote
4747
- Joycon
4848
- Sound card
49-
- StreamDeck
5049
- Loupedeck
5150
- GPIO (Raspberry only)
5251

0 commit comments

Comments
 (0)