From 3e6d1726380326c0faba9029e2a68886595a2ebc Mon Sep 17 00:00:00 2001 From: Oswald Buddenhagen Date: Tue, 29 Sep 2015 12:39:08 +0200 Subject: move inclusions of unix.conf (and related files) near the top that way we can override the values defined there. Change-Id: Ib9bce596d9fd43875b26a97c5489ee9d0d46b77c Reviewed-by: Joerg Bornemann --- mkspecs/unsupported/vxworks-simpentium-g++/qmake.conf | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'mkspecs/unsupported/vxworks-simpentium-g++/qmake.conf') diff --git a/mkspecs/unsupported/vxworks-simpentium-g++/qmake.conf b/mkspecs/unsupported/vxworks-simpentium-g++/qmake.conf index 3c8fd12d4a..4d5cc97fad 100644 --- a/mkspecs/unsupported/vxworks-simpentium-g++/qmake.conf +++ b/mkspecs/unsupported/vxworks-simpentium-g++/qmake.conf @@ -8,13 +8,14 @@ CONFIG += incremental QMAKE_INCREMENTAL_STYLE = sublib DEFINES += VXWORKS +include(../../common/linux.conf) + VXWORKS_ARCH = simlinux VXWORKS_CPU = SIMLINUX VXWORKS_ARCH_MUNCH = pentium include(../../common/gcc-base-unix.conf) include(../../common/g++-unix.conf) -include(../../common/linux.conf) QMAKE_CC = cc$$VXWORKS_ARCH_MUNCH QMAKE_CFLAGS = -fno-builtin -I$(WIND_BASE)/target/h -I$(WIND_BASE)/target/h/wrn/coreip -DCPU=$$upper($$VXWORKS_ARCH) -DVX_CPU_FAMILY=$$VXWORKS_ARCH -DTOOL_FAMILY=gnu -DTOOL=gnu -D_WRS_KERNEL -D_VSB_CONFIG_FILE=\'<../lib/h/config/vsbConfig.h>\' -- cgit v1.2.3