From ae5e0d348f9f6fdda65210b2574288de41b14713 Mon Sep 17 00:00:00 2001 From: jules Date: Sun, 12 Feb 2012 14:48:33 +0000 Subject: [PATCH] Introjucer: Added pre- and post-build commands and manifest generation options for MSVC. --- .../VisualStudio2005/The Introjucer.vcproj | 3 +- .../VisualStudio2008/The Introjucer.vcproj | 3 +- .../VisualStudio2010/The Introjucer.vcxproj | 2 + .../Project Saving/jucer_ProjectExport_MSVC.h | 97 +++++++++++-------- .../Project Saving/jucer_ProjectExporter.h | 3 +- .../Source/Project/jucer_AudioPluginModule.h | 7 +- .../jucer_ProjectInformationComponent.cpp | 22 ++--- .../Source/Utility/jucer_PresetIDs.h | 2 + .../Builds/VisualStudio2005/Juce Demo.vcproj | 3 +- .../Builds/VisualStudio2008/Juce Demo.vcproj | 3 +- .../Builds/VisualStudio2010/Juce Demo.vcxproj | 2 + .../VisualStudio2005/JuceDemoPlugin.vcproj | 3 +- .../VisualStudio2008/JuceDemoPlugin.vcproj | 3 +- .../VisualStudio2005/Plugin Host.vcproj | 3 +- .../VisualStudio2008/Plugin Host.vcproj | 3 +- .../VisualStudio2008/BinaryBuilder.vcproj | 3 +- .../Builds/VisualStudio2005/HelloWorld.vcproj | 3 +- .../Builds/VisualStudio2008/HelloWorld.vcproj | 3 +- .../Builds/VisualStudio2010/juce.vcxproj | 2 + .../Builds/VisualStudio2008/Jucer.vcproj | 3 +- .../Builds/VisualStudio2010/Jucer.vcxproj | 2 + 21 files changed, 105 insertions(+), 70 deletions(-) diff --git a/extras/Introjucer/Builds/VisualStudio2005/The Introjucer.vcproj b/extras/Introjucer/Builds/VisualStudio2005/The Introjucer.vcproj index 4a4eacab59..957c1e0b5f 100644 --- a/extras/Introjucer/Builds/VisualStudio2005/The Introjucer.vcproj +++ b/extras/Introjucer/Builds/VisualStudio2005/The Introjucer.vcproj @@ -54,6 +54,7 @@ GenerateDebugInformation="true" ProgramDatabaseFile=".\Debug\Introjucer.pdb" SubSystem="2" + GenerateManifest="true" TargetMachine="1"/> @@ -110,7 +111,7 @@ GenerateDebugInformation="false" ProgramDatabaseFile=".\Release\Introjucer.pdb" SubSystem="2" - GenerateManifest="false" + GenerateManifest="true" OptimizeReferences="2" EnableCOMDATFolding="2" TargetMachine="1"/> diff --git a/extras/Introjucer/Builds/VisualStudio2008/The Introjucer.vcproj b/extras/Introjucer/Builds/VisualStudio2008/The Introjucer.vcproj index 652f6c65d7..1e04196276 100644 --- a/extras/Introjucer/Builds/VisualStudio2008/The Introjucer.vcproj +++ b/extras/Introjucer/Builds/VisualStudio2008/The Introjucer.vcproj @@ -54,6 +54,7 @@ GenerateDebugInformation="true" ProgramDatabaseFile=".\Debug\Introjucer.pdb" SubSystem="2" + GenerateManifest="true" TargetMachine="1"/> @@ -110,7 +111,7 @@ GenerateDebugInformation="false" ProgramDatabaseFile=".\Release\Introjucer.pdb" SubSystem="2" - GenerateManifest="false" + GenerateManifest="true" OptimizeReferences="2" EnableCOMDATFolding="2" TargetMachine="1"/> diff --git a/extras/Introjucer/Builds/VisualStudio2010/The Introjucer.vcxproj b/extras/Introjucer/Builds/VisualStudio2010/The Introjucer.vcxproj index 973d294a0c..b931013b0d 100644 --- a/extras/Introjucer/Builds/VisualStudio2010/The Introjucer.vcxproj +++ b/extras/Introjucer/Builds/VisualStudio2010/The Introjucer.vcxproj @@ -38,9 +38,11 @@ .\Debug\ .\Debug\ Introjucer + true .\Release\ .\Release\ Introjucer + true diff --git a/extras/Introjucer/Source/Project Saving/jucer_ProjectExport_MSVC.h b/extras/Introjucer/Source/Project Saving/jucer_ProjectExport_MSVC.h index 25686c099f..36bde0c2c5 100644 --- a/extras/Introjucer/Source/Project Saving/jucer_ProjectExport_MSVC.h +++ b/extras/Introjucer/Source/Project Saving/jucer_ProjectExport_MSVC.h @@ -103,12 +103,19 @@ protected: getWarningLevelValue() = 4; msvcPreBuildCommand = getPrebuildCommand().toString(); + msvcPostBuildCommand = getPostbuildCommand().toString(); + + if (! shouldGenerateManifest().getValue().isBool()) + shouldGenerateManifest() = var (true); } - Value getWarningLevelValue() const { return getValue (Ids::winWarningLevel); } - int getWarningLevel() const { return getWarningLevelValue().getValue(); } + Value getWarningLevelValue() const { return getValue (Ids::winWarningLevel); } + int getWarningLevel() const { return getWarningLevelValue().getValue(); } - Value getPrebuildCommand() const { return getValue (Ids::prebuildCommand); } + Value getPrebuildCommand() const { return getValue (Ids::prebuildCommand); } + Value getPostbuildCommand() const { return getValue (Ids::postbuildCommand); } + + Value shouldGenerateManifest() const { return getValue (Ids::generateManifest); } void createPropertyEditors (PropertyListBuilder& props) { @@ -120,7 +127,9 @@ protected: props.add (new ChoicePropertyComponent (getWarningLevelValue(), "Warning Level", StringArray (warningLevelNames), Array (warningLevels))); - props.add (new TextPropertyComponent (getPrebuildCommand(), "Pre-build Command", 2048, false)); + props.add (new TextPropertyComponent (getPrebuildCommand(), "Pre-build Command", 2048, false)); + props.add (new TextPropertyComponent (getPostbuildCommand(), "Post-build Command", 2048, false)); + props.add (new BooleanPropertyComponent (shouldGenerateManifest(), "Manifest", "Generate Manifest")); } }; @@ -589,14 +598,7 @@ protected: preBuildEvent->setAttribute ("CommandLine", config.msvcPreBuildCommand); } - XmlElement* customBuild = createToolElement (xml, "VCCustomBuildTool"); - - if (config.msvcPostBuildCommand.isNotEmpty()) - customBuild->setAttribute ("CommandLine", config.msvcPostBuildCommand); - - if (config.msvcPostBuildOutputs.isNotEmpty()) - customBuild->setAttribute ("Outputs", config.msvcPostBuildOutputs); - + createToolElement (xml, "VCCustomBuildTool"); createToolElement (xml, "VCXMLDataGeneratorTool"); createToolElement (xml, "VCWebServiceProxyGeneratorTool"); @@ -669,9 +671,10 @@ protected: linker->setAttribute ("ProgramDatabaseFile", FileHelpers::windowsStylePath (intermediatesPath + "/" + binaryName + ".pdb")); linker->setAttribute ("SubSystem", msvcIsWindowsSubsystem ? "2" : "1"); + linker->setAttribute ("GenerateManifest", config.shouldGenerateManifest().getValue() ? "true" : "false"); + if (! isDebug) { - linker->setAttribute ("GenerateManifest", "false"); linker->setAttribute ("OptimizeReferences", "2"); linker->setAttribute ("EnableCOMDATFolding", "2"); } @@ -729,7 +732,13 @@ protected: if (! projectType.isLibrary()) createToolElement (xml, "VCAppVerifierTool"); - createToolElement (xml, "VCPostBuildEventTool"); + XmlElement* postBuildEvent = createToolElement (xml, "VCPostBuildEventTool"); + + if (config.msvcPostBuildCommand.isNotEmpty()) + { + postBuildEvent->setAttribute ("Description", "Post-build"); + postBuildEvent->setAttribute ("CommandLine", config.msvcPostBuildCommand); + } } void createConfigs (XmlElement& xml) @@ -1217,19 +1226,33 @@ protected: XmlElement* props = projectXml.createNewChildElement ("PropertyGroup"); props->createNewChildElement ("_ProjectFileVersion")->addTextElement ("10.0.30319.1"); - for (ConfigIterator config (*this); config.next();) + for (ConfigIterator i (*this); i.next();) { - XmlElement* outdir = props->createNewChildElement ("OutDir"); - setConditionAttribute (*outdir, *config); - outdir->addTextElement (getConfigTargetPath (*config) + "\\"); + const MSVCBuildConfiguration& config = dynamic_cast (*i); - XmlElement* intdir = props->createNewChildElement ("IntDir"); - setConditionAttribute (*intdir, *config); - intdir->addTextElement (getConfigTargetPath (*config) + "\\"); + { + XmlElement* outdir = props->createNewChildElement ("OutDir"); + setConditionAttribute (*outdir, config); + outdir->addTextElement (getConfigTargetPath (config) + "\\"); + } - XmlElement* name = props->createNewChildElement ("TargetName"); - setConditionAttribute (*name, *config); - name->addTextElement (getBinaryFileForConfig (*config).upToLastOccurrenceOf (".", false, false)); + { + XmlElement* intdir = props->createNewChildElement ("IntDir"); + setConditionAttribute (*intdir, config); + intdir->addTextElement (getConfigTargetPath (config) + "\\"); + } + + { + XmlElement* name = props->createNewChildElement ("TargetName"); + setConditionAttribute (*name, config); + name->addTextElement (getBinaryFileForConfig (config).upToLastOccurrenceOf (".", false, false)); + } + + { + XmlElement* manifest = props->createNewChildElement ("GenerateManifest"); + setConditionAttribute (*manifest, config); + manifest->addTextElement (config.shouldGenerateManifest().getValue() ? "true" : "false"); + } } } @@ -1321,25 +1344,15 @@ protected: bsc->createNewChildElement ("OutputFile")->addTextElement (FileHelpers::windowsStylePath (intermediatesPath + "/" + binaryName + ".bsc")); } - if (config.msvcPostBuildCommand.isNotEmpty()) - { - XmlElement* bsc = group->createNewChildElement ("PostBuildEvent"); - bsc->createNewChildElement ("Command")->addTextElement (config.msvcPostBuildCommand); - } + if (config.msvcPreBuildCommand.isNotEmpty()) + group->createNewChildElement ("PreBuildEvent") + ->createNewChildElement ("Command") + ->addTextElement (config.msvcPreBuildCommand); - //xxx -// -// asd -// -// -// dfg -// -// -// abc -// -// -// xyz -// + if (config.msvcPostBuildCommand.isNotEmpty()) + group->createNewChildElement ("PostBuildEvent") + ->createNewChildElement ("Command") + ->addTextElement (config.msvcPostBuildCommand); } { diff --git a/extras/Introjucer/Source/Project Saving/jucer_ProjectExporter.h b/extras/Introjucer/Source/Project Saving/jucer_ProjectExporter.h index 78c2ca904e..c2dee40bf6 100644 --- a/extras/Introjucer/Source/Project Saving/jucer_ProjectExporter.h +++ b/extras/Introjucer/Source/Project Saving/jucer_ProjectExporter.h @@ -165,8 +165,7 @@ public: //============================================================================== String msvcExtraLinkerOptions, msvcModuleDefinitionFile; - String msvcPostBuildCommand, msvcPostBuildOutputs; - String msvcPreBuildCommand; + String msvcPreBuildCommand, msvcPostBuildCommand; protected: Project& project; diff --git a/extras/Introjucer/Source/Project/jucer_AudioPluginModule.h b/extras/Introjucer/Source/Project/jucer_AudioPluginModule.h index 2ce0cc19af..7f89da8d9c 100644 --- a/extras/Introjucer/Source/Project/jucer_AudioPluginModule.h +++ b/extras/Introjucer/Source/Project/jucer_AudioPluginModule.h @@ -315,9 +315,10 @@ namespace RTASHelpers { config->msvcExtraLinkerOptions = "/FORCE:multiple"; config->msvcModuleDefinitionFile = msvcPathToRTASFolder + "juce_RTAS_WinExports.def"; - config->msvcPostBuildOutputs = "\"$(TargetPath)\".rsr"; - config->msvcPostBuildCommand = "copy /Y \"" + msvcPathToRTASFolder + "juce_RTAS_WinResources.rsr" - + "\" \"$(TargetPath)\".rsr"; + + if (config->msvcPostBuildCommand.isEmpty()) + config->msvcPostBuildCommand = "copy /Y \"" + msvcPathToRTASFolder + "juce_RTAS_WinResources.rsr" + + "\" \"$(TargetPath)\".rsr"; } exporter.xcodeExtraLibrariesDebug.add (rtasFolder.getChildFile ("MacBag/Libs/Debug/libPluginLibrary.a")); diff --git a/extras/Introjucer/Source/Project/jucer_ProjectInformationComponent.cpp b/extras/Introjucer/Source/Project/jucer_ProjectInformationComponent.cpp index 0c152bed41..1dceb8b83e 100644 --- a/extras/Introjucer/Source/Project/jucer_ProjectInformationComponent.cpp +++ b/extras/Introjucer/Source/Project/jucer_ProjectInformationComponent.cpp @@ -470,8 +470,8 @@ public: addAndMakeVisible (&modulesPanelGroup); addAndMakeVisible (&exporters); - mainProjectInfoPanel.backgroundColour = Colours::white.withAlpha (0.3f); - modulesPanelGroup .backgroundColour = Colours::white.withAlpha (0.3f); + mainProjectInfoPanel.fillBackground = true; + modulesPanelGroup.fillBackground = true; } void updateSize (int width) @@ -522,7 +522,7 @@ public: for (Project::ExporterIterator exporter (project); exporter.next();) { PropertyGroup* exporterGroup = exporters.createGroup(); - exporterGroup->backgroundColour = Colours::white.withAlpha (0.3f); + exporterGroup->fillBackground = true; exporterGroup->addDeleteButton ("exporter " + String (exporter.index), "Deletes this export target."); PropertyListBuilder props; @@ -679,7 +679,7 @@ private: { public: PropertyGroup() - : deleteButton ("Delete") + : deleteButton ("Delete"), fillBackground (false) { deleteButton.addListener (this); } @@ -706,7 +706,7 @@ private: int updateSize (int y, int width) { - int height = 32; + int height = fillBackground ? 36 : 32; for (int i = 0; i < properties.size(); ++i) { @@ -727,18 +727,18 @@ private: void paint (Graphics& g) { - if (! backgroundColour.isTransparent()) + if (fillBackground) { - g.setColour (backgroundColour); - g.fillRect (0, 0, getWidth(), getHeight() - 10); + g.setColour (Colours::white.withAlpha (0.3f)); + g.fillRect (0, 28, getWidth(), getHeight() - 38); g.setColour (Colours::black.withAlpha (0.4f)); - g.drawRect (0, 0, getWidth(), getHeight() - 10); + g.drawRect (0, 28, getWidth(), getHeight() - 38); } g.setFont (14.0f, Font::bold); g.setColour (Colours::black); - g.drawFittedText (getName(), 12, 0, getWidth() - 16, 28, Justification::bottomLeft, 1); + g.drawFittedText (getName(), 12, 0, getWidth() - 16, 26, Justification::bottomLeft, 1); } void buttonClicked (Button*) @@ -750,7 +750,7 @@ private: OwnedArray properties; TextButton deleteButton; - Colour backgroundColour; + bool fillBackground; }; //============================================================================== diff --git a/extras/Introjucer/Source/Utility/jucer_PresetIDs.h b/extras/Introjucer/Source/Utility/jucer_PresetIDs.h index e357c4cda7..6de4a636b9 100644 --- a/extras/Introjucer/Source/Utility/jucer_PresetIDs.h +++ b/extras/Introjucer/Source/Utility/jucer_PresetIDs.h @@ -66,6 +66,8 @@ namespace Ids DECLARE_ID (jucerVersion); DECLARE_ID (projectType); DECLARE_ID (prebuildCommand); + DECLARE_ID (postbuildCommand); + DECLARE_ID (generateManifest); DECLARE_ID (juceLinkage); DECLARE_ID (buildVST); DECLARE_ID (bundleIdentifier); diff --git a/extras/JuceDemo/Builds/VisualStudio2005/Juce Demo.vcproj b/extras/JuceDemo/Builds/VisualStudio2005/Juce Demo.vcproj index 5c631b04fc..79f8a61125 100644 --- a/extras/JuceDemo/Builds/VisualStudio2005/Juce Demo.vcproj +++ b/extras/JuceDemo/Builds/VisualStudio2005/Juce Demo.vcproj @@ -54,6 +54,7 @@ GenerateDebugInformation="true" ProgramDatabaseFile=".\Debug\JuceDemo.pdb" SubSystem="2" + GenerateManifest="true" TargetMachine="1"/> @@ -110,7 +111,7 @@ GenerateDebugInformation="false" ProgramDatabaseFile=".\Release\JuceDemo.pdb" SubSystem="2" - GenerateManifest="false" + GenerateManifest="true" OptimizeReferences="2" EnableCOMDATFolding="2" TargetMachine="1"/> diff --git a/extras/JuceDemo/Builds/VisualStudio2008/Juce Demo.vcproj b/extras/JuceDemo/Builds/VisualStudio2008/Juce Demo.vcproj index 844fddd0be..0cb3b801f2 100644 --- a/extras/JuceDemo/Builds/VisualStudio2008/Juce Demo.vcproj +++ b/extras/JuceDemo/Builds/VisualStudio2008/Juce Demo.vcproj @@ -54,6 +54,7 @@ GenerateDebugInformation="true" ProgramDatabaseFile=".\Debug\JuceDemo.pdb" SubSystem="2" + GenerateManifest="true" TargetMachine="1"/> @@ -110,7 +111,7 @@ GenerateDebugInformation="false" ProgramDatabaseFile=".\Release\JuceDemo.pdb" SubSystem="2" - GenerateManifest="false" + GenerateManifest="true" OptimizeReferences="2" EnableCOMDATFolding="2" TargetMachine="1"/> diff --git a/extras/JuceDemo/Builds/VisualStudio2010/Juce Demo.vcxproj b/extras/JuceDemo/Builds/VisualStudio2010/Juce Demo.vcxproj index 1965c049d2..c70bbf7f71 100644 --- a/extras/JuceDemo/Builds/VisualStudio2010/Juce Demo.vcxproj +++ b/extras/JuceDemo/Builds/VisualStudio2010/Juce Demo.vcxproj @@ -38,9 +38,11 @@ .\Debug\ .\Debug\ JuceDemo + true .\Release\ .\Release\ JuceDemo + true diff --git a/extras/audio plugin demo/Builds/VisualStudio2005/JuceDemoPlugin.vcproj b/extras/audio plugin demo/Builds/VisualStudio2005/JuceDemoPlugin.vcproj index 0554401f03..2ee18e7592 100644 --- a/extras/audio plugin demo/Builds/VisualStudio2005/JuceDemoPlugin.vcproj +++ b/extras/audio plugin demo/Builds/VisualStudio2005/JuceDemoPlugin.vcproj @@ -54,6 +54,7 @@ GenerateDebugInformation="true" ProgramDatabaseFile=".\Debug\JuceDemoPlugin.pdb" SubSystem="2" + GenerateManifest="true" TargetMachine="1"/> @@ -110,7 +111,7 @@ GenerateDebugInformation="false" ProgramDatabaseFile=".\Release\JuceDemoPlugin.pdb" SubSystem="2" - GenerateManifest="false" + GenerateManifest="true" OptimizeReferences="2" EnableCOMDATFolding="2" TargetMachine="1"/> diff --git a/extras/audio plugin demo/Builds/VisualStudio2008/JuceDemoPlugin.vcproj b/extras/audio plugin demo/Builds/VisualStudio2008/JuceDemoPlugin.vcproj index 04958e4666..0ee4cfc423 100644 --- a/extras/audio plugin demo/Builds/VisualStudio2008/JuceDemoPlugin.vcproj +++ b/extras/audio plugin demo/Builds/VisualStudio2008/JuceDemoPlugin.vcproj @@ -54,6 +54,7 @@ GenerateDebugInformation="true" ProgramDatabaseFile=".\Debug\JuceDemoPlugin.pdb" SubSystem="2" + GenerateManifest="true" TargetMachine="1"/> @@ -110,7 +111,7 @@ GenerateDebugInformation="false" ProgramDatabaseFile=".\Release\JuceDemoPlugin.pdb" SubSystem="2" - GenerateManifest="false" + GenerateManifest="true" OptimizeReferences="2" EnableCOMDATFolding="2" TargetMachine="1"/> diff --git a/extras/audio plugin host/Builds/VisualStudio2005/Plugin Host.vcproj b/extras/audio plugin host/Builds/VisualStudio2005/Plugin Host.vcproj index d8a7c79901..19e8f4b62d 100644 --- a/extras/audio plugin host/Builds/VisualStudio2005/Plugin Host.vcproj +++ b/extras/audio plugin host/Builds/VisualStudio2005/Plugin Host.vcproj @@ -54,6 +54,7 @@ GenerateDebugInformation="true" ProgramDatabaseFile=".\Debug\Plugin Host.pdb" SubSystem="2" + GenerateManifest="true" TargetMachine="1"/> @@ -110,7 +111,7 @@ GenerateDebugInformation="false" ProgramDatabaseFile=".\Release\Plugin Host.pdb" SubSystem="2" - GenerateManifest="false" + GenerateManifest="true" OptimizeReferences="2" EnableCOMDATFolding="2" TargetMachine="1"/> diff --git a/extras/audio plugin host/Builds/VisualStudio2008/Plugin Host.vcproj b/extras/audio plugin host/Builds/VisualStudio2008/Plugin Host.vcproj index 3bd7893147..789adbf417 100644 --- a/extras/audio plugin host/Builds/VisualStudio2008/Plugin Host.vcproj +++ b/extras/audio plugin host/Builds/VisualStudio2008/Plugin Host.vcproj @@ -54,6 +54,7 @@ GenerateDebugInformation="true" ProgramDatabaseFile=".\Debug\Plugin Host.pdb" SubSystem="2" + GenerateManifest="true" TargetMachine="1"/> @@ -110,7 +111,7 @@ GenerateDebugInformation="false" ProgramDatabaseFile=".\Release\Plugin Host.pdb" SubSystem="2" - GenerateManifest="false" + GenerateManifest="true" OptimizeReferences="2" EnableCOMDATFolding="2" TargetMachine="1"/> diff --git a/extras/binarybuilder/Builds/VisualStudio2008/BinaryBuilder.vcproj b/extras/binarybuilder/Builds/VisualStudio2008/BinaryBuilder.vcproj index 4ef0d6093e..fce70eb36f 100644 --- a/extras/binarybuilder/Builds/VisualStudio2008/BinaryBuilder.vcproj +++ b/extras/binarybuilder/Builds/VisualStudio2008/BinaryBuilder.vcproj @@ -54,6 +54,7 @@ GenerateDebugInformation="true" ProgramDatabaseFile=".\Debug\BinaryBuilder.pdb" SubSystem="1" + GenerateManifest="true" TargetMachine="1"/> @@ -110,7 +111,7 @@ GenerateDebugInformation="false" ProgramDatabaseFile=".\Release\BinaryBuilder.pdb" SubSystem="1" - GenerateManifest="false" + GenerateManifest="true" OptimizeReferences="2" EnableCOMDATFolding="2" TargetMachine="1"/> diff --git a/extras/example projects/Builds/VisualStudio2005/HelloWorld.vcproj b/extras/example projects/Builds/VisualStudio2005/HelloWorld.vcproj index 181324f27c..970cde6405 100644 --- a/extras/example projects/Builds/VisualStudio2005/HelloWorld.vcproj +++ b/extras/example projects/Builds/VisualStudio2005/HelloWorld.vcproj @@ -54,6 +54,7 @@ GenerateDebugInformation="true" ProgramDatabaseFile=".\Debug\HelloWorld.pdb" SubSystem="2" + GenerateManifest="true" TargetMachine="1"/> @@ -110,7 +111,7 @@ GenerateDebugInformation="false" ProgramDatabaseFile=".\Release\HelloWorld.pdb" SubSystem="2" - GenerateManifest="false" + GenerateManifest="true" OptimizeReferences="2" EnableCOMDATFolding="2" TargetMachine="1"/> diff --git a/extras/example projects/Builds/VisualStudio2008/HelloWorld.vcproj b/extras/example projects/Builds/VisualStudio2008/HelloWorld.vcproj index 5f3b63a933..56c4344e93 100644 --- a/extras/example projects/Builds/VisualStudio2008/HelloWorld.vcproj +++ b/extras/example projects/Builds/VisualStudio2008/HelloWorld.vcproj @@ -54,6 +54,7 @@ GenerateDebugInformation="true" ProgramDatabaseFile=".\Debug\HelloWorld.pdb" SubSystem="2" + GenerateManifest="true" TargetMachine="1"/> @@ -110,7 +111,7 @@ GenerateDebugInformation="false" ProgramDatabaseFile=".\Release\HelloWorld.pdb" SubSystem="2" - GenerateManifest="false" + GenerateManifest="true" OptimizeReferences="2" EnableCOMDATFolding="2" TargetMachine="1"/> diff --git a/extras/static library/Builds/VisualStudio2010/juce.vcxproj b/extras/static library/Builds/VisualStudio2010/juce.vcxproj index e62a018fd1..67537f4090 100644 --- a/extras/static library/Builds/VisualStudio2010/juce.vcxproj +++ b/extras/static library/Builds/VisualStudio2010/juce.vcxproj @@ -38,9 +38,11 @@ .\Debug\ .\Debug\ jucedebug + true .\Release\ .\Release\ juce + true diff --git a/extras/the jucer/Builds/VisualStudio2008/Jucer.vcproj b/extras/the jucer/Builds/VisualStudio2008/Jucer.vcproj index edec5abf1d..a40526a965 100644 --- a/extras/the jucer/Builds/VisualStudio2008/Jucer.vcproj +++ b/extras/the jucer/Builds/VisualStudio2008/Jucer.vcproj @@ -54,6 +54,7 @@ GenerateDebugInformation="true" ProgramDatabaseFile=".\Debug\Jucer.pdb" SubSystem="2" + GenerateManifest="true" TargetMachine="1"/> @@ -110,7 +111,7 @@ GenerateDebugInformation="false" ProgramDatabaseFile=".\Release\Jucer.pdb" SubSystem="2" - GenerateManifest="false" + GenerateManifest="true" OptimizeReferences="2" EnableCOMDATFolding="2" TargetMachine="1"/> diff --git a/extras/the jucer/Builds/VisualStudio2010/Jucer.vcxproj b/extras/the jucer/Builds/VisualStudio2010/Jucer.vcxproj index dccd381e65..4b6883e4b1 100644 --- a/extras/the jucer/Builds/VisualStudio2010/Jucer.vcxproj +++ b/extras/the jucer/Builds/VisualStudio2010/Jucer.vcxproj @@ -38,9 +38,11 @@ .\Debug\ .\Debug\ Jucer + true .\Release\ .\Release\ Jucer + true