Browse Source

Introjucer: removed image code from BinaryData classes without any images. Rebuilt some project files.

tags/2021-05-28
jules 13 years ago
parent
commit
c782b5cc02
9 changed files with 260 additions and 194 deletions
  1. +10
    -0
      extras/Introjucer/Builds/VisualStudio2010/The Introjucer.vcxproj
  2. +30
    -30
      extras/Introjucer/Builds/VisualStudio2010/The Introjucer.vcxproj.filters
  3. +36
    -29
      extras/Introjucer/Source/Project Saving/jucer_ResourceFile.cpp
  4. +20
    -0
      extras/JuceDemo/Builds/VisualStudio2010/Juce Demo.vcxproj
  5. +60
    -60
      extras/JuceDemo/Builds/VisualStudio2010/Juce Demo.vcxproj.filters
  6. +16
    -0
      extras/static library/Builds/VisualStudio2010/juce.vcxproj
  7. +44
    -42
      extras/static library/Builds/VisualStudio2010/juce.vcxproj.filters
  8. +11
    -0
      extras/the jucer/Builds/VisualStudio2010/Jucer.vcxproj
  9. +33
    -33
      extras/the jucer/Builds/VisualStudio2010/Jucer.vcxproj.filters

+ 10
- 0
extras/Introjucer/Builds/VisualStudio2010/The Introjucer.vcxproj View File

@@ -1329,6 +1329,16 @@
<ClInclude Include="..\..\JuceLibraryCode\JuceHeader.h"/>
</ItemGroup>
<ItemGroup>
<None Include="..\..\Source\BinaryData\AudioPluginXCodeScript.txt"/>
<None Include="..\..\Source\BinaryData\brushed_aluminium.png"/>
<None Include="..\..\Source\BinaryData\juce_icon.png"/>
<None Include="..\..\..\..\modules\juce_core\juce_module_info"/>
<None Include="..\..\..\..\modules\juce_cryptography\juce_module_info"/>
<None Include="..\..\..\..\modules\juce_data_structures\juce_module_info"/>
<None Include="..\..\..\..\modules\juce_events\juce_module_info"/>
<None Include="..\..\..\..\modules\juce_graphics\juce_module_info"/>
<None Include="..\..\..\..\modules\juce_gui_basics\juce_module_info"/>
<None Include="..\..\..\..\modules\juce_gui_extra\juce_module_info"/>
<None Include=".\icon.ico"/>
</ItemGroup>
<ItemGroup>


+ 30
- 30
extras/Introjucer/Builds/VisualStudio2010/The Introjucer.vcxproj.filters View File

@@ -304,12 +304,6 @@
<ClCompile Include="..\..\Source\Code Editor\jucer_SourceCodeEditor.cpp">
<Filter>The Introjucer\Code Editor</Filter>
</ClCompile>
<ClCompile Include="..\..\Source\BinaryData\AudioPluginXCodeScript.txt">
<Filter>The Introjucer\BinaryData</Filter>
</ClCompile>
<ClCompile Include="..\..\Source\BinaryData\brushed_aluminium.png">
<Filter>The Introjucer\BinaryData</Filter>
</ClCompile>
<ClCompile Include="..\..\Source\BinaryData\jucer_AudioPluginEditorTemplate.cpp">
<Filter>The Introjucer\BinaryData</Filter>
</ClCompile>
@@ -328,9 +322,6 @@
<ClCompile Include="..\..\Source\BinaryData\jucer_WindowTemplate.cpp">
<Filter>The Introjucer\BinaryData</Filter>
</ClCompile>
<ClCompile Include="..\..\Source\BinaryData\juce_icon.png">
<Filter>The Introjucer\BinaryData</Filter>
</ClCompile>
<ClCompile Include="..\..\..\..\modules\juce_core\text\juce_CharacterFunctions.cpp">
<Filter>Juce Modules\juce_core\text</Filter>
</ClCompile>
@@ -550,9 +541,6 @@
<ClCompile Include="..\..\..\..\modules\juce_core\native\juce_win32_Threads.cpp">
<Filter>Juce Modules\juce_core\native</Filter>
</ClCompile>
<ClCompile Include="..\..\..\..\modules\juce_core\juce_module_info">
<Filter>Juce Modules\juce_core</Filter>
</ClCompile>
<ClCompile Include="..\..\..\..\modules\juce_cryptography\encryption\juce_BlowFish.cpp">
<Filter>Juce Modules\juce_cryptography\encryption</Filter>
</ClCompile>
@@ -568,9 +556,6 @@
<ClCompile Include="..\..\..\..\modules\juce_cryptography\hashing\juce_SHA256.cpp">
<Filter>Juce Modules\juce_cryptography\hashing</Filter>
</ClCompile>
<ClCompile Include="..\..\..\..\modules\juce_cryptography\juce_module_info">
<Filter>Juce Modules\juce_cryptography</Filter>
</ClCompile>
<ClCompile Include="..\..\..\..\modules\juce_data_structures\values\juce_Value.cpp">
<Filter>Juce Modules\juce_data_structures\values</Filter>
</ClCompile>
@@ -586,9 +571,6 @@
<ClCompile Include="..\..\..\..\modules\juce_data_structures\app_properties\juce_PropertiesFile.cpp">
<Filter>Juce Modules\juce_data_structures\app_properties</Filter>
</ClCompile>
<ClCompile Include="..\..\..\..\modules\juce_data_structures\juce_module_info">
<Filter>Juce Modules\juce_data_structures</Filter>
</ClCompile>
<ClCompile Include="..\..\..\..\modules\juce_events\messages\juce_ApplicationBase.cpp">
<Filter>Juce Modules\juce_events\messages</Filter>
</ClCompile>
@@ -637,9 +619,6 @@
<ClCompile Include="..\..\..\..\modules\juce_events\native\juce_win32_Messaging.cpp">
<Filter>Juce Modules\juce_events\native</Filter>
</ClCompile>
<ClCompile Include="..\..\..\..\modules\juce_events\juce_module_info">
<Filter>Juce Modules\juce_events</Filter>
</ClCompile>
<ClCompile Include="..\..\..\..\modules\juce_graphics\colour\juce_Colour.cpp">
<Filter>Juce Modules\juce_graphics\colour</Filter>
</ClCompile>
@@ -757,9 +736,6 @@
<ClCompile Include="..\..\..\..\modules\juce_graphics\native\juce_win32_Fonts.cpp">
<Filter>Juce Modules\juce_graphics\native</Filter>
</ClCompile>
<ClCompile Include="..\..\..\..\modules\juce_graphics\juce_module_info">
<Filter>Juce Modules\juce_graphics</Filter>
</ClCompile>
<ClCompile Include="..\..\..\..\modules\juce_gui_basics\components\juce_Component.cpp">
<Filter>Juce Modules\juce_gui_basics\components</Filter>
</ClCompile>
@@ -1126,9 +1102,6 @@
<ClCompile Include="..\..\..\..\modules\juce_gui_basics\native\juce_win32_Windowing.cpp">
<Filter>Juce Modules\juce_gui_basics\native</Filter>
</ClCompile>
<ClCompile Include="..\..\..\..\modules\juce_gui_basics\juce_module_info">
<Filter>Juce Modules\juce_gui_basics</Filter>
</ClCompile>
<ClCompile Include="..\..\..\..\modules\juce_gui_extra\code_editor\juce_CodeDocument.cpp">
<Filter>Juce Modules\juce_gui_extra\code_editor</Filter>
</ClCompile>
@@ -1195,9 +1168,6 @@
<ClCompile Include="..\..\..\..\modules\juce_gui_extra\native\juce_win32_WebBrowserComponent.cpp">
<Filter>Juce Modules\juce_gui_extra\native</Filter>
</ClCompile>
<ClCompile Include="..\..\..\..\modules\juce_gui_extra\juce_module_info">
<Filter>Juce Modules\juce_gui_extra</Filter>
</ClCompile>
<ClCompile Include="..\..\JuceLibraryCode\BinaryData.cpp">
<Filter>Juce Library Code</Filter>
</ClCompile>
@@ -2312,6 +2282,36 @@
</ClInclude>
</ItemGroup>
<ItemGroup>
<None Include="..\..\Source\BinaryData\AudioPluginXCodeScript.txt">
<Filter>The Introjucer\BinaryData</Filter>
</None>
<None Include="..\..\Source\BinaryData\brushed_aluminium.png">
<Filter>The Introjucer\BinaryData</Filter>
</None>
<None Include="..\..\Source\BinaryData\juce_icon.png">
<Filter>The Introjucer\BinaryData</Filter>
</None>
<None Include="..\..\..\..\modules\juce_core\juce_module_info">
<Filter>Juce Modules\juce_core</Filter>
</None>
<None Include="..\..\..\..\modules\juce_cryptography\juce_module_info">
<Filter>Juce Modules\juce_cryptography</Filter>
</None>
<None Include="..\..\..\..\modules\juce_data_structures\juce_module_info">
<Filter>Juce Modules\juce_data_structures</Filter>
</None>
<None Include="..\..\..\..\modules\juce_events\juce_module_info">
<Filter>Juce Modules\juce_events</Filter>
</None>
<None Include="..\..\..\..\modules\juce_graphics\juce_module_info">
<Filter>Juce Modules\juce_graphics</Filter>
</None>
<None Include="..\..\..\..\modules\juce_gui_basics\juce_module_info">
<Filter>Juce Modules\juce_gui_basics</Filter>
</None>
<None Include="..\..\..\..\modules\juce_gui_extra\juce_module_info">
<Filter>Juce Modules\juce_gui_extra</Filter>
</None>
<None Include=".\icon.ico">
<Filter>Juce Library Code</Filter>
</None>


+ 36
- 29
extras/Introjucer/Source/Project Saving/jucer_ResourceFile.cpp View File

@@ -139,6 +139,7 @@ bool ResourceFile::write (const File& cppFile, OutputStream& cpp, OutputStream&
header << "namespace " << namespaceName << newLine << "{" << newLine;
StringArray returnCodes;
bool containsAnyImages = false;
for (int i = 0; i < files.size(); ++i)
{
@@ -149,11 +150,14 @@ bool ResourceFile::write (const File& cppFile, OutputStream& cpp, OutputStream&
returnCodes.add ("numBytes = " + String (dataSize) + "; return " + variableName + ";");
ScopedPointer <InputStream> fileStream (file.createInputStream());
jassert (fileStream != nullptr);
FileInputStream fileStream (file);
jassert (fileStream.openedOk());
if (fileStream != nullptr)
if (fileStream.openedOk())
{
containsAnyImages = containsAnyImages
|| (ImageFileFormat::findImageFormatForStream (fileStream) != nullptr);
const String tempVariable ("temp_" + String::toHexString (file.hashCode()));
header << " extern const char* " << variableName << ";" << newLine;
@@ -164,7 +168,7 @@ bool ResourceFile::write (const File& cppFile, OutputStream& cpp, OutputStream&
{
MemoryBlock data;
fileStream->readIntoMemoryBlock (data);
fileStream.readIntoMemoryBlock (data);
CodeHelpers::writeDataAsCppLiteral (data, cpp, true, true);
}
@@ -187,31 +191,34 @@ bool ResourceFile::write (const File& cppFile, OutputStream& cpp, OutputStream&
<< newLine
<< "}" << newLine;
header << " // If you provide the name of one of the binary resource variables above, this function will" << newLine
<< " // return the corresponding data and its size (or a null pointer if the name isn't found)." << newLine
<< " const char* getNamedResource (const char* resourceNameUTF8, int& dataSizeInBytes) throw();" << newLine
<< newLine
<< " //==============================================================================" << newLine
<< " // This class acts as an ImageProvider that will access the BinaryData images" << newLine
<< " class ImageProvider : public juce::ComponentBuilder::ImageProvider" << newLine
<< " {" << newLine
<< " public:" << newLine
<< " ImageProvider() noexcept {}" << newLine
<< newLine
<< " juce::Image getImageForIdentifier (const juce::var& imageIdentifier)" << newLine
<< " {" << newLine
<< " int dataSize = 0;" << newLine
<< " const char* const data = getNamedResource (imageIdentifier.toString().toUTF8(), dataSize);" << newLine
<< newLine
<< " if (data != nullptr)" << newLine
<< " return juce::ImageCache::getFromMemory (data, dataSize);" << newLine
<< newLine
<< " return juce::Image();" << newLine
<< " }" << newLine
<< newLine
<< " juce::var getIdentifierForImage (const juce::Image&) { return juce::var(); }" << newLine
<< " };" << newLine
<< "}" << newLine;
if (containsAnyImages)
{
header << " // If you provide the name of one of the binary resource variables above, this function will" << newLine
<< " // return the corresponding data and its size (or a null pointer if the name isn't found)." << newLine
<< " const char* getNamedResource (const char* resourceNameUTF8, int& dataSizeInBytes) throw();" << newLine
<< newLine
<< " //==============================================================================" << newLine
<< " // This class acts as an ImageProvider that will access the BinaryData images" << newLine
<< " class ImageProvider : public juce::ComponentBuilder::ImageProvider" << newLine
<< " {" << newLine
<< " public:" << newLine
<< " ImageProvider() noexcept {}" << newLine
<< newLine
<< " juce::Image getImageForIdentifier (const juce::var& imageIdentifier)" << newLine
<< " {" << newLine
<< " int dataSize = 0;" << newLine
<< " const char* const data = getNamedResource (imageIdentifier.toString().toUTF8(), dataSize);" << newLine
<< newLine
<< " if (data != nullptr)" << newLine
<< " return juce::ImageCache::getFromMemory (data, dataSize);" << newLine
<< newLine
<< " return juce::Image();" << newLine
<< " }" << newLine
<< newLine
<< " juce::var getIdentifierForImage (const juce::Image&) { return juce::var(); }" << newLine
<< " };" << newLine
<< "}" << newLine;
}
return true;
}


+ 20
- 0
extras/JuceDemo/Builds/VisualStudio2010/Juce Demo.vcxproj View File

@@ -1631,6 +1631,26 @@
<ClInclude Include="..\..\JuceLibraryCode\JuceHeader.h"/>
</ItemGroup>
<ItemGroup>
<None Include="..\..\Binary Data\cello.wav"/>
<None Include="..\..\Binary Data\demo table data.xml"/>
<None Include="..\..\Binary Data\icons.zip"/>
<None Include="..\..\Binary Data\juce.png"/>
<None Include="..\..\Binary Data\juce_icon.png"/>
<None Include="..\..\Binary Data\treedemo.xml"/>
<None Include="..\..\..\..\modules\juce_audio_basics\juce_module_info"/>
<None Include="..\..\..\..\modules\juce_audio_devices\juce_module_info"/>
<None Include="..\..\..\..\modules\juce_audio_formats\juce_module_info"/>
<None Include="..\..\..\..\modules\juce_audio_processors\juce_module_info"/>
<None Include="..\..\..\..\modules\juce_audio_utils\juce_module_info"/>
<None Include="..\..\..\..\modules\juce_core\juce_module_info"/>
<None Include="..\..\..\..\modules\juce_cryptography\juce_module_info"/>
<None Include="..\..\..\..\modules\juce_data_structures\juce_module_info"/>
<None Include="..\..\..\..\modules\juce_events\juce_module_info"/>
<None Include="..\..\..\..\modules\juce_graphics\juce_module_info"/>
<None Include="..\..\..\..\modules\juce_gui_basics\juce_module_info"/>
<None Include="..\..\..\..\modules\juce_gui_extra\juce_module_info"/>
<None Include="..\..\..\..\modules\juce_opengl\juce_module_info"/>
<None Include="..\..\..\..\modules\juce_video\juce_module_info"/>
<None Include=".\icon.ico"/>
</ItemGroup>
<ItemGroup>


+ 60
- 60
extras/JuceDemo/Builds/VisualStudio2010/Juce Demo.vcxproj.filters View File

@@ -376,24 +376,6 @@
<ClCompile Include="..\..\Source\demos\WidgetsDemo.cpp">
<Filter>Juce Demo\Demos</Filter>
</ClCompile>
<ClCompile Include="..\..\Binary Data\cello.wav">
<Filter>Juce Demo\Binary Data</Filter>
</ClCompile>
<ClCompile Include="..\..\Binary Data\demo table data.xml">
<Filter>Juce Demo\Binary Data</Filter>
</ClCompile>
<ClCompile Include="..\..\Binary Data\icons.zip">
<Filter>Juce Demo\Binary Data</Filter>
</ClCompile>
<ClCompile Include="..\..\Binary Data\juce.png">
<Filter>Juce Demo\Binary Data</Filter>
</ClCompile>
<ClCompile Include="..\..\Binary Data\juce_icon.png">
<Filter>Juce Demo\Binary Data</Filter>
</ClCompile>
<ClCompile Include="..\..\Binary Data\treedemo.xml">
<Filter>Juce Demo\Binary Data</Filter>
</ClCompile>
<ClCompile Include="..\..\..\..\modules\juce_audio_basics\buffers\juce_AudioDataConverters.cpp">
<Filter>Juce Modules\juce_audio_basics\buffers</Filter>
</ClCompile>
@@ -442,9 +424,6 @@
<ClCompile Include="..\..\..\..\modules\juce_audio_basics\synthesisers\juce_Synthesiser.cpp">
<Filter>Juce Modules\juce_audio_basics\synthesisers</Filter>
</ClCompile>
<ClCompile Include="..\..\..\..\modules\juce_audio_basics\juce_module_info">
<Filter>Juce Modules\juce_audio_basics</Filter>
</ClCompile>
<ClCompile Include="..\..\..\..\modules\juce_audio_devices\audio_io\juce_AudioDeviceManager.cpp">
<Filter>Juce Modules\juce_audio_devices\audio_io</Filter>
</ClCompile>
@@ -523,9 +502,6 @@
<ClCompile Include="..\..\..\..\modules\juce_audio_devices\native\juce_win32_WASAPI.cpp">
<Filter>Juce Modules\juce_audio_devices\native</Filter>
</ClCompile>
<ClCompile Include="..\..\..\..\modules\juce_audio_devices\juce_module_info">
<Filter>Juce Modules\juce_audio_devices</Filter>
</ClCompile>
<ClCompile Include="..\..\..\..\modules\juce_audio_formats\format\juce_AudioFormat.cpp">
<Filter>Juce Modules\juce_audio_formats\format</Filter>
</ClCompile>
@@ -571,9 +547,6 @@
<ClCompile Include="..\..\..\..\modules\juce_audio_formats\sampler\juce_Sampler.cpp">
<Filter>Juce Modules\juce_audio_formats\sampler</Filter>
</ClCompile>
<ClCompile Include="..\..\..\..\modules\juce_audio_formats\juce_module_info">
<Filter>Juce Modules\juce_audio_formats</Filter>
</ClCompile>
<ClCompile Include="..\..\..\..\modules\juce_audio_processors\processors\juce_AudioProcessor.cpp">
<Filter>Juce Modules\juce_audio_processors\processors</Filter>
</ClCompile>
@@ -610,9 +583,6 @@
<ClCompile Include="..\..\..\..\modules\juce_audio_processors\scanning\juce_PluginListComponent.cpp">
<Filter>Juce Modules\juce_audio_processors\scanning</Filter>
</ClCompile>
<ClCompile Include="..\..\..\..\modules\juce_audio_processors\juce_module_info">
<Filter>Juce Modules\juce_audio_processors</Filter>
</ClCompile>
<ClCompile Include="..\..\..\..\modules\juce_audio_utils\gui\juce_AudioDeviceSelectorComponent.cpp">
<Filter>Juce Modules\juce_audio_utils\gui</Filter>
</ClCompile>
@@ -628,9 +598,6 @@
<ClCompile Include="..\..\..\..\modules\juce_audio_utils\players\juce_AudioProcessorPlayer.cpp">
<Filter>Juce Modules\juce_audio_utils\players</Filter>
</ClCompile>
<ClCompile Include="..\..\..\..\modules\juce_audio_utils\juce_module_info">
<Filter>Juce Modules\juce_audio_utils</Filter>
</ClCompile>
<ClCompile Include="..\..\..\..\modules\juce_core\text\juce_CharacterFunctions.cpp">
<Filter>Juce Modules\juce_core\text</Filter>
</ClCompile>
@@ -850,9 +817,6 @@
<ClCompile Include="..\..\..\..\modules\juce_core\native\juce_win32_Threads.cpp">
<Filter>Juce Modules\juce_core\native</Filter>
</ClCompile>
<ClCompile Include="..\..\..\..\modules\juce_core\juce_module_info">
<Filter>Juce Modules\juce_core</Filter>
</ClCompile>
<ClCompile Include="..\..\..\..\modules\juce_cryptography\encryption\juce_BlowFish.cpp">
<Filter>Juce Modules\juce_cryptography\encryption</Filter>
</ClCompile>
@@ -868,9 +832,6 @@
<ClCompile Include="..\..\..\..\modules\juce_cryptography\hashing\juce_SHA256.cpp">
<Filter>Juce Modules\juce_cryptography\hashing</Filter>
</ClCompile>
<ClCompile Include="..\..\..\..\modules\juce_cryptography\juce_module_info">
<Filter>Juce Modules\juce_cryptography</Filter>
</ClCompile>
<ClCompile Include="..\..\..\..\modules\juce_data_structures\values\juce_Value.cpp">
<Filter>Juce Modules\juce_data_structures\values</Filter>
</ClCompile>
@@ -886,9 +847,6 @@
<ClCompile Include="..\..\..\..\modules\juce_data_structures\app_properties\juce_PropertiesFile.cpp">
<Filter>Juce Modules\juce_data_structures\app_properties</Filter>
</ClCompile>
<ClCompile Include="..\..\..\..\modules\juce_data_structures\juce_module_info">
<Filter>Juce Modules\juce_data_structures</Filter>
</ClCompile>
<ClCompile Include="..\..\..\..\modules\juce_events\messages\juce_ApplicationBase.cpp">
<Filter>Juce Modules\juce_events\messages</Filter>
</ClCompile>
@@ -937,9 +895,6 @@
<ClCompile Include="..\..\..\..\modules\juce_events\native\juce_win32_Messaging.cpp">
<Filter>Juce Modules\juce_events\native</Filter>
</ClCompile>
<ClCompile Include="..\..\..\..\modules\juce_events\juce_module_info">
<Filter>Juce Modules\juce_events</Filter>
</ClCompile>
<ClCompile Include="..\..\..\..\modules\juce_graphics\colour\juce_Colour.cpp">
<Filter>Juce Modules\juce_graphics\colour</Filter>
</ClCompile>
@@ -1057,9 +1012,6 @@
<ClCompile Include="..\..\..\..\modules\juce_graphics\native\juce_win32_Fonts.cpp">
<Filter>Juce Modules\juce_graphics\native</Filter>
</ClCompile>
<ClCompile Include="..\..\..\..\modules\juce_graphics\juce_module_info">
<Filter>Juce Modules\juce_graphics</Filter>
</ClCompile>
<ClCompile Include="..\..\..\..\modules\juce_gui_basics\components\juce_Component.cpp">
<Filter>Juce Modules\juce_gui_basics\components</Filter>
</ClCompile>
@@ -1426,9 +1378,6 @@
<ClCompile Include="..\..\..\..\modules\juce_gui_basics\native\juce_win32_Windowing.cpp">
<Filter>Juce Modules\juce_gui_basics\native</Filter>
</ClCompile>
<ClCompile Include="..\..\..\..\modules\juce_gui_basics\juce_module_info">
<Filter>Juce Modules\juce_gui_basics</Filter>
</ClCompile>
<ClCompile Include="..\..\..\..\modules\juce_gui_extra\code_editor\juce_CodeDocument.cpp">
<Filter>Juce Modules\juce_gui_extra\code_editor</Filter>
</ClCompile>
@@ -1495,9 +1444,6 @@
<ClCompile Include="..\..\..\..\modules\juce_gui_extra\native\juce_win32_WebBrowserComponent.cpp">
<Filter>Juce Modules\juce_gui_extra\native</Filter>
</ClCompile>
<ClCompile Include="..\..\..\..\modules\juce_gui_extra\juce_module_info">
<Filter>Juce Modules\juce_gui_extra</Filter>
</ClCompile>
<ClCompile Include="..\..\..\..\modules\juce_opengl\opengl\juce_OpenGLContext.cpp">
<Filter>Juce Modules\juce_opengl\opengl</Filter>
</ClCompile>
@@ -1522,9 +1468,6 @@
<ClCompile Include="..\..\..\..\modules\juce_opengl\opengl\juce_OpenGLTexture.cpp">
<Filter>Juce Modules\juce_opengl\opengl</Filter>
</ClCompile>
<ClCompile Include="..\..\..\..\modules\juce_opengl\juce_module_info">
<Filter>Juce Modules\juce_opengl</Filter>
</ClCompile>
<ClCompile Include="..\..\..\..\modules\juce_video\native\juce_android_CameraDevice.cpp">
<Filter>Juce Modules\juce_video\native</Filter>
</ClCompile>
@@ -1543,9 +1486,6 @@
<ClCompile Include="..\..\..\..\modules\juce_video\native\juce_win32_QuickTimeMovieComponent.cpp">
<Filter>Juce Modules\juce_video\native</Filter>
</ClCompile>
<ClCompile Include="..\..\..\..\modules\juce_video\juce_module_info">
<Filter>Juce Modules\juce_video</Filter>
</ClCompile>
<ClCompile Include="..\..\JuceLibraryCode\BinaryData.cpp">
<Filter>Juce Library Code</Filter>
</ClCompile>
@@ -2882,6 +2822,66 @@
</ClInclude>
</ItemGroup>
<ItemGroup>
<None Include="..\..\Binary Data\cello.wav">
<Filter>Juce Demo\Binary Data</Filter>
</None>
<None Include="..\..\Binary Data\demo table data.xml">
<Filter>Juce Demo\Binary Data</Filter>
</None>
<None Include="..\..\Binary Data\icons.zip">
<Filter>Juce Demo\Binary Data</Filter>
</None>
<None Include="..\..\Binary Data\juce.png">
<Filter>Juce Demo\Binary Data</Filter>
</None>
<None Include="..\..\Binary Data\juce_icon.png">
<Filter>Juce Demo\Binary Data</Filter>
</None>
<None Include="..\..\Binary Data\treedemo.xml">
<Filter>Juce Demo\Binary Data</Filter>
</None>
<None Include="..\..\..\..\modules\juce_audio_basics\juce_module_info">
<Filter>Juce Modules\juce_audio_basics</Filter>
</None>
<None Include="..\..\..\..\modules\juce_audio_devices\juce_module_info">
<Filter>Juce Modules\juce_audio_devices</Filter>
</None>
<None Include="..\..\..\..\modules\juce_audio_formats\juce_module_info">
<Filter>Juce Modules\juce_audio_formats</Filter>
</None>
<None Include="..\..\..\..\modules\juce_audio_processors\juce_module_info">
<Filter>Juce Modules\juce_audio_processors</Filter>
</None>
<None Include="..\..\..\..\modules\juce_audio_utils\juce_module_info">
<Filter>Juce Modules\juce_audio_utils</Filter>
</None>
<None Include="..\..\..\..\modules\juce_core\juce_module_info">
<Filter>Juce Modules\juce_core</Filter>
</None>
<None Include="..\..\..\..\modules\juce_cryptography\juce_module_info">
<Filter>Juce Modules\juce_cryptography</Filter>
</None>
<None Include="..\..\..\..\modules\juce_data_structures\juce_module_info">
<Filter>Juce Modules\juce_data_structures</Filter>
</None>
<None Include="..\..\..\..\modules\juce_events\juce_module_info">
<Filter>Juce Modules\juce_events</Filter>
</None>
<None Include="..\..\..\..\modules\juce_graphics\juce_module_info">
<Filter>Juce Modules\juce_graphics</Filter>
</None>
<None Include="..\..\..\..\modules\juce_gui_basics\juce_module_info">
<Filter>Juce Modules\juce_gui_basics</Filter>
</None>
<None Include="..\..\..\..\modules\juce_gui_extra\juce_module_info">
<Filter>Juce Modules\juce_gui_extra</Filter>
</None>
<None Include="..\..\..\..\modules\juce_opengl\juce_module_info">
<Filter>Juce Modules\juce_opengl</Filter>
</None>
<None Include="..\..\..\..\modules\juce_video\juce_module_info">
<Filter>Juce Modules\juce_video</Filter>
</None>
<None Include=".\icon.ico">
<Filter>Juce Library Code</Filter>
</None>


+ 16
- 0
extras/static library/Builds/VisualStudio2010/juce.vcxproj View File

@@ -1597,6 +1597,22 @@
<ClInclude Include="..\..\JuceLibraryCode\AppConfig.h"/>
<ClInclude Include="..\..\JuceLibraryCode\JuceHeader.h"/>
</ItemGroup>
<ItemGroup>
<None Include="..\..\..\..\modules\juce_audio_basics\juce_module_info"/>
<None Include="..\..\..\..\modules\juce_audio_devices\juce_module_info"/>
<None Include="..\..\..\..\modules\juce_audio_formats\juce_module_info"/>
<None Include="..\..\..\..\modules\juce_audio_processors\juce_module_info"/>
<None Include="..\..\..\..\modules\juce_audio_utils\juce_module_info"/>
<None Include="..\..\..\..\modules\juce_core\juce_module_info"/>
<None Include="..\..\..\..\modules\juce_cryptography\juce_module_info"/>
<None Include="..\..\..\..\modules\juce_data_structures\juce_module_info"/>
<None Include="..\..\..\..\modules\juce_events\juce_module_info"/>
<None Include="..\..\..\..\modules\juce_graphics\juce_module_info"/>
<None Include="..\..\..\..\modules\juce_gui_basics\juce_module_info"/>
<None Include="..\..\..\..\modules\juce_gui_extra\juce_module_info"/>
<None Include="..\..\..\..\modules\juce_opengl\juce_module_info"/>
<None Include="..\..\..\..\modules\juce_video\juce_module_info"/>
</ItemGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets"/>
<ImportGroup Label="ExtensionTargets"/>
</Project>

+ 44
- 42
extras/static library/Builds/VisualStudio2010/juce.vcxproj.filters View File

@@ -355,9 +355,6 @@
<ClCompile Include="..\..\..\..\modules\juce_audio_basics\synthesisers\juce_Synthesiser.cpp">
<Filter>Juce Modules\juce_audio_basics\synthesisers</Filter>
</ClCompile>
<ClCompile Include="..\..\..\..\modules\juce_audio_basics\juce_module_info">
<Filter>Juce Modules\juce_audio_basics</Filter>
</ClCompile>
<ClCompile Include="..\..\..\..\modules\juce_audio_devices\audio_io\juce_AudioDeviceManager.cpp">
<Filter>Juce Modules\juce_audio_devices\audio_io</Filter>
</ClCompile>
@@ -436,9 +433,6 @@
<ClCompile Include="..\..\..\..\modules\juce_audio_devices\native\juce_win32_WASAPI.cpp">
<Filter>Juce Modules\juce_audio_devices\native</Filter>
</ClCompile>
<ClCompile Include="..\..\..\..\modules\juce_audio_devices\juce_module_info">
<Filter>Juce Modules\juce_audio_devices</Filter>
</ClCompile>
<ClCompile Include="..\..\..\..\modules\juce_audio_formats\format\juce_AudioFormat.cpp">
<Filter>Juce Modules\juce_audio_formats\format</Filter>
</ClCompile>
@@ -484,9 +478,6 @@
<ClCompile Include="..\..\..\..\modules\juce_audio_formats\sampler\juce_Sampler.cpp">
<Filter>Juce Modules\juce_audio_formats\sampler</Filter>
</ClCompile>
<ClCompile Include="..\..\..\..\modules\juce_audio_formats\juce_module_info">
<Filter>Juce Modules\juce_audio_formats</Filter>
</ClCompile>
<ClCompile Include="..\..\..\..\modules\juce_audio_processors\processors\juce_AudioProcessor.cpp">
<Filter>Juce Modules\juce_audio_processors\processors</Filter>
</ClCompile>
@@ -523,9 +514,6 @@
<ClCompile Include="..\..\..\..\modules\juce_audio_processors\scanning\juce_PluginListComponent.cpp">
<Filter>Juce Modules\juce_audio_processors\scanning</Filter>
</ClCompile>
<ClCompile Include="..\..\..\..\modules\juce_audio_processors\juce_module_info">
<Filter>Juce Modules\juce_audio_processors</Filter>
</ClCompile>
<ClCompile Include="..\..\..\..\modules\juce_audio_utils\gui\juce_AudioDeviceSelectorComponent.cpp">
<Filter>Juce Modules\juce_audio_utils\gui</Filter>
</ClCompile>
@@ -541,9 +529,6 @@
<ClCompile Include="..\..\..\..\modules\juce_audio_utils\players\juce_AudioProcessorPlayer.cpp">
<Filter>Juce Modules\juce_audio_utils\players</Filter>
</ClCompile>
<ClCompile Include="..\..\..\..\modules\juce_audio_utils\juce_module_info">
<Filter>Juce Modules\juce_audio_utils</Filter>
</ClCompile>
<ClCompile Include="..\..\..\..\modules\juce_core\text\juce_CharacterFunctions.cpp">
<Filter>Juce Modules\juce_core\text</Filter>
</ClCompile>
@@ -763,9 +748,6 @@
<ClCompile Include="..\..\..\..\modules\juce_core\native\juce_win32_Threads.cpp">
<Filter>Juce Modules\juce_core\native</Filter>
</ClCompile>
<ClCompile Include="..\..\..\..\modules\juce_core\juce_module_info">
<Filter>Juce Modules\juce_core</Filter>
</ClCompile>
<ClCompile Include="..\..\..\..\modules\juce_cryptography\encryption\juce_BlowFish.cpp">
<Filter>Juce Modules\juce_cryptography\encryption</Filter>
</ClCompile>
@@ -781,9 +763,6 @@
<ClCompile Include="..\..\..\..\modules\juce_cryptography\hashing\juce_SHA256.cpp">
<Filter>Juce Modules\juce_cryptography\hashing</Filter>
</ClCompile>
<ClCompile Include="..\..\..\..\modules\juce_cryptography\juce_module_info">
<Filter>Juce Modules\juce_cryptography</Filter>
</ClCompile>
<ClCompile Include="..\..\..\..\modules\juce_data_structures\values\juce_Value.cpp">
<Filter>Juce Modules\juce_data_structures\values</Filter>
</ClCompile>
@@ -799,9 +778,6 @@
<ClCompile Include="..\..\..\..\modules\juce_data_structures\app_properties\juce_PropertiesFile.cpp">
<Filter>Juce Modules\juce_data_structures\app_properties</Filter>
</ClCompile>
<ClCompile Include="..\..\..\..\modules\juce_data_structures\juce_module_info">
<Filter>Juce Modules\juce_data_structures</Filter>
</ClCompile>
<ClCompile Include="..\..\..\..\modules\juce_events\messages\juce_ApplicationBase.cpp">
<Filter>Juce Modules\juce_events\messages</Filter>
</ClCompile>
@@ -850,9 +826,6 @@
<ClCompile Include="..\..\..\..\modules\juce_events\native\juce_win32_Messaging.cpp">
<Filter>Juce Modules\juce_events\native</Filter>
</ClCompile>
<ClCompile Include="..\..\..\..\modules\juce_events\juce_module_info">
<Filter>Juce Modules\juce_events</Filter>
</ClCompile>
<ClCompile Include="..\..\..\..\modules\juce_graphics\colour\juce_Colour.cpp">
<Filter>Juce Modules\juce_graphics\colour</Filter>
</ClCompile>
@@ -970,9 +943,6 @@
<ClCompile Include="..\..\..\..\modules\juce_graphics\native\juce_win32_Fonts.cpp">
<Filter>Juce Modules\juce_graphics\native</Filter>
</ClCompile>
<ClCompile Include="..\..\..\..\modules\juce_graphics\juce_module_info">
<Filter>Juce Modules\juce_graphics</Filter>
</ClCompile>
<ClCompile Include="..\..\..\..\modules\juce_gui_basics\components\juce_Component.cpp">
<Filter>Juce Modules\juce_gui_basics\components</Filter>
</ClCompile>
@@ -1339,9 +1309,6 @@
<ClCompile Include="..\..\..\..\modules\juce_gui_basics\native\juce_win32_Windowing.cpp">
<Filter>Juce Modules\juce_gui_basics\native</Filter>
</ClCompile>
<ClCompile Include="..\..\..\..\modules\juce_gui_basics\juce_module_info">
<Filter>Juce Modules\juce_gui_basics</Filter>
</ClCompile>
<ClCompile Include="..\..\..\..\modules\juce_gui_extra\code_editor\juce_CodeDocument.cpp">
<Filter>Juce Modules\juce_gui_extra\code_editor</Filter>
</ClCompile>
@@ -1408,9 +1375,6 @@
<ClCompile Include="..\..\..\..\modules\juce_gui_extra\native\juce_win32_WebBrowserComponent.cpp">
<Filter>Juce Modules\juce_gui_extra\native</Filter>
</ClCompile>
<ClCompile Include="..\..\..\..\modules\juce_gui_extra\juce_module_info">
<Filter>Juce Modules\juce_gui_extra</Filter>
</ClCompile>
<ClCompile Include="..\..\..\..\modules\juce_opengl\opengl\juce_OpenGLContext.cpp">
<Filter>Juce Modules\juce_opengl\opengl</Filter>
</ClCompile>
@@ -1435,9 +1399,6 @@
<ClCompile Include="..\..\..\..\modules\juce_opengl\opengl\juce_OpenGLTexture.cpp">
<Filter>Juce Modules\juce_opengl\opengl</Filter>
</ClCompile>
<ClCompile Include="..\..\..\..\modules\juce_opengl\juce_module_info">
<Filter>Juce Modules\juce_opengl</Filter>
</ClCompile>
<ClCompile Include="..\..\..\..\modules\juce_video\native\juce_android_CameraDevice.cpp">
<Filter>Juce Modules\juce_video\native</Filter>
</ClCompile>
@@ -1456,9 +1417,6 @@
<ClCompile Include="..\..\..\..\modules\juce_video\native\juce_win32_QuickTimeMovieComponent.cpp">
<Filter>Juce Modules\juce_video\native</Filter>
</ClCompile>
<ClCompile Include="..\..\..\..\modules\juce_video\juce_module_info">
<Filter>Juce Modules\juce_video</Filter>
</ClCompile>
<ClCompile Include="..\..\..\..\modules\juce_audio_basics\juce_audio_basics.cpp">
<Filter>Juce Library Code</Filter>
</ClCompile>
@@ -2761,4 +2719,48 @@
<Filter>Juce Library Code</Filter>
</ClInclude>
</ItemGroup>
<ItemGroup>
<None Include="..\..\..\..\modules\juce_audio_basics\juce_module_info">
<Filter>Juce Modules\juce_audio_basics</Filter>
</None>
<None Include="..\..\..\..\modules\juce_audio_devices\juce_module_info">
<Filter>Juce Modules\juce_audio_devices</Filter>
</None>
<None Include="..\..\..\..\modules\juce_audio_formats\juce_module_info">
<Filter>Juce Modules\juce_audio_formats</Filter>
</None>
<None Include="..\..\..\..\modules\juce_audio_processors\juce_module_info">
<Filter>Juce Modules\juce_audio_processors</Filter>
</None>
<None Include="..\..\..\..\modules\juce_audio_utils\juce_module_info">
<Filter>Juce Modules\juce_audio_utils</Filter>
</None>
<None Include="..\..\..\..\modules\juce_core\juce_module_info">
<Filter>Juce Modules\juce_core</Filter>
</None>
<None Include="..\..\..\..\modules\juce_cryptography\juce_module_info">
<Filter>Juce Modules\juce_cryptography</Filter>
</None>
<None Include="..\..\..\..\modules\juce_data_structures\juce_module_info">
<Filter>Juce Modules\juce_data_structures</Filter>
</None>
<None Include="..\..\..\..\modules\juce_events\juce_module_info">
<Filter>Juce Modules\juce_events</Filter>
</None>
<None Include="..\..\..\..\modules\juce_graphics\juce_module_info">
<Filter>Juce Modules\juce_graphics</Filter>
</None>
<None Include="..\..\..\..\modules\juce_gui_basics\juce_module_info">
<Filter>Juce Modules\juce_gui_basics</Filter>
</None>
<None Include="..\..\..\..\modules\juce_gui_extra\juce_module_info">
<Filter>Juce Modules\juce_gui_extra</Filter>
</None>
<None Include="..\..\..\..\modules\juce_opengl\juce_module_info">
<Filter>Juce Modules\juce_opengl</Filter>
</None>
<None Include="..\..\..\..\modules\juce_video\juce_module_info">
<Filter>Juce Modules\juce_video</Filter>
</None>
</ItemGroup>
</Project>

+ 11
- 0
extras/the jucer/Builds/VisualStudio2010/Jucer.vcxproj View File

@@ -1326,6 +1326,17 @@
<ClInclude Include="..\..\JuceLibraryCode\JuceHeader.h"/>
</ItemGroup>
<ItemGroup>
<None Include="..\..\src\binarydata\juce_icon.png"/>
<None Include="..\..\src\binarydata\jules.jpg"/>
<None Include="..\..\src\binarydata\prefs_about.png"/>
<None Include="..\..\src\binarydata\prefs_keys.png"/>
<None Include="..\..\src\binarydata\prefs_misc.png"/>
<None Include="..\..\..\..\modules\juce_core\juce_module_info"/>
<None Include="..\..\..\..\modules\juce_data_structures\juce_module_info"/>
<None Include="..\..\..\..\modules\juce_events\juce_module_info"/>
<None Include="..\..\..\..\modules\juce_graphics\juce_module_info"/>
<None Include="..\..\..\..\modules\juce_gui_basics\juce_module_info"/>
<None Include="..\..\..\..\modules\juce_gui_extra\juce_module_info"/>
<None Include=".\icon.ico"/>
</ItemGroup>
<ItemGroup>


+ 33
- 33
extras/the jucer/Builds/VisualStudio2010/Jucer.vcxproj.filters View File

@@ -325,21 +325,6 @@
<ClCompile Include="..\..\src\utility\jucer_UtilityFunctions.cpp">
<Filter>Jucer\src\utility</Filter>
</ClCompile>
<ClCompile Include="..\..\src\binarydata\juce_icon.png">
<Filter>Jucer\src\binarydata</Filter>
</ClCompile>
<ClCompile Include="..\..\src\binarydata\jules.jpg">
<Filter>Jucer\src\binarydata</Filter>
</ClCompile>
<ClCompile Include="..\..\src\binarydata\prefs_about.png">
<Filter>Jucer\src\binarydata</Filter>
</ClCompile>
<ClCompile Include="..\..\src\binarydata\prefs_keys.png">
<Filter>Jucer\src\binarydata</Filter>
</ClCompile>
<ClCompile Include="..\..\src\binarydata\prefs_misc.png">
<Filter>Jucer\src\binarydata</Filter>
</ClCompile>
<ClCompile Include="..\..\src\jucer_Main.cpp">
<Filter>Jucer\src</Filter>
</ClCompile>
@@ -562,9 +547,6 @@
<ClCompile Include="..\..\..\..\modules\juce_core\native\juce_win32_Threads.cpp">
<Filter>Juce Modules\juce_core\native</Filter>
</ClCompile>
<ClCompile Include="..\..\..\..\modules\juce_core\juce_module_info">
<Filter>Juce Modules\juce_core</Filter>
</ClCompile>
<ClCompile Include="..\..\..\..\modules\juce_data_structures\values\juce_Value.cpp">
<Filter>Juce Modules\juce_data_structures\values</Filter>
</ClCompile>
@@ -580,9 +562,6 @@
<ClCompile Include="..\..\..\..\modules\juce_data_structures\app_properties\juce_PropertiesFile.cpp">
<Filter>Juce Modules\juce_data_structures\app_properties</Filter>
</ClCompile>
<ClCompile Include="..\..\..\..\modules\juce_data_structures\juce_module_info">
<Filter>Juce Modules\juce_data_structures</Filter>
</ClCompile>
<ClCompile Include="..\..\..\..\modules\juce_events\messages\juce_ApplicationBase.cpp">
<Filter>Juce Modules\juce_events\messages</Filter>
</ClCompile>
@@ -631,9 +610,6 @@
<ClCompile Include="..\..\..\..\modules\juce_events\native\juce_win32_Messaging.cpp">
<Filter>Juce Modules\juce_events\native</Filter>
</ClCompile>
<ClCompile Include="..\..\..\..\modules\juce_events\juce_module_info">
<Filter>Juce Modules\juce_events</Filter>
</ClCompile>
<ClCompile Include="..\..\..\..\modules\juce_graphics\colour\juce_Colour.cpp">
<Filter>Juce Modules\juce_graphics\colour</Filter>
</ClCompile>
@@ -751,9 +727,6 @@
<ClCompile Include="..\..\..\..\modules\juce_graphics\native\juce_win32_Fonts.cpp">
<Filter>Juce Modules\juce_graphics\native</Filter>
</ClCompile>
<ClCompile Include="..\..\..\..\modules\juce_graphics\juce_module_info">
<Filter>Juce Modules\juce_graphics</Filter>
</ClCompile>
<ClCompile Include="..\..\..\..\modules\juce_gui_basics\components\juce_Component.cpp">
<Filter>Juce Modules\juce_gui_basics\components</Filter>
</ClCompile>
@@ -1120,9 +1093,6 @@
<ClCompile Include="..\..\..\..\modules\juce_gui_basics\native\juce_win32_Windowing.cpp">
<Filter>Juce Modules\juce_gui_basics\native</Filter>
</ClCompile>
<ClCompile Include="..\..\..\..\modules\juce_gui_basics\juce_module_info">
<Filter>Juce Modules\juce_gui_basics</Filter>
</ClCompile>
<ClCompile Include="..\..\..\..\modules\juce_gui_extra\code_editor\juce_CodeDocument.cpp">
<Filter>Juce Modules\juce_gui_extra\code_editor</Filter>
</ClCompile>
@@ -1189,9 +1159,6 @@
<ClCompile Include="..\..\..\..\modules\juce_gui_extra\native\juce_win32_WebBrowserComponent.cpp">
<Filter>Juce Modules\juce_gui_extra\native</Filter>
</ClCompile>
<ClCompile Include="..\..\..\..\modules\juce_gui_extra\juce_module_info">
<Filter>Juce Modules\juce_gui_extra</Filter>
</ClCompile>
<ClCompile Include="..\..\JuceLibraryCode\BinaryData.cpp">
<Filter>Juce Library Code</Filter>
</ClCompile>
@@ -2369,6 +2336,39 @@
</ClInclude>
</ItemGroup>
<ItemGroup>
<None Include="..\..\src\binarydata\juce_icon.png">
<Filter>Jucer\src\binarydata</Filter>
</None>
<None Include="..\..\src\binarydata\jules.jpg">
<Filter>Jucer\src\binarydata</Filter>
</None>
<None Include="..\..\src\binarydata\prefs_about.png">
<Filter>Jucer\src\binarydata</Filter>
</None>
<None Include="..\..\src\binarydata\prefs_keys.png">
<Filter>Jucer\src\binarydata</Filter>
</None>
<None Include="..\..\src\binarydata\prefs_misc.png">
<Filter>Jucer\src\binarydata</Filter>
</None>
<None Include="..\..\..\..\modules\juce_core\juce_module_info">
<Filter>Juce Modules\juce_core</Filter>
</None>
<None Include="..\..\..\..\modules\juce_data_structures\juce_module_info">
<Filter>Juce Modules\juce_data_structures</Filter>
</None>
<None Include="..\..\..\..\modules\juce_events\juce_module_info">
<Filter>Juce Modules\juce_events</Filter>
</None>
<None Include="..\..\..\..\modules\juce_graphics\juce_module_info">
<Filter>Juce Modules\juce_graphics</Filter>
</None>
<None Include="..\..\..\..\modules\juce_gui_basics\juce_module_info">
<Filter>Juce Modules\juce_gui_basics</Filter>
</None>
<None Include="..\..\..\..\modules\juce_gui_extra\juce_module_info">
<Filter>Juce Modules\juce_gui_extra</Filter>
</None>
<None Include=".\icon.ico">
<Filter>Juce Library Code</Filter>
</None>


Loading…
Cancel
Save