Workaround for dirty build folders.
My disgust just turned into barely contained rage :<
This commit is contained in:
parent
f9169654c5
commit
482ad250a4
@ -1,4 +1,4 @@
|
|||||||
#include "Config.h"
|
#include "BuildConfig.h"
|
||||||
|
|
||||||
Config BuildConfig;
|
Config BuildConfig;
|
||||||
|
|
@ -204,7 +204,7 @@ IF(MultiMC_CODE_COVERAGE)
|
|||||||
ENDIF(MultiMC_CODE_COVERAGE)
|
ENDIF(MultiMC_CODE_COVERAGE)
|
||||||
|
|
||||||
######## Configure header ########
|
######## Configure header ########
|
||||||
configure_file("${PROJECT_SOURCE_DIR}/Config.cpp.in" "${PROJECT_BINARY_DIR}/Config.cpp")
|
configure_file("${PROJECT_SOURCE_DIR}/BuildConfig.cpp.in" "${PROJECT_BINARY_DIR}/BuildConfig.cpp")
|
||||||
|
|
||||||
######## Packaging/install paths setup ########
|
######## Packaging/install paths setup ########
|
||||||
|
|
||||||
@ -279,8 +279,8 @@ SET(MULTIMC_SOURCES
|
|||||||
MultiMC.h
|
MultiMC.h
|
||||||
MultiMC.cpp
|
MultiMC.cpp
|
||||||
MMCError.h
|
MMCError.h
|
||||||
Config.h
|
BuildConfig.h
|
||||||
${PROJECT_BINARY_DIR}/Config.cpp
|
${PROJECT_BINARY_DIR}/BuildConfig.cpp
|
||||||
|
|
||||||
# Logging
|
# Logging
|
||||||
logger/QsDebugOutput.cpp
|
logger/QsDebugOutput.cpp
|
||||||
|
@ -1,5 +1,5 @@
|
|||||||
#include "MultiMC.h"
|
#include "MultiMC.h"
|
||||||
#include "Config.h"
|
#include "BuildConfig.h"
|
||||||
|
|
||||||
#include <iostream>
|
#include <iostream>
|
||||||
#include <QDir>
|
#include <QDir>
|
||||||
|
@ -17,7 +17,7 @@
|
|||||||
* limitations under the License.
|
* limitations under the License.
|
||||||
*/
|
*/
|
||||||
#include "MultiMC.h"
|
#include "MultiMC.h"
|
||||||
#include "Config.h"
|
#include "BuildConfig.h"
|
||||||
|
|
||||||
#include "MainWindow.h"
|
#include "MainWindow.h"
|
||||||
#include "ui_MainWindow.h"
|
#include "ui_MainWindow.h"
|
||||||
|
@ -18,7 +18,7 @@
|
|||||||
#include <QIcon>
|
#include <QIcon>
|
||||||
#include "MultiMC.h"
|
#include "MultiMC.h"
|
||||||
#include "gui/Platform.h"
|
#include "gui/Platform.h"
|
||||||
#include "Config.h"
|
#include "BuildConfig.h"
|
||||||
|
|
||||||
AboutDialog::AboutDialog(QWidget *parent) : QDialog(parent), ui(new Ui::AboutDialog)
|
AboutDialog::AboutDialog(QWidget *parent) : QDialog(parent), ui(new Ui::AboutDialog)
|
||||||
{
|
{
|
||||||
|
@ -15,7 +15,7 @@
|
|||||||
* limitations under the License.
|
* limitations under the License.
|
||||||
*/
|
*/
|
||||||
#include "MultiMC.h"
|
#include "MultiMC.h"
|
||||||
#include "Config.h"
|
#include "BuildConfig.h"
|
||||||
|
|
||||||
#include "MinecraftProcess.h"
|
#include "MinecraftProcess.h"
|
||||||
|
|
||||||
|
@ -16,7 +16,7 @@
|
|||||||
#include "DownloadUpdateTask.h"
|
#include "DownloadUpdateTask.h"
|
||||||
|
|
||||||
#include "MultiMC.h"
|
#include "MultiMC.h"
|
||||||
#include "Config.h"
|
#include "BuildConfig.h"
|
||||||
|
|
||||||
#include "logic/updater/UpdateChecker.h"
|
#include "logic/updater/UpdateChecker.h"
|
||||||
#include "logic/net/NetJob.h"
|
#include "logic/net/NetJob.h"
|
||||||
|
@ -5,7 +5,7 @@
|
|||||||
#include <QJsonArray>
|
#include <QJsonArray>
|
||||||
|
|
||||||
#include "MultiMC.h"
|
#include "MultiMC.h"
|
||||||
#include "Config.h"
|
#include "BuildConfig.h"
|
||||||
#include "logic/net/CacheDownload.h"
|
#include "logic/net/CacheDownload.h"
|
||||||
|
|
||||||
NotificationChecker::NotificationChecker(QObject *parent)
|
NotificationChecker::NotificationChecker(QObject *parent)
|
||||||
|
@ -16,7 +16,7 @@
|
|||||||
#include "UpdateChecker.h"
|
#include "UpdateChecker.h"
|
||||||
|
|
||||||
#include "MultiMC.h"
|
#include "MultiMC.h"
|
||||||
#include "Config.h"
|
#include "BuildConfig.h"
|
||||||
|
|
||||||
#include "logger/QsLog.h"
|
#include "logger/QsLog.h"
|
||||||
|
|
||||||
|
@ -4,7 +4,7 @@
|
|||||||
#include "depends/settings/settingsobject.h"
|
#include "depends/settings/settingsobject.h"
|
||||||
#include "depends/settings/setting.h"
|
#include "depends/settings/setting.h"
|
||||||
|
|
||||||
#include "Config.h"
|
#include "BuildConfig.h"
|
||||||
#include "TestUtil.h"
|
#include "TestUtil.h"
|
||||||
#include "logic/updater/UpdateChecker.h"
|
#include "logic/updater/UpdateChecker.h"
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user