Commit 8b4d6ea8 authored by Tobias Hunger's avatar Tobias Hunger

Only build and use MSVC on windows

Reviewed-by: dt
parent 2e4b4472
......@@ -32,6 +32,7 @@
**************************************************************************/
#include "msvctoolchain.h"
#include "msvcparser.h"
#include "projectexplorerconstants.h"
#include "headerpath.h"
......@@ -42,9 +43,7 @@
#include <utils/qtcprocess.h>
#include <utils/qtcassert.h>
#include <utils/synchronousprocess.h>
#ifdef Q_OS_WIN
# include <utils/winutils.h>
#endif
#include <utils/winutils.h>
#include <QtCore/QCoreApplication>
#include <QtCore/QDir>
......
......@@ -36,7 +36,6 @@
#include "buildsteplist.h"
#include "deployconfiguration.h"
#include "gcctoolchainfactories.h"
#include "msvctoolchain.h"
#include "project.h"
#include "projectexplorersettings.h"
#include "target.h"
......@@ -86,6 +85,10 @@
#include "publishing/ipublishingwizardfactory.h"
#include "publishing/publishingwizardselectiondialog.h"
#ifdef Q_OS_WIN
# include "msvctoolchain.h"
#endif
#include <coreplugin/coreconstants.h>
#include <coreplugin/filemanager.h>
#include <coreplugin/icore.h>
......@@ -288,12 +291,12 @@ bool ProjectExplorerPlugin::initialize(const QStringList &arguments, QString *er
addObject(this);
// Add ToolChainFactories:
#ifndef Q_OS_WIN
addAutoReleasedObject(new Internal::GccToolChainFactory);
addAutoReleasedObject(new Internal::LinuxIccToolChainFactory);
#else
#ifdef Q_OS_WIN
addAutoReleasedObject(new Internal::MingwToolChainFactory);
addAutoReleasedObject(new Internal::MsvcToolChainFactory);
#else
addAutoReleasedObject(new Internal::GccToolChainFactory);
addAutoReleasedObject(new Internal::LinuxIccToolChainFactory);
#endif
d->m_toolChainManager = new ToolChainManager(this);
......
......@@ -12,7 +12,6 @@ INCLUDEPATH += $$PWD/../../libs/utils
HEADERS += projectexplorer.h \
abi.h \
gcctoolchain.h \
msvctoolchain.h \
projectexplorer_export.h \
projectwindow.h \
buildmanager.h \
......@@ -79,7 +78,6 @@ HEADERS += projectexplorer.h \
userfileaccessor.h \
cesdkhandler.h \
gccparser.h \
msvcparser.h \
filewatcher.h \
debugginghelper.h \
projectexplorersettingspage.h \
......@@ -112,7 +110,6 @@ HEADERS += projectexplorer.h \
SOURCES += projectexplorer.cpp \
abi.cpp \
gcctoolchain.cpp \
msvctoolchain.cpp \
projectwindow.cpp \
buildmanager.cpp \
buildsteplist.cpp \
......@@ -172,7 +169,6 @@ SOURCES += projectexplorer.cpp \
cesdkhandler.cpp \
userfileaccessor.cpp \
gccparser.cpp \
msvcparser.cpp \
filewatcher.cpp \
debugginghelper.cpp \
projectexplorersettingspage.cpp \
......@@ -219,8 +215,12 @@ equals(TEST, 1) {
win32 {
SOURCES += applicationlauncher_win.cpp \
winguiprocess.cpp
HEADERS += winguiprocess.h
winguiprocess.cpp \
msvcparser.cpp \
msvctoolchain.cpp
HEADERS += winguiprocess.h \
msvcparser.h \
msvctoolchain.h
} else {
SOURCES += applicationlauncher_x11.cpp
macx:LIBS += -framework Carbon
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment