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

Introjucer: modified the MSVC exporter to leave it up to MSVC to choose the default binary folder name unless you specifically set a value for it.

Browse source
This commit is contained in:
jules 2015-02-16 10:21:12 +00:00
parent 6cee485a0a
commit 24bce65869
23 changed files with 5 additions and 46 deletions
Download patch file Download diff file Expand all files Collapse all files

2
examples/AnimationAppExample/Builds/VisualStudio2010/AnimationAppExample.vcxproj
View file

@ -33,10 +33,8 @@
<PropertyGroup Label="UserMacros"/>
<PropertyGroup>
<_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
<OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">.\Debug\</OutDir>
<TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">AnimationAppExample</TargetName>
<GenerateManifest Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</GenerateManifest>
<OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">.\Release\</OutDir>
<TargetName Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">AnimationAppExample</TargetName>
<GenerateManifest Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</GenerateManifest>
</PropertyGroup>

2
examples/AudioAppExample/Builds/VisualStudio2010/AudioAppExample.vcxproj
View file

@ -33,10 +33,8 @@
<PropertyGroup Label="UserMacros"/>
<PropertyGroup>
<_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
<OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">.\Debug\</OutDir>
<TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">AudioAppExample</TargetName>
<GenerateManifest Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</GenerateManifest>
<OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">.\Release\</OutDir>
<TargetName Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">AudioAppExample</TargetName>
<GenerateManifest Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</GenerateManifest>
</PropertyGroup>

2
examples/BouncingBallWavetableDemo/Builds/VisualStudio2013/BouncingBallWavetableDemo.vcxproj
View file

@ -38,10 +38,8 @@
</PropertyGroup>
<PropertyGroup>
<_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
<OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">.\Debug\</OutDir>
<TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">WavetableBouncingEditor</TargetName>
<GenerateManifest Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</GenerateManifest>
<OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">.\Release\</OutDir>
<TargetName Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">WavetableBouncingEditor</TargetName>
<GenerateManifest Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</GenerateManifest>
<PlatformToolset>v120</PlatformToolset>

2
examples/Demo/Builds/VisualStudio2010/JuceDemo.vcxproj
View file

@ -33,10 +33,8 @@
<PropertyGroup Label="UserMacros"/>
<PropertyGroup>
<_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
<OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">.\Debug\</OutDir>
<TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">JuceDemo</TargetName>
<GenerateManifest Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</GenerateManifest>
<OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">.\Release\</OutDir>
<TargetName Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">JuceDemo</TargetName>
<GenerateManifest Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</GenerateManifest>
</PropertyGroup>

2
examples/Demo/Builds/VisualStudio2012/JuceDemo.vcxproj
View file

@ -38,10 +38,8 @@
</PropertyGroup>
<PropertyGroup>
<_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
<OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">.\Debug\</OutDir>
<TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">JuceDemo</TargetName>
<GenerateManifest Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</GenerateManifest>
<OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">.\Release\</OutDir>
<TargetName Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">JuceDemo</TargetName>
<GenerateManifest Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</GenerateManifest>
<PlatformToolset>v110</PlatformToolset>

2
examples/Demo/Builds/VisualStudio2013/JuceDemo.vcxproj
View file

@ -38,10 +38,8 @@
</PropertyGroup>
<PropertyGroup>
<_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
<OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">.\Debug\</OutDir>
<TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">JuceDemo</TargetName>
<GenerateManifest Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</GenerateManifest>
<OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">.\Release\</OutDir>
<TargetName Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">JuceDemo</TargetName>
<GenerateManifest Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</GenerateManifest>
<PlatformToolset>v120</PlatformToolset>

2
examples/HelloWorld/Builds/VisualStudio2005/HelloWorld.vcproj
View file

@ -11,7 +11,6 @@
<ToolFiles/>
<Configurations>
<Configuration Name="Debug|Win32"
OutputDirectory=".\Debug"
ConfigurationType="1"
UseOfMFC="0"
ATLMinimizesCRunTimeLibraryUsage="false"
@ -66,7 +65,6 @@
<Tool Name="VCPostBuildEventTool"/>
</Configuration>
<Configuration Name="Release|Win32"
OutputDirectory=".\Release"
ConfigurationType="1"
UseOfMFC="0"
ATLMinimizesCRunTimeLibraryUsage="false"

2
examples/HelloWorld/Builds/VisualStudio2008/HelloWorld.vcproj
View file

@ -11,7 +11,6 @@
<ToolFiles/>
<Configurations>
<Configuration Name="Debug|Win32"
OutputDirectory=".\Debug"
ConfigurationType="1"
UseOfMFC="0"
ATLMinimizesCRunTimeLibraryUsage="false"
@ -66,7 +65,6 @@
<Tool Name="VCPostBuildEventTool"/>
</Configuration>
<Configuration Name="Release|Win32"
OutputDirectory=".\Release"
ConfigurationType="1"
UseOfMFC="0"
ATLMinimizesCRunTimeLibraryUsage="false"

2
examples/OpenGLAppExample/Builds/VisualStudio2010/OpenGLAppExample.vcxproj
View file

@ -33,10 +33,8 @@
<PropertyGroup Label="UserMacros"/>
<PropertyGroup>
<_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
<OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">.\Debug\</OutDir>
<TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">OpenGLAppExample</TargetName>
<GenerateManifest Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</GenerateManifest>
<OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">.\Release\</OutDir>
<TargetName Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">OpenGLAppExample</TargetName>
<GenerateManifest Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</GenerateManifest>
</PropertyGroup>

2
examples/PluckedStringsDemo/Builds/VisualStudio2013/PluckedStringsDemo.vcxproj
View file

@ -38,10 +38,8 @@
</PropertyGroup>
<PropertyGroup>
<_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
<OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">.\Debug\</OutDir>
<TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">PluckedStringsDemo</TargetName>
<GenerateManifest Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</GenerateManifest>
<OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">.\Release\</OutDir>
<TargetName Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">PluckedStringsDemo</TargetName>
<GenerateManifest Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</GenerateManifest>
<PlatformToolset>v120</PlatformToolset>

2
examples/SimpleFFTExample/Builds/VisualStudio2013/SimpleFFTExample.vcxproj
View file

@ -38,10 +38,8 @@
</PropertyGroup>
<PropertyGroup>
<_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
<OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">.\Debug\</OutDir>
<TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">SimpleFFTExample</TargetName>
<GenerateManifest Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</GenerateManifest>
<OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">.\Release\</OutDir>
<TargetName Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">SimpleFFTExample</TargetName>
<GenerateManifest Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</GenerateManifest>
<PlatformToolset>v120</PlatformToolset>

2
examples/audio plugin demo/Builds/VisualStudio2005/JuceDemoPlugin.vcproj
View file

@ -11,7 +11,6 @@
<ToolFiles/>
<Configurations>
<Configuration Name="Debug|Win32"
OutputDirectory=".\Debug"
ConfigurationType="2"
UseOfMFC="0"
ATLMinimizesCRunTimeLibraryUsage="false"
@ -69,7 +68,6 @@
CommandLine="copy /Y &quot;$(OutDir)\$(TargetFileName)&quot; &quot;$(OutDir)\$(TargetName).vst3&quot;"/>
</Configuration>
<Configuration Name="Release|Win32"
OutputDirectory=".\Release"
ConfigurationType="2"
UseOfMFC="0"
ATLMinimizesCRunTimeLibraryUsage="false"

2
examples/audio plugin demo/Builds/VisualStudio2008/JuceDemoPlugin.vcproj
View file

@ -11,7 +11,6 @@
<ToolFiles/>
<Configurations>
<Configuration Name="Debug|Win32"
OutputDirectory=".\Debug"
ConfigurationType="2"
UseOfMFC="0"
ATLMinimizesCRunTimeLibraryUsage="false"
@ -69,7 +68,6 @@
CommandLine="copy /Y &quot;$(OutDir)\$(TargetFileName)&quot; &quot;$(OutDir)\$(TargetName).vst3&quot;"/>
</Configuration>
<Configuration Name="Release|Win32"
OutputDirectory=".\Release"
ConfigurationType="2"
UseOfMFC="0"
ATLMinimizesCRunTimeLibraryUsage="false"

2
examples/audio plugin demo/Builds/VisualStudio2010/JuceDemoPlugin.vcxproj
View file

@ -33,10 +33,8 @@
<PropertyGroup Label="UserMacros"/>
<PropertyGroup>
<_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
<OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">.\Debug\</OutDir>
<TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">JuceDemoPlugin</TargetName>
<GenerateManifest Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</GenerateManifest>
<OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">.\Release\</OutDir>
<TargetName Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">JuceDemoPlugin</TargetName>
<GenerateManifest Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</GenerateManifest>
</PropertyGroup>

2
examples/audio plugin host/Builds/VisualStudio2010/Plugin Host.vcxproj
View file

@ -33,10 +33,8 @@
<PropertyGroup Label="UserMacros"/>
<PropertyGroup>
<_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
<OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">.\Debug\</OutDir>
<TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Plugin Host</TargetName>
<GenerateManifest Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</GenerateManifest>
<OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">.\Release\</OutDir>
<TargetName Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Plugin Host</TargetName>
<GenerateManifest Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</GenerateManifest>
</PropertyGroup>

2
extras/Introjucer/Builds/VisualStudio2005/The Introjucer.vcproj
View file

@ -11,7 +11,6 @@
<ToolFiles/>
<Configurations>
<Configuration Name="Debug|Win32"
OutputDirectory=".\Debug"
ConfigurationType="1"
UseOfMFC="0"
ATLMinimizesCRunTimeLibraryUsage="false"
@ -66,7 +65,6 @@
<Tool Name="VCPostBuildEventTool"/>
</Configuration>
<Configuration Name="Release|Win32"
OutputDirectory=".\Release"
ConfigurationType="1"
UseOfMFC="0"
ATLMinimizesCRunTimeLibraryUsage="false"

2
extras/Introjucer/Builds/VisualStudio2008/The Introjucer.vcproj
View file

@ -11,7 +11,6 @@
<ToolFiles/>
<Configurations>
<Configuration Name="Debug|Win32"
OutputDirectory=".\Debug"
ConfigurationType="1"
UseOfMFC="0"
ATLMinimizesCRunTimeLibraryUsage="false"
@ -66,7 +65,6 @@
<Tool Name="VCPostBuildEventTool"/>
</Configuration>
<Configuration Name="Release|Win32"
OutputDirectory=".\Release"
ConfigurationType="1"
UseOfMFC="0"
ATLMinimizesCRunTimeLibraryUsage="false"

2
extras/Introjucer/Builds/VisualStudio2010/The Introjucer.vcxproj
View file

@ -33,10 +33,8 @@
<PropertyGroup Label="UserMacros"/>
<PropertyGroup>
<_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
<OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">.\Debug\</OutDir>
<TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Introjucer</TargetName>
<GenerateManifest Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</GenerateManifest>
<OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">.\Release\</OutDir>
<TargetName Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Introjucer</TargetName>
<GenerateManifest Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</GenerateManifest>
</PropertyGroup>

2
extras/Introjucer/Builds/VisualStudio2012/The Introjucer.vcxproj
View file

@ -38,10 +38,8 @@
</PropertyGroup>
<PropertyGroup>
<_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
<OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">.\Debug\</OutDir>
<TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">The Introjucer</TargetName>
<GenerateManifest Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</GenerateManifest>
<OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">.\Release\</OutDir>
<TargetName Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">The Introjucer</TargetName>
<GenerateManifest Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</GenerateManifest>
<PlatformToolset>v110</PlatformToolset>

2
extras/Introjucer/Builds/VisualStudio2013/The Introjucer.vcxproj
View file

@ -38,10 +38,8 @@
</PropertyGroup>
<PropertyGroup>
<_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
<OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">.\Debug\</OutDir>
<TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">The Introjucer</TargetName>
<GenerateManifest Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</GenerateManifest>
<OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">.\Release\</OutDir>
<TargetName Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">The Introjucer</TargetName>
<GenerateManifest Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</GenerateManifest>
<PlatformToolset>v120</PlatformToolset>

7
extras/Introjucer/Source/Project Saving/jucer_ProjectExport_MSVC.h
View file

@ -221,7 +221,7 @@ protected:
{
const String binaryPath (config.getTargetBinaryRelativePathString().trim());
if (binaryPath.isEmpty())
return prependDot (File::createLegalFileName (config.getName().trim()));
return binaryPath;
RelativePath binaryRelPath (binaryPath, RelativePath::projectFolder);
@ -708,7 +708,9 @@ protected:
const bool isDebug = config.isDebug();
xml.setAttribute ("Name", createConfigName (config));
xml.setAttribute ("OutputDirectory", FileHelpers::windowsStylePath (getConfigTargetPath (config)));
if (getConfigTargetPath (config).isNotEmpty())
xml.setAttribute ("OutputDirectory", FileHelpers::windowsStylePath (getConfigTargetPath (config)));
if (config.getIntermediatesPath().isNotEmpty())
xml.setAttribute ("IntermediateDirectory", FileHelpers::windowsStylePath (config.getIntermediatesPath()));
@ -1149,6 +1151,7 @@ protected:
{
const VC2010BuildConfiguration& config = dynamic_cast<const VC2010BuildConfiguration&> (*i);
if (getConfigTargetPath (config).isNotEmpty())
{
XmlElement* outdir = props->createNewChildElement ("OutDir");
setConditionAttribute (*outdir, config);

2
extras/binarybuilder/Builds/VisualStudio2008/BinaryBuilder.vcproj
View file

@ -11,7 +11,6 @@
<ToolFiles/>
<Configurations>
<Configuration Name="Debug|Win32"
OutputDirectory=".\Debug"
ConfigurationType="1"
UseOfMFC="0"
ATLMinimizesCRunTimeLibraryUsage="false"
@ -66,7 +65,6 @@
<Tool Name="VCPostBuildEventTool"/>
</Configuration>
<Configuration Name="Release|Win32"
OutputDirectory=".\Release"
ConfigurationType="1"
UseOfMFC="0"
ATLMinimizesCRunTimeLibraryUsage="false"

2
extras/windows dll/Builds/VisualStudio2008/juce_dll.vcproj
View file

@ -11,7 +11,6 @@
<ToolFiles/>
<Configurations>
<Configuration Name="Debug|Win32"
OutputDirectory=".\Debug"
ConfigurationType="4"
UseOfMFC="0"
ATLMinimizesCRunTimeLibraryUsage="false"
@ -52,7 +51,6 @@
<Tool Name="VCPostBuildEventTool"/>
</Configuration>
<Configuration Name="Release|Win32"
OutputDirectory=".\Release"
ConfigurationType="4"
UseOfMFC="0"
ATLMinimizesCRunTimeLibraryUsage="false"