diff options
| author | Peter Korsgaard <jacmet@sunsite.dk> | 2009-01-25 20:19:06 +0000 |
|---|---|---|
| committer | Peter Korsgaard <jacmet@sunsite.dk> | 2009-01-25 20:19:06 +0000 |
| commit | ae3e3d132523af866f183cf049f8302393ad6364 (patch) | |
| tree | 4baaaa6c8fb90f0365c5de043239e4d4d52cb300 /package/qtopia4/qtopia4.mk | |
| parent | f85f2de174779aaf02cf2a858b2ba28c4cb6f843 (diff) | |
qtopia4: fix and improve color/pixel depths config
Also fix whitespace and use an existing variable for qmake.conf, which
was forgotten in r23828, though it's only commented out.
Signed-off-by: Markus Heidelberg <markus.heidelberg@web.de>
Diffstat (limited to 'package/qtopia4/qtopia4.mk')
| -rw-r--r-- | package/qtopia4/qtopia4.mk | 40 |
1 files changed, 38 insertions, 2 deletions
diff --git a/package/qtopia4/qtopia4.mk b/package/qtopia4/qtopia4.mk index fd7cb8b1d..569966ed4 100644 --- a/package/qtopia4/qtopia4.mk +++ b/package/qtopia4/qtopia4.mk @@ -66,6 +66,42 @@ QTOPIA4_CONFIGURE+= -no-qt3support endif +### Pixel depths +ifeq ($(BR2_PACKAGE_QTOPIA4_PIXEL_DEPTH_ALL),y) +QTOPIA4_PIXEL_DEPTHS = all +else +ifeq ($(BR2_PACKAGE_QTOPIA4_PIXEL_DEPTH_1),y) +QTOPIA4_PIXEL_DEPTHS += 1 +endif +ifeq ($(BR2_PACKAGE_QTOPIA4_PIXEL_DEPTH_4),y) +QTOPIA4_PIXEL_DEPTHS += 4 +endif +ifeq ($(BR2_PACKAGE_QTOPIA4_PIXEL_DEPTH_8),y) +QTOPIA4_PIXEL_DEPTHS += 8 +endif +ifeq ($(BR2_PACKAGE_QTOPIA4_PIXEL_DEPTH_12),y) +QTOPIA4_PIXEL_DEPTHS += 12 +endif +ifeq ($(BR2_PACKAGE_QTOPIA4_PIXEL_DEPTH_15),y) +QTOPIA4_PIXEL_DEPTHS += 15 +endif +ifeq ($(BR2_PACKAGE_QTOPIA4_PIXEL_DEPTH_16),y) +QTOPIA4_PIXEL_DEPTHS += 16 +endif +ifeq ($(BR2_PACKAGE_QTOPIA4_PIXEL_DEPTH_18),y) +QTOPIA4_PIXEL_DEPTHS += 18 +endif +ifeq ($(BR2_PACKAGE_QTOPIA4_PIXEL_DEPTH_24),y) +QTOPIA4_PIXEL_DEPTHS += 24 +endif +ifeq ($(BR2_PACKAGE_QTOPIA4_PIXEL_DEPTH_32),y) +QTOPIA4_PIXEL_DEPTHS += 32 +endif +endif +ifneq ($(QTOPIA4_PIXEL_DEPTHS),) +QTOPIA4_CONFIGURE += -depths $(subst $(space),$(comma),$(strip $(QTOPIA4_PIXEL_DEPTHS))) +endif + ### Display drivers ifeq ($(BR2_PACKAGE_QTOPIA4_GFX_LINUXFB),y) QTOPIA4_CONFIGURE += -qt-gfx-linuxfb @@ -310,8 +346,8 @@ ifneq ($(BR2_INET_IPV6),y) $(SED) 's/^CFG_IPV6IFNAME=auto/CFG_IPV6IFNAME=no/' $(QTOPIA4_TARGET_DIR)/configure endif $(SED) 's/^CFG_XINERAMA=auto/CFG_XINERAMA=no/' $(QTOPIA4_TARGET_DIR)/configure - #$(SED) 's,-O2,$(TARGET_CFLAGS),' $(QTOPIA4_TARGET_DIR)/mkspecs/qws/linux-$(BR2_PACKAGE_QTOPIA4_EMB_PLATFORM)-g++/qmake.conf - # Fix compiler path + #$(SED) 's,-O2,$(TARGET_CFLAGS),' $(QTOPIA4_QMAKE_CONF) + # Fix compiler path $(SED) '\,QMAKE_CC[ ]*=, c\QMAKE_CC = $(TARGET_CC)' $(QTOPIA4_QMAKE_CONF) $(SED) '\,QMAKE_CXX[ ]*=, c\QMAKE_CXX = $(TARGET_CXX)' $(QTOPIA4_QMAKE_CONF) $(SED) '\,QMAKE_LINK[ ]*=, c\QMAKE_LINK = $(TARGET_CXX)' $(QTOPIA4_QMAKE_CONF) |