diff --git a/ground/openpilotgcs/openpilotgcs.pri b/ground/openpilotgcs/openpilotgcs.pri index 3141d1832..7ca4defb6 100644 --- a/ground/openpilotgcs/openpilotgcs.pri +++ b/ground/openpilotgcs/openpilotgcs.pri @@ -168,7 +168,6 @@ macx { MESAWIN_DIR = $$(MESAWIN_DIR) isEmpty(MESAWIN_DIR):MESAWIN_DIR = $${TOOLS_DIR}/mesawin - contains(TEMPLATE, vc.*)|contains(TEMPLATE_PREFIX, vc):vcproj = 1 GCS_APP_TARGET = openpilotgcs GCS_QT_PLUGINS_PATH = $$GCS_APP_PATH diff --git a/ground/openpilotgcs/share/openpilotgcs/translations/translations.pro b/ground/openpilotgcs/share/openpilotgcs/translations/translations.pro index 767ad3bb6..69923c4fd 100644 --- a/ground/openpilotgcs/share/openpilotgcs/translations/translations.pro +++ b/ground/openpilotgcs/share/openpilotgcs/translations/translations.pro @@ -40,27 +40,15 @@ LIBS = updateqm.input = TRANSLATIONS updateqm.output = $$GCS_DATA_PATH/translations/${QMAKE_FILE_BASE}.qm -isEmpty(vcproj):updateqm.variable_out = PRE_TARGETDEPS +updateqm.variable_out = PRE_TARGETDEPS updateqm.commands = $$LRELEASE ${QMAKE_FILE_IN} -qm ${QMAKE_FILE_OUT} updateqm.name = LRELEASE ${QMAKE_FILE_IN} updateqm.CONFIG += no_link QMAKE_EXTRA_COMPILERS += updateqm -isEmpty(vcproj) { - QMAKE_LINK = @: IGNORE THIS LINE - OBJECTS_DIR = - win32:CONFIG -= embed_manifest_exe -} else { - CONFIG += console - PHONY_DEPS = . - phony_src.input = PHONY_DEPS - phony_src.output = phony.c - phony_src.variable_out = GENERATED_SOURCES - phony_src.commands = echo int main() { return 0; } > phony.c - phony_src.name = CREATE phony.c - phony_src.CONFIG += combine - QMAKE_EXTRA_COMPILERS += phony_src -} +QMAKE_LINK = @: IGNORE THIS LINE +OBJECTS_DIR = +win32:CONFIG -= embed_manifest_exe qmfiles.files = $$prependAll(LANGUAGES, $$OUT_PWD/openpilotgcs_,.qm) qmfiles.path = /share/openpilotgcs/translations @@ -79,7 +67,7 @@ QT_TRANSLATIONS = $$QtQmExists(LANGUAGES) copyQT_QMs.input = QT_TRANSLATIONS copyQT_QMs.output = $$GCS_DATA_PATH/translations/${QMAKE_FILE_BASE}.qm -isEmpty(vcproj):copyQT_QMs.variable_out = PRE_TARGETDEPS +copyQT_QMs.variable_out = PRE_TARGETDEPS copyQT_QMs.commands = $(COPY_FILE) ${QMAKE_FILE_IN} ${QMAKE_FILE_OUT} copyQT_QMs.name = Copy ${QMAKE_FILE_IN} copyQT_QMs.CONFIG += no_link diff --git a/ground/openpilotgcs/src/openpilotgcsplugin.pri b/ground/openpilotgcs/src/openpilotgcsplugin.pri index 2a01ffcc3..8215631d3 100644 --- a/ground/openpilotgcs/src/openpilotgcsplugin.pri +++ b/ground/openpilotgcs/src/openpilotgcsplugin.pri @@ -19,7 +19,7 @@ isEmpty(TARGET) { PLUGINSPECS = $${_PRO_FILE_PWD_}/$${TARGET}.pluginspec copy2build.input = PLUGINSPECS copy2build.output = $$DESTDIR/${QMAKE_FUNC_FILE_IN_stripSrcDir} -isEmpty(vcproj):copy2build.variable_out = PRE_TARGETDEPS +copy2build.variable_out = PRE_TARGETDEPS copy2build.commands = $$QMAKE_COPY ${QMAKE_FILE_IN} ${QMAKE_FILE_OUT} copy2build.name = COPY ${QMAKE_FILE_IN} copy2build.CONFIG += no_link