From bc19ab03b2e1ac71910ac5309e5ada90b5ffa9a5 Mon Sep 17 00:00:00 2001 From: hjk Date: Thu, 26 Jun 2014 16:27:38 +0200 Subject: RCC: (Re-)introduce a way to build resources in one go This is essentially an opt-out using CONFIG += resources_small for the 'big-data' feature introduced and made mandatory with commit 5395180. This is currently not active in any configuration, but can be used when the two-pass approach is neither needed nor wanted. Change-Id: I6d4f663843e629da6f39ac4da5e77d39c58b3ddf Reviewed-by: Oswald Buddenhagen Reviewed-by: Thiago Macieira --- mkspecs/features/resources.prf | 20 ++++++++++++++++---- 1 file changed, 16 insertions(+), 4 deletions(-) (limited to 'mkspecs') diff --git a/mkspecs/features/resources.prf b/mkspecs/features/resources.prf index cd00aba90f..c1470e2dd8 100644 --- a/mkspecs/features/resources.prf +++ b/mkspecs/features/resources.prf @@ -6,6 +6,19 @@ isEmpty(QMAKE_MOD_RCC):QMAKE_MOD_RCC = qrc !contains(QMAKE_RESOURCE_FLAGS, -root):!isEmpty(QMAKE_RESOURCE_ROOT):QMAKE_RESOURCE_FLAGS += -root $$QMAKE_RESOURCE_ROOT !contains(QMAKE_RESOURCE_FLAGS, -name): QMAKE_RESOURCE_FLAGS += -name ${QMAKE_FILE_BASE} +rcc.input = RESOURCES +rcc.name = RCC ${QMAKE_FILE_IN} +rcc.depend_command = $$QMAKE_RCC_DEP -list $$QMAKE_RESOURCE_FLAGS ${QMAKE_FILE_IN} +rcc.CONFIG += add_inputs_as_makefile_deps + +resources_small { + +rcc.output = $$RCC_DIR/$${first(QMAKE_MOD_RCC)}_${QMAKE_FILE_BASE}$${first(QMAKE_EXT_CPP)} +rcc.commands = $$QMAKE_RCC $$QMAKE_RESOURCE_FLAGS ${QMAKE_FILE_IN} -o ${QMAKE_FILE_OUT} +rcc.variable_out = SOURCES + +} else { + isEmpty(RCC_CXX):RCC_CXX = $$QMAKE_CXX $(CXXFLAGS) RCC_OUT_BASE = $$RCC_DIR/$${first(QMAKE_MOD_RCC)}_${QMAKE_FILE_BASE} RCC_CPP = $$RCC_OUT_BASE$${first(QMAKE_EXT_CPP)} @@ -15,15 +28,14 @@ RCC_OBJ = $$RCC_OUT_BASE$${first(QMAKE_EXT_OBJ)} msvc: RCC_CXX_O_FLAG = "-Fo" else: RCC_CXX_O_FLAG = "-o " -rcc.input = RESOURCES -rcc.CONFIG += add_inputs_as_makefile_deps -rcc.name = RCC ${QMAKE_FILE_IN} rcc.output = $$RCC_OBJ -rcc.depend_command = $$QMAKE_RCC_DEP -list $$QMAKE_RESOURCE_FLAGS ${QMAKE_FILE_IN} rcc.commands = \ $$QMAKE_RCC $$QMAKE_RESOURCE_FLAGS ${QMAKE_FILE_IN} -pass 1 -o $$RCC_CPP && \ $$RCC_CXX -c $$RCC_CPP $$RCC_CXX_O_FLAG$$RCC_TMP && \ $$QMAKE_RCC $$QMAKE_RESOURCE_FLAGS ${QMAKE_FILE_IN} -pass 2 -temp $$RCC_TMP -o ${QMAKE_FILE_OUT} rcc.clean += $$RCC_CPP $$RCC_TMP + +} + silent:rcc.commands = @echo rcc ${QMAKE_FILE_IN} && $$rcc.commands QMAKE_EXTRA_COMPILERS += rcc -- cgit v1.2.3