diff --git a/extras/Projucer/Builds/LinuxMakefile/Makefile b/extras/Projucer/Builds/LinuxMakefile/Makefile
index 65663a4204..e0cd20409e 100644
--- a/extras/Projucer/Builds/LinuxMakefile/Makefile
+++ b/extras/Projucer/Builds/LinuxMakefile/Makefile
@@ -416,7 +416,7 @@ $(JUCE_OBJDIR)/include_juce_gui_extra_6dee1c1a.o: ../../JuceLibraryCode/include_
check-pkg-config:
@command -v pkg-config >/dev/null 2>&1 || { echo >&2 "pkg-config not installed. Please, install it."; exit 1; }
- @pkg-config --print-errors freetype2 libcurl x11 xext xinerama
+ @pkg-config --print-errors freetype2 libcurl x11 xext xinerama webkit2gtk-4.0 gtk+-x11-3.0
clean:
@echo Cleaning Projucer
diff --git a/extras/Projucer/Builds/MacOSX/Info-App.plist b/extras/Projucer/Builds/MacOSX/Info-App.plist
index 996aad50d4..e5c569a0cc 100644
--- a/extras/Projucer/Builds/MacOSX/Info-App.plist
+++ b/extras/Projucer/Builds/MacOSX/Info-App.plist
@@ -21,7 +21,7 @@
CFBundleExecutable
${EXECUTABLE_NAME}
CFBundleIconFile
-
+ Icon.icns
CFBundleIdentifier
$(PRODUCT_BUNDLE_IDENTIFIER)
CFBundleName
diff --git a/extras/Projucer/Builds/MacOSX/Projucer.xcodeproj/project.pbxproj b/extras/Projucer/Builds/MacOSX/Projucer.xcodeproj/project.pbxproj
index ecaded751f..0a37ad2b2f 100644
--- a/extras/Projucer/Builds/MacOSX/Projucer.xcodeproj/project.pbxproj
+++ b/extras/Projucer/Builds/MacOSX/Projucer.xcodeproj/project.pbxproj
@@ -23,6 +23,7 @@
11D42F7EC6E6539D79A7F4B1 = {isa = PBXBuildFile; fileRef = E5D6C36496F5BC84D7213BE8; };
B980464FA2761CCD64B1FAD6 = {isa = PBXBuildFile; fileRef = CF6C8BD0DA3D8CD4E99EBADA; };
2610F357881240ACBF612F48 = {isa = PBXBuildFile; fileRef = 6678E9B3EEACAD47F438B264; };
+ 1321E6C1C6170B6C898AD09D = {isa = PBXBuildFile; fileRef = 951128CA33CCDEF570436B1C; };
6DD9DA1677A6CF789CDAB478 = {isa = PBXBuildFile; fileRef = 0D4D508C638BC74943B9976D; };
954A036F5DDB375DB23FFB3E = {isa = PBXBuildFile; fileRef = 0400CB0E056A1D840304D2DE; };
95B44E6C74B1DED31DBE37EB = {isa = PBXBuildFile; fileRef = 8C52A3DDA62A746AA7A68535; };
@@ -115,6 +116,7 @@
1C80C7672975C1FF9AAC4A4F = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "jucer_ProjectTab.h"; path = "../../Source/Project/UI/Sidebar/jucer_ProjectTab.h"; sourceTree = "SOURCE_ROOT"; };
1DCA18E935A35D29D2D9B6A0 = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = "jucer_ComponentDocument.cpp"; path = "../../Source/ComponentEditor/Documents/jucer_ComponentDocument.cpp"; sourceTree = "SOURCE_ROOT"; };
1DE5BBC777FB64798D823002 = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.objcpp; name = "include_juce_data_structures.mm"; path = "../../JuceLibraryCode/include_juce_data_structures.mm"; sourceTree = "SOURCE_ROOT"; };
+ 20075A86A4D0E8A5B973D9DB = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "jucer_ProjectExport_Xcode.h"; path = "../../Source/ProjectSaving/jucer_ProjectExport_Xcode.h"; sourceTree = "SOURCE_ROOT"; };
203FA6AD7EDDF1F9C338CC2A = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = "jucer_AudioComponentTemplate.cpp"; path = "../../Source/BinaryData/Templates/jucer_AudioComponentTemplate.cpp"; sourceTree = "SOURCE_ROOT"; };
2072D6BAE744B53B6FBBDDD8 = {isa = PBXFileReference; lastKnownFileType = file.svg; name = "wizard_AudioPlugin.svg"; path = "../../Source/BinaryData/Icons/wizard_AudioPlugin.svg"; sourceTree = "SOURCE_ROOT"; };
210CD22F25F2C22F9CEEB025 = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = AVFoundation.framework; path = System/Library/Frameworks/AVFoundation.framework; sourceTree = SDKROOT; };
@@ -129,7 +131,6 @@
28D0199327887FFABF9C3F20 = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "jucer_UserSettingsPopup.h"; path = "../../Source/Utility/UI/jucer_UserSettingsPopup.h"; sourceTree = "SOURCE_ROOT"; };
2BD9B4556479A8A41740BCAE = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "jucer_ComponentTemplate.h"; path = "../../Source/BinaryData/Templates/jucer_ComponentTemplate.h"; sourceTree = "SOURCE_ROOT"; };
2CD34A70B4032C0426F7AA10 = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "jucer_MainWindow.h"; path = "../../Source/Application/jucer_MainWindow.h"; sourceTree = "SOURCE_ROOT"; };
- 2D3715751E901915E416301D = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "jucer_ProjectExport_Xcode.h"; path = "../../Source/ProjectSaving/jucer_ProjectExport_Xcode.h"; sourceTree = "SOURCE_ROOT"; };
2DF5A61F3C497537634773DF = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "jucer_ActivityListComponent.h"; path = "../../Source/LiveBuildEngine/UI/jucer_ActivityListComponent.h"; sourceTree = "SOURCE_ROOT"; };
2EEB1C074162F363C6599282 = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "jucer_CommandLine.h"; path = "../../Source/Application/jucer_CommandLine.h"; sourceTree = "SOURCE_ROOT"; };
2F373F97E30AC1A0BFC1FC61 = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "jucer_FilePropertyComponent.h"; path = "../../Source/ComponentEditor/Properties/jucer_FilePropertyComponent.h"; sourceTree = "SOURCE_ROOT"; };
@@ -252,6 +253,7 @@
9069981E414A631B036CC9AC = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = "jucer_MainWindow.cpp"; path = "../../Source/Application/jucer_MainWindow.cpp"; sourceTree = "SOURCE_ROOT"; };
92926A4D3CC4BB2A9D35EB0B = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "jucer_UTF8WindowComponent.h"; path = "../../Source/Application/Windows/jucer_UTF8WindowComponent.h"; sourceTree = "SOURCE_ROOT"; };
92A66A8BD87F98EB6B4FB6D0 = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "jucer_ProjectContentComponent.h"; path = "../../Source/Project/UI/jucer_ProjectContentComponent.h"; sourceTree = "SOURCE_ROOT"; };
+ 951128CA33CCDEF570436B1C = {isa = PBXFileReference; lastKnownFileType = file.icns; name = Icon.icns; path = Icon.icns; sourceTree = "SOURCE_ROOT"; };
95EAB6EC9B724538B93910D4 = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "jucer_TabComponents.h"; path = "../../Source/Project/UI/Sidebar/jucer_TabComponents.h"; sourceTree = "SOURCE_ROOT"; };
97A847B59EE04483E8850E4B = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = "jucer_MainTemplate_SimpleWindow.cpp"; path = "../../Source/BinaryData/Templates/jucer_MainTemplate_SimpleWindow.cpp"; sourceTree = "SOURCE_ROOT"; };
983CFBA01CA8811F30FA7F4C = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "jucer_MiscUtilities.h"; path = "../../Source/Utility/Helpers/jucer_MiscUtilities.h"; sourceTree = "SOURCE_ROOT"; };
@@ -619,7 +621,7 @@
FA790C59A304579F660F112F,
59520B8137E6A2E483074399,
FF68231DE2B395461009116C,
- 2D3715751E901915E416301D,
+ 20075A86A4D0E8A5B973D9DB,
C3BB9F92B02B06D04A73794C,
8DBB36126CD144A8364F1F19,
4FF81FC167C924C47BD8C1C9,
@@ -716,7 +718,8 @@
364D1A9B113320407A7E57B9, ); name = "Juce Library Code"; sourceTree = ""; };
8180B5894A78501084B8F133 = {isa = PBXGroup; children = (
E266DE67FF319D56F63193A6,
- 6678E9B3EEACAD47F438B264, ); name = Resources; sourceTree = ""; };
+ 6678E9B3EEACAD47F438B264,
+ 951128CA33CCDEF570436B1C, ); name = Resources; sourceTree = ""; };
0FFEF043CA89142B18C79ABE = {isa = PBXGroup; children = (
80D62B907248523E6943298B,
5A75806B34E4EA6598A6024A,
@@ -891,7 +894,8 @@
0CC6C439D038EDA0D7F10DF0,
0BC15DC2E5FE5ECFFB398D49, ); defaultConfigurationIsVisible = 0; defaultConfigurationName = Debug; };
C262D0F297DDE25326F5AC81 = {isa = PBXResourcesBuildPhase; buildActionMask = 2147483647; files = (
- 2610F357881240ACBF612F48, ); runOnlyForDeploymentPostprocessing = 0; };
+ 2610F357881240ACBF612F48,
+ 1321E6C1C6170B6C898AD09D, ); runOnlyForDeploymentPostprocessing = 0; };
5CB869A8DA78BE6FA2757034 = {isa = PBXSourcesBuildPhase; buildActionMask = 2147483647; files = (
6DD9DA1677A6CF789CDAB478,
954A036F5DDB375DB23FFB3E,
diff --git a/extras/Projucer/Builds/VisualStudio2013/Projucer_App.vcxproj b/extras/Projucer/Builds/VisualStudio2013/Projucer_App.vcxproj
index 1958fe2485..f4325f2cdf 100644
--- a/extras/Projucer/Builds/VisualStudio2013/Projucer_App.vcxproj
+++ b/extras/Projucer/Builds/VisualStudio2013/Projucer_App.vcxproj
@@ -1982,6 +1982,7 @@
+
diff --git a/extras/Projucer/Builds/VisualStudio2013/Projucer_App.vcxproj.filters b/extras/Projucer/Builds/VisualStudio2013/Projucer_App.vcxproj.filters
index d409202e57..4df93f6572 100644
--- a/extras/Projucer/Builds/VisualStudio2013/Projucer_App.vcxproj.filters
+++ b/extras/Projucer/Builds/VisualStudio2013/Projucer_App.vcxproj.filters
@@ -3509,6 +3509,9 @@
Juce Modules\juce_graphics\image_formats\pnglib
+
+ Juce Library Code
+
diff --git a/extras/Projucer/Builds/VisualStudio2013/resources.rc b/extras/Projucer/Builds/VisualStudio2013/resources.rc
index c88cbde3cf..ebe5fb46cb 100644
--- a/extras/Projucer/Builds/VisualStudio2013/resources.rc
+++ b/extras/Projucer/Builds/VisualStudio2013/resources.rc
@@ -14,6 +14,7 @@ BEGIN
BLOCK "040904E4"
BEGIN
VALUE "CompanyName", "ROLI Ltd.\0"
+ VALUE "LegalCopyright", "ROLI Ltd.\0"
VALUE "FileDescription", "Projucer\0"
VALUE "FileVersion", "5.1.2\0"
VALUE "ProductName", "Projucer\0"
@@ -28,3 +29,6 @@ BEGIN
END
#endif
+
+IDI_ICON1 ICON DISCARDABLE "icon.ico"
+IDI_ICON2 ICON DISCARDABLE "icon.ico"
\ No newline at end of file
diff --git a/extras/Projucer/Builds/VisualStudio2015/Projucer_App.vcxproj b/extras/Projucer/Builds/VisualStudio2015/Projucer_App.vcxproj
index 4b85221d0e..046706d6dc 100644
--- a/extras/Projucer/Builds/VisualStudio2015/Projucer_App.vcxproj
+++ b/extras/Projucer/Builds/VisualStudio2015/Projucer_App.vcxproj
@@ -1982,6 +1982,7 @@
+
diff --git a/extras/Projucer/Builds/VisualStudio2015/Projucer_App.vcxproj.filters b/extras/Projucer/Builds/VisualStudio2015/Projucer_App.vcxproj.filters
index 31a2e9a3fa..dd7f7267ec 100644
--- a/extras/Projucer/Builds/VisualStudio2015/Projucer_App.vcxproj.filters
+++ b/extras/Projucer/Builds/VisualStudio2015/Projucer_App.vcxproj.filters
@@ -3509,6 +3509,9 @@
Juce Modules\juce_graphics\image_formats\pnglib
+
+ Juce Library Code
+
diff --git a/extras/Projucer/Builds/VisualStudio2015/resources.rc b/extras/Projucer/Builds/VisualStudio2015/resources.rc
index c88cbde3cf..ebe5fb46cb 100644
--- a/extras/Projucer/Builds/VisualStudio2015/resources.rc
+++ b/extras/Projucer/Builds/VisualStudio2015/resources.rc
@@ -14,6 +14,7 @@ BEGIN
BLOCK "040904E4"
BEGIN
VALUE "CompanyName", "ROLI Ltd.\0"
+ VALUE "LegalCopyright", "ROLI Ltd.\0"
VALUE "FileDescription", "Projucer\0"
VALUE "FileVersion", "5.1.2\0"
VALUE "ProductName", "Projucer\0"
@@ -28,3 +29,6 @@ BEGIN
END
#endif
+
+IDI_ICON1 ICON DISCARDABLE "icon.ico"
+IDI_ICON2 ICON DISCARDABLE "icon.ico"
\ No newline at end of file
diff --git a/extras/Projucer/Builds/VisualStudio2017/Projucer_App.vcxproj b/extras/Projucer/Builds/VisualStudio2017/Projucer_App.vcxproj
index 3376cf1de5..d43515ed8c 100644
--- a/extras/Projucer/Builds/VisualStudio2017/Projucer_App.vcxproj
+++ b/extras/Projucer/Builds/VisualStudio2017/Projucer_App.vcxproj
@@ -1982,6 +1982,7 @@
+
diff --git a/extras/Projucer/Builds/VisualStudio2017/Projucer_App.vcxproj.filters b/extras/Projucer/Builds/VisualStudio2017/Projucer_App.vcxproj.filters
index 5256aac656..74cb348344 100644
--- a/extras/Projucer/Builds/VisualStudio2017/Projucer_App.vcxproj.filters
+++ b/extras/Projucer/Builds/VisualStudio2017/Projucer_App.vcxproj.filters
@@ -3509,6 +3509,9 @@
Juce Modules\juce_graphics\image_formats\pnglib
+
+ Juce Library Code
+
diff --git a/extras/Projucer/Builds/VisualStudio2017/resources.rc b/extras/Projucer/Builds/VisualStudio2017/resources.rc
index c88cbde3cf..ebe5fb46cb 100644
--- a/extras/Projucer/Builds/VisualStudio2017/resources.rc
+++ b/extras/Projucer/Builds/VisualStudio2017/resources.rc
@@ -14,6 +14,7 @@ BEGIN
BLOCK "040904E4"
BEGIN
VALUE "CompanyName", "ROLI Ltd.\0"
+ VALUE "LegalCopyright", "ROLI Ltd.\0"
VALUE "FileDescription", "Projucer\0"
VALUE "FileVersion", "5.1.2\0"
VALUE "ProductName", "Projucer\0"
@@ -28,3 +29,6 @@ BEGIN
END
#endif
+
+IDI_ICON1 ICON DISCARDABLE "icon.ico"
+IDI_ICON2 ICON DISCARDABLE "icon.ico"
\ No newline at end of file
diff --git a/extras/Projucer/Projucer.jucer b/extras/Projucer/Projucer.jucer
index c89529855e..5073d63806 100644
--- a/extras/Projucer/Projucer.jucer
+++ b/extras/Projucer/Projucer.jucer
@@ -4,10 +4,10 @@
jucerVersion="5.1.2" version="5.1.2" bundleIdentifier="com.juce.theprojucer"
defines="" includeBinaryInAppConfig="1" splashScreenColour="Dark"
displaySplashScreen="0" reportAppUsage="0" companyName="ROLI Ltd."
- cppLanguageStandard="11">
+ cppLanguageStandard="11" companyCopyright="ROLI Ltd.">
@@ -30,7 +30,7 @@
+ bigIcon="rv1F4h" toolset="v120" vstFolder="" windowsTargetPlatformVersion="8.1">
-
+
-
+
@@ -87,7 +87,7 @@
+ bigIcon="rv1F4h" smallIcon="" vstFolder="">