onkelbeh/fwbuilder
1
0
Fork 0
mirror of https://github.com/fwbuilder/fwbuilder synced 2026-05-10 11:05:06 +02:00
Code Issues Releases Wiki Activity

chore: Let qmake respect CXXFLAGS environment variable

Browse Source
This commit is contained in:
Sirius Bakke
2018-04-19 17:35:03 +02:00
parent 673600c178
commit 8642f8bf81
2 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
qmake.inc.in
View File

@@ -165,7 +165,7 @@ macx {
# dependency libraries. Building on 10.6 with deployment target 10.5
# should solve the problem
QMAKE_MACOSX_DEPLOYMENT_TARGET = $$(QMAKE_MACOSX_DEPLOYMENT_TARGET)
QMAKE_CXXFLAGS += -mmacosx-version-min=$$(QMAKE_MACOSX_DEPLOYMENT_TARGET)
QMAKE_CXXFLAGS += -mmacosx-version-min=$$(QMAKE_MACOSX_DEPLOYMENT_TARGET) $$(CXXFLAGS)
QMAKE_MAC_SDK = $$(QMAKE_MAC_SDK)
CONFIG += qt thread rtti stl warn_on debug # release
@@ -197,8 +197,8 @@ FWB_SIG = $$(FWB_SIG)
if (isEmpty(FWB_SIG)) { FWB_SIG=26932 }
DEFINES += FWB_SIG=$$FWB_SIG
QMAKE_CXXFLAGS_DEBUG += -D__STDC_FORMAT_MACROS -Wall -Wextra -Werror
QMAKE_CXXFLAGS_RELEASE += -D__STDC_FORMAT_MACROS -Wall -Wextra -Werror
QMAKE_CXXFLAGS_DEBUG += -D__STDC_FORMAT_MACROS -Wall -Wextra -Werror $$(CXXFLAGS)
QMAKE_CXXFLAGS_RELEASE += -D__STDC_FORMAT_MACROS -Wall -Wextra -Werror $$(CXXFLAGS)
exists(qmake2.inc) {
include(qmake2.inc)

6
src/libfwbuilder/qmake.inc.in
View File

@@ -16,8 +16,8 @@ CPPUNIT_LIBS = @CPPUNIT_LIBS@
CONFIG -= qt
CONFIG += c++14
QMAKE_CXXFLAGS_DEBUG += -D__STDC_FORMAT_MACROS -Wall -Wextra -Werror
QMAKE_CXXFLAGS_RELEASE += -D__STDC_FORMAT_MACROS -Wall -Wextra -Werror
QMAKE_CXXFLAGS_DEBUG += -D__STDC_FORMAT_MACROS -Wall -Wextra -Werror $$(CXXFLAGS)
QMAKE_CXXFLAGS_RELEASE += -D__STDC_FORMAT_MACROS -Wall -Wextra -Werror $$(CXXFLAGS)
unix {
@@ -96,7 +96,7 @@ macx {
# dependency libraries. Building on 10.6 with deployment target 10.5
# should solve the problem
QMAKE_MACOSX_DEPLOYMENT_TARGET = $$(QMAKE_MACOSX_DEPLOYMENT_TARGET)
QMAKE_CXXFLAGS += -mmacosx-version-min=$$(QMAKE_MACOSX_DEPLOYMENT_TARGET)
QMAKE_CXXFLAGS += -mmacosx-version-min=$$(QMAKE_MACOSX_DEPLOYMENT_TARGET) $$(CXXFLAGS)
QMAKE_MAC_SDK = $$(QMAKE_MAC_SDK)
QMAKE_LFLAGS_SONAME = -Wl,-install_name,@executable_path/../Frameworks/