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

Introjucer RTAS fix. VST fix for intel compiler.

This commit is contained in:
jules 2012-01-10 11:35:46 +00:00
parent b65b34ad40
commit 0301e9d1e4
2 changed files with 16 additions and 4 deletions

View file

@ -50,6 +50,18 @@ namespace
Value getPluginAUCocoaViewClassName (const Project& project) { return project.getProjectValue ("pluginAUViewClass"); } Value getPluginAUCocoaViewClassName (const Project& project) { return project.getProjectValue ("pluginAUViewClass"); }
Value getPluginRTASCategory (const Project& project) { return project.getProjectValue ("pluginRTASCategory"); } Value getPluginRTASCategory (const Project& project) { return project.getProjectValue ("pluginRTASCategory"); }
String getPluginRTASCategoryCode (const Project& project)
{
if (static_cast <bool> (getPluginIsSynth (project).getValue()))
return "ePlugInCategory_SWGenerators";
String s (getPluginRTASCategory (project).toString());
if (s.isEmpty())
s = "ePlugInCategory_None";
return s;
}
int countMaxPluginChannels (const String& configString, bool isInput) int countMaxPluginChannels (const String& configString, bool isInput)
{ {
StringArray configs; StringArray configs;
@ -103,7 +115,7 @@ namespace
<< "#define JucePlugin_AUManufacturerCode JucePlugin_ManufacturerCode" << newLine << "#define JucePlugin_AUManufacturerCode JucePlugin_ManufacturerCode" << newLine
<< "#define JucePlugin_CFBundleIdentifier " << project.getBundleIdentifier().toString() << newLine << "#define JucePlugin_CFBundleIdentifier " << project.getBundleIdentifier().toString() << newLine
<< "#define JucePlugin_AUCocoaViewClassName " << getPluginAUCocoaViewClassName (project).toString() << newLine << "#define JucePlugin_AUCocoaViewClassName " << getPluginAUCocoaViewClassName (project).toString() << newLine
<< "#define JucePlugin_RTASCategory " << ((bool) getPluginIsSynth (project).getValue() ? "ePlugInCategory_SWGenerators" : "ePlugInCategory_None") << newLine << "#define JucePlugin_RTASCategory " << getPluginRTASCategoryCode (project) << newLine
<< "#define JucePlugin_RTASManufacturerCode JucePlugin_ManufacturerCode" << newLine << "#define JucePlugin_RTASManufacturerCode JucePlugin_ManufacturerCode" << newLine
<< "#define JucePlugin_RTASProductId JucePlugin_PluginCode" << newLine << "#define JucePlugin_RTASProductId JucePlugin_PluginCode" << newLine
<< newLine; << newLine;

View file

@ -1448,10 +1448,10 @@ namespace
return pluginEntryPoint (audioMaster); return pluginEntryPoint (audioMaster);
} }
#ifndef _WIN64 // (can't compile this on win64, but it's not needed anyway with VST2.4) #ifndef JUCE_64BIT // (can't compile this on win64, but it's not needed anyway with VST2.4)
extern "C" __declspec (dllexport) void* main (audioMasterCallback audioMaster) extern "C" __declspec (dllexport) int main (audioMasterCallback audioMaster)
{ {
return (void*) pluginEntryPoint (audioMaster); return (int) pluginEntryPoint (audioMaster);
} }
#endif #endif