Skip to content

Commit c1f67d2

Browse files
committed
JUCE update to 6.0.8 (gcc-10 builds the project now)
added a "dumb" script to remove the "final" word for JUCE classes, this needs to run at least once if JUCE is updated updated ProJucer project and headers to build on Linux
1 parent 7c57832 commit c1f67d2

File tree

443 files changed

+20486
-27234
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

443 files changed

+20486
-27234
lines changed

Builds/CodeBlocksLinux/Ctrlr.cbp

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7517,6 +7517,18 @@
75177517
<Option compile="0"/>
75187518
<Option link="0"/>
75197519
</Unit>
7520+
<Unit filename="../../../../juce/juce_audio_processors/utilities/juce_PluginHostType.cpp">
7521+
<Option target="Shared Code | Debug"/>
7522+
<Option target="Shared Code | Release"/>
7523+
<Option compile="0"/>
7524+
<Option link="0"/>
7525+
</Unit>
7526+
<Unit filename="../../../../juce/juce_audio_processors/utilities/juce_PluginHostType.h">
7527+
<Option target="Shared Code | Debug"/>
7528+
<Option target="Shared Code | Release"/>
7529+
<Option compile="0"/>
7530+
<Option link="0"/>
7531+
</Unit>
75207532
<Unit filename="../../../../juce/juce_audio_processors/utilities/juce_RangedAudioParameter.cpp">
75217533
<Option target="Shared Code | Debug"/>
75227534
<Option target="Shared Code | Release"/>
@@ -8447,6 +8459,12 @@
84478459
<Option compile="0"/>
84488460
<Option link="0"/>
84498461
</Unit>
8462+
<Unit filename="../../../../juce/juce_core/native/juce_wasm_SystemStats.cpp">
8463+
<Option target="Shared Code | Debug"/>
8464+
<Option target="Shared Code | Release"/>
8465+
<Option compile="0"/>
8466+
<Option link="0"/>
8467+
</Unit>
84508468
<Unit filename="../../../../juce/juce_core/native/juce_win32_ComSmartPtr.h">
84518469
<Option target="Shared Code | Debug"/>
84528470
<Option target="Shared Code | Release"/>
@@ -11861,6 +11879,12 @@
1186111879
<Option compile="0"/>
1186211880
<Option link="0"/>
1186311881
</Unit>
11882+
<Unit filename="../../../../juce/juce_gui_basics/native/juce_win32_ScopedThreadDPIAwarenessSetter.h">
11883+
<Option target="Shared Code | Debug"/>
11884+
<Option target="Shared Code | Release"/>
11885+
<Option compile="0"/>
11886+
<Option link="0"/>
11887+
</Unit>
1186411888
<Unit filename="../../../../juce/juce_gui_basics/native/juce_win32_Windowing.cpp">
1186511889
<Option target="Shared Code | Debug"/>
1186611890
<Option target="Shared Code | Release"/>

Builds/LinuxMakefile/build.sh

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22
MAXJOBS=`nproc`
33
echo "CTRLR[linux]: Building for $HOSTTYPE, JOBS $MAXJOBS"
44
#make -j$JOBS CONFIG=Release ARCH=$HOSTTYPE BINDIR=$BUILDDIR LIBDIR=$BUILDDIR OBJDIR=$BUILDDIR
5+
#make CONFIG=Release -j $MAXJOBS -f pchbuild.mk "$@"
56
make CONFIG=Release -j$MAXJOBS "$@"
67
if [ $? -ne 0 ]; then
78
echo -e "CTRLR[linux]: build failed\n"

Builds/MacOSX/Ctrlr.xcodeproj/project.pbxproj

Lines changed: 2941 additions & 7621 deletions
Large diffs are not rendered by default.

Builds/VisualStudio2019/Ctrlr.sln

Lines changed: 29 additions & 53 deletions
Original file line numberDiff line numberDiff line change
@@ -1,89 +1,65 @@
1-
Microsoft Visual Studio Solution File, Format Version 12.00
2-
# Visual Studio Version 16
3-
VisualStudioVersion = 16.0.30621.155
4-
MinimumVisualStudioVersion = 10.0.40219.1
5-
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Ctrlr_StandalonePlugin", "Ctrlr_StandalonePlugin.vcxproj", "{96EE761C-BA88-ACCE-1077-F30C539905EC}"
1+
Microsoft Visual Studio Solution File, Format Version 11.00
2+
# Visual Studio 2019
3+
4+
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Ctrlr - Standalone Plugin", "Ctrlr_StandalonePlugin.vcxproj", "{96EE761C-BA88-ACCE-1077-F30C539905EC}"
65
ProjectSection(ProjectDependencies) = postProject
76
{26C7C7B7-2721-17FE-683D-CFE301C3A488} = {26C7C7B7-2721-17FE-683D-CFE301C3A488}
87
EndProjectSection
98
EndProject
10-
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Ctrlr_VST", "Ctrlr_VST.vcxproj", "{45D63B7A-48C9-9315-F736-43CDE2A172DC}"
9+
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Ctrlr - VST", "Ctrlr_VST.vcxproj", "{45D63B7A-48C9-9315-F736-43CDE2A172DC}"
1110
ProjectSection(ProjectDependencies) = postProject
1211
{26C7C7B7-2721-17FE-683D-CFE301C3A488} = {26C7C7B7-2721-17FE-683D-CFE301C3A488}
1312
EndProjectSection
1413
EndProject
15-
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Ctrlr_VST3", "Ctrlr_VST3.vcxproj", "{C0741910-803C-1B51-CBA2-5BE30D8ADBB3}"
14+
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Ctrlr - VST3", "Ctrlr_VST3.vcxproj", "{C0741910-803C-1B51-CBA2-5BE30D8ADBB3}"
1615
ProjectSection(ProjectDependencies) = postProject
1716
{26C7C7B7-2721-17FE-683D-CFE301C3A488} = {26C7C7B7-2721-17FE-683D-CFE301C3A488}
1817
EndProjectSection
1918
EndProject
20-
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Ctrlr_SharedCode", "Ctrlr_SharedCode.vcxproj", "{26C7C7B7-2721-17FE-683D-CFE301C3A488}"
19+
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Ctrlr - Shared Code", "Ctrlr_SharedCode.vcxproj", "{26C7C7B7-2721-17FE-683D-CFE301C3A488}"
2120
EndProject
2221
Global
2322
GlobalSection(SolutionConfigurationPlatforms) = preSolution
24-
Debug_Win32|Win32 = Debug_Win32|Win32
25-
Debug_Win32|x64 = Debug_Win32|x64
26-
Debug|Win32 = Debug|Win32
2723
Debug|x64 = Debug|x64
28-
Release_Win32|Win32 = Release_Win32|Win32
29-
Release_Win32|x64 = Release_Win32|x64
30-
Release|Win32 = Release|Win32
3124
Release|x64 = Release|x64
25+
Debug_Win32|Win32 = Debug_Win32|Win32
26+
Release_Win32|Win32 = Release_Win32|Win32
3227
EndGlobalSection
3328
GlobalSection(ProjectConfigurationPlatforms) = postSolution
34-
{96EE761C-BA88-ACCE-1077-F30C539905EC}.Debug_Win32|Win32.ActiveCfg = Debug_Win32|Win32
35-
{96EE761C-BA88-ACCE-1077-F30C539905EC}.Debug_Win32|Win32.Build.0 = Debug_Win32|Win32
36-
{96EE761C-BA88-ACCE-1077-F30C539905EC}.Debug_Win32|x64.ActiveCfg = Debug_Win32|Win32
37-
{96EE761C-BA88-ACCE-1077-F30C539905EC}.Debug|Win32.ActiveCfg = Debug|x64
38-
{96EE761C-BA88-ACCE-1077-F30C539905EC}.Debug|x64.ActiveCfg = Debug|x64
39-
{96EE761C-BA88-ACCE-1077-F30C539905EC}.Debug|x64.Build.0 = Debug|x64
40-
{96EE761C-BA88-ACCE-1077-F30C539905EC}.Release_Win32|Win32.ActiveCfg = Release_Win32|Win32
41-
{96EE761C-BA88-ACCE-1077-F30C539905EC}.Release_Win32|Win32.Build.0 = Release_Win32|Win32
42-
{96EE761C-BA88-ACCE-1077-F30C539905EC}.Release_Win32|x64.ActiveCfg = Release_Win32|Win32
43-
{96EE761C-BA88-ACCE-1077-F30C539905EC}.Release|Win32.ActiveCfg = Release|x64
44-
{96EE761C-BA88-ACCE-1077-F30C539905EC}.Release|x64.ActiveCfg = Release|x64
45-
{96EE761C-BA88-ACCE-1077-F30C539905EC}.Release|x64.Build.0 = Release|x64
46-
{45D63B7A-48C9-9315-F736-43CDE2A172DC}.Debug_Win32|Win32.ActiveCfg = Debug_Win32|Win32
47-
{45D63B7A-48C9-9315-F736-43CDE2A172DC}.Debug_Win32|Win32.Build.0 = Debug_Win32|Win32
48-
{45D63B7A-48C9-9315-F736-43CDE2A172DC}.Debug_Win32|x64.ActiveCfg = Debug_Win32|Win32
49-
{45D63B7A-48C9-9315-F736-43CDE2A172DC}.Debug|Win32.ActiveCfg = Debug|x64
5029
{45D63B7A-48C9-9315-F736-43CDE2A172DC}.Debug|x64.ActiveCfg = Debug|x64
5130
{45D63B7A-48C9-9315-F736-43CDE2A172DC}.Debug|x64.Build.0 = Debug|x64
52-
{45D63B7A-48C9-9315-F736-43CDE2A172DC}.Release_Win32|Win32.ActiveCfg = Release_Win32|Win32
53-
{45D63B7A-48C9-9315-F736-43CDE2A172DC}.Release_Win32|Win32.Build.0 = Release_Win32|Win32
54-
{45D63B7A-48C9-9315-F736-43CDE2A172DC}.Release_Win32|x64.ActiveCfg = Release_Win32|Win32
55-
{45D63B7A-48C9-9315-F736-43CDE2A172DC}.Release|Win32.ActiveCfg = Release|x64
5631
{45D63B7A-48C9-9315-F736-43CDE2A172DC}.Release|x64.ActiveCfg = Release|x64
5732
{45D63B7A-48C9-9315-F736-43CDE2A172DC}.Release|x64.Build.0 = Release|x64
58-
{C0741910-803C-1B51-CBA2-5BE30D8ADBB3}.Debug_Win32|Win32.ActiveCfg = Debug_Win32|Win32
59-
{C0741910-803C-1B51-CBA2-5BE30D8ADBB3}.Debug_Win32|Win32.Build.0 = Debug_Win32|Win32
60-
{C0741910-803C-1B51-CBA2-5BE30D8ADBB3}.Debug_Win32|x64.ActiveCfg = Debug_Win32|Win32
61-
{C0741910-803C-1B51-CBA2-5BE30D8ADBB3}.Debug|Win32.ActiveCfg = Debug|x64
33+
{45D63B7A-48C9-9315-F736-43CDE2A172DC}.Debug_Win32|Win32.ActiveCfg = Debug_Win32|Win32
34+
{45D63B7A-48C9-9315-F736-43CDE2A172DC}.Debug_Win32|Win32.Build.0 = Debug_Win32|Win32
35+
{45D63B7A-48C9-9315-F736-43CDE2A172DC}.Release_Win32|Win32.ActiveCfg = Release_Win32|Win32
36+
{45D63B7A-48C9-9315-F736-43CDE2A172DC}.Release_Win32|Win32.Build.0 = Release_Win32|Win32
6237
{C0741910-803C-1B51-CBA2-5BE30D8ADBB3}.Debug|x64.ActiveCfg = Debug|x64
6338
{C0741910-803C-1B51-CBA2-5BE30D8ADBB3}.Debug|x64.Build.0 = Debug|x64
64-
{C0741910-803C-1B51-CBA2-5BE30D8ADBB3}.Release_Win32|Win32.ActiveCfg = Release_Win32|Win32
65-
{C0741910-803C-1B51-CBA2-5BE30D8ADBB3}.Release_Win32|Win32.Build.0 = Release_Win32|Win32
66-
{C0741910-803C-1B51-CBA2-5BE30D8ADBB3}.Release_Win32|x64.ActiveCfg = Release_Win32|Win32
67-
{C0741910-803C-1B51-CBA2-5BE30D8ADBB3}.Release|Win32.ActiveCfg = Release|x64
6839
{C0741910-803C-1B51-CBA2-5BE30D8ADBB3}.Release|x64.ActiveCfg = Release|x64
6940
{C0741910-803C-1B51-CBA2-5BE30D8ADBB3}.Release|x64.Build.0 = Release|x64
70-
{26C7C7B7-2721-17FE-683D-CFE301C3A488}.Debug_Win32|Win32.ActiveCfg = Debug_Win32|Win32
71-
{26C7C7B7-2721-17FE-683D-CFE301C3A488}.Debug_Win32|Win32.Build.0 = Debug_Win32|Win32
72-
{26C7C7B7-2721-17FE-683D-CFE301C3A488}.Debug_Win32|x64.ActiveCfg = Debug_Win32|Win32
73-
{26C7C7B7-2721-17FE-683D-CFE301C3A488}.Debug|Win32.ActiveCfg = Debug|x64
41+
{C0741910-803C-1B51-CBA2-5BE30D8ADBB3}.Debug_Win32|Win32.ActiveCfg = Debug_Win32|Win32
42+
{C0741910-803C-1B51-CBA2-5BE30D8ADBB3}.Debug_Win32|Win32.Build.0 = Debug_Win32|Win32
43+
{C0741910-803C-1B51-CBA2-5BE30D8ADBB3}.Release_Win32|Win32.ActiveCfg = Release_Win32|Win32
44+
{C0741910-803C-1B51-CBA2-5BE30D8ADBB3}.Release_Win32|Win32.Build.0 = Release_Win32|Win32
45+
{96EE761C-BA88-ACCE-1077-F30C539905EC}.Debug|x64.ActiveCfg = Debug|x64
46+
{96EE761C-BA88-ACCE-1077-F30C539905EC}.Debug|x64.Build.0 = Debug|x64
47+
{96EE761C-BA88-ACCE-1077-F30C539905EC}.Release|x64.ActiveCfg = Release|x64
48+
{96EE761C-BA88-ACCE-1077-F30C539905EC}.Release|x64.Build.0 = Release|x64
49+
{96EE761C-BA88-ACCE-1077-F30C539905EC}.Debug_Win32|Win32.ActiveCfg = Debug_Win32|Win32
50+
{96EE761C-BA88-ACCE-1077-F30C539905EC}.Debug_Win32|Win32.Build.0 = Debug_Win32|Win32
51+
{96EE761C-BA88-ACCE-1077-F30C539905EC}.Release_Win32|Win32.ActiveCfg = Release_Win32|Win32
52+
{96EE761C-BA88-ACCE-1077-F30C539905EC}.Release_Win32|Win32.Build.0 = Release_Win32|Win32
7453
{26C7C7B7-2721-17FE-683D-CFE301C3A488}.Debug|x64.ActiveCfg = Debug|x64
7554
{26C7C7B7-2721-17FE-683D-CFE301C3A488}.Debug|x64.Build.0 = Debug|x64
76-
{26C7C7B7-2721-17FE-683D-CFE301C3A488}.Release_Win32|Win32.ActiveCfg = Release_Win32|Win32
77-
{26C7C7B7-2721-17FE-683D-CFE301C3A488}.Release_Win32|Win32.Build.0 = Release_Win32|Win32
78-
{26C7C7B7-2721-17FE-683D-CFE301C3A488}.Release_Win32|x64.ActiveCfg = Release_Win32|Win32
79-
{26C7C7B7-2721-17FE-683D-CFE301C3A488}.Release|Win32.ActiveCfg = Release|x64
8055
{26C7C7B7-2721-17FE-683D-CFE301C3A488}.Release|x64.ActiveCfg = Release|x64
8156
{26C7C7B7-2721-17FE-683D-CFE301C3A488}.Release|x64.Build.0 = Release|x64
57+
{26C7C7B7-2721-17FE-683D-CFE301C3A488}.Debug_Win32|Win32.ActiveCfg = Debug_Win32|Win32
58+
{26C7C7B7-2721-17FE-683D-CFE301C3A488}.Debug_Win32|Win32.Build.0 = Debug_Win32|Win32
59+
{26C7C7B7-2721-17FE-683D-CFE301C3A488}.Release_Win32|Win32.ActiveCfg = Release_Win32|Win32
60+
{26C7C7B7-2721-17FE-683D-CFE301C3A488}.Release_Win32|Win32.Build.0 = Release_Win32|Win32
8261
EndGlobalSection
8362
GlobalSection(SolutionProperties) = preSolution
8463
HideSolutionNode = FALSE
8564
EndGlobalSection
86-
GlobalSection(ExtensibilityGlobals) = postSolution
87-
SolutionGuid = {B3B9F240-A636-4231-BBC8-0ED210F25938}
88-
EndGlobalSection
8965
EndGlobal

0 commit comments

Comments
 (0)