mirror/JUCE
1
0
Fork 0
mirror of https://github.com/juce-framework/JUCE.git synced 2026-02-07 04:10:08 +00:00
Code Activity

better double comparisons for var. Fix for VS2005/VS2010 RTAS exporting. Minor GL cleanups and project updates.

Browse source
This commit is contained in:
jules 2012-03-31 16:41:05 +01:00
parent 8de9d9c6da
commit 4e1a9f6526
10 changed files with 50 additions and 68 deletions
Download patch file Download diff file Expand all files Collapse all files

45
extras/Introjucer/Source/Project/jucer_AudioPluginModule.h
View file

@ -302,24 +302,27 @@ namespace RTASHelpers
{
fixMissingRTASValues (exporter);
exporter.xcodeCanUseDwarf = false;
exporter.msvcTargetSuffix = ".dpm";
exporter.msvcNeedsDLLRuntimeLib = true;
exporter.msvcExtraPreprocessorDefs.set ("JucePlugin_WinBag_path",
CodeHelpers::addEscapeChars (getRTASFolderRelativePath (exporter)
.getChildFile ("WinBag")
.toWindowsStyle()).quoted());
String msvcPathToRTASFolder (exporter.getJucePathFromTargetFolder()
.getChildFile ("juce_audio_plugin_client/RTAS")
.toWindowsStyle() + "\\");
exporter.msvcDelayLoadedDLLs = "DAE.dll; DigiExt.dll; DSI.dll; PluginLib.dll; DSPManager.dll";
if (exporter.isVisualStudio())
{
exporter.msvcTargetSuffix = ".dpm";
exporter.msvcNeedsDLLRuntimeLib = true;
String winbag (CodeHelpers::addEscapeChars (getRTASFolderRelativePath (exporter)
.getChildFile ("WinBag")
.toWindowsStyle()).quoted());
// (VS10 automatically adds escape characters to the quotes for this definition)
winbag = (exporter.getVisualStudioVersion() < 10) ? CodeHelpers::addEscapeChars (winbag.quoted())
: CodeHelpers::addEscapeChars (winbag).quoted();
exporter.msvcExtraPreprocessorDefs.set ("JucePlugin_WinBag_path", winbag);
String msvcPathToRTASFolder (exporter.getJucePathFromTargetFolder()
.getChildFile ("juce_audio_plugin_client/RTAS")
.toWindowsStyle() + "\\");
exporter.msvcDelayLoadedDLLs = "DAE.dll; DigiExt.dll; DSI.dll; PluginLib.dll; DSPManager.dll";
if (! exporter.getExtraLinkerFlags().toString().contains ("/FORCE:multiple"))
exporter.getExtraLinkerFlags() = exporter.getExtraLinkerFlags().toString() + " /FORCE:multiple";
@ -332,10 +335,14 @@ namespace RTASHelpers
+ "\" \"$(TargetPath)\".rsr";
}
}
else
{
exporter.xcodeCanUseDwarf = false;
RelativePath rtasFolder (getRTASFolder (exporter).toString(), RelativePath::projectFolder);
exporter.xcodeExtraLibrariesDebug.add (rtasFolder.getChildFile ("MacBag/Libs/Debug/libPluginLibrary.a"));
exporter.xcodeExtraLibrariesRelease.add (rtasFolder.getChildFile ("MacBag/Libs/Release/libPluginLibrary.a"));
RelativePath rtasFolder (getRTASFolder (exporter).toString(), RelativePath::projectFolder);
exporter.xcodeExtraLibrariesDebug.add (rtasFolder.getChildFile ("MacBag/Libs/Debug/libPluginLibrary.a"));
exporter.xcodeExtraLibrariesRelease.add (rtasFolder.getChildFile ("MacBag/Libs/Release/libPluginLibrary.a"));
}
writePluginCharacteristicsFile (projectSaver);