mirror/JUCE
1
0
Fork 0
mirror of https://github.com/juce-framework/JUCE.git synced 2026-01-09 23:34:20 +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>