From 9af677cea585fd6ce8f9a0e451e4ac7d146876a3 Mon Sep 17 00:00:00 2001 From: Felix Kauselmann <2039670+selmf@users.noreply.github.com> Date: Tue, 17 Feb 2015 18:39:55 +0100 Subject: [PATCH] Don't explicitly set -lGL when compiling with no_opengl --- YACReader/YACReader.pri | 5 ++++- YACReaderLibrary/YACReaderLibrary.pro | 5 ++++- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/YACReader/YACReader.pri b/YACReader/YACReader.pri index a6636953..066fdafe 100644 --- a/YACReader/YACReader.pri +++ b/YACReader/YACReader.pri @@ -16,7 +16,10 @@ LIBS += -lpoppler-qt4 INCLUDEPATH += ../dependencies/poppler/include/qt4 } -QMAKE_CXXFLAGS_RELEASE += /MP /Ob2 /Oi /Ot /GT /GL +QMAKE_CXXFLAGS_RELEASE += /MP /Ob2 /Oi /Ot /GT +!CONFIG(no_opengl) { + QMAKE_CXXFLAGS_RELEASE += /GL +} QMAKE_LFLAGS_RELEASE += /LTCG CONFIG -= embed_manifest_exe } diff --git a/YACReaderLibrary/YACReaderLibrary.pro b/YACReaderLibrary/YACReaderLibrary.pro index 9b552ddb..4fac73e0 100644 --- a/YACReaderLibrary/YACReaderLibrary.pro +++ b/YACReaderLibrary/YACReaderLibrary.pro @@ -32,7 +32,10 @@ LIBS += -lpoppler-qt4 INCLUDEPATH += ../dependencies/poppler/include/qt4 } -QMAKE_CXXFLAGS_RELEASE += /MP /Ob2 /Oi /Ot /GT /GL +QMAKE_CXXFLAGS_RELEASE += /MP /Ob2 /Oi /Ot /GT +!CONFIG(no_opengl) { + QMAKE_CXXFLAGS_RELEASE += /GL +} QMAKE_LFLAGS_RELEASE += /LTCG CONFIG -= embed_manifest_exe }