mirror of
https://github.com/juce-framework/JUCE.git
synced 2026-01-10 23:44:24 +00:00
WebBrowserComponent: Improve native integrations
This commit is contained in:
attila
Anthony Nicholls
parent
624fed2c7f
commit
5f638157f7
63 changed files with 5155 additions and 1288 deletions
|
|
@ -953,6 +953,7 @@ add_library( ${BINARY_NAME}
|
|||
"../../../../../modules/juce_core/misc/juce_EnumHelpers.h"
|
||||
"../../../../../modules/juce_core/misc/juce_EnumHelpers_test.cpp"
|
||||
"../../../../../modules/juce_core/misc/juce_Functional.h"
|
||||
"../../../../../modules/juce_core/misc/juce_OptionsHelpers.h"
|
||||
"../../../../../modules/juce_core/misc/juce_Result.cpp"
|
||||
"../../../../../modules/juce_core/misc/juce_Result.h"
|
||||
"../../../../../modules/juce_core/misc/juce_RuntimePermissions.cpp"
|
||||
|
|
@ -1762,6 +1763,7 @@ add_library( ${BINARY_NAME}
|
|||
"../../../../../modules/juce_gui_extra/code_editor/juce_LuaCodeTokeniser.h"
|
||||
"../../../../../modules/juce_gui_extra/code_editor/juce_XMLCodeTokeniser.cpp"
|
||||
"../../../../../modules/juce_gui_extra/code_editor/juce_XMLCodeTokeniser.h"
|
||||
"../../../../../modules/juce_gui_extra/detail/juce_WebControlRelayEvents.h"
|
||||
"../../../../../modules/juce_gui_extra/documents/juce_FileBasedDocument.cpp"
|
||||
"../../../../../modules/juce_gui_extra/documents/juce_FileBasedDocument.h"
|
||||
"../../../../../modules/juce_gui_extra/embedding/juce_ActiveXControlComponent.h"
|
||||
|
|
@ -1793,6 +1795,8 @@ add_library( ${BINARY_NAME}
|
|||
"../../../../../modules/juce_gui_extra/misc/juce_SystemTrayIconComponent.h"
|
||||
"../../../../../modules/juce_gui_extra/misc/juce_WebBrowserComponent.cpp"
|
||||
"../../../../../modules/juce_gui_extra/misc/juce_WebBrowserComponent.h"
|
||||
"../../../../../modules/juce_gui_extra/misc/juce_WebControlRelays.cpp"
|
||||
"../../../../../modules/juce_gui_extra/misc/juce_WebControlRelays.h"
|
||||
"../../../../../modules/juce_gui_extra/native/juce_ActiveXComponent_windows.cpp"
|
||||
"../../../../../modules/juce_gui_extra/native/juce_AndroidViewComponent.cpp"
|
||||
"../../../../../modules/juce_gui_extra/native/juce_AppleRemote_mac.mm"
|
||||
|
|
@ -2747,6 +2751,7 @@ set_source_files_properties(
|
|||
"../../../../../modules/juce_core/misc/juce_EnumHelpers.h"
|
||||
"../../../../../modules/juce_core/misc/juce_EnumHelpers_test.cpp"
|
||||
"../../../../../modules/juce_core/misc/juce_Functional.h"
|
||||
"../../../../../modules/juce_core/misc/juce_OptionsHelpers.h"
|
||||
"../../../../../modules/juce_core/misc/juce_Result.cpp"
|
||||
"../../../../../modules/juce_core/misc/juce_Result.h"
|
||||
"../../../../../modules/juce_core/misc/juce_RuntimePermissions.cpp"
|
||||
|
|
@ -3556,6 +3561,7 @@ set_source_files_properties(
|
|||
"../../../../../modules/juce_gui_extra/code_editor/juce_LuaCodeTokeniser.h"
|
||||
"../../../../../modules/juce_gui_extra/code_editor/juce_XMLCodeTokeniser.cpp"
|
||||
"../../../../../modules/juce_gui_extra/code_editor/juce_XMLCodeTokeniser.h"
|
||||
"../../../../../modules/juce_gui_extra/detail/juce_WebControlRelayEvents.h"
|
||||
"../../../../../modules/juce_gui_extra/documents/juce_FileBasedDocument.cpp"
|
||||
"../../../../../modules/juce_gui_extra/documents/juce_FileBasedDocument.h"
|
||||
"../../../../../modules/juce_gui_extra/embedding/juce_ActiveXControlComponent.h"
|
||||
|
|
@ -3587,6 +3593,8 @@ set_source_files_properties(
|
|||
"../../../../../modules/juce_gui_extra/misc/juce_SystemTrayIconComponent.h"
|
||||
"../../../../../modules/juce_gui_extra/misc/juce_WebBrowserComponent.cpp"
|
||||
"../../../../../modules/juce_gui_extra/misc/juce_WebBrowserComponent.h"
|
||||
"../../../../../modules/juce_gui_extra/misc/juce_WebControlRelays.cpp"
|
||||
"../../../../../modules/juce_gui_extra/misc/juce_WebControlRelays.h"
|
||||
"../../../../../modules/juce_gui_extra/native/juce_ActiveXComponent_windows.cpp"
|
||||
"../../../../../modules/juce_gui_extra/native/juce_AndroidViewComponent.cpp"
|
||||
"../../../../../modules/juce_gui_extra/native/juce_AppleRemote_mac.mm"
|
||||
|
|
|
|||
|
|
@ -2371,6 +2371,9 @@
|
|||
<ClCompile Include="..\..\..\..\modules\juce_gui_extra\misc\juce_WebBrowserComponent.cpp">
|
||||
<ExcludedFromBuild>true</ExcludedFromBuild>
|
||||
</ClCompile>
|
||||
<ClCompile Include="..\..\..\..\modules\juce_gui_extra\misc\juce_WebControlRelays.cpp">
|
||||
<ExcludedFromBuild>true</ExcludedFromBuild>
|
||||
</ClCompile>
|
||||
<ClCompile Include="..\..\..\..\modules\juce_gui_extra\native\juce_ActiveXComponent_windows.cpp">
|
||||
<ExcludedFromBuild>true</ExcludedFromBuild>
|
||||
</ClCompile>
|
||||
|
|
@ -2961,6 +2964,7 @@
|
|||
<ClInclude Include="..\..\..\..\modules\juce_core\misc\juce_ConsoleApplication.h"/>
|
||||
<ClInclude Include="..\..\..\..\modules\juce_core\misc\juce_EnumHelpers.h"/>
|
||||
<ClInclude Include="..\..\..\..\modules\juce_core\misc\juce_Functional.h"/>
|
||||
<ClInclude Include="..\..\..\..\modules\juce_core\misc\juce_OptionsHelpers.h"/>
|
||||
<ClInclude Include="..\..\..\..\modules\juce_core\misc\juce_Result.h"/>
|
||||
<ClInclude Include="..\..\..\..\modules\juce_core\misc\juce_RuntimePermissions.h"/>
|
||||
<ClInclude Include="..\..\..\..\modules\juce_core\misc\juce_ScopeGuard.h"/>
|
||||
|
|
@ -3363,6 +3367,7 @@
|
|||
<ClInclude Include="..\..\..\..\modules\juce_gui_extra\code_editor\juce_CPlusPlusCodeTokeniserFunctions.h"/>
|
||||
<ClInclude Include="..\..\..\..\modules\juce_gui_extra\code_editor\juce_LuaCodeTokeniser.h"/>
|
||||
<ClInclude Include="..\..\..\..\modules\juce_gui_extra\code_editor\juce_XMLCodeTokeniser.h"/>
|
||||
<ClInclude Include="..\..\..\..\modules\juce_gui_extra\detail\juce_WebControlRelayEvents.h"/>
|
||||
<ClInclude Include="..\..\..\..\modules\juce_gui_extra\documents\juce_FileBasedDocument.h"/>
|
||||
<ClInclude Include="..\..\..\..\modules\juce_gui_extra\embedding\juce_ActiveXControlComponent.h"/>
|
||||
<ClInclude Include="..\..\..\..\modules\juce_gui_extra\embedding\juce_AndroidViewComponent.h"/>
|
||||
|
|
@ -3382,6 +3387,7 @@
|
|||
<ClInclude Include="..\..\..\..\modules\juce_gui_extra\misc\juce_SplashScreen.h"/>
|
||||
<ClInclude Include="..\..\..\..\modules\juce_gui_extra\misc\juce_SystemTrayIconComponent.h"/>
|
||||
<ClInclude Include="..\..\..\..\modules\juce_gui_extra\misc\juce_WebBrowserComponent.h"/>
|
||||
<ClInclude Include="..\..\..\..\modules\juce_gui_extra\misc\juce_WebControlRelays.h"/>
|
||||
<ClInclude Include="..\..\..\..\modules\juce_gui_extra\native\juce_NSViewFrameWatcher_mac.h"/>
|
||||
<ClInclude Include="..\..\..\..\modules\juce_gui_extra\juce_gui_extra.h"/>
|
||||
<ClInclude Include="..\..\JuceLibraryCode\JuceHeader.h"/>
|
||||
|
|
@ -3414,5 +3420,4 @@
|
|||
<ResourceCompile Include=".\resources.rc"/>
|
||||
</ItemGroup>
|
||||
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets"/>
|
||||
<ImportGroup Label="ExtensionTargets"/>
|
||||
</Project>
|
||||
|
|
|
|||
|
|
@ -572,6 +572,9 @@
|
|||
<Filter Include="JUCE Modules\juce_gui_extra\code_editor">
|
||||
<UniqueIdentifier>{DF95D4BF-E18C-125A-5EBB-8993A06E232C}</UniqueIdentifier>
|
||||
</Filter>
|
||||
<Filter Include="JUCE Modules\juce_gui_extra\detail">
|
||||
<UniqueIdentifier>{E0FCBD5F-0B11-D78C-F786-52AB7FEE2383}</UniqueIdentifier>
|
||||
</Filter>
|
||||
<Filter Include="JUCE Modules\juce_gui_extra\documents">
|
||||
<UniqueIdentifier>{118946F2-AC24-0F09-62D5-753DF87A60CD}</UniqueIdentifier>
|
||||
</Filter>
|
||||
|
|
@ -2956,6 +2959,9 @@
|
|||
<ClCompile Include="..\..\..\..\modules\juce_gui_extra\misc\juce_WebBrowserComponent.cpp">
|
||||
<Filter>JUCE Modules\juce_gui_extra\misc</Filter>
|
||||
</ClCompile>
|
||||
<ClCompile Include="..\..\..\..\modules\juce_gui_extra\misc\juce_WebControlRelays.cpp">
|
||||
<Filter>JUCE Modules\juce_gui_extra\misc</Filter>
|
||||
</ClCompile>
|
||||
<ClCompile Include="..\..\..\..\modules\juce_gui_extra\native\juce_ActiveXComponent_windows.cpp">
|
||||
<Filter>JUCE Modules\juce_gui_extra\native</Filter>
|
||||
</ClCompile>
|
||||
|
|
@ -4635,6 +4641,9 @@
|
|||
<ClInclude Include="..\..\..\..\modules\juce_core\misc\juce_Functional.h">
|
||||
<Filter>JUCE Modules\juce_core\misc</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="..\..\..\..\modules\juce_core\misc\juce_OptionsHelpers.h">
|
||||
<Filter>JUCE Modules\juce_core\misc</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="..\..\..\..\modules\juce_core\misc\juce_Result.h">
|
||||
<Filter>JUCE Modules\juce_core\misc</Filter>
|
||||
</ClInclude>
|
||||
|
|
@ -5841,6 +5850,9 @@
|
|||
<ClInclude Include="..\..\..\..\modules\juce_gui_extra\code_editor\juce_XMLCodeTokeniser.h">
|
||||
<Filter>JUCE Modules\juce_gui_extra\code_editor</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="..\..\..\..\modules\juce_gui_extra\detail\juce_WebControlRelayEvents.h">
|
||||
<Filter>JUCE Modules\juce_gui_extra\detail</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="..\..\..\..\modules\juce_gui_extra\documents\juce_FileBasedDocument.h">
|
||||
<Filter>JUCE Modules\juce_gui_extra\documents</Filter>
|
||||
</ClInclude>
|
||||
|
|
@ -5898,6 +5910,9 @@
|
|||
<ClInclude Include="..\..\..\..\modules\juce_gui_extra\misc\juce_WebBrowserComponent.h">
|
||||
<Filter>JUCE Modules\juce_gui_extra\misc</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="..\..\..\..\modules\juce_gui_extra\misc\juce_WebControlRelays.h">
|
||||
<Filter>JUCE Modules\juce_gui_extra\misc</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="..\..\..\..\modules\juce_gui_extra\native\juce_NSViewFrameWatcher_mac.h">
|
||||
<Filter>JUCE Modules\juce_gui_extra\native</Filter>
|
||||
</ClInclude>
|
||||
|
|
|
|||
|
|
@ -986,6 +986,7 @@ add_library( ${BINARY_NAME}
|
|||
"../../../../../modules/juce_core/misc/juce_EnumHelpers.h"
|
||||
"../../../../../modules/juce_core/misc/juce_EnumHelpers_test.cpp"
|
||||
"../../../../../modules/juce_core/misc/juce_Functional.h"
|
||||
"../../../../../modules/juce_core/misc/juce_OptionsHelpers.h"
|
||||
"../../../../../modules/juce_core/misc/juce_Result.cpp"
|
||||
"../../../../../modules/juce_core/misc/juce_Result.h"
|
||||
"../../../../../modules/juce_core/misc/juce_RuntimePermissions.cpp"
|
||||
|
|
@ -1892,6 +1893,7 @@ add_library( ${BINARY_NAME}
|
|||
"../../../../../modules/juce_gui_extra/code_editor/juce_LuaCodeTokeniser.h"
|
||||
"../../../../../modules/juce_gui_extra/code_editor/juce_XMLCodeTokeniser.cpp"
|
||||
"../../../../../modules/juce_gui_extra/code_editor/juce_XMLCodeTokeniser.h"
|
||||
"../../../../../modules/juce_gui_extra/detail/juce_WebControlRelayEvents.h"
|
||||
"../../../../../modules/juce_gui_extra/documents/juce_FileBasedDocument.cpp"
|
||||
"../../../../../modules/juce_gui_extra/documents/juce_FileBasedDocument.h"
|
||||
"../../../../../modules/juce_gui_extra/embedding/juce_ActiveXControlComponent.h"
|
||||
|
|
@ -1923,6 +1925,8 @@ add_library( ${BINARY_NAME}
|
|||
"../../../../../modules/juce_gui_extra/misc/juce_SystemTrayIconComponent.h"
|
||||
"../../../../../modules/juce_gui_extra/misc/juce_WebBrowserComponent.cpp"
|
||||
"../../../../../modules/juce_gui_extra/misc/juce_WebBrowserComponent.h"
|
||||
"../../../../../modules/juce_gui_extra/misc/juce_WebControlRelays.cpp"
|
||||
"../../../../../modules/juce_gui_extra/misc/juce_WebControlRelays.h"
|
||||
"../../../../../modules/juce_gui_extra/native/juce_ActiveXComponent_windows.cpp"
|
||||
"../../../../../modules/juce_gui_extra/native/juce_AndroidViewComponent.cpp"
|
||||
"../../../../../modules/juce_gui_extra/native/juce_AppleRemote_mac.mm"
|
||||
|
|
@ -2933,6 +2937,7 @@ set_source_files_properties(
|
|||
"../../../../../modules/juce_core/misc/juce_EnumHelpers.h"
|
||||
"../../../../../modules/juce_core/misc/juce_EnumHelpers_test.cpp"
|
||||
"../../../../../modules/juce_core/misc/juce_Functional.h"
|
||||
"../../../../../modules/juce_core/misc/juce_OptionsHelpers.h"
|
||||
"../../../../../modules/juce_core/misc/juce_Result.cpp"
|
||||
"../../../../../modules/juce_core/misc/juce_Result.h"
|
||||
"../../../../../modules/juce_core/misc/juce_RuntimePermissions.cpp"
|
||||
|
|
@ -3839,6 +3844,7 @@ set_source_files_properties(
|
|||
"../../../../../modules/juce_gui_extra/code_editor/juce_LuaCodeTokeniser.h"
|
||||
"../../../../../modules/juce_gui_extra/code_editor/juce_XMLCodeTokeniser.cpp"
|
||||
"../../../../../modules/juce_gui_extra/code_editor/juce_XMLCodeTokeniser.h"
|
||||
"../../../../../modules/juce_gui_extra/detail/juce_WebControlRelayEvents.h"
|
||||
"../../../../../modules/juce_gui_extra/documents/juce_FileBasedDocument.cpp"
|
||||
"../../../../../modules/juce_gui_extra/documents/juce_FileBasedDocument.h"
|
||||
"../../../../../modules/juce_gui_extra/embedding/juce_ActiveXControlComponent.h"
|
||||
|
|
@ -3870,6 +3876,8 @@ set_source_files_properties(
|
|||
"../../../../../modules/juce_gui_extra/misc/juce_SystemTrayIconComponent.h"
|
||||
"../../../../../modules/juce_gui_extra/misc/juce_WebBrowserComponent.cpp"
|
||||
"../../../../../modules/juce_gui_extra/misc/juce_WebBrowserComponent.h"
|
||||
"../../../../../modules/juce_gui_extra/misc/juce_WebControlRelays.cpp"
|
||||
"../../../../../modules/juce_gui_extra/misc/juce_WebControlRelays.h"
|
||||
"../../../../../modules/juce_gui_extra/native/juce_ActiveXComponent_windows.cpp"
|
||||
"../../../../../modules/juce_gui_extra/native/juce_AndroidViewComponent.cpp"
|
||||
"../../../../../modules/juce_gui_extra/native/juce_AppleRemote_mac.mm"
|
||||
|
|
|
|||
|
|
@ -2505,6 +2505,9 @@
|
|||
<ClCompile Include="..\..\..\..\modules\juce_gui_extra\misc\juce_WebBrowserComponent.cpp">
|
||||
<ExcludedFromBuild>true</ExcludedFromBuild>
|
||||
</ClCompile>
|
||||
<ClCompile Include="..\..\..\..\modules\juce_gui_extra\misc\juce_WebControlRelays.cpp">
|
||||
<ExcludedFromBuild>true</ExcludedFromBuild>
|
||||
</ClCompile>
|
||||
<ClCompile Include="..\..\..\..\modules\juce_gui_extra\native\juce_ActiveXComponent_windows.cpp">
|
||||
<ExcludedFromBuild>true</ExcludedFromBuild>
|
||||
</ClCompile>
|
||||
|
|
@ -3141,6 +3144,7 @@
|
|||
<ClInclude Include="..\..\..\..\modules\juce_core\misc\juce_ConsoleApplication.h"/>
|
||||
<ClInclude Include="..\..\..\..\modules\juce_core\misc\juce_EnumHelpers.h"/>
|
||||
<ClInclude Include="..\..\..\..\modules\juce_core\misc\juce_Functional.h"/>
|
||||
<ClInclude Include="..\..\..\..\modules\juce_core\misc\juce_OptionsHelpers.h"/>
|
||||
<ClInclude Include="..\..\..\..\modules\juce_core\misc\juce_Result.h"/>
|
||||
<ClInclude Include="..\..\..\..\modules\juce_core\misc\juce_RuntimePermissions.h"/>
|
||||
<ClInclude Include="..\..\..\..\modules\juce_core\misc\juce_ScopeGuard.h"/>
|
||||
|
|
@ -3596,6 +3600,7 @@
|
|||
<ClInclude Include="..\..\..\..\modules\juce_gui_extra\code_editor\juce_CPlusPlusCodeTokeniserFunctions.h"/>
|
||||
<ClInclude Include="..\..\..\..\modules\juce_gui_extra\code_editor\juce_LuaCodeTokeniser.h"/>
|
||||
<ClInclude Include="..\..\..\..\modules\juce_gui_extra\code_editor\juce_XMLCodeTokeniser.h"/>
|
||||
<ClInclude Include="..\..\..\..\modules\juce_gui_extra\detail\juce_WebControlRelayEvents.h"/>
|
||||
<ClInclude Include="..\..\..\..\modules\juce_gui_extra\documents\juce_FileBasedDocument.h"/>
|
||||
<ClInclude Include="..\..\..\..\modules\juce_gui_extra\embedding\juce_ActiveXControlComponent.h"/>
|
||||
<ClInclude Include="..\..\..\..\modules\juce_gui_extra\embedding\juce_AndroidViewComponent.h"/>
|
||||
|
|
@ -3615,6 +3620,7 @@
|
|||
<ClInclude Include="..\..\..\..\modules\juce_gui_extra\misc\juce_SplashScreen.h"/>
|
||||
<ClInclude Include="..\..\..\..\modules\juce_gui_extra\misc\juce_SystemTrayIconComponent.h"/>
|
||||
<ClInclude Include="..\..\..\..\modules\juce_gui_extra\misc\juce_WebBrowserComponent.h"/>
|
||||
<ClInclude Include="..\..\..\..\modules\juce_gui_extra\misc\juce_WebControlRelays.h"/>
|
||||
<ClInclude Include="..\..\..\..\modules\juce_gui_extra\native\juce_NSViewFrameWatcher_mac.h"/>
|
||||
<ClInclude Include="..\..\..\..\modules\juce_gui_extra\juce_gui_extra.h"/>
|
||||
<ClInclude Include="..\..\..\..\modules\juce_opengl\geometry\juce_Draggable3DOrientation.h"/>
|
||||
|
|
@ -3681,5 +3687,4 @@
|
|||
<ResourceCompile Include=".\resources.rc"/>
|
||||
</ItemGroup>
|
||||
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets"/>
|
||||
<ImportGroup Label="ExtensionTargets"/>
|
||||
</Project>
|
||||
|
|
|
|||
|
|
@ -614,6 +614,9 @@
|
|||
<Filter Include="JUCE Modules\juce_gui_extra\code_editor">
|
||||
<UniqueIdentifier>{DF95D4BF-E18C-125A-5EBB-8993A06E232C}</UniqueIdentifier>
|
||||
</Filter>
|
||||
<Filter Include="JUCE Modules\juce_gui_extra\detail">
|
||||
<UniqueIdentifier>{E0FCBD5F-0B11-D78C-F786-52AB7FEE2383}</UniqueIdentifier>
|
||||
</Filter>
|
||||
<Filter Include="JUCE Modules\juce_gui_extra\documents">
|
||||
<UniqueIdentifier>{118946F2-AC24-0F09-62D5-753DF87A60CD}</UniqueIdentifier>
|
||||
</Filter>
|
||||
|
|
@ -3163,6 +3166,9 @@
|
|||
<ClCompile Include="..\..\..\..\modules\juce_gui_extra\misc\juce_WebBrowserComponent.cpp">
|
||||
<Filter>JUCE Modules\juce_gui_extra\misc</Filter>
|
||||
</ClCompile>
|
||||
<ClCompile Include="..\..\..\..\modules\juce_gui_extra\misc\juce_WebControlRelays.cpp">
|
||||
<Filter>JUCE Modules\juce_gui_extra\misc</Filter>
|
||||
</ClCompile>
|
||||
<ClCompile Include="..\..\..\..\modules\juce_gui_extra\native\juce_ActiveXComponent_windows.cpp">
|
||||
<Filter>JUCE Modules\juce_gui_extra\native</Filter>
|
||||
</ClCompile>
|
||||
|
|
@ -4911,6 +4917,9 @@
|
|||
<ClInclude Include="..\..\..\..\modules\juce_core\misc\juce_Functional.h">
|
||||
<Filter>JUCE Modules\juce_core\misc</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="..\..\..\..\modules\juce_core\misc\juce_OptionsHelpers.h">
|
||||
<Filter>JUCE Modules\juce_core\misc</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="..\..\..\..\modules\juce_core\misc\juce_Result.h">
|
||||
<Filter>JUCE Modules\juce_core\misc</Filter>
|
||||
</ClInclude>
|
||||
|
|
@ -6276,6 +6285,9 @@
|
|||
<ClInclude Include="..\..\..\..\modules\juce_gui_extra\code_editor\juce_XMLCodeTokeniser.h">
|
||||
<Filter>JUCE Modules\juce_gui_extra\code_editor</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="..\..\..\..\modules\juce_gui_extra\detail\juce_WebControlRelayEvents.h">
|
||||
<Filter>JUCE Modules\juce_gui_extra\detail</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="..\..\..\..\modules\juce_gui_extra\documents\juce_FileBasedDocument.h">
|
||||
<Filter>JUCE Modules\juce_gui_extra\documents</Filter>
|
||||
</ClInclude>
|
||||
|
|
@ -6333,6 +6345,9 @@
|
|||
<ClInclude Include="..\..\..\..\modules\juce_gui_extra\misc\juce_WebBrowserComponent.h">
|
||||
<Filter>JUCE Modules\juce_gui_extra\misc</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="..\..\..\..\modules\juce_gui_extra\misc\juce_WebControlRelays.h">
|
||||
<Filter>JUCE Modules\juce_gui_extra\misc</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="..\..\..\..\modules\juce_gui_extra\native\juce_NSViewFrameWatcher_mac.h">
|
||||
<Filter>JUCE Modules\juce_gui_extra\native</Filter>
|
||||
</ClInclude>
|
||||
|
|
|
|||
|
|
@ -2505,6 +2505,9 @@
|
|||
<ClCompile Include="..\..\..\..\modules\juce_gui_extra\misc\juce_WebBrowserComponent.cpp">
|
||||
<ExcludedFromBuild>true</ExcludedFromBuild>
|
||||
</ClCompile>
|
||||
<ClCompile Include="..\..\..\..\modules\juce_gui_extra\misc\juce_WebControlRelays.cpp">
|
||||
<ExcludedFromBuild>true</ExcludedFromBuild>
|
||||
</ClCompile>
|
||||
<ClCompile Include="..\..\..\..\modules\juce_gui_extra\native\juce_ActiveXComponent_windows.cpp">
|
||||
<ExcludedFromBuild>true</ExcludedFromBuild>
|
||||
</ClCompile>
|
||||
|
|
@ -3141,6 +3144,7 @@
|
|||
<ClInclude Include="..\..\..\..\modules\juce_core\misc\juce_ConsoleApplication.h"/>
|
||||
<ClInclude Include="..\..\..\..\modules\juce_core\misc\juce_EnumHelpers.h"/>
|
||||
<ClInclude Include="..\..\..\..\modules\juce_core\misc\juce_Functional.h"/>
|
||||
<ClInclude Include="..\..\..\..\modules\juce_core\misc\juce_OptionsHelpers.h"/>
|
||||
<ClInclude Include="..\..\..\..\modules\juce_core\misc\juce_Result.h"/>
|
||||
<ClInclude Include="..\..\..\..\modules\juce_core\misc\juce_RuntimePermissions.h"/>
|
||||
<ClInclude Include="..\..\..\..\modules\juce_core\misc\juce_ScopeGuard.h"/>
|
||||
|
|
@ -3596,6 +3600,7 @@
|
|||
<ClInclude Include="..\..\..\..\modules\juce_gui_extra\code_editor\juce_CPlusPlusCodeTokeniserFunctions.h"/>
|
||||
<ClInclude Include="..\..\..\..\modules\juce_gui_extra\code_editor\juce_LuaCodeTokeniser.h"/>
|
||||
<ClInclude Include="..\..\..\..\modules\juce_gui_extra\code_editor\juce_XMLCodeTokeniser.h"/>
|
||||
<ClInclude Include="..\..\..\..\modules\juce_gui_extra\detail\juce_WebControlRelayEvents.h"/>
|
||||
<ClInclude Include="..\..\..\..\modules\juce_gui_extra\documents\juce_FileBasedDocument.h"/>
|
||||
<ClInclude Include="..\..\..\..\modules\juce_gui_extra\embedding\juce_ActiveXControlComponent.h"/>
|
||||
<ClInclude Include="..\..\..\..\modules\juce_gui_extra\embedding\juce_AndroidViewComponent.h"/>
|
||||
|
|
@ -3615,6 +3620,7 @@
|
|||
<ClInclude Include="..\..\..\..\modules\juce_gui_extra\misc\juce_SplashScreen.h"/>
|
||||
<ClInclude Include="..\..\..\..\modules\juce_gui_extra\misc\juce_SystemTrayIconComponent.h"/>
|
||||
<ClInclude Include="..\..\..\..\modules\juce_gui_extra\misc\juce_WebBrowserComponent.h"/>
|
||||
<ClInclude Include="..\..\..\..\modules\juce_gui_extra\misc\juce_WebControlRelays.h"/>
|
||||
<ClInclude Include="..\..\..\..\modules\juce_gui_extra\native\juce_NSViewFrameWatcher_mac.h"/>
|
||||
<ClInclude Include="..\..\..\..\modules\juce_gui_extra\juce_gui_extra.h"/>
|
||||
<ClInclude Include="..\..\..\..\modules\juce_opengl\geometry\juce_Draggable3DOrientation.h"/>
|
||||
|
|
@ -3681,5 +3687,4 @@
|
|||
<ResourceCompile Include=".\resources.rc"/>
|
||||
</ItemGroup>
|
||||
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets"/>
|
||||
<ImportGroup Label="ExtensionTargets"/>
|
||||
</Project>
|
||||
|
|
|
|||
|
|
@ -614,6 +614,9 @@
|
|||
<Filter Include="JUCE Modules\juce_gui_extra\code_editor">
|
||||
<UniqueIdentifier>{DF95D4BF-E18C-125A-5EBB-8993A06E232C}</UniqueIdentifier>
|
||||
</Filter>
|
||||
<Filter Include="JUCE Modules\juce_gui_extra\detail">
|
||||
<UniqueIdentifier>{E0FCBD5F-0B11-D78C-F786-52AB7FEE2383}</UniqueIdentifier>
|
||||
</Filter>
|
||||
<Filter Include="JUCE Modules\juce_gui_extra\documents">
|
||||
<UniqueIdentifier>{118946F2-AC24-0F09-62D5-753DF87A60CD}</UniqueIdentifier>
|
||||
</Filter>
|
||||
|
|
@ -3163,6 +3166,9 @@
|
|||
<ClCompile Include="..\..\..\..\modules\juce_gui_extra\misc\juce_WebBrowserComponent.cpp">
|
||||
<Filter>JUCE Modules\juce_gui_extra\misc</Filter>
|
||||
</ClCompile>
|
||||
<ClCompile Include="..\..\..\..\modules\juce_gui_extra\misc\juce_WebControlRelays.cpp">
|
||||
<Filter>JUCE Modules\juce_gui_extra\misc</Filter>
|
||||
</ClCompile>
|
||||
<ClCompile Include="..\..\..\..\modules\juce_gui_extra\native\juce_ActiveXComponent_windows.cpp">
|
||||
<Filter>JUCE Modules\juce_gui_extra\native</Filter>
|
||||
</ClCompile>
|
||||
|
|
@ -4911,6 +4917,9 @@
|
|||
<ClInclude Include="..\..\..\..\modules\juce_core\misc\juce_Functional.h">
|
||||
<Filter>JUCE Modules\juce_core\misc</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="..\..\..\..\modules\juce_core\misc\juce_OptionsHelpers.h">
|
||||
<Filter>JUCE Modules\juce_core\misc</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="..\..\..\..\modules\juce_core\misc\juce_Result.h">
|
||||
<Filter>JUCE Modules\juce_core\misc</Filter>
|
||||
</ClInclude>
|
||||
|
|
@ -6276,6 +6285,9 @@
|
|||
<ClInclude Include="..\..\..\..\modules\juce_gui_extra\code_editor\juce_XMLCodeTokeniser.h">
|
||||
<Filter>JUCE Modules\juce_gui_extra\code_editor</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="..\..\..\..\modules\juce_gui_extra\detail\juce_WebControlRelayEvents.h">
|
||||
<Filter>JUCE Modules\juce_gui_extra\detail</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="..\..\..\..\modules\juce_gui_extra\documents\juce_FileBasedDocument.h">
|
||||
<Filter>JUCE Modules\juce_gui_extra\documents</Filter>
|
||||
</ClInclude>
|
||||
|
|
@ -6333,6 +6345,9 @@
|
|||
<ClInclude Include="..\..\..\..\modules\juce_gui_extra\misc\juce_WebBrowserComponent.h">
|
||||
<Filter>JUCE Modules\juce_gui_extra\misc</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="..\..\..\..\modules\juce_gui_extra\misc\juce_WebControlRelays.h">
|
||||
<Filter>JUCE Modules\juce_gui_extra\misc</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="..\..\..\..\modules\juce_gui_extra\native\juce_NSViewFrameWatcher_mac.h">
|
||||
<Filter>JUCE Modules\juce_gui_extra\native</Filter>
|
||||
</ClInclude>
|
||||
|
|
|
|||
|
|
@ -2505,6 +2505,9 @@
|
|||
<ClCompile Include="..\..\..\..\modules\juce_gui_extra\misc\juce_WebBrowserComponent.cpp">
|
||||
<ExcludedFromBuild>true</ExcludedFromBuild>
|
||||
</ClCompile>
|
||||
<ClCompile Include="..\..\..\..\modules\juce_gui_extra\misc\juce_WebControlRelays.cpp">
|
||||
<ExcludedFromBuild>true</ExcludedFromBuild>
|
||||
</ClCompile>
|
||||
<ClCompile Include="..\..\..\..\modules\juce_gui_extra\native\juce_ActiveXComponent_windows.cpp">
|
||||
<ExcludedFromBuild>true</ExcludedFromBuild>
|
||||
</ClCompile>
|
||||
|
|
@ -3141,6 +3144,7 @@
|
|||
<ClInclude Include="..\..\..\..\modules\juce_core\misc\juce_ConsoleApplication.h"/>
|
||||
<ClInclude Include="..\..\..\..\modules\juce_core\misc\juce_EnumHelpers.h"/>
|
||||
<ClInclude Include="..\..\..\..\modules\juce_core\misc\juce_Functional.h"/>
|
||||
<ClInclude Include="..\..\..\..\modules\juce_core\misc\juce_OptionsHelpers.h"/>
|
||||
<ClInclude Include="..\..\..\..\modules\juce_core\misc\juce_Result.h"/>
|
||||
<ClInclude Include="..\..\..\..\modules\juce_core\misc\juce_RuntimePermissions.h"/>
|
||||
<ClInclude Include="..\..\..\..\modules\juce_core\misc\juce_ScopeGuard.h"/>
|
||||
|
|
@ -3596,6 +3600,7 @@
|
|||
<ClInclude Include="..\..\..\..\modules\juce_gui_extra\code_editor\juce_CPlusPlusCodeTokeniserFunctions.h"/>
|
||||
<ClInclude Include="..\..\..\..\modules\juce_gui_extra\code_editor\juce_LuaCodeTokeniser.h"/>
|
||||
<ClInclude Include="..\..\..\..\modules\juce_gui_extra\code_editor\juce_XMLCodeTokeniser.h"/>
|
||||
<ClInclude Include="..\..\..\..\modules\juce_gui_extra\detail\juce_WebControlRelayEvents.h"/>
|
||||
<ClInclude Include="..\..\..\..\modules\juce_gui_extra\documents\juce_FileBasedDocument.h"/>
|
||||
<ClInclude Include="..\..\..\..\modules\juce_gui_extra\embedding\juce_ActiveXControlComponent.h"/>
|
||||
<ClInclude Include="..\..\..\..\modules\juce_gui_extra\embedding\juce_AndroidViewComponent.h"/>
|
||||
|
|
@ -3615,6 +3620,7 @@
|
|||
<ClInclude Include="..\..\..\..\modules\juce_gui_extra\misc\juce_SplashScreen.h"/>
|
||||
<ClInclude Include="..\..\..\..\modules\juce_gui_extra\misc\juce_SystemTrayIconComponent.h"/>
|
||||
<ClInclude Include="..\..\..\..\modules\juce_gui_extra\misc\juce_WebBrowserComponent.h"/>
|
||||
<ClInclude Include="..\..\..\..\modules\juce_gui_extra\misc\juce_WebControlRelays.h"/>
|
||||
<ClInclude Include="..\..\..\..\modules\juce_gui_extra\native\juce_NSViewFrameWatcher_mac.h"/>
|
||||
<ClInclude Include="..\..\..\..\modules\juce_gui_extra\juce_gui_extra.h"/>
|
||||
<ClInclude Include="..\..\..\..\modules\juce_opengl\geometry\juce_Draggable3DOrientation.h"/>
|
||||
|
|
@ -3681,5 +3687,4 @@
|
|||
<ResourceCompile Include=".\resources.rc"/>
|
||||
</ItemGroup>
|
||||
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets"/>
|
||||
<ImportGroup Label="ExtensionTargets"/>
|
||||
</Project>
|
||||
|
|
|
|||
|
|
@ -614,6 +614,9 @@
|
|||
<Filter Include="JUCE Modules\juce_gui_extra\code_editor">
|
||||
<UniqueIdentifier>{DF95D4BF-E18C-125A-5EBB-8993A06E232C}</UniqueIdentifier>
|
||||
</Filter>
|
||||
<Filter Include="JUCE Modules\juce_gui_extra\detail">
|
||||
<UniqueIdentifier>{E0FCBD5F-0B11-D78C-F786-52AB7FEE2383}</UniqueIdentifier>
|
||||
</Filter>
|
||||
<Filter Include="JUCE Modules\juce_gui_extra\documents">
|
||||
<UniqueIdentifier>{118946F2-AC24-0F09-62D5-753DF87A60CD}</UniqueIdentifier>
|
||||
</Filter>
|
||||
|
|
@ -3163,6 +3166,9 @@
|
|||
<ClCompile Include="..\..\..\..\modules\juce_gui_extra\misc\juce_WebBrowserComponent.cpp">
|
||||
<Filter>JUCE Modules\juce_gui_extra\misc</Filter>
|
||||
</ClCompile>
|
||||
<ClCompile Include="..\..\..\..\modules\juce_gui_extra\misc\juce_WebControlRelays.cpp">
|
||||
<Filter>JUCE Modules\juce_gui_extra\misc</Filter>
|
||||
</ClCompile>
|
||||
<ClCompile Include="..\..\..\..\modules\juce_gui_extra\native\juce_ActiveXComponent_windows.cpp">
|
||||
<Filter>JUCE Modules\juce_gui_extra\native</Filter>
|
||||
</ClCompile>
|
||||
|
|
@ -4911,6 +4917,9 @@
|
|||
<ClInclude Include="..\..\..\..\modules\juce_core\misc\juce_Functional.h">
|
||||
<Filter>JUCE Modules\juce_core\misc</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="..\..\..\..\modules\juce_core\misc\juce_OptionsHelpers.h">
|
||||
<Filter>JUCE Modules\juce_core\misc</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="..\..\..\..\modules\juce_core\misc\juce_Result.h">
|
||||
<Filter>JUCE Modules\juce_core\misc</Filter>
|
||||
</ClInclude>
|
||||
|
|
@ -6276,6 +6285,9 @@
|
|||
<ClInclude Include="..\..\..\..\modules\juce_gui_extra\code_editor\juce_XMLCodeTokeniser.h">
|
||||
<Filter>JUCE Modules\juce_gui_extra\code_editor</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="..\..\..\..\modules\juce_gui_extra\detail\juce_WebControlRelayEvents.h">
|
||||
<Filter>JUCE Modules\juce_gui_extra\detail</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="..\..\..\..\modules\juce_gui_extra\documents\juce_FileBasedDocument.h">
|
||||
<Filter>JUCE Modules\juce_gui_extra\documents</Filter>
|
||||
</ClInclude>
|
||||
|
|
@ -6333,6 +6345,9 @@
|
|||
<ClInclude Include="..\..\..\..\modules\juce_gui_extra\misc\juce_WebBrowserComponent.h">
|
||||
<Filter>JUCE Modules\juce_gui_extra\misc</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="..\..\..\..\modules\juce_gui_extra\misc\juce_WebControlRelays.h">
|
||||
<Filter>JUCE Modules\juce_gui_extra\misc</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="..\..\..\..\modules\juce_gui_extra\native\juce_NSViewFrameWatcher_mac.h">
|
||||
<Filter>JUCE Modules\juce_gui_extra\native</Filter>
|
||||
</ClInclude>
|
||||
|
|
|
|||
|
|
@ -568,6 +568,7 @@
|
|||
<ClInclude Include="..\..\..\..\modules\juce_core\misc\juce_ConsoleApplication.h"/>
|
||||
<ClInclude Include="..\..\..\..\modules\juce_core\misc\juce_EnumHelpers.h"/>
|
||||
<ClInclude Include="..\..\..\..\modules\juce_core\misc\juce_Functional.h"/>
|
||||
<ClInclude Include="..\..\..\..\modules\juce_core\misc\juce_OptionsHelpers.h"/>
|
||||
<ClInclude Include="..\..\..\..\modules\juce_core\misc\juce_Result.h"/>
|
||||
<ClInclude Include="..\..\..\..\modules\juce_core\misc\juce_RuntimePermissions.h"/>
|
||||
<ClInclude Include="..\..\..\..\modules\juce_core\misc\juce_ScopeGuard.h"/>
|
||||
|
|
@ -668,5 +669,4 @@
|
|||
<ResourceCompile Include=".\resources.rc"/>
|
||||
</ItemGroup>
|
||||
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets"/>
|
||||
<ImportGroup Label="ExtensionTargets"/>
|
||||
</Project>
|
||||
|
|
|
|||
|
|
@ -669,6 +669,9 @@
|
|||
<ClInclude Include="..\..\..\..\modules\juce_core\misc\juce_Functional.h">
|
||||
<Filter>JUCE Modules\juce_core\misc</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="..\..\..\..\modules\juce_core\misc\juce_OptionsHelpers.h">
|
||||
<Filter>JUCE Modules\juce_core\misc</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="..\..\..\..\modules\juce_core\misc\juce_Result.h">
|
||||
<Filter>JUCE Modules\juce_core\misc</Filter>
|
||||
</ClInclude>
|
||||
|
|
|
|||
92
extras/Build/CMake/FindWebView2.cmake
Normal file
92
extras/Build/CMake/FindWebView2.cmake
Normal file
|
|
@ -0,0 +1,92 @@
|
|||
# ==============================================================================
|
||||
#
|
||||
# This file is part of the JUCE framework.
|
||||
# Copyright (c) Raw Material Software Limited
|
||||
#
|
||||
# JUCE is an open source framework subject to commercial or open source
|
||||
# licensing.
|
||||
#
|
||||
# By downloading, installing, or using the JUCE framework, or combining the
|
||||
# JUCE framework with any other source code, object code, content or any other
|
||||
# copyrightable work, you agree to the terms of the JUCE End User Licence
|
||||
# Agreement, and all incorporated terms including the JUCE Privacy Policy and
|
||||
# the JUCE Website Terms of Service, as applicable, which will bind you. If you
|
||||
# do not agree to the terms of these agreements, we will not license the JUCE
|
||||
# framework to you, and you must discontinue the installation or download
|
||||
# process and cease use of the JUCE framework.
|
||||
#
|
||||
# JUCE End User Licence Agreement: https://juce.com/legal/juce-8-licence/
|
||||
# JUCE Privacy Policy: https://juce.com/juce-privacy-policy
|
||||
# JUCE Website Terms of Service: https://juce.com/juce-website-terms-of-service/
|
||||
#
|
||||
# Or:
|
||||
#
|
||||
# You may also use this code under the terms of the AGPLv3:
|
||||
# https://www.gnu.org/licenses/agpl-3.0.en.html
|
||||
#
|
||||
# THE JUCE FRAMEWORK IS PROVIDED "AS IS" WITHOUT ANY WARRANTY, AND ALL
|
||||
# WARRANTIES, WHETHER EXPRESSED OR IMPLIED, INCLUDING WARRANTY OF
|
||||
# MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE, ARE DISCLAIMED.
|
||||
#
|
||||
# ==============================================================================
|
||||
|
||||
include(FindPackageHandleStandardArgs)
|
||||
|
||||
if(JUCE_WEBVIEW2_PACKAGE_LOCATION)
|
||||
set(initial_search_dir ${JUCE_WEBVIEW2_PACKAGE_LOCATION})
|
||||
else()
|
||||
set(initial_search_dir "$ENV{USERPROFILE}/AppData/Local/PackageManagement/NuGet/Packages")
|
||||
endif()
|
||||
|
||||
file(GLOB subdirs "${initial_search_dir}/*Microsoft.Web.WebView2*")
|
||||
|
||||
if(subdirs)
|
||||
list(GET subdirs 0 search_dir)
|
||||
list(LENGTH subdirs num_webview2_packages)
|
||||
|
||||
if(num_webview2_packages GREATER 1)
|
||||
message(WARNING "Multiple WebView2 packages found in the local NuGet folder. Proceeding with ${search_dir}.")
|
||||
endif()
|
||||
|
||||
find_path(WebView2_root_dir build/native/include/WebView2.h HINTS ${search_dir})
|
||||
|
||||
set(WebView2_include_dir "${WebView2_root_dir}/build/native/include")
|
||||
|
||||
if(${CMAKE_SYSTEM_PROCESSOR} STREQUAL "arm64")
|
||||
set(WebView2_arch arm64)
|
||||
else()
|
||||
if(CMAKE_SIZEOF_VOID_P EQUAL 8)
|
||||
set(WebView2_arch x64)
|
||||
elseif(CMAKE_SIZEOF_VOID_P EQUAL 4)
|
||||
set(WebView2_arch x86)
|
||||
endif()
|
||||
endif()
|
||||
|
||||
set(WebView2_library "${WebView2_root_dir}/build/native/${WebView2_arch}/WebView2LoaderStatic.lib")
|
||||
elseif(NOT WebView2_FIND_QUIETLY)
|
||||
message(WARNING
|
||||
"WebView2 wasn't found in the the local NuGet folder."
|
||||
"\n"
|
||||
"To install NuGet and the WebView2 package containing the statically linked library, "
|
||||
"open a PowerShell and issue the following commands"
|
||||
"\n"
|
||||
"> Register-PackageSource -provider NuGet -name nugetRepository -location https://www.nuget.org/api/v2\n"
|
||||
"> Install-Package NuGet.CommandLine -Scope CurrentUser\n"
|
||||
"> Install-Package Microsoft.Web.WebView2 -Scope CurrentUser -RequiredVersion 1.0.1901.177\n")
|
||||
endif()
|
||||
|
||||
find_package_handle_standard_args(WebView2 DEFAULT_MSG WebView2_include_dir WebView2_library)
|
||||
|
||||
if(WebView2_FOUND)
|
||||
set(WebView2_INCLUDE_DIRS ${WebView2_include_dir})
|
||||
set(WebView2_LIBRARIES ${WebView2_library} )
|
||||
|
||||
mark_as_advanced(WebView2_library WebView2_include_dir WebView2_root_dir)
|
||||
|
||||
if(NOT TARGET juce_webview2)
|
||||
add_library(juce_webview2 INTERFACE)
|
||||
add_library(juce::juce_webview2 ALIAS juce_webview2)
|
||||
target_include_directories(juce_webview2 INTERFACE ${WebView2_INCLUDE_DIRS})
|
||||
target_link_libraries(juce_webview2 INTERFACE ${WebView2_LIBRARIES})
|
||||
endif()
|
||||
endif()
|
||||
|
|
@ -275,6 +275,17 @@ function(_juce_link_optional_libraries target)
|
|||
if(CMAKE_SYSTEM_NAME STREQUAL "iOS" AND needs_camera)
|
||||
_juce_link_frameworks("${target}" PRIVATE ImageIO)
|
||||
endif()
|
||||
elseif(WIN32)
|
||||
get_target_property(needs_webview2 ${target} JUCE_NEEDS_WEBVIEW2)
|
||||
|
||||
if (needs_webview2)
|
||||
if(NOT ("${JUCE_CMAKE_UTILS_DIR}" IN_LIST CMAKE_MODULE_PATH))
|
||||
list(APPEND CMAKE_MODULE_PATH "${JUCE_CMAKE_UTILS_DIR}")
|
||||
endif()
|
||||
|
||||
find_package(WebView2 REQUIRED)
|
||||
target_link_libraries(${target} PRIVATE juce::juce_webview2)
|
||||
endif()
|
||||
endif()
|
||||
endfunction()
|
||||
|
||||
|
|
@ -1864,6 +1875,7 @@ function(_juce_initialise_target target)
|
|||
COMPANY_EMAIL
|
||||
NEEDS_CURL # Set this true if you want to link curl on Linux
|
||||
NEEDS_WEB_BROWSER # Set this true if you want to link webkit on Linux
|
||||
NEEDS_WEBVIEW2 # Set this true if you want to link WebView2 statically on Windows
|
||||
NEEDS_STORE_KIT # Set this true if you want in-app-purchases on Mac
|
||||
PUSH_NOTIFICATIONS_ENABLED
|
||||
NETWORK_MULTICAST_ENABLED
|
||||
|
|
@ -2130,6 +2142,10 @@ function(juce_add_pip header)
|
|||
list(APPEND extra_target_args PLUGINHOST_AU TRUE)
|
||||
endif()
|
||||
|
||||
if("JUCE_USE_WIN_WEBVIEW2_WITH_STATIC_LINKING=1" IN_LIST pip_moduleflags)
|
||||
list(APPEND extra_target_args NEEDS_WEBVIEW2 TRUE)
|
||||
endif()
|
||||
|
||||
if(pip_kind STREQUAL "AudioProcessor")
|
||||
_juce_get_metadata("${metadata_dict}" documentControllerClass JUCE_PIP_DOCUMENTCONTROLLER_CLASS)
|
||||
|
||||
|
|
|
|||
|
|
@ -957,6 +957,7 @@ add_library( ${BINARY_NAME}
|
|||
"../../../../../modules/juce_core/misc/juce_EnumHelpers.h"
|
||||
"../../../../../modules/juce_core/misc/juce_EnumHelpers_test.cpp"
|
||||
"../../../../../modules/juce_core/misc/juce_Functional.h"
|
||||
"../../../../../modules/juce_core/misc/juce_OptionsHelpers.h"
|
||||
"../../../../../modules/juce_core/misc/juce_Result.cpp"
|
||||
"../../../../../modules/juce_core/misc/juce_Result.h"
|
||||
"../../../../../modules/juce_core/misc/juce_RuntimePermissions.cpp"
|
||||
|
|
@ -1781,6 +1782,7 @@ add_library( ${BINARY_NAME}
|
|||
"../../../../../modules/juce_gui_extra/code_editor/juce_LuaCodeTokeniser.h"
|
||||
"../../../../../modules/juce_gui_extra/code_editor/juce_XMLCodeTokeniser.cpp"
|
||||
"../../../../../modules/juce_gui_extra/code_editor/juce_XMLCodeTokeniser.h"
|
||||
"../../../../../modules/juce_gui_extra/detail/juce_WebControlRelayEvents.h"
|
||||
"../../../../../modules/juce_gui_extra/documents/juce_FileBasedDocument.cpp"
|
||||
"../../../../../modules/juce_gui_extra/documents/juce_FileBasedDocument.h"
|
||||
"../../../../../modules/juce_gui_extra/embedding/juce_ActiveXControlComponent.h"
|
||||
|
|
@ -1812,6 +1814,8 @@ add_library( ${BINARY_NAME}
|
|||
"../../../../../modules/juce_gui_extra/misc/juce_SystemTrayIconComponent.h"
|
||||
"../../../../../modules/juce_gui_extra/misc/juce_WebBrowserComponent.cpp"
|
||||
"../../../../../modules/juce_gui_extra/misc/juce_WebBrowserComponent.h"
|
||||
"../../../../../modules/juce_gui_extra/misc/juce_WebControlRelays.cpp"
|
||||
"../../../../../modules/juce_gui_extra/misc/juce_WebControlRelays.h"
|
||||
"../../../../../modules/juce_gui_extra/native/juce_ActiveXComponent_windows.cpp"
|
||||
"../../../../../modules/juce_gui_extra/native/juce_AndroidViewComponent.cpp"
|
||||
"../../../../../modules/juce_gui_extra/native/juce_AppleRemote_mac.mm"
|
||||
|
|
@ -2831,6 +2835,7 @@ set_source_files_properties(
|
|||
"../../../../../modules/juce_core/misc/juce_EnumHelpers.h"
|
||||
"../../../../../modules/juce_core/misc/juce_EnumHelpers_test.cpp"
|
||||
"../../../../../modules/juce_core/misc/juce_Functional.h"
|
||||
"../../../../../modules/juce_core/misc/juce_OptionsHelpers.h"
|
||||
"../../../../../modules/juce_core/misc/juce_Result.cpp"
|
||||
"../../../../../modules/juce_core/misc/juce_Result.h"
|
||||
"../../../../../modules/juce_core/misc/juce_RuntimePermissions.cpp"
|
||||
|
|
@ -3655,6 +3660,7 @@ set_source_files_properties(
|
|||
"../../../../../modules/juce_gui_extra/code_editor/juce_LuaCodeTokeniser.h"
|
||||
"../../../../../modules/juce_gui_extra/code_editor/juce_XMLCodeTokeniser.cpp"
|
||||
"../../../../../modules/juce_gui_extra/code_editor/juce_XMLCodeTokeniser.h"
|
||||
"../../../../../modules/juce_gui_extra/detail/juce_WebControlRelayEvents.h"
|
||||
"../../../../../modules/juce_gui_extra/documents/juce_FileBasedDocument.cpp"
|
||||
"../../../../../modules/juce_gui_extra/documents/juce_FileBasedDocument.h"
|
||||
"../../../../../modules/juce_gui_extra/embedding/juce_ActiveXControlComponent.h"
|
||||
|
|
@ -3686,6 +3692,8 @@ set_source_files_properties(
|
|||
"../../../../../modules/juce_gui_extra/misc/juce_SystemTrayIconComponent.h"
|
||||
"../../../../../modules/juce_gui_extra/misc/juce_WebBrowserComponent.cpp"
|
||||
"../../../../../modules/juce_gui_extra/misc/juce_WebBrowserComponent.h"
|
||||
"../../../../../modules/juce_gui_extra/misc/juce_WebControlRelays.cpp"
|
||||
"../../../../../modules/juce_gui_extra/misc/juce_WebControlRelays.h"
|
||||
"../../../../../modules/juce_gui_extra/native/juce_ActiveXComponent_windows.cpp"
|
||||
"../../../../../modules/juce_gui_extra/native/juce_AndroidViewComponent.cpp"
|
||||
"../../../../../modules/juce_gui_extra/native/juce_AppleRemote_mac.mm"
|
||||
|
|
|
|||
|
|
@ -2392,6 +2392,9 @@
|
|||
<ClCompile Include="..\..\..\..\modules\juce_gui_extra\misc\juce_WebBrowserComponent.cpp">
|
||||
<ExcludedFromBuild>true</ExcludedFromBuild>
|
||||
</ClCompile>
|
||||
<ClCompile Include="..\..\..\..\modules\juce_gui_extra\misc\juce_WebControlRelays.cpp">
|
||||
<ExcludedFromBuild>true</ExcludedFromBuild>
|
||||
</ClCompile>
|
||||
<ClCompile Include="..\..\..\..\modules\juce_gui_extra\native\juce_ActiveXComponent_windows.cpp">
|
||||
<ExcludedFromBuild>true</ExcludedFromBuild>
|
||||
</ClCompile>
|
||||
|
|
@ -3052,6 +3055,7 @@
|
|||
<ClInclude Include="..\..\..\..\modules\juce_core\misc\juce_ConsoleApplication.h"/>
|
||||
<ClInclude Include="..\..\..\..\modules\juce_core\misc\juce_EnumHelpers.h"/>
|
||||
<ClInclude Include="..\..\..\..\modules\juce_core\misc\juce_Functional.h"/>
|
||||
<ClInclude Include="..\..\..\..\modules\juce_core\misc\juce_OptionsHelpers.h"/>
|
||||
<ClInclude Include="..\..\..\..\modules\juce_core\misc\juce_Result.h"/>
|
||||
<ClInclude Include="..\..\..\..\modules\juce_core\misc\juce_RuntimePermissions.h"/>
|
||||
<ClInclude Include="..\..\..\..\modules\juce_core\misc\juce_ScopeGuard.h"/>
|
||||
|
|
@ -3461,6 +3465,7 @@
|
|||
<ClInclude Include="..\..\..\..\modules\juce_gui_extra\code_editor\juce_CPlusPlusCodeTokeniserFunctions.h"/>
|
||||
<ClInclude Include="..\..\..\..\modules\juce_gui_extra\code_editor\juce_LuaCodeTokeniser.h"/>
|
||||
<ClInclude Include="..\..\..\..\modules\juce_gui_extra\code_editor\juce_XMLCodeTokeniser.h"/>
|
||||
<ClInclude Include="..\..\..\..\modules\juce_gui_extra\detail\juce_WebControlRelayEvents.h"/>
|
||||
<ClInclude Include="..\..\..\..\modules\juce_gui_extra\documents\juce_FileBasedDocument.h"/>
|
||||
<ClInclude Include="..\..\..\..\modules\juce_gui_extra\embedding\juce_ActiveXControlComponent.h"/>
|
||||
<ClInclude Include="..\..\..\..\modules\juce_gui_extra\embedding\juce_AndroidViewComponent.h"/>
|
||||
|
|
@ -3480,6 +3485,7 @@
|
|||
<ClInclude Include="..\..\..\..\modules\juce_gui_extra\misc\juce_SplashScreen.h"/>
|
||||
<ClInclude Include="..\..\..\..\modules\juce_gui_extra\misc\juce_SystemTrayIconComponent.h"/>
|
||||
<ClInclude Include="..\..\..\..\modules\juce_gui_extra\misc\juce_WebBrowserComponent.h"/>
|
||||
<ClInclude Include="..\..\..\..\modules\juce_gui_extra\misc\juce_WebControlRelays.h"/>
|
||||
<ClInclude Include="..\..\..\..\modules\juce_gui_extra\native\juce_NSViewFrameWatcher_mac.h"/>
|
||||
<ClInclude Include="..\..\..\..\modules\juce_gui_extra\juce_gui_extra.h"/>
|
||||
<ClInclude Include="..\..\..\..\modules\juce_opengl\geometry\juce_Draggable3DOrientation.h"/>
|
||||
|
|
@ -3548,5 +3554,4 @@
|
|||
<ResourceCompile Include=".\resources.rc"/>
|
||||
</ItemGroup>
|
||||
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets"/>
|
||||
<ImportGroup Label="ExtensionTargets"/>
|
||||
</Project>
|
||||
|
|
|
|||
|
|
@ -581,6 +581,9 @@
|
|||
<Filter Include="JUCE Modules\juce_gui_extra\code_editor">
|
||||
<UniqueIdentifier>{DF95D4BF-E18C-125A-5EBB-8993A06E232C}</UniqueIdentifier>
|
||||
</Filter>
|
||||
<Filter Include="JUCE Modules\juce_gui_extra\detail">
|
||||
<UniqueIdentifier>{E0FCBD5F-0B11-D78C-F786-52AB7FEE2383}</UniqueIdentifier>
|
||||
</Filter>
|
||||
<Filter Include="JUCE Modules\juce_gui_extra\documents">
|
||||
<UniqueIdentifier>{118946F2-AC24-0F09-62D5-753DF87A60CD}</UniqueIdentifier>
|
||||
</Filter>
|
||||
|
|
@ -3010,6 +3013,9 @@
|
|||
<ClCompile Include="..\..\..\..\modules\juce_gui_extra\misc\juce_WebBrowserComponent.cpp">
|
||||
<Filter>JUCE Modules\juce_gui_extra\misc</Filter>
|
||||
</ClCompile>
|
||||
<ClCompile Include="..\..\..\..\modules\juce_gui_extra\misc\juce_WebControlRelays.cpp">
|
||||
<Filter>JUCE Modules\juce_gui_extra\misc</Filter>
|
||||
</ClCompile>
|
||||
<ClCompile Include="..\..\..\..\modules\juce_gui_extra\native\juce_ActiveXComponent_windows.cpp">
|
||||
<Filter>JUCE Modules\juce_gui_extra\native</Filter>
|
||||
</ClCompile>
|
||||
|
|
@ -4776,6 +4782,9 @@
|
|||
<ClInclude Include="..\..\..\..\modules\juce_core\misc\juce_Functional.h">
|
||||
<Filter>JUCE Modules\juce_core\misc</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="..\..\..\..\modules\juce_core\misc\juce_OptionsHelpers.h">
|
||||
<Filter>JUCE Modules\juce_core\misc</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="..\..\..\..\modules\juce_core\misc\juce_Result.h">
|
||||
<Filter>JUCE Modules\juce_core\misc</Filter>
|
||||
</ClInclude>
|
||||
|
|
@ -6003,6 +6012,9 @@
|
|||
<ClInclude Include="..\..\..\..\modules\juce_gui_extra\code_editor\juce_XMLCodeTokeniser.h">
|
||||
<Filter>JUCE Modules\juce_gui_extra\code_editor</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="..\..\..\..\modules\juce_gui_extra\detail\juce_WebControlRelayEvents.h">
|
||||
<Filter>JUCE Modules\juce_gui_extra\detail</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="..\..\..\..\modules\juce_gui_extra\documents\juce_FileBasedDocument.h">
|
||||
<Filter>JUCE Modules\juce_gui_extra\documents</Filter>
|
||||
</ClInclude>
|
||||
|
|
@ -6060,6 +6072,9 @@
|
|||
<ClInclude Include="..\..\..\..\modules\juce_gui_extra\misc\juce_WebBrowserComponent.h">
|
||||
<Filter>JUCE Modules\juce_gui_extra\misc</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="..\..\..\..\modules\juce_gui_extra\misc\juce_WebControlRelays.h">
|
||||
<Filter>JUCE Modules\juce_gui_extra\misc</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="..\..\..\..\modules\juce_gui_extra\native\juce_NSViewFrameWatcher_mac.h">
|
||||
<Filter>JUCE Modules\juce_gui_extra\native</Filter>
|
||||
</ClInclude>
|
||||
|
|
|
|||
|
|
@ -1574,6 +1574,9 @@
|
|||
<ClCompile Include="..\..\..\..\modules\juce_gui_extra\misc\juce_WebBrowserComponent.cpp">
|
||||
<ExcludedFromBuild>true</ExcludedFromBuild>
|
||||
</ClCompile>
|
||||
<ClCompile Include="..\..\..\..\modules\juce_gui_extra\misc\juce_WebControlRelays.cpp">
|
||||
<ExcludedFromBuild>true</ExcludedFromBuild>
|
||||
</ClCompile>
|
||||
<ClCompile Include="..\..\..\..\modules\juce_gui_extra\native\juce_ActiveXComponent_windows.cpp">
|
||||
<ExcludedFromBuild>true</ExcludedFromBuild>
|
||||
</ClCompile>
|
||||
|
|
@ -1869,6 +1872,7 @@
|
|||
<ClInclude Include="..\..\..\..\modules\juce_core\misc\juce_ConsoleApplication.h"/>
|
||||
<ClInclude Include="..\..\..\..\modules\juce_core\misc\juce_EnumHelpers.h"/>
|
||||
<ClInclude Include="..\..\..\..\modules\juce_core\misc\juce_Functional.h"/>
|
||||
<ClInclude Include="..\..\..\..\modules\juce_core\misc\juce_OptionsHelpers.h"/>
|
||||
<ClInclude Include="..\..\..\..\modules\juce_core\misc\juce_Result.h"/>
|
||||
<ClInclude Include="..\..\..\..\modules\juce_core\misc\juce_RuntimePermissions.h"/>
|
||||
<ClInclude Include="..\..\..\..\modules\juce_core\misc\juce_ScopeGuard.h"/>
|
||||
|
|
@ -2278,6 +2282,7 @@
|
|||
<ClInclude Include="..\..\..\..\modules\juce_gui_extra\code_editor\juce_CPlusPlusCodeTokeniserFunctions.h"/>
|
||||
<ClInclude Include="..\..\..\..\modules\juce_gui_extra\code_editor\juce_LuaCodeTokeniser.h"/>
|
||||
<ClInclude Include="..\..\..\..\modules\juce_gui_extra\code_editor\juce_XMLCodeTokeniser.h"/>
|
||||
<ClInclude Include="..\..\..\..\modules\juce_gui_extra\detail\juce_WebControlRelayEvents.h"/>
|
||||
<ClInclude Include="..\..\..\..\modules\juce_gui_extra\documents\juce_FileBasedDocument.h"/>
|
||||
<ClInclude Include="..\..\..\..\modules\juce_gui_extra\embedding\juce_ActiveXControlComponent.h"/>
|
||||
<ClInclude Include="..\..\..\..\modules\juce_gui_extra\embedding\juce_AndroidViewComponent.h"/>
|
||||
|
|
@ -2297,6 +2302,7 @@
|
|||
<ClInclude Include="..\..\..\..\modules\juce_gui_extra\misc\juce_SplashScreen.h"/>
|
||||
<ClInclude Include="..\..\..\..\modules\juce_gui_extra\misc\juce_SystemTrayIconComponent.h"/>
|
||||
<ClInclude Include="..\..\..\..\modules\juce_gui_extra\misc\juce_WebBrowserComponent.h"/>
|
||||
<ClInclude Include="..\..\..\..\modules\juce_gui_extra\misc\juce_WebControlRelays.h"/>
|
||||
<ClInclude Include="..\..\..\..\modules\juce_gui_extra\native\juce_NSViewFrameWatcher_mac.h"/>
|
||||
<ClInclude Include="..\..\..\..\modules\juce_gui_extra\juce_gui_extra.h"/>
|
||||
<ClInclude Include="..\..\JuceLibraryCode\BinaryData.h"/>
|
||||
|
|
@ -2344,5 +2350,4 @@
|
|||
<ResourceCompile Include=".\resources.rc"/>
|
||||
</ItemGroup>
|
||||
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets"/>
|
||||
<ImportGroup Label="ExtensionTargets"/>
|
||||
</Project>
|
||||
|
|
|
|||
|
|
@ -305,6 +305,9 @@
|
|||
<Filter Include="JUCE Modules\juce_gui_extra\code_editor">
|
||||
<UniqueIdentifier>{DF95D4BF-E18C-125A-5EBB-8993A06E232C}</UniqueIdentifier>
|
||||
</Filter>
|
||||
<Filter Include="JUCE Modules\juce_gui_extra\detail">
|
||||
<UniqueIdentifier>{E0FCBD5F-0B11-D78C-F786-52AB7FEE2383}</UniqueIdentifier>
|
||||
</Filter>
|
||||
<Filter Include="JUCE Modules\juce_gui_extra\documents">
|
||||
<UniqueIdentifier>{118946F2-AC24-0F09-62D5-753DF87A60CD}</UniqueIdentifier>
|
||||
</Filter>
|
||||
|
|
@ -1954,6 +1957,9 @@
|
|||
<ClCompile Include="..\..\..\..\modules\juce_gui_extra\misc\juce_WebBrowserComponent.cpp">
|
||||
<Filter>JUCE Modules\juce_gui_extra\misc</Filter>
|
||||
</ClCompile>
|
||||
<ClCompile Include="..\..\..\..\modules\juce_gui_extra\misc\juce_WebControlRelays.cpp">
|
||||
<Filter>JUCE Modules\juce_gui_extra\misc</Filter>
|
||||
</ClCompile>
|
||||
<ClCompile Include="..\..\..\..\modules\juce_gui_extra\native\juce_ActiveXComponent_windows.cpp">
|
||||
<Filter>JUCE Modules\juce_gui_extra\native</Filter>
|
||||
</ClCompile>
|
||||
|
|
@ -2754,6 +2760,9 @@
|
|||
<ClInclude Include="..\..\..\..\modules\juce_core\misc\juce_Functional.h">
|
||||
<Filter>JUCE Modules\juce_core\misc</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="..\..\..\..\modules\juce_core\misc\juce_OptionsHelpers.h">
|
||||
<Filter>JUCE Modules\juce_core\misc</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="..\..\..\..\modules\juce_core\misc\juce_Result.h">
|
||||
<Filter>JUCE Modules\juce_core\misc</Filter>
|
||||
</ClInclude>
|
||||
|
|
@ -3981,6 +3990,9 @@
|
|||
<ClInclude Include="..\..\..\..\modules\juce_gui_extra\code_editor\juce_XMLCodeTokeniser.h">
|
||||
<Filter>JUCE Modules\juce_gui_extra\code_editor</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="..\..\..\..\modules\juce_gui_extra\detail\juce_WebControlRelayEvents.h">
|
||||
<Filter>JUCE Modules\juce_gui_extra\detail</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="..\..\..\..\modules\juce_gui_extra\documents\juce_FileBasedDocument.h">
|
||||
<Filter>JUCE Modules\juce_gui_extra\documents</Filter>
|
||||
</ClInclude>
|
||||
|
|
@ -4038,6 +4050,9 @@
|
|||
<ClInclude Include="..\..\..\..\modules\juce_gui_extra\misc\juce_WebBrowserComponent.h">
|
||||
<Filter>JUCE Modules\juce_gui_extra\misc</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="..\..\..\..\modules\juce_gui_extra\misc\juce_WebControlRelays.h">
|
||||
<Filter>JUCE Modules\juce_gui_extra\misc</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="..\..\..\..\modules\juce_gui_extra\native\juce_NSViewFrameWatcher_mac.h">
|
||||
<Filter>JUCE Modules\juce_gui_extra\native</Filter>
|
||||
</ClInclude>
|
||||
|
|
|
|||
|
|
@ -1574,6 +1574,9 @@
|
|||
<ClCompile Include="..\..\..\..\modules\juce_gui_extra\misc\juce_WebBrowserComponent.cpp">
|
||||
<ExcludedFromBuild>true</ExcludedFromBuild>
|
||||
</ClCompile>
|
||||
<ClCompile Include="..\..\..\..\modules\juce_gui_extra\misc\juce_WebControlRelays.cpp">
|
||||
<ExcludedFromBuild>true</ExcludedFromBuild>
|
||||
</ClCompile>
|
||||
<ClCompile Include="..\..\..\..\modules\juce_gui_extra\native\juce_ActiveXComponent_windows.cpp">
|
||||
<ExcludedFromBuild>true</ExcludedFromBuild>
|
||||
</ClCompile>
|
||||
|
|
@ -1869,6 +1872,7 @@
|
|||
<ClInclude Include="..\..\..\..\modules\juce_core\misc\juce_ConsoleApplication.h"/>
|
||||
<ClInclude Include="..\..\..\..\modules\juce_core\misc\juce_EnumHelpers.h"/>
|
||||
<ClInclude Include="..\..\..\..\modules\juce_core\misc\juce_Functional.h"/>
|
||||
<ClInclude Include="..\..\..\..\modules\juce_core\misc\juce_OptionsHelpers.h"/>
|
||||
<ClInclude Include="..\..\..\..\modules\juce_core\misc\juce_Result.h"/>
|
||||
<ClInclude Include="..\..\..\..\modules\juce_core\misc\juce_RuntimePermissions.h"/>
|
||||
<ClInclude Include="..\..\..\..\modules\juce_core\misc\juce_ScopeGuard.h"/>
|
||||
|
|
@ -2278,6 +2282,7 @@
|
|||
<ClInclude Include="..\..\..\..\modules\juce_gui_extra\code_editor\juce_CPlusPlusCodeTokeniserFunctions.h"/>
|
||||
<ClInclude Include="..\..\..\..\modules\juce_gui_extra\code_editor\juce_LuaCodeTokeniser.h"/>
|
||||
<ClInclude Include="..\..\..\..\modules\juce_gui_extra\code_editor\juce_XMLCodeTokeniser.h"/>
|
||||
<ClInclude Include="..\..\..\..\modules\juce_gui_extra\detail\juce_WebControlRelayEvents.h"/>
|
||||
<ClInclude Include="..\..\..\..\modules\juce_gui_extra\documents\juce_FileBasedDocument.h"/>
|
||||
<ClInclude Include="..\..\..\..\modules\juce_gui_extra\embedding\juce_ActiveXControlComponent.h"/>
|
||||
<ClInclude Include="..\..\..\..\modules\juce_gui_extra\embedding\juce_AndroidViewComponent.h"/>
|
||||
|
|
@ -2297,6 +2302,7 @@
|
|||
<ClInclude Include="..\..\..\..\modules\juce_gui_extra\misc\juce_SplashScreen.h"/>
|
||||
<ClInclude Include="..\..\..\..\modules\juce_gui_extra\misc\juce_SystemTrayIconComponent.h"/>
|
||||
<ClInclude Include="..\..\..\..\modules\juce_gui_extra\misc\juce_WebBrowserComponent.h"/>
|
||||
<ClInclude Include="..\..\..\..\modules\juce_gui_extra\misc\juce_WebControlRelays.h"/>
|
||||
<ClInclude Include="..\..\..\..\modules\juce_gui_extra\native\juce_NSViewFrameWatcher_mac.h"/>
|
||||
<ClInclude Include="..\..\..\..\modules\juce_gui_extra\juce_gui_extra.h"/>
|
||||
<ClInclude Include="..\..\JuceLibraryCode\BinaryData.h"/>
|
||||
|
|
@ -2344,5 +2350,4 @@
|
|||
<ResourceCompile Include=".\resources.rc"/>
|
||||
</ItemGroup>
|
||||
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets"/>
|
||||
<ImportGroup Label="ExtensionTargets"/>
|
||||
</Project>
|
||||
|
|
|
|||
|
|
@ -305,6 +305,9 @@
|
|||
<Filter Include="JUCE Modules\juce_gui_extra\code_editor">
|
||||
<UniqueIdentifier>{DF95D4BF-E18C-125A-5EBB-8993A06E232C}</UniqueIdentifier>
|
||||
</Filter>
|
||||
<Filter Include="JUCE Modules\juce_gui_extra\detail">
|
||||
<UniqueIdentifier>{E0FCBD5F-0B11-D78C-F786-52AB7FEE2383}</UniqueIdentifier>
|
||||
</Filter>
|
||||
<Filter Include="JUCE Modules\juce_gui_extra\documents">
|
||||
<UniqueIdentifier>{118946F2-AC24-0F09-62D5-753DF87A60CD}</UniqueIdentifier>
|
||||
</Filter>
|
||||
|
|
@ -1954,6 +1957,9 @@
|
|||
<ClCompile Include="..\..\..\..\modules\juce_gui_extra\misc\juce_WebBrowserComponent.cpp">
|
||||
<Filter>JUCE Modules\juce_gui_extra\misc</Filter>
|
||||
</ClCompile>
|
||||
<ClCompile Include="..\..\..\..\modules\juce_gui_extra\misc\juce_WebControlRelays.cpp">
|
||||
<Filter>JUCE Modules\juce_gui_extra\misc</Filter>
|
||||
</ClCompile>
|
||||
<ClCompile Include="..\..\..\..\modules\juce_gui_extra\native\juce_ActiveXComponent_windows.cpp">
|
||||
<Filter>JUCE Modules\juce_gui_extra\native</Filter>
|
||||
</ClCompile>
|
||||
|
|
@ -2754,6 +2760,9 @@
|
|||
<ClInclude Include="..\..\..\..\modules\juce_core\misc\juce_Functional.h">
|
||||
<Filter>JUCE Modules\juce_core\misc</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="..\..\..\..\modules\juce_core\misc\juce_OptionsHelpers.h">
|
||||
<Filter>JUCE Modules\juce_core\misc</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="..\..\..\..\modules\juce_core\misc\juce_Result.h">
|
||||
<Filter>JUCE Modules\juce_core\misc</Filter>
|
||||
</ClInclude>
|
||||
|
|
@ -3981,6 +3990,9 @@
|
|||
<ClInclude Include="..\..\..\..\modules\juce_gui_extra\code_editor\juce_XMLCodeTokeniser.h">
|
||||
<Filter>JUCE Modules\juce_gui_extra\code_editor</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="..\..\..\..\modules\juce_gui_extra\detail\juce_WebControlRelayEvents.h">
|
||||
<Filter>JUCE Modules\juce_gui_extra\detail</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="..\..\..\..\modules\juce_gui_extra\documents\juce_FileBasedDocument.h">
|
||||
<Filter>JUCE Modules\juce_gui_extra\documents</Filter>
|
||||
</ClInclude>
|
||||
|
|
@ -4038,6 +4050,9 @@
|
|||
<ClInclude Include="..\..\..\..\modules\juce_gui_extra\misc\juce_WebBrowserComponent.h">
|
||||
<Filter>JUCE Modules\juce_gui_extra\misc</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="..\..\..\..\modules\juce_gui_extra\misc\juce_WebControlRelays.h">
|
||||
<Filter>JUCE Modules\juce_gui_extra\misc</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="..\..\..\..\modules\juce_gui_extra\native\juce_NSViewFrameWatcher_mac.h">
|
||||
<Filter>JUCE Modules\juce_gui_extra\native</Filter>
|
||||
</ClInclude>
|
||||
|
|
|
|||
|
|
@ -1574,6 +1574,9 @@
|
|||
<ClCompile Include="..\..\..\..\modules\juce_gui_extra\misc\juce_WebBrowserComponent.cpp">
|
||||
<ExcludedFromBuild>true</ExcludedFromBuild>
|
||||
</ClCompile>
|
||||
<ClCompile Include="..\..\..\..\modules\juce_gui_extra\misc\juce_WebControlRelays.cpp">
|
||||
<ExcludedFromBuild>true</ExcludedFromBuild>
|
||||
</ClCompile>
|
||||
<ClCompile Include="..\..\..\..\modules\juce_gui_extra\native\juce_ActiveXComponent_windows.cpp">
|
||||
<ExcludedFromBuild>true</ExcludedFromBuild>
|
||||
</ClCompile>
|
||||
|
|
@ -1869,6 +1872,7 @@
|
|||
<ClInclude Include="..\..\..\..\modules\juce_core\misc\juce_ConsoleApplication.h"/>
|
||||
<ClInclude Include="..\..\..\..\modules\juce_core\misc\juce_EnumHelpers.h"/>
|
||||
<ClInclude Include="..\..\..\..\modules\juce_core\misc\juce_Functional.h"/>
|
||||
<ClInclude Include="..\..\..\..\modules\juce_core\misc\juce_OptionsHelpers.h"/>
|
||||
<ClInclude Include="..\..\..\..\modules\juce_core\misc\juce_Result.h"/>
|
||||
<ClInclude Include="..\..\..\..\modules\juce_core\misc\juce_RuntimePermissions.h"/>
|
||||
<ClInclude Include="..\..\..\..\modules\juce_core\misc\juce_ScopeGuard.h"/>
|
||||
|
|
@ -2278,6 +2282,7 @@
|
|||
<ClInclude Include="..\..\..\..\modules\juce_gui_extra\code_editor\juce_CPlusPlusCodeTokeniserFunctions.h"/>
|
||||
<ClInclude Include="..\..\..\..\modules\juce_gui_extra\code_editor\juce_LuaCodeTokeniser.h"/>
|
||||
<ClInclude Include="..\..\..\..\modules\juce_gui_extra\code_editor\juce_XMLCodeTokeniser.h"/>
|
||||
<ClInclude Include="..\..\..\..\modules\juce_gui_extra\detail\juce_WebControlRelayEvents.h"/>
|
||||
<ClInclude Include="..\..\..\..\modules\juce_gui_extra\documents\juce_FileBasedDocument.h"/>
|
||||
<ClInclude Include="..\..\..\..\modules\juce_gui_extra\embedding\juce_ActiveXControlComponent.h"/>
|
||||
<ClInclude Include="..\..\..\..\modules\juce_gui_extra\embedding\juce_AndroidViewComponent.h"/>
|
||||
|
|
@ -2297,6 +2302,7 @@
|
|||
<ClInclude Include="..\..\..\..\modules\juce_gui_extra\misc\juce_SplashScreen.h"/>
|
||||
<ClInclude Include="..\..\..\..\modules\juce_gui_extra\misc\juce_SystemTrayIconComponent.h"/>
|
||||
<ClInclude Include="..\..\..\..\modules\juce_gui_extra\misc\juce_WebBrowserComponent.h"/>
|
||||
<ClInclude Include="..\..\..\..\modules\juce_gui_extra\misc\juce_WebControlRelays.h"/>
|
||||
<ClInclude Include="..\..\..\..\modules\juce_gui_extra\native\juce_NSViewFrameWatcher_mac.h"/>
|
||||
<ClInclude Include="..\..\..\..\modules\juce_gui_extra\juce_gui_extra.h"/>
|
||||
<ClInclude Include="..\..\JuceLibraryCode\BinaryData.h"/>
|
||||
|
|
@ -2344,5 +2350,4 @@
|
|||
<ResourceCompile Include=".\resources.rc"/>
|
||||
</ItemGroup>
|
||||
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets"/>
|
||||
<ImportGroup Label="ExtensionTargets"/>
|
||||
</Project>
|
||||
|
|
|
|||
|
|
@ -305,6 +305,9 @@
|
|||
<Filter Include="JUCE Modules\juce_gui_extra\code_editor">
|
||||
<UniqueIdentifier>{DF95D4BF-E18C-125A-5EBB-8993A06E232C}</UniqueIdentifier>
|
||||
</Filter>
|
||||
<Filter Include="JUCE Modules\juce_gui_extra\detail">
|
||||
<UniqueIdentifier>{E0FCBD5F-0B11-D78C-F786-52AB7FEE2383}</UniqueIdentifier>
|
||||
</Filter>
|
||||
<Filter Include="JUCE Modules\juce_gui_extra\documents">
|
||||
<UniqueIdentifier>{118946F2-AC24-0F09-62D5-753DF87A60CD}</UniqueIdentifier>
|
||||
</Filter>
|
||||
|
|
@ -1954,6 +1957,9 @@
|
|||
<ClCompile Include="..\..\..\..\modules\juce_gui_extra\misc\juce_WebBrowserComponent.cpp">
|
||||
<Filter>JUCE Modules\juce_gui_extra\misc</Filter>
|
||||
</ClCompile>
|
||||
<ClCompile Include="..\..\..\..\modules\juce_gui_extra\misc\juce_WebControlRelays.cpp">
|
||||
<Filter>JUCE Modules\juce_gui_extra\misc</Filter>
|
||||
</ClCompile>
|
||||
<ClCompile Include="..\..\..\..\modules\juce_gui_extra\native\juce_ActiveXComponent_windows.cpp">
|
||||
<Filter>JUCE Modules\juce_gui_extra\native</Filter>
|
||||
</ClCompile>
|
||||
|
|
@ -2754,6 +2760,9 @@
|
|||
<ClInclude Include="..\..\..\..\modules\juce_core\misc\juce_Functional.h">
|
||||
<Filter>JUCE Modules\juce_core\misc</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="..\..\..\..\modules\juce_core\misc\juce_OptionsHelpers.h">
|
||||
<Filter>JUCE Modules\juce_core\misc</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="..\..\..\..\modules\juce_core\misc\juce_Result.h">
|
||||
<Filter>JUCE Modules\juce_core\misc</Filter>
|
||||
</ClInclude>
|
||||
|
|
@ -3981,6 +3990,9 @@
|
|||
<ClInclude Include="..\..\..\..\modules\juce_gui_extra\code_editor\juce_XMLCodeTokeniser.h">
|
||||
<Filter>JUCE Modules\juce_gui_extra\code_editor</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="..\..\..\..\modules\juce_gui_extra\detail\juce_WebControlRelayEvents.h">
|
||||
<Filter>JUCE Modules\juce_gui_extra\detail</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="..\..\..\..\modules\juce_gui_extra\documents\juce_FileBasedDocument.h">
|
||||
<Filter>JUCE Modules\juce_gui_extra\documents</Filter>
|
||||
</ClInclude>
|
||||
|
|
@ -4038,6 +4050,9 @@
|
|||
<ClInclude Include="..\..\..\..\modules\juce_gui_extra\misc\juce_WebBrowserComponent.h">
|
||||
<Filter>JUCE Modules\juce_gui_extra\misc</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="..\..\..\..\modules\juce_gui_extra\misc\juce_WebControlRelays.h">
|
||||
<Filter>JUCE Modules\juce_gui_extra\misc</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="..\..\..\..\modules\juce_gui_extra\native\juce_NSViewFrameWatcher_mac.h">
|
||||
<Filter>JUCE Modules\juce_gui_extra\native</Filter>
|
||||
</ClInclude>
|
||||
|
|
|
|||
|
|
@ -844,11 +844,11 @@ public:
|
|||
}
|
||||
|
||||
{
|
||||
auto* importGroup = projectXml.createNewChildElement ("ImportGroup");
|
||||
importGroup->setAttribute ("Label", "ExtensionTargets");
|
||||
|
||||
if (owner.shouldAddWebView2Package())
|
||||
{
|
||||
auto* importGroup = projectXml.createNewChildElement ("ImportGroup");
|
||||
importGroup->setAttribute ("Label", "ExtensionTargets");
|
||||
|
||||
auto packageTargetsPath = "packages\\" + getWebView2PackageName() + "." + getWebView2PackageVersion()
|
||||
+ "\\build\\native\\" + getWebView2PackageName() + ".targets";
|
||||
|
||||
|
|
@ -856,6 +856,13 @@ public:
|
|||
e->setAttribute ("Project", packageTargetsPath);
|
||||
e->setAttribute ("Condition", "Exists('" + packageTargetsPath + "')");
|
||||
}
|
||||
|
||||
if (owner.shouldLinkWebView2Statically())
|
||||
{
|
||||
auto* propertyGroup = projectXml.createNewChildElement ("PropertyGroup");
|
||||
auto* loaderPref = propertyGroup->createNewChildElement ("WebView2LoaderPreference");
|
||||
loaderPref->addTextElement ("Static");
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
|
|
@ -1882,11 +1889,18 @@ protected:
|
|||
bool shouldAddWebView2Package() const
|
||||
{
|
||||
return project.getEnabledModules().isModuleEnabled ("juce_gui_extra")
|
||||
&& project.isConfigFlagEnabled ("JUCE_USE_WIN_WEBVIEW2", false);
|
||||
&& ( project.isConfigFlagEnabled ("JUCE_USE_WIN_WEBVIEW2", false)
|
||||
|| project.isConfigFlagEnabled ("JUCE_USE_WIN_WEBVIEW2_WITH_STATIC_LINKING", false));
|
||||
}
|
||||
|
||||
bool shouldLinkWebView2Statically() const
|
||||
{
|
||||
return project.getEnabledModules().isModuleEnabled ("juce_gui_extra")
|
||||
&& project.isConfigFlagEnabled ("JUCE_USE_WIN_WEBVIEW2_WITH_STATIC_LINKING", false);
|
||||
}
|
||||
|
||||
static String getWebView2PackageName() { return "Microsoft.Web.WebView2"; }
|
||||
static String getWebView2PackageVersion() { return "1.0.902.49"; }
|
||||
static String getWebView2PackageVersion() { return "1.0.1901.177"; }
|
||||
|
||||
void createPackagesConfigFile() const
|
||||
{
|
||||
|
|
|
|||
|
|
@ -2513,6 +2513,9 @@
|
|||
<ClCompile Include="..\..\..\..\modules\juce_gui_extra\misc\juce_WebBrowserComponent.cpp">
|
||||
<ExcludedFromBuild>true</ExcludedFromBuild>
|
||||
</ClCompile>
|
||||
<ClCompile Include="..\..\..\..\modules\juce_gui_extra\misc\juce_WebControlRelays.cpp">
|
||||
<ExcludedFromBuild>true</ExcludedFromBuild>
|
||||
</ClCompile>
|
||||
<ClCompile Include="..\..\..\..\modules\juce_gui_extra\native\juce_ActiveXComponent_windows.cpp">
|
||||
<ExcludedFromBuild>true</ExcludedFromBuild>
|
||||
</ClCompile>
|
||||
|
|
@ -3237,6 +3240,7 @@
|
|||
<ClInclude Include="..\..\..\..\modules\juce_core\misc\juce_ConsoleApplication.h"/>
|
||||
<ClInclude Include="..\..\..\..\modules\juce_core\misc\juce_EnumHelpers.h"/>
|
||||
<ClInclude Include="..\..\..\..\modules\juce_core\misc\juce_Functional.h"/>
|
||||
<ClInclude Include="..\..\..\..\modules\juce_core\misc\juce_OptionsHelpers.h"/>
|
||||
<ClInclude Include="..\..\..\..\modules\juce_core\misc\juce_Result.h"/>
|
||||
<ClInclude Include="..\..\..\..\modules\juce_core\misc\juce_RuntimePermissions.h"/>
|
||||
<ClInclude Include="..\..\..\..\modules\juce_core\misc\juce_ScopeGuard.h"/>
|
||||
|
|
@ -3692,6 +3696,7 @@
|
|||
<ClInclude Include="..\..\..\..\modules\juce_gui_extra\code_editor\juce_CPlusPlusCodeTokeniserFunctions.h"/>
|
||||
<ClInclude Include="..\..\..\..\modules\juce_gui_extra\code_editor\juce_LuaCodeTokeniser.h"/>
|
||||
<ClInclude Include="..\..\..\..\modules\juce_gui_extra\code_editor\juce_XMLCodeTokeniser.h"/>
|
||||
<ClInclude Include="..\..\..\..\modules\juce_gui_extra\detail\juce_WebControlRelayEvents.h"/>
|
||||
<ClInclude Include="..\..\..\..\modules\juce_gui_extra\documents\juce_FileBasedDocument.h"/>
|
||||
<ClInclude Include="..\..\..\..\modules\juce_gui_extra\embedding\juce_ActiveXControlComponent.h"/>
|
||||
<ClInclude Include="..\..\..\..\modules\juce_gui_extra\embedding\juce_AndroidViewComponent.h"/>
|
||||
|
|
@ -3711,6 +3716,7 @@
|
|||
<ClInclude Include="..\..\..\..\modules\juce_gui_extra\misc\juce_SplashScreen.h"/>
|
||||
<ClInclude Include="..\..\..\..\modules\juce_gui_extra\misc\juce_SystemTrayIconComponent.h"/>
|
||||
<ClInclude Include="..\..\..\..\modules\juce_gui_extra\misc\juce_WebBrowserComponent.h"/>
|
||||
<ClInclude Include="..\..\..\..\modules\juce_gui_extra\misc\juce_WebControlRelays.h"/>
|
||||
<ClInclude Include="..\..\..\..\modules\juce_gui_extra\native\juce_NSViewFrameWatcher_mac.h"/>
|
||||
<ClInclude Include="..\..\..\..\modules\juce_gui_extra\juce_gui_extra.h"/>
|
||||
<ClInclude Include="..\..\..\..\modules\juce_midi_ci\ci\juce_CIChannelAddress.h"/>
|
||||
|
|
@ -3815,5 +3821,4 @@
|
|||
<ResourceCompile Include=".\resources.rc"/>
|
||||
</ItemGroup>
|
||||
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets"/>
|
||||
<ImportGroup Label="ExtensionTargets"/>
|
||||
</Project>
|
||||
|
|
|
|||
|
|
@ -614,6 +614,9 @@
|
|||
<Filter Include="JUCE Modules\juce_gui_extra\code_editor">
|
||||
<UniqueIdentifier>{DF95D4BF-E18C-125A-5EBB-8993A06E232C}</UniqueIdentifier>
|
||||
</Filter>
|
||||
<Filter Include="JUCE Modules\juce_gui_extra\detail">
|
||||
<UniqueIdentifier>{E0FCBD5F-0B11-D78C-F786-52AB7FEE2383}</UniqueIdentifier>
|
||||
</Filter>
|
||||
<Filter Include="JUCE Modules\juce_gui_extra\documents">
|
||||
<UniqueIdentifier>{118946F2-AC24-0F09-62D5-753DF87A60CD}</UniqueIdentifier>
|
||||
</Filter>
|
||||
|
|
@ -3184,6 +3187,9 @@
|
|||
<ClCompile Include="..\..\..\..\modules\juce_gui_extra\misc\juce_WebBrowserComponent.cpp">
|
||||
<Filter>JUCE Modules\juce_gui_extra\misc</Filter>
|
||||
</ClCompile>
|
||||
<ClCompile Include="..\..\..\..\modules\juce_gui_extra\misc\juce_WebControlRelays.cpp">
|
||||
<Filter>JUCE Modules\juce_gui_extra\misc</Filter>
|
||||
</ClCompile>
|
||||
<ClCompile Include="..\..\..\..\modules\juce_gui_extra\native\juce_ActiveXComponent_windows.cpp">
|
||||
<Filter>JUCE Modules\juce_gui_extra\native</Filter>
|
||||
</ClCompile>
|
||||
|
|
@ -5025,6 +5031,9 @@
|
|||
<ClInclude Include="..\..\..\..\modules\juce_core\misc\juce_Functional.h">
|
||||
<Filter>JUCE Modules\juce_core\misc</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="..\..\..\..\modules\juce_core\misc\juce_OptionsHelpers.h">
|
||||
<Filter>JUCE Modules\juce_core\misc</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="..\..\..\..\modules\juce_core\misc\juce_Result.h">
|
||||
<Filter>JUCE Modules\juce_core\misc</Filter>
|
||||
</ClInclude>
|
||||
|
|
@ -6390,6 +6399,9 @@
|
|||
<ClInclude Include="..\..\..\..\modules\juce_gui_extra\code_editor\juce_XMLCodeTokeniser.h">
|
||||
<Filter>JUCE Modules\juce_gui_extra\code_editor</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="..\..\..\..\modules\juce_gui_extra\detail\juce_WebControlRelayEvents.h">
|
||||
<Filter>JUCE Modules\juce_gui_extra\detail</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="..\..\..\..\modules\juce_gui_extra\documents\juce_FileBasedDocument.h">
|
||||
<Filter>JUCE Modules\juce_gui_extra\documents</Filter>
|
||||
</ClInclude>
|
||||
|
|
@ -6447,6 +6459,9 @@
|
|||
<ClInclude Include="..\..\..\..\modules\juce_gui_extra\misc\juce_WebBrowserComponent.h">
|
||||
<Filter>JUCE Modules\juce_gui_extra\misc</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="..\..\..\..\modules\juce_gui_extra\misc\juce_WebControlRelays.h">
|
||||
<Filter>JUCE Modules\juce_gui_extra\misc</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="..\..\..\..\modules\juce_gui_extra\native\juce_NSViewFrameWatcher_mac.h">
|
||||
<Filter>JUCE Modules\juce_gui_extra\native</Filter>
|
||||
</ClInclude>
|
||||
|
|
|
|||
|
|
@ -2513,6 +2513,9 @@
|
|||
<ClCompile Include="..\..\..\..\modules\juce_gui_extra\misc\juce_WebBrowserComponent.cpp">
|
||||
<ExcludedFromBuild>true</ExcludedFromBuild>
|
||||
</ClCompile>
|
||||
<ClCompile Include="..\..\..\..\modules\juce_gui_extra\misc\juce_WebControlRelays.cpp">
|
||||
<ExcludedFromBuild>true</ExcludedFromBuild>
|
||||
</ClCompile>
|
||||
<ClCompile Include="..\..\..\..\modules\juce_gui_extra\native\juce_ActiveXComponent_windows.cpp">
|
||||
<ExcludedFromBuild>true</ExcludedFromBuild>
|
||||
</ClCompile>
|
||||
|
|
@ -3237,6 +3240,7 @@
|
|||
<ClInclude Include="..\..\..\..\modules\juce_core\misc\juce_ConsoleApplication.h"/>
|
||||
<ClInclude Include="..\..\..\..\modules\juce_core\misc\juce_EnumHelpers.h"/>
|
||||
<ClInclude Include="..\..\..\..\modules\juce_core\misc\juce_Functional.h"/>
|
||||
<ClInclude Include="..\..\..\..\modules\juce_core\misc\juce_OptionsHelpers.h"/>
|
||||
<ClInclude Include="..\..\..\..\modules\juce_core\misc\juce_Result.h"/>
|
||||
<ClInclude Include="..\..\..\..\modules\juce_core\misc\juce_RuntimePermissions.h"/>
|
||||
<ClInclude Include="..\..\..\..\modules\juce_core\misc\juce_ScopeGuard.h"/>
|
||||
|
|
@ -3692,6 +3696,7 @@
|
|||
<ClInclude Include="..\..\..\..\modules\juce_gui_extra\code_editor\juce_CPlusPlusCodeTokeniserFunctions.h"/>
|
||||
<ClInclude Include="..\..\..\..\modules\juce_gui_extra\code_editor\juce_LuaCodeTokeniser.h"/>
|
||||
<ClInclude Include="..\..\..\..\modules\juce_gui_extra\code_editor\juce_XMLCodeTokeniser.h"/>
|
||||
<ClInclude Include="..\..\..\..\modules\juce_gui_extra\detail\juce_WebControlRelayEvents.h"/>
|
||||
<ClInclude Include="..\..\..\..\modules\juce_gui_extra\documents\juce_FileBasedDocument.h"/>
|
||||
<ClInclude Include="..\..\..\..\modules\juce_gui_extra\embedding\juce_ActiveXControlComponent.h"/>
|
||||
<ClInclude Include="..\..\..\..\modules\juce_gui_extra\embedding\juce_AndroidViewComponent.h"/>
|
||||
|
|
@ -3711,6 +3716,7 @@
|
|||
<ClInclude Include="..\..\..\..\modules\juce_gui_extra\misc\juce_SplashScreen.h"/>
|
||||
<ClInclude Include="..\..\..\..\modules\juce_gui_extra\misc\juce_SystemTrayIconComponent.h"/>
|
||||
<ClInclude Include="..\..\..\..\modules\juce_gui_extra\misc\juce_WebBrowserComponent.h"/>
|
||||
<ClInclude Include="..\..\..\..\modules\juce_gui_extra\misc\juce_WebControlRelays.h"/>
|
||||
<ClInclude Include="..\..\..\..\modules\juce_gui_extra\native\juce_NSViewFrameWatcher_mac.h"/>
|
||||
<ClInclude Include="..\..\..\..\modules\juce_gui_extra\juce_gui_extra.h"/>
|
||||
<ClInclude Include="..\..\..\..\modules\juce_midi_ci\ci\juce_CIChannelAddress.h"/>
|
||||
|
|
@ -3815,5 +3821,4 @@
|
|||
<ResourceCompile Include=".\resources.rc"/>
|
||||
</ItemGroup>
|
||||
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets"/>
|
||||
<ImportGroup Label="ExtensionTargets"/>
|
||||
</Project>
|
||||
|
|
|
|||
|
|
@ -614,6 +614,9 @@
|
|||
<Filter Include="JUCE Modules\juce_gui_extra\code_editor">
|
||||
<UniqueIdentifier>{DF95D4BF-E18C-125A-5EBB-8993A06E232C}</UniqueIdentifier>
|
||||
</Filter>
|
||||
<Filter Include="JUCE Modules\juce_gui_extra\detail">
|
||||
<UniqueIdentifier>{E0FCBD5F-0B11-D78C-F786-52AB7FEE2383}</UniqueIdentifier>
|
||||
</Filter>
|
||||
<Filter Include="JUCE Modules\juce_gui_extra\documents">
|
||||
<UniqueIdentifier>{118946F2-AC24-0F09-62D5-753DF87A60CD}</UniqueIdentifier>
|
||||
</Filter>
|
||||
|
|
@ -3184,6 +3187,9 @@
|
|||
<ClCompile Include="..\..\..\..\modules\juce_gui_extra\misc\juce_WebBrowserComponent.cpp">
|
||||
<Filter>JUCE Modules\juce_gui_extra\misc</Filter>
|
||||
</ClCompile>
|
||||
<ClCompile Include="..\..\..\..\modules\juce_gui_extra\misc\juce_WebControlRelays.cpp">
|
||||
<Filter>JUCE Modules\juce_gui_extra\misc</Filter>
|
||||
</ClCompile>
|
||||
<ClCompile Include="..\..\..\..\modules\juce_gui_extra\native\juce_ActiveXComponent_windows.cpp">
|
||||
<Filter>JUCE Modules\juce_gui_extra\native</Filter>
|
||||
</ClCompile>
|
||||
|
|
@ -5025,6 +5031,9 @@
|
|||
<ClInclude Include="..\..\..\..\modules\juce_core\misc\juce_Functional.h">
|
||||
<Filter>JUCE Modules\juce_core\misc</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="..\..\..\..\modules\juce_core\misc\juce_OptionsHelpers.h">
|
||||
<Filter>JUCE Modules\juce_core\misc</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="..\..\..\..\modules\juce_core\misc\juce_Result.h">
|
||||
<Filter>JUCE Modules\juce_core\misc</Filter>
|
||||
</ClInclude>
|
||||
|
|
@ -6390,6 +6399,9 @@
|
|||
<ClInclude Include="..\..\..\..\modules\juce_gui_extra\code_editor\juce_XMLCodeTokeniser.h">
|
||||
<Filter>JUCE Modules\juce_gui_extra\code_editor</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="..\..\..\..\modules\juce_gui_extra\detail\juce_WebControlRelayEvents.h">
|
||||
<Filter>JUCE Modules\juce_gui_extra\detail</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="..\..\..\..\modules\juce_gui_extra\documents\juce_FileBasedDocument.h">
|
||||
<Filter>JUCE Modules\juce_gui_extra\documents</Filter>
|
||||
</ClInclude>
|
||||
|
|
@ -6447,6 +6459,9 @@
|
|||
<ClInclude Include="..\..\..\..\modules\juce_gui_extra\misc\juce_WebBrowserComponent.h">
|
||||
<Filter>JUCE Modules\juce_gui_extra\misc</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="..\..\..\..\modules\juce_gui_extra\misc\juce_WebControlRelays.h">
|
||||
<Filter>JUCE Modules\juce_gui_extra\misc</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="..\..\..\..\modules\juce_gui_extra\native\juce_NSViewFrameWatcher_mac.h">
|
||||
<Filter>JUCE Modules\juce_gui_extra\native</Filter>
|
||||
</ClInclude>
|
||||
|
|
|
|||
|
|
@ -2513,6 +2513,9 @@
|
|||
<ClCompile Include="..\..\..\..\modules\juce_gui_extra\misc\juce_WebBrowserComponent.cpp">
|
||||
<ExcludedFromBuild>true</ExcludedFromBuild>
|
||||
</ClCompile>
|
||||
<ClCompile Include="..\..\..\..\modules\juce_gui_extra\misc\juce_WebControlRelays.cpp">
|
||||
<ExcludedFromBuild>true</ExcludedFromBuild>
|
||||
</ClCompile>
|
||||
<ClCompile Include="..\..\..\..\modules\juce_gui_extra\native\juce_ActiveXComponent_windows.cpp">
|
||||
<ExcludedFromBuild>true</ExcludedFromBuild>
|
||||
</ClCompile>
|
||||
|
|
@ -3237,6 +3240,7 @@
|
|||
<ClInclude Include="..\..\..\..\modules\juce_core\misc\juce_ConsoleApplication.h"/>
|
||||
<ClInclude Include="..\..\..\..\modules\juce_core\misc\juce_EnumHelpers.h"/>
|
||||
<ClInclude Include="..\..\..\..\modules\juce_core\misc\juce_Functional.h"/>
|
||||
<ClInclude Include="..\..\..\..\modules\juce_core\misc\juce_OptionsHelpers.h"/>
|
||||
<ClInclude Include="..\..\..\..\modules\juce_core\misc\juce_Result.h"/>
|
||||
<ClInclude Include="..\..\..\..\modules\juce_core\misc\juce_RuntimePermissions.h"/>
|
||||
<ClInclude Include="..\..\..\..\modules\juce_core\misc\juce_ScopeGuard.h"/>
|
||||
|
|
@ -3692,6 +3696,7 @@
|
|||
<ClInclude Include="..\..\..\..\modules\juce_gui_extra\code_editor\juce_CPlusPlusCodeTokeniserFunctions.h"/>
|
||||
<ClInclude Include="..\..\..\..\modules\juce_gui_extra\code_editor\juce_LuaCodeTokeniser.h"/>
|
||||
<ClInclude Include="..\..\..\..\modules\juce_gui_extra\code_editor\juce_XMLCodeTokeniser.h"/>
|
||||
<ClInclude Include="..\..\..\..\modules\juce_gui_extra\detail\juce_WebControlRelayEvents.h"/>
|
||||
<ClInclude Include="..\..\..\..\modules\juce_gui_extra\documents\juce_FileBasedDocument.h"/>
|
||||
<ClInclude Include="..\..\..\..\modules\juce_gui_extra\embedding\juce_ActiveXControlComponent.h"/>
|
||||
<ClInclude Include="..\..\..\..\modules\juce_gui_extra\embedding\juce_AndroidViewComponent.h"/>
|
||||
|
|
@ -3711,6 +3716,7 @@
|
|||
<ClInclude Include="..\..\..\..\modules\juce_gui_extra\misc\juce_SplashScreen.h"/>
|
||||
<ClInclude Include="..\..\..\..\modules\juce_gui_extra\misc\juce_SystemTrayIconComponent.h"/>
|
||||
<ClInclude Include="..\..\..\..\modules\juce_gui_extra\misc\juce_WebBrowserComponent.h"/>
|
||||
<ClInclude Include="..\..\..\..\modules\juce_gui_extra\misc\juce_WebControlRelays.h"/>
|
||||
<ClInclude Include="..\..\..\..\modules\juce_gui_extra\native\juce_NSViewFrameWatcher_mac.h"/>
|
||||
<ClInclude Include="..\..\..\..\modules\juce_gui_extra\juce_gui_extra.h"/>
|
||||
<ClInclude Include="..\..\..\..\modules\juce_midi_ci\ci\juce_CIChannelAddress.h"/>
|
||||
|
|
@ -3815,5 +3821,4 @@
|
|||
<ResourceCompile Include=".\resources.rc"/>
|
||||
</ItemGroup>
|
||||
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets"/>
|
||||
<ImportGroup Label="ExtensionTargets"/>
|
||||
</Project>
|
||||
|
|
|
|||
|
|
@ -614,6 +614,9 @@
|
|||
<Filter Include="JUCE Modules\juce_gui_extra\code_editor">
|
||||
<UniqueIdentifier>{DF95D4BF-E18C-125A-5EBB-8993A06E232C}</UniqueIdentifier>
|
||||
</Filter>
|
||||
<Filter Include="JUCE Modules\juce_gui_extra\detail">
|
||||
<UniqueIdentifier>{E0FCBD5F-0B11-D78C-F786-52AB7FEE2383}</UniqueIdentifier>
|
||||
</Filter>
|
||||
<Filter Include="JUCE Modules\juce_gui_extra\documents">
|
||||
<UniqueIdentifier>{118946F2-AC24-0F09-62D5-753DF87A60CD}</UniqueIdentifier>
|
||||
</Filter>
|
||||
|
|
@ -3184,6 +3187,9 @@
|
|||
<ClCompile Include="..\..\..\..\modules\juce_gui_extra\misc\juce_WebBrowserComponent.cpp">
|
||||
<Filter>JUCE Modules\juce_gui_extra\misc</Filter>
|
||||
</ClCompile>
|
||||
<ClCompile Include="..\..\..\..\modules\juce_gui_extra\misc\juce_WebControlRelays.cpp">
|
||||
<Filter>JUCE Modules\juce_gui_extra\misc</Filter>
|
||||
</ClCompile>
|
||||
<ClCompile Include="..\..\..\..\modules\juce_gui_extra\native\juce_ActiveXComponent_windows.cpp">
|
||||
<Filter>JUCE Modules\juce_gui_extra\native</Filter>
|
||||
</ClCompile>
|
||||
|
|
@ -5025,6 +5031,9 @@
|
|||
<ClInclude Include="..\..\..\..\modules\juce_core\misc\juce_Functional.h">
|
||||
<Filter>JUCE Modules\juce_core\misc</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="..\..\..\..\modules\juce_core\misc\juce_OptionsHelpers.h">
|
||||
<Filter>JUCE Modules\juce_core\misc</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="..\..\..\..\modules\juce_core\misc\juce_Result.h">
|
||||
<Filter>JUCE Modules\juce_core\misc</Filter>
|
||||
</ClInclude>
|
||||
|
|
@ -6390,6 +6399,9 @@
|
|||
<ClInclude Include="..\..\..\..\modules\juce_gui_extra\code_editor\juce_XMLCodeTokeniser.h">
|
||||
<Filter>JUCE Modules\juce_gui_extra\code_editor</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="..\..\..\..\modules\juce_gui_extra\detail\juce_WebControlRelayEvents.h">
|
||||
<Filter>JUCE Modules\juce_gui_extra\detail</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="..\..\..\..\modules\juce_gui_extra\documents\juce_FileBasedDocument.h">
|
||||
<Filter>JUCE Modules\juce_gui_extra\documents</Filter>
|
||||
</ClInclude>
|
||||
|
|
@ -6447,6 +6459,9 @@
|
|||
<ClInclude Include="..\..\..\..\modules\juce_gui_extra\misc\juce_WebBrowserComponent.h">
|
||||
<Filter>JUCE Modules\juce_gui_extra\misc</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="..\..\..\..\modules\juce_gui_extra\misc\juce_WebControlRelays.h">
|
||||
<Filter>JUCE Modules\juce_gui_extra\misc</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="..\..\..\..\modules\juce_gui_extra\native\juce_NSViewFrameWatcher_mac.h">
|
||||
<Filter>JUCE Modules\juce_gui_extra\native</Filter>
|
||||
</ClInclude>
|
||||
|
|
|
|||
|
|
@ -2391,6 +2391,9 @@
|
|||
<ClCompile Include="..\..\..\..\modules\juce_gui_extra\misc\juce_WebBrowserComponent.cpp">
|
||||
<ExcludedFromBuild>true</ExcludedFromBuild>
|
||||
</ClCompile>
|
||||
<ClCompile Include="..\..\..\..\modules\juce_gui_extra\misc\juce_WebControlRelays.cpp">
|
||||
<ExcludedFromBuild>true</ExcludedFromBuild>
|
||||
</ClCompile>
|
||||
<ClCompile Include="..\..\..\..\modules\juce_gui_extra\native\juce_ActiveXComponent_windows.cpp">
|
||||
<ExcludedFromBuild>true</ExcludedFromBuild>
|
||||
</ClCompile>
|
||||
|
|
@ -3028,6 +3031,7 @@
|
|||
<ClInclude Include="..\..\..\..\modules\juce_core\misc\juce_ConsoleApplication.h"/>
|
||||
<ClInclude Include="..\..\..\..\modules\juce_core\misc\juce_EnumHelpers.h"/>
|
||||
<ClInclude Include="..\..\..\..\modules\juce_core\misc\juce_Functional.h"/>
|
||||
<ClInclude Include="..\..\..\..\modules\juce_core\misc\juce_OptionsHelpers.h"/>
|
||||
<ClInclude Include="..\..\..\..\modules\juce_core\misc\juce_Result.h"/>
|
||||
<ClInclude Include="..\..\..\..\modules\juce_core\misc\juce_RuntimePermissions.h"/>
|
||||
<ClInclude Include="..\..\..\..\modules\juce_core\misc\juce_ScopeGuard.h"/>
|
||||
|
|
@ -3437,6 +3441,7 @@
|
|||
<ClInclude Include="..\..\..\..\modules\juce_gui_extra\code_editor\juce_CPlusPlusCodeTokeniserFunctions.h"/>
|
||||
<ClInclude Include="..\..\..\..\modules\juce_gui_extra\code_editor\juce_LuaCodeTokeniser.h"/>
|
||||
<ClInclude Include="..\..\..\..\modules\juce_gui_extra\code_editor\juce_XMLCodeTokeniser.h"/>
|
||||
<ClInclude Include="..\..\..\..\modules\juce_gui_extra\detail\juce_WebControlRelayEvents.h"/>
|
||||
<ClInclude Include="..\..\..\..\modules\juce_gui_extra\documents\juce_FileBasedDocument.h"/>
|
||||
<ClInclude Include="..\..\..\..\modules\juce_gui_extra\embedding\juce_ActiveXControlComponent.h"/>
|
||||
<ClInclude Include="..\..\..\..\modules\juce_gui_extra\embedding\juce_AndroidViewComponent.h"/>
|
||||
|
|
@ -3456,6 +3461,7 @@
|
|||
<ClInclude Include="..\..\..\..\modules\juce_gui_extra\misc\juce_SplashScreen.h"/>
|
||||
<ClInclude Include="..\..\..\..\modules\juce_gui_extra\misc\juce_SystemTrayIconComponent.h"/>
|
||||
<ClInclude Include="..\..\..\..\modules\juce_gui_extra\misc\juce_WebBrowserComponent.h"/>
|
||||
<ClInclude Include="..\..\..\..\modules\juce_gui_extra\misc\juce_WebControlRelays.h"/>
|
||||
<ClInclude Include="..\..\..\..\modules\juce_gui_extra\native\juce_NSViewFrameWatcher_mac.h"/>
|
||||
<ClInclude Include="..\..\..\..\modules\juce_gui_extra\juce_gui_extra.h"/>
|
||||
<ClInclude Include="..\..\..\..\modules\juce_opengl\geometry\juce_Draggable3DOrientation.h"/>
|
||||
|
|
@ -3521,5 +3527,4 @@
|
|||
<None Include="..\..\..\..\modules\juce_graphics\image_formats\pnglib\libpng_readme.txt"/>
|
||||
</ItemGroup>
|
||||
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets"/>
|
||||
<ImportGroup Label="ExtensionTargets"/>
|
||||
</Project>
|
||||
|
|
|
|||
|
|
@ -575,6 +575,9 @@
|
|||
<Filter Include="JUCE Modules\juce_gui_extra\code_editor">
|
||||
<UniqueIdentifier>{DF95D4BF-E18C-125A-5EBB-8993A06E232C}</UniqueIdentifier>
|
||||
</Filter>
|
||||
<Filter Include="JUCE Modules\juce_gui_extra\detail">
|
||||
<UniqueIdentifier>{E0FCBD5F-0B11-D78C-F786-52AB7FEE2383}</UniqueIdentifier>
|
||||
</Filter>
|
||||
<Filter Include="JUCE Modules\juce_gui_extra\documents">
|
||||
<UniqueIdentifier>{118946F2-AC24-0F09-62D5-753DF87A60CD}</UniqueIdentifier>
|
||||
</Filter>
|
||||
|
|
@ -3007,6 +3010,9 @@
|
|||
<ClCompile Include="..\..\..\..\modules\juce_gui_extra\misc\juce_WebBrowserComponent.cpp">
|
||||
<Filter>JUCE Modules\juce_gui_extra\misc</Filter>
|
||||
</ClCompile>
|
||||
<ClCompile Include="..\..\..\..\modules\juce_gui_extra\misc\juce_WebControlRelays.cpp">
|
||||
<Filter>JUCE Modules\juce_gui_extra\misc</Filter>
|
||||
</ClCompile>
|
||||
<ClCompile Include="..\..\..\..\modules\juce_gui_extra\native\juce_ActiveXComponent_windows.cpp">
|
||||
<Filter>JUCE Modules\juce_gui_extra\native</Filter>
|
||||
</ClCompile>
|
||||
|
|
@ -4743,6 +4749,9 @@
|
|||
<ClInclude Include="..\..\..\..\modules\juce_core\misc\juce_Functional.h">
|
||||
<Filter>JUCE Modules\juce_core\misc</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="..\..\..\..\modules\juce_core\misc\juce_OptionsHelpers.h">
|
||||
<Filter>JUCE Modules\juce_core\misc</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="..\..\..\..\modules\juce_core\misc\juce_Result.h">
|
||||
<Filter>JUCE Modules\juce_core\misc</Filter>
|
||||
</ClInclude>
|
||||
|
|
@ -5970,6 +5979,9 @@
|
|||
<ClInclude Include="..\..\..\..\modules\juce_gui_extra\code_editor\juce_XMLCodeTokeniser.h">
|
||||
<Filter>JUCE Modules\juce_gui_extra\code_editor</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="..\..\..\..\modules\juce_gui_extra\detail\juce_WebControlRelayEvents.h">
|
||||
<Filter>JUCE Modules\juce_gui_extra\detail</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="..\..\..\..\modules\juce_gui_extra\documents\juce_FileBasedDocument.h">
|
||||
<Filter>JUCE Modules\juce_gui_extra\documents</Filter>
|
||||
</ClInclude>
|
||||
|
|
@ -6027,6 +6039,9 @@
|
|||
<ClInclude Include="..\..\..\..\modules\juce_gui_extra\misc\juce_WebBrowserComponent.h">
|
||||
<Filter>JUCE Modules\juce_gui_extra\misc</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="..\..\..\..\modules\juce_gui_extra\misc\juce_WebControlRelays.h">
|
||||
<Filter>JUCE Modules\juce_gui_extra\misc</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="..\..\..\..\modules\juce_gui_extra\native\juce_NSViewFrameWatcher_mac.h">
|
||||
<Filter>JUCE Modules\juce_gui_extra\native</Filter>
|
||||
</ClInclude>
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue