mirror/JUCE
1
0
Fork 0
mirror of https://github.com/juce-framework/JUCE.git synced 2026-01-10 23:44:24 +00:00
Code Activity

Place all choc types inside an anonymous namespace

Browse source 
This is to allow users to include choc in a JUCE project and not have
symbol collisions with our internally included copy of choc.
This commit is contained in:
attila 2024-05-01 16:47:15 +02:00 • committed by Anthony Nicholls
parent 7c2a5fc758
commit dbd3b4f34b
46 changed files with 115 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

2
examples/DemoRunner/Builds/Android/app/CMakeLists.txt
View file

@ -1058,6 +1058,7 @@ add_library( ${BINARY_NAME}
"../../../../../modules/juce_core/javascript/choc/text/choc_JSON.h"
"../../../../../modules/juce_core/javascript/choc/text/choc_StringUtilities.h"
"../../../../../modules/juce_core/javascript/choc/text/choc_UTF8.h"
"../../../../../modules/juce_core/javascript/choc/JUCE_CHANGES.txt"
"../../../../../modules/juce_core/javascript/juce_Javascript.cpp"
"../../../../../modules/juce_core/javascript/juce_Javascript.h"
"../../../../../modules/juce_core/javascript/juce_JSON.cpp"
@ -3555,6 +3556,7 @@ set_source_files_properties(
"../../../../../modules/juce_core/javascript/choc/text/choc_JSON.h"
"../../../../../modules/juce_core/javascript/choc/text/choc_StringUtilities.h"
"../../../../../modules/juce_core/javascript/choc/text/choc_UTF8.h"
"../../../../../modules/juce_core/javascript/choc/JUCE_CHANGES.txt"
"../../../../../modules/juce_core/javascript/juce_Javascript.cpp"
"../../../../../modules/juce_core/javascript/juce_Javascript.h"
"../../../../../modules/juce_core/javascript/juce_JSON.cpp"

1
examples/DemoRunner/Builds/VisualStudio2017/DemoRunner_App.vcxproj
View file

@ -4563,6 +4563,7 @@
<None Include="..\..\..\..\modules\juce_audio_processors\format_types\VST3_SDK\LICENSE.txt"/>
<None Include="..\..\..\..\modules\juce_audio_processors\format_types\VST3_SDK\README.md"/>
<None Include="..\..\..\..\modules\juce_box2d\box2d\README.txt"/>
<None Include="..\..\..\..\modules\juce_core\javascript\choc\JUCE_CHANGES.txt"/>
<None Include="..\..\..\..\modules\juce_core\native\java\README.txt"/>
<None Include="..\..\..\..\modules\juce_graphics\image_formats\jpglib\changes to libjpeg for JUCE.txt"/>
<None Include="..\..\..\..\modules\juce_graphics\image_formats\pnglib\libpng_readme.txt"/>

3
examples/DemoRunner/Builds/VisualStudio2017/DemoRunner_App.vcxproj.filters
View file

@ -8297,6 +8297,9 @@
<None Include="..\..\..\..\modules\juce_box2d\box2d\README.txt">
<Filter>JUCE Modules\juce_box2d\box2d</Filter>
</None>
<None Include="..\..\..\..\modules\juce_core\javascript\choc\JUCE_CHANGES.txt">
<Filter>JUCE Modules\juce_core\javascript\choc</Filter>
</None>
<None Include="..\..\..\..\modules\juce_core\native\java\README.txt">
<Filter>JUCE Modules\juce_core\native\java</Filter>
</None>

1
examples/DemoRunner/Builds/VisualStudio2019/DemoRunner_App.vcxproj
View file

@ -4563,6 +4563,7 @@
<None Include="..\..\..\..\modules\juce_audio_processors\format_types\VST3_SDK\LICENSE.txt"/>
<None Include="..\..\..\..\modules\juce_audio_processors\format_types\VST3_SDK\README.md"/>
<None Include="..\..\..\..\modules\juce_box2d\box2d\README.txt"/>
<None Include="..\..\..\..\modules\juce_core\javascript\choc\JUCE_CHANGES.txt"/>
<None Include="..\..\..\..\modules\juce_core\native\java\README.txt"/>
<None Include="..\..\..\..\modules\juce_graphics\image_formats\jpglib\changes to libjpeg for JUCE.txt"/>
<None Include="..\..\..\..\modules\juce_graphics\image_formats\pnglib\libpng_readme.txt"/>

3
examples/DemoRunner/Builds/VisualStudio2019/DemoRunner_App.vcxproj.filters
View file

@ -8297,6 +8297,9 @@
<None Include="..\..\..\..\modules\juce_box2d\box2d\README.txt">
<Filter>JUCE Modules\juce_box2d\box2d</Filter>
</None>
<None Include="..\..\..\..\modules\juce_core\javascript\choc\JUCE_CHANGES.txt">
<Filter>JUCE Modules\juce_core\javascript\choc</Filter>
</None>
<None Include="..\..\..\..\modules\juce_core\native\java\README.txt">
<Filter>JUCE Modules\juce_core\native\java</Filter>
</None>

1
examples/DemoRunner/Builds/VisualStudio2022/DemoRunner_App.vcxproj
View file

@ -4563,6 +4563,7 @@
<None Include="..\..\..\..\modules\juce_audio_processors\format_types\VST3_SDK\LICENSE.txt"/>
<None Include="..\..\..\..\modules\juce_audio_processors\format_types\VST3_SDK\README.md"/>
<None Include="..\..\..\..\modules\juce_box2d\box2d\README.txt"/>
<None Include="..\..\..\..\modules\juce_core\javascript\choc\JUCE_CHANGES.txt"/>
<None Include="..\..\..\..\modules\juce_core\native\java\README.txt"/>
<None Include="..\..\..\..\modules\juce_graphics\image_formats\jpglib\changes to libjpeg for JUCE.txt"/>
<None Include="..\..\..\..\modules\juce_graphics\image_formats\pnglib\libpng_readme.txt"/>

3
examples/DemoRunner/Builds/VisualStudio2022/DemoRunner_App.vcxproj.filters
View file

@ -8297,6 +8297,9 @@
<None Include="..\..\..\..\modules\juce_box2d\box2d\README.txt">
<Filter>JUCE Modules\juce_box2d\box2d</Filter>
</None>
<None Include="..\..\..\..\modules\juce_core\javascript\choc\JUCE_CHANGES.txt">
<Filter>JUCE Modules\juce_core\javascript\choc</Filter>
</None>
<None Include="..\..\..\..\modules\juce_core\native\java\README.txt">
<Filter>JUCE Modules\juce_core\native\java</Filter>
</None>

2
extras/AudioPerformanceTest/Builds/Android/app/CMakeLists.txt
View file

@ -917,6 +917,7 @@ add_library( ${BINARY_NAME}
"../../../../../modules/juce_core/javascript/choc/text/choc_JSON.h"
"../../../../../modules/juce_core/javascript/choc/text/choc_StringUtilities.h"
"../../../../../modules/juce_core/javascript/choc/text/choc_UTF8.h"
"../../../../../modules/juce_core/javascript/choc/JUCE_CHANGES.txt"
"../../../../../modules/juce_core/javascript/juce_Javascript.cpp"
"../../../../../modules/juce_core/javascript/juce_Javascript.h"
"../../../../../modules/juce_core/javascript/juce_JSON.cpp"
@ -3096,6 +3097,7 @@ set_source_files_properties(
"../../../../../modules/juce_core/javascript/choc/text/choc_JSON.h"
"../../../../../modules/juce_core/javascript/choc/text/choc_StringUtilities.h"
"../../../../../modules/juce_core/javascript/choc/text/choc_UTF8.h"
"../../../../../modules/juce_core/javascript/choc/JUCE_CHANGES.txt"
"../../../../../modules/juce_core/javascript/juce_Javascript.cpp"
"../../../../../modules/juce_core/javascript/juce_Javascript.h"
"../../../../../modules/juce_core/javascript/juce_JSON.cpp"

1
extras/AudioPerformanceTest/Builds/VisualStudio2022/AudioPerformanceTest_App.vcxproj
View file

@ -3981,6 +3981,7 @@
<None Include="..\..\..\..\modules\juce_audio_processors\format_types\VST3_SDK\JUCE_README.md"/>
<None Include="..\..\..\..\modules\juce_audio_processors\format_types\VST3_SDK\LICENSE.txt"/>
<None Include="..\..\..\..\modules\juce_audio_processors\format_types\VST3_SDK\README.md"/>
<None Include="..\..\..\..\modules\juce_core\javascript\choc\JUCE_CHANGES.txt"/>
<None Include="..\..\..\..\modules\juce_core\native\java\README.txt"/>
<None Include="..\..\..\..\modules\juce_graphics\image_formats\jpglib\changes to libjpeg for JUCE.txt"/>
<None Include="..\..\..\..\modules\juce_graphics\image_formats\pnglib\libpng_readme.txt"/>

3
extras/AudioPerformanceTest/Builds/VisualStudio2022/AudioPerformanceTest_App.vcxproj.filters
View file

@ -7193,6 +7193,9 @@
<None Include="..\..\..\..\modules\juce_audio_processors\format_types\VST3_SDK\README.md">
<Filter>JUCE Modules\juce_audio_processors\format_types\VST3_SDK</Filter>
</None>
<None Include="..\..\..\..\modules\juce_core\javascript\choc\JUCE_CHANGES.txt">
<Filter>JUCE Modules\juce_core\javascript\choc</Filter>
</None>
<None Include="..\..\..\..\modules\juce_core\native\java\README.txt">
<Filter>JUCE Modules\juce_core\native\java</Filter>
</None>

2
extras/AudioPluginHost/Builds/Android/app/CMakeLists.txt
View file

@ -950,6 +950,7 @@ add_library( ${BINARY_NAME}
"../../../../../modules/juce_core/javascript/choc/text/choc_JSON.h"
"../../../../../modules/juce_core/javascript/choc/text/choc_StringUtilities.h"
"../../../../../modules/juce_core/javascript/choc/text/choc_UTF8.h"
"../../../../../modules/juce_core/javascript/choc/JUCE_CHANGES.txt"
"../../../../../modules/juce_core/javascript/juce_Javascript.cpp"
"../../../../../modules/juce_core/javascript/juce_Javascript.h"
"../../../../../modules/juce_core/javascript/juce_JSON.cpp"
@ -3282,6 +3283,7 @@ set_source_files_properties(
"../../../../../modules/juce_core/javascript/choc/text/choc_JSON.h"
"../../../../../modules/juce_core/javascript/choc/text/choc_StringUtilities.h"
"../../../../../modules/juce_core/javascript/choc/text/choc_UTF8.h"
"../../../../../modules/juce_core/javascript/choc/JUCE_CHANGES.txt"
"../../../../../modules/juce_core/javascript/juce_Javascript.cpp"
"../../../../../modules/juce_core/javascript/juce_Javascript.h"
"../../../../../modules/juce_core/javascript/juce_JSON.cpp"

1
extras/AudioPluginHost/Builds/VisualStudio2017/AudioPluginHost_App.vcxproj
View file

@ -4247,6 +4247,7 @@
<None Include="..\..\..\..\modules\juce_audio_processors\format_types\VST3_SDK\JUCE_README.md"/>
<None Include="..\..\..\..\modules\juce_audio_processors\format_types\VST3_SDK\LICENSE.txt"/>
<None Include="..\..\..\..\modules\juce_audio_processors\format_types\VST3_SDK\README.md"/>
<None Include="..\..\..\..\modules\juce_core\javascript\choc\JUCE_CHANGES.txt"/>
<None Include="..\..\..\..\modules\juce_core\native\java\README.txt"/>
<None Include="..\..\..\..\modules\juce_graphics\image_formats\jpglib\changes to libjpeg for JUCE.txt"/>
<None Include="..\..\..\..\modules\juce_graphics\image_formats\pnglib\libpng_readme.txt"/>

3
extras/AudioPluginHost/Builds/VisualStudio2017/AudioPluginHost_App.vcxproj.filters
View file

@ -7727,6 +7727,9 @@
<None Include="..\..\..\..\modules\juce_audio_processors\format_types\VST3_SDK\README.md">
<Filter>JUCE Modules\juce_audio_processors\format_types\VST3_SDK</Filter>
</None>
<None Include="..\..\..\..\modules\juce_core\javascript\choc\JUCE_CHANGES.txt">
<Filter>JUCE Modules\juce_core\javascript\choc</Filter>
</None>
<None Include="..\..\..\..\modules\juce_core\native\java\README.txt">
<Filter>JUCE Modules\juce_core\native\java</Filter>
</None>

1
extras/AudioPluginHost/Builds/VisualStudio2019/AudioPluginHost_App.vcxproj
View file

@ -4247,6 +4247,7 @@
<None Include="..\..\..\..\modules\juce_audio_processors\format_types\VST3_SDK\JUCE_README.md"/>
<None Include="..\..\..\..\modules\juce_audio_processors\format_types\VST3_SDK\LICENSE.txt"/>
<None Include="..\..\..\..\modules\juce_audio_processors\format_types\VST3_SDK\README.md"/>
<None Include="..\..\..\..\modules\juce_core\javascript\choc\JUCE_CHANGES.txt"/>
<None Include="..\..\..\..\modules\juce_core\native\java\README.txt"/>
<None Include="..\..\..\..\modules\juce_graphics\image_formats\jpglib\changes to libjpeg for JUCE.txt"/>
<None Include="..\..\..\..\modules\juce_graphics\image_formats\pnglib\libpng_readme.txt"/>

3
extras/AudioPluginHost/Builds/VisualStudio2019/AudioPluginHost_App.vcxproj.filters
View file

@ -7727,6 +7727,9 @@
<None Include="..\..\..\..\modules\juce_audio_processors\format_types\VST3_SDK\README.md">
<Filter>JUCE Modules\juce_audio_processors\format_types\VST3_SDK</Filter>
</None>
<None Include="..\..\..\..\modules\juce_core\javascript\choc\JUCE_CHANGES.txt">
<Filter>JUCE Modules\juce_core\javascript\choc</Filter>
</None>
<None Include="..\..\..\..\modules\juce_core\native\java\README.txt">
<Filter>JUCE Modules\juce_core\native\java</Filter>
</None>

1
extras/AudioPluginHost/Builds/VisualStudio2022/AudioPluginHost_App.vcxproj
View file

@ -4247,6 +4247,7 @@
<None Include="..\..\..\..\modules\juce_audio_processors\format_types\VST3_SDK\JUCE_README.md"/>
<None Include="..\..\..\..\modules\juce_audio_processors\format_types\VST3_SDK\LICENSE.txt"/>
<None Include="..\..\..\..\modules\juce_audio_processors\format_types\VST3_SDK\README.md"/>
<None Include="..\..\..\..\modules\juce_core\javascript\choc\JUCE_CHANGES.txt"/>
<None Include="..\..\..\..\modules\juce_core\native\java\README.txt"/>
<None Include="..\..\..\..\modules\juce_graphics\image_formats\jpglib\changes to libjpeg for JUCE.txt"/>
<None Include="..\..\..\..\modules\juce_graphics\image_formats\pnglib\libpng_readme.txt"/>

3
extras/AudioPluginHost/Builds/VisualStudio2022/AudioPluginHost_App.vcxproj.filters
View file

@ -7727,6 +7727,9 @@
<None Include="..\..\..\..\modules\juce_audio_processors\format_types\VST3_SDK\README.md">
<Filter>JUCE Modules\juce_audio_processors\format_types\VST3_SDK</Filter>
</None>
<None Include="..\..\..\..\modules\juce_core\javascript\choc\JUCE_CHANGES.txt">
<Filter>JUCE Modules\juce_core\javascript\choc</Filter>
</None>
<None Include="..\..\..\..\modules\juce_core\native\java\README.txt">
<Filter>JUCE Modules\juce_core\native\java</Filter>
</None>

1
extras/BinaryBuilder/Builds/VisualStudio2022/BinaryBuilder_ConsoleApp.vcxproj
View file

@ -674,6 +674,7 @@
<ClInclude Include="..\..\JuceLibraryCode\JuceHeader.h"/>
</ItemGroup>
<ItemGroup>
<None Include="..\..\..\..\modules\juce_core\javascript\choc\JUCE_CHANGES.txt"/>
<None Include="..\..\..\..\modules\juce_core\native\java\README.txt"/>
</ItemGroup>
<ItemGroup>

3
extras/BinaryBuilder/Builds/VisualStudio2022/BinaryBuilder_ConsoleApp.vcxproj.filters
View file

@ -1001,6 +1001,9 @@
</ClInclude>
</ItemGroup>
<ItemGroup>
<None Include="..\..\..\..\modules\juce_core\javascript\choc\JUCE_CHANGES.txt">
<Filter>JUCE Modules\juce_core\javascript\choc</Filter>
</None>
<None Include="..\..\..\..\modules\juce_core\native\java\README.txt">
<Filter>JUCE Modules\juce_core\native\java</Filter>
</None>

2
extras/NetworkGraphicsDemo/Builds/Android/app/CMakeLists.txt
View file

@ -921,6 +921,7 @@ add_library( ${BINARY_NAME}
"../../../../../modules/juce_core/javascript/choc/text/choc_JSON.h"
"../../../../../modules/juce_core/javascript/choc/text/choc_StringUtilities.h"
"../../../../../modules/juce_core/javascript/choc/text/choc_UTF8.h"
"../../../../../modules/juce_core/javascript/choc/JUCE_CHANGES.txt"
"../../../../../modules/juce_core/javascript/juce_Javascript.cpp"
"../../../../../modules/juce_core/javascript/juce_Javascript.h"
"../../../../../modules/juce_core/javascript/juce_JSON.cpp"
@ -3180,6 +3181,7 @@ set_source_files_properties(
"../../../../../modules/juce_core/javascript/choc/text/choc_JSON.h"
"../../../../../modules/juce_core/javascript/choc/text/choc_StringUtilities.h"
"../../../../../modules/juce_core/javascript/choc/text/choc_UTF8.h"
"../../../../../modules/juce_core/javascript/choc/JUCE_CHANGES.txt"
"../../../../../modules/juce_core/javascript/juce_Javascript.cpp"
"../../../../../modules/juce_core/javascript/juce_Javascript.h"
"../../../../../modules/juce_core/javascript/juce_JSON.cpp"

1
extras/NetworkGraphicsDemo/Builds/VisualStudio2022/NetworkGraphicsDemo_App.vcxproj
View file

@ -4115,6 +4115,7 @@
<None Include="..\..\..\..\modules\juce_audio_processors\format_types\VST3_SDK\JUCE_README.md"/>
<None Include="..\..\..\..\modules\juce_audio_processors\format_types\VST3_SDK\LICENSE.txt"/>
<None Include="..\..\..\..\modules\juce_audio_processors\format_types\VST3_SDK\README.md"/>
<None Include="..\..\..\..\modules\juce_core\javascript\choc\JUCE_CHANGES.txt"/>
<None Include="..\..\..\..\modules\juce_core\native\java\README.txt"/>
<None Include="..\..\..\..\modules\juce_graphics\image_formats\jpglib\changes to libjpeg for JUCE.txt"/>
<None Include="..\..\..\..\modules\juce_graphics\image_formats\pnglib\libpng_readme.txt"/>

3
extras/NetworkGraphicsDemo/Builds/VisualStudio2022/NetworkGraphicsDemo_App.vcxproj.filters
View file

@ -7463,6 +7463,9 @@
<None Include="..\..\..\..\modules\juce_audio_processors\format_types\VST3_SDK\README.md">
<Filter>JUCE Modules\juce_audio_processors\format_types\VST3_SDK</Filter>
</None>
<None Include="..\..\..\..\modules\juce_core\javascript\choc\JUCE_CHANGES.txt">
<Filter>JUCE Modules\juce_core\javascript\choc</Filter>
</None>
<None Include="..\..\..\..\modules\juce_core\native\java\README.txt">
<Filter>JUCE Modules\juce_core\native\java</Filter>
</None>

1
extras/Projucer/Builds/VisualStudio2017/Projucer_App.vcxproj
View file

@ -2910,6 +2910,7 @@
<None Include="..\..\Source\BinaryData\Icons\wizard_StaticLibrary.svg"/>
<None Include="..\..\Source\BinaryData\colourscheme_dark.xml"/>
<None Include="..\..\Source\BinaryData\colourscheme_light.xml"/>
<None Include="..\..\..\..\modules\juce_core\javascript\choc\JUCE_CHANGES.txt"/>
<None Include="..\..\..\..\modules\juce_core\native\java\README.txt"/>
<None Include="..\..\..\..\modules\juce_graphics\image_formats\jpglib\changes to libjpeg for JUCE.txt"/>
<None Include="..\..\..\..\modules\juce_graphics\image_formats\pnglib\libpng_readme.txt"/>

3
extras/Projucer/Builds/VisualStudio2017/Projucer_App.vcxproj.filters
View file

@ -5375,6 +5375,9 @@
<None Include="..\..\Source\BinaryData\colourscheme_light.xml">
<Filter>Projucer\BinaryData</Filter>
</None>
<None Include="..\..\..\..\modules\juce_core\javascript\choc\JUCE_CHANGES.txt">
<Filter>JUCE Modules\juce_core\javascript\choc</Filter>
</None>
<None Include="..\..\..\..\modules\juce_core\native\java\README.txt">
<Filter>JUCE Modules\juce_core\native\java</Filter>
</None>

1
extras/Projucer/Builds/VisualStudio2019/Projucer_App.vcxproj
View file

@ -2910,6 +2910,7 @@
<None Include="..\..\Source\BinaryData\Icons\wizard_StaticLibrary.svg"/>
<None Include="..\..\Source\BinaryData\colourscheme_dark.xml"/>
<None Include="..\..\Source\BinaryData\colourscheme_light.xml"/>
<None Include="..\..\..\..\modules\juce_core\javascript\choc\JUCE_CHANGES.txt"/>
<None Include="..\..\..\..\modules\juce_core\native\java\README.txt"/>
<None Include="..\..\..\..\modules\juce_graphics\image_formats\jpglib\changes to libjpeg for JUCE.txt"/>
<None Include="..\..\..\..\modules\juce_graphics\image_formats\pnglib\libpng_readme.txt"/>

3
extras/Projucer/Builds/VisualStudio2019/Projucer_App.vcxproj.filters
View file

@ -5375,6 +5375,9 @@
<None Include="..\..\Source\BinaryData\colourscheme_light.xml">
<Filter>Projucer\BinaryData</Filter>
</None>
<None Include="..\..\..\..\modules\juce_core\javascript\choc\JUCE_CHANGES.txt">
<Filter>JUCE Modules\juce_core\javascript\choc</Filter>
</None>
<None Include="..\..\..\..\modules\juce_core\native\java\README.txt">
<Filter>JUCE Modules\juce_core\native\java</Filter>
</None>

1
extras/Projucer/Builds/VisualStudio2022/Projucer_App.vcxproj
View file

@ -2910,6 +2910,7 @@
<None Include="..\..\Source\BinaryData\Icons\wizard_StaticLibrary.svg"/>
<None Include="..\..\Source\BinaryData\colourscheme_dark.xml"/>
<None Include="..\..\Source\BinaryData\colourscheme_light.xml"/>
<None Include="..\..\..\..\modules\juce_core\javascript\choc\JUCE_CHANGES.txt"/>
<None Include="..\..\..\..\modules\juce_core\native\java\README.txt"/>
<None Include="..\..\..\..\modules\juce_graphics\image_formats\jpglib\changes to libjpeg for JUCE.txt"/>
<None Include="..\..\..\..\modules\juce_graphics\image_formats\pnglib\libpng_readme.txt"/>

3
extras/Projucer/Builds/VisualStudio2022/Projucer_App.vcxproj.filters
View file

@ -5375,6 +5375,9 @@
<None Include="..\..\Source\BinaryData\colourscheme_light.xml">
<Filter>Projucer\BinaryData</Filter>
</None>
<None Include="..\..\..\..\modules\juce_core\javascript\choc\JUCE_CHANGES.txt">
<Filter>JUCE Modules\juce_core\javascript\choc</Filter>
</None>
<None Include="..\..\..\..\modules\juce_core\native\java\README.txt">
<Filter>JUCE Modules\juce_core\native\java</Filter>
</None>

1
extras/UnitTestRunner/Builds/VisualStudio2017/UnitTestRunner_ConsoleApp.vcxproj
View file

@ -4382,6 +4382,7 @@
<None Include="..\..\..\..\modules\juce_audio_processors\format_types\VST3_SDK\JUCE_README.md"/>
<None Include="..\..\..\..\modules\juce_audio_processors\format_types\VST3_SDK\LICENSE.txt"/>
<None Include="..\..\..\..\modules\juce_audio_processors\format_types\VST3_SDK\README.md"/>
<None Include="..\..\..\..\modules\juce_core\javascript\choc\JUCE_CHANGES.txt"/>
<None Include="..\..\..\..\modules\juce_core\native\java\README.txt"/>
<None Include="..\..\..\..\modules\juce_graphics\image_formats\jpglib\changes to libjpeg for JUCE.txt"/>
<None Include="..\..\..\..\modules\juce_graphics\image_formats\pnglib\libpng_readme.txt"/>

3
extras/UnitTestRunner/Builds/VisualStudio2017/UnitTestRunner_ConsoleApp.vcxproj.filters
View file

@ -7958,6 +7958,9 @@
<None Include="..\..\..\..\modules\juce_audio_processors\format_types\VST3_SDK\README.md">
<Filter>JUCE Modules\juce_audio_processors\format_types\VST3_SDK</Filter>
</None>
<None Include="..\..\..\..\modules\juce_core\javascript\choc\JUCE_CHANGES.txt">
<Filter>JUCE Modules\juce_core\javascript\choc</Filter>
</None>
<None Include="..\..\..\..\modules\juce_core\native\java\README.txt">
<Filter>JUCE Modules\juce_core\native\java</Filter>
</None>

1
extras/UnitTestRunner/Builds/VisualStudio2019/UnitTestRunner_ConsoleApp.vcxproj
View file

@ -4382,6 +4382,7 @@
<None Include="..\..\..\..\modules\juce_audio_processors\format_types\VST3_SDK\JUCE_README.md"/>
<None Include="..\..\..\..\modules\juce_audio_processors\format_types\VST3_SDK\LICENSE.txt"/>
<None Include="..\..\..\..\modules\juce_audio_processors\format_types\VST3_SDK\README.md"/>
<None Include="..\..\..\..\modules\juce_core\javascript\choc\JUCE_CHANGES.txt"/>
<None Include="..\..\..\..\modules\juce_core\native\java\README.txt"/>
<None Include="..\..\..\..\modules\juce_graphics\image_formats\jpglib\changes to libjpeg for JUCE.txt"/>
<None Include="..\..\..\..\modules\juce_graphics\image_formats\pnglib\libpng_readme.txt"/>

3
extras/UnitTestRunner/Builds/VisualStudio2019/UnitTestRunner_ConsoleApp.vcxproj.filters
View file

@ -7958,6 +7958,9 @@
<None Include="..\..\..\..\modules\juce_audio_processors\format_types\VST3_SDK\README.md">
<Filter>JUCE Modules\juce_audio_processors\format_types\VST3_SDK</Filter>
</None>
<None Include="..\..\..\..\modules\juce_core\javascript\choc\JUCE_CHANGES.txt">
<Filter>JUCE Modules\juce_core\javascript\choc</Filter>
</None>
<None Include="..\..\..\..\modules\juce_core\native\java\README.txt">
<Filter>JUCE Modules\juce_core\native\java</Filter>
</None>

1
extras/UnitTestRunner/Builds/VisualStudio2022/UnitTestRunner_ConsoleApp.vcxproj
View file

@ -4382,6 +4382,7 @@
<None Include="..\..\..\..\modules\juce_audio_processors\format_types\VST3_SDK\JUCE_README.md"/>
<None Include="..\..\..\..\modules\juce_audio_processors\format_types\VST3_SDK\LICENSE.txt"/>
<None Include="..\..\..\..\modules\juce_audio_processors\format_types\VST3_SDK\README.md"/>
<None Include="..\..\..\..\modules\juce_core\javascript\choc\JUCE_CHANGES.txt"/>
<None Include="..\..\..\..\modules\juce_core\native\java\README.txt"/>
<None Include="..\..\..\..\modules\juce_graphics\image_formats\jpglib\changes to libjpeg for JUCE.txt"/>
<None Include="..\..\..\..\modules\juce_graphics\image_formats\pnglib\libpng_readme.txt"/>

3
extras/UnitTestRunner/Builds/VisualStudio2022/UnitTestRunner_ConsoleApp.vcxproj.filters
View file

@ -7958,6 +7958,9 @@
<None Include="..\..\..\..\modules\juce_audio_processors\format_types\VST3_SDK\README.md">
<Filter>JUCE Modules\juce_audio_processors\format_types\VST3_SDK</Filter>
</None>
<None Include="..\..\..\..\modules\juce_core\javascript\choc\JUCE_CHANGES.txt">
<Filter>JUCE Modules\juce_core\javascript\choc</Filter>
</None>
<None Include="..\..\..\..\modules\juce_core\native\java\README.txt">
<Filter>JUCE Modules\juce_core\native\java</Filter>
</None>

1
extras/WindowsDLL/Builds/VisualStudio2022/WindowsDLL_StaticLibrary.vcxproj
View file

@ -4091,6 +4091,7 @@
<None Include="..\..\..\..\modules\juce_audio_processors\format_types\VST3_SDK\JUCE_README.md"/>
<None Include="..\..\..\..\modules\juce_audio_processors\format_types\VST3_SDK\LICENSE.txt"/>
<None Include="..\..\..\..\modules\juce_audio_processors\format_types\VST3_SDK\README.md"/>
<None Include="..\..\..\..\modules\juce_core\javascript\choc\JUCE_CHANGES.txt"/>
<None Include="..\..\..\..\modules\juce_core\native\java\README.txt"/>
<None Include="..\..\..\..\modules\juce_graphics\image_formats\jpglib\changes to libjpeg for JUCE.txt"/>
<None Include="..\..\..\..\modules\juce_graphics\image_formats\pnglib\libpng_readme.txt"/>

3
extras/WindowsDLL/Builds/VisualStudio2022/WindowsDLL_StaticLibrary.vcxproj.filters
View file

@ -7430,6 +7430,9 @@
<None Include="..\..\..\..\modules\juce_audio_processors\format_types\VST3_SDK\README.md">
<Filter>JUCE Modules\juce_audio_processors\format_types\VST3_SDK</Filter>
</None>
<None Include="..\..\..\..\modules\juce_core\javascript\choc\JUCE_CHANGES.txt">
<Filter>JUCE Modules\juce_core\javascript\choc</Filter>
</None>
<None Include="..\..\..\..\modules\juce_core\native\java\README.txt">
<Filter>JUCE Modules\juce_core\native\java</Filter>
</None>

12
modules/juce_core/javascript/choc/JUCE_CHANGES.txt Normal file
View file

@ -0,0 +1,12 @@
The files in this directory were downloaded from the choc repository at
https://github.com/Tracktion/choc.
In order to avoid exposing any symbols in the choc implementation, the files were modified by
prepending all `namespace choc...` lines with `namespace {`, and by adding corresponding closing
brackets as well.
Enclosing all choc definitions in an anonymous namespace allows JUCE based projects to use an
external copy of choc without running into multiply defined symbol compilation errors.
By placing the anonymous namespace encapsulation inside the choc header files we avoid the issue of
including the system headers in the namespace as well.

3
modules/juce_core/javascript/choc/containers/choc_Value.h
View file

@ -27,6 +27,8 @@
#include <exception>
#include "../platform/choc_Assert.h"
namespace
{
namespace choc::value
{
@ -3236,5 +3238,6 @@ inline std::string_view SimpleStringDictionary::getStringForHandle (Handle handl
inline void SimpleStringDictionary::clear() { strings.clear(); }
} // namespace choc::value
} // anonymous namespace
#endif // CHOC_VALUE_POOL_HEADER_INCLUDED

6
modules/juce_core/javascript/choc/javascript/choc_javascript.h
View file

@ -33,6 +33,8 @@
choc::javascript::createQuickJSContext() to create a context for running
javascript code.
*/
namespace
{
namespace choc::javascript
{
/// This is thrown by any javascript functions that need to report an error
@ -171,6 +173,7 @@ namespace choc::javascript
/// search path, and that you statically link the appropriate V8 libs.
Context createV8Context();
}
} // anonymous namespace
//==============================================================================
@ -184,6 +187,8 @@ namespace choc::javascript
//
//==============================================================================
namespace
{
namespace choc::javascript
{
@ -290,6 +295,7 @@ Context::Pimpl* Context::getPimpl() const
}
} // namespace choc::javascript
} // anonymous namespace
#endif // CHOC_JAVASCRIPT_HEADER_INCLUDED

3
modules/juce_core/javascript/choc/javascript/choc_javascript_QuickJS.h
View file

@ -77,6 +77,8 @@
#include <sys/time.h>
#endif
namespace
{
namespace choc::javascript
{
@ -64343,5 +64345,6 @@ Context createQuickJSContext()
}
} // namespace choc::javascript
} // anonymous namespace
#endif // CHOC_JAVASCRIPT_QUICKJS_HEADER_INCLUDED

3
modules/juce_core/javascript/choc/math/choc_MathHelpers.h
View file

@ -36,6 +36,8 @@
#endif
#endif
namespace
{
namespace choc::math
{
@ -114,5 +116,6 @@ inline Int128 multiply128 (uint64_t a, uint64_t b)
} // namespace choc::math
} // anonymous namespace
#endif

3
modules/juce_core/javascript/choc/text/choc_FloatToString.h
View file

@ -23,6 +23,8 @@
#include <string>
#include "../math/choc_MathHelpers.h"
namespace
{
namespace choc::text
{
@ -393,5 +395,6 @@ inline std::string floatToString (float value, int maxDecimals, bool omitPointIf
inline std::string floatToString (double value, int maxDecimals, bool omitPointIfPossible) { return FloatToStringBuffer<double> (value, maxDecimals, omitPointIfPossible).toString(); }
} // namespace choc::text
} // anonymous namespace
#endif

3
modules/juce_core/javascript/choc/text/choc_JSON.h
View file

@ -31,6 +31,8 @@
#undef max // It's never a smart idea to include any C headers before your C++ ones, as it
#undef min // risks polluting your namespace with all kinds of dangerous macros like these ones.
namespace
{
namespace choc::json
{
@ -557,5 +559,6 @@ value::Value create (Properties&&... properties)
} // namespace choc::json
} // anonymous namespace
#endif

3
modules/juce_core/javascript/choc/text/choc_StringUtilities.h
View file

@ -29,6 +29,8 @@
#include <cwctype>
#include "../platform/choc_Assert.h"
namespace
{
namespace choc::text
{
@ -593,5 +595,6 @@ inline std::string percentEncodeURI (std::string_view text)
} // namespace choc::text
} // anonymous namespace
#endif

3
modules/juce_core/javascript/choc/text/choc_UTF8.h
View file

@ -22,6 +22,8 @@
#include <cstddef>
#include "choc_StringUtilities.h"
namespace
{
namespace choc::text
{
@ -651,5 +653,6 @@ inline std::string convertUTF8ToCESU8 (UTF8Pointer utf8)
} // namespace choc::text
} // anonymous namespace
#endif

7
modules/juce_core/javascript/juce_Javascript.cpp
View file

@ -34,10 +34,11 @@
JUCE_BEGIN_IGNORE_WARNINGS_GCC_LIKE ("-Wdeprecated-copy-with-dtor",
"-Wunused-but-set-variable",
"-Wdeprecated")
"-Wdeprecated",
"-Wunused-function")
JUCE_BEGIN_IGNORE_WARNINGS_MSVC (6011 6246 6255 6262 6297 6308 6323 6340 6385 6386 28182)
#include "choc/javascript/choc_javascript_QuickJS.h"
#include "choc/javascript/choc_javascript.h"
#include <juce_core/javascript/choc/javascript/choc_javascript_QuickJS.h>
#include <juce_core/javascript/choc/javascript/choc_javascript.h>
JUCE_END_IGNORE_WARNINGS_MSVC
JUCE_END_IGNORE_WARNINGS_GCC_LIKE