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

Projucer: Ensure that the compile engine settings are stored and recalled correctly

Browse source
This commit is contained in:
ed 2018-04-11 09:48:09 +01:00
parent 08e87599d3
commit fabb3a1e09
5 changed files with 12 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

3
extras/Projucer/Source/LiveBuildEngine/jucer_CompileEngineClient.cpp
View file

@ -35,7 +35,8 @@
#include "jucer_ProjectBuildInfo.h"
#include "jucer_ClientServerMessages.h"
#include "jucer_CompileEngineClient.h"
#include "../LiveBuildEngine/jucer_CompileEngineServer.h"
#include "jucer_CompileEngineServer.h"
#include "jucer_CompileEngineSettings.h"
#ifndef RUN_CLANG_IN_CHILD_PROCESS
#error

1
extras/Projucer/Source/LiveBuildEngine/jucer_CompileEngineSettings.h
View file

@ -106,4 +106,5 @@ private:
}
//==============================================================================
JUCE_DECLARE_NON_COPYABLE_WITH_LEAK_DETECTOR (CompileEngineSettings)
};

1
extras/Projucer/Source/Project/UI/jucer_ProjectContentComponent.cpp
View file

@ -27,6 +27,7 @@
#include "../../Application/jucer_Headers.h"
#include "jucer_ProjectContentComponent.h"
#include "../../LiveBuildEngine/jucer_DownloadCompileEngineThread.h"
#include "../../LiveBuildEngine/jucer_CompileEngineSettings.h"
#include "jucer_HeaderComponent.h"
#include "Sidebar/jucer_TabComponents.h"

5
extras/Projucer/Source/Project/jucer_Project.cpp
View file

@ -28,6 +28,7 @@
#include "jucer_Project.h"
#include "../ProjectSaving/jucer_ProjectSaver.h"
#include "../Application/jucer_Application.h"
#include "../LiveBuildEngine/jucer_CompileEngineSettings.h"
namespace
{
@ -67,6 +68,8 @@ Project::Project (const File& f)
projectRoot.addListener (this);
compileEngineSettings.reset (new CompileEngineSettings (projectRoot));
setChangedFlag (false);
modificationTime = getFile().getLastModificationTime();
}
@ -579,6 +582,8 @@ Result Project::loadDocument (const File& file)
if (! ProjucerApplication::getApp().isRunningCommandLine)
warnAboutOldProjucerVersion();
compileEngineSettings.reset (new CompileEngineSettings (projectRoot));
return Result::ok();
}

6
extras/Projucer/Source/Project/jucer_Project.h
View file

@ -27,12 +27,12 @@
#pragma once
#include "jucer_ProjectType.h"
#include "../LiveBuildEngine/jucer_CompileEngineSettings.h"
class ProjectExporter;
class LibraryModule;
class EnabledModuleList;
class ProjectContentComponent;
class CompileEngineSettings;
//==============================================================================
class Project : public FileBasedDocument,
@ -384,7 +384,7 @@ public:
bool shouldSendGUIBuilderAnalyticsEvent() noexcept;
//==============================================================================
CompileEngineSettings& getCompileEngineSettings() { return compileEngineSettings; }
CompileEngineSettings& getCompileEngineSettings() { return *compileEngineSettings; }
private:
ValueTree projectRoot { Ids::JUCERPROJECT };
@ -398,7 +398,7 @@ private:
pluginAUMainTypeValue, pluginRTASCategoryValue, pluginVSTCategoryValue, pluginVST3CategoryValue, pluginAAXCategoryValue;
//==============================================================================
CompileEngineSettings compileEngineSettings { projectRoot };
ScopedPointer<CompileEngineSettings> compileEngineSettings;
//==============================================================================
bool shouldWriteLegacyPluginFormatSettings = false;