Prekopirovani linux.conf do adresare qt a uprava Makefile.omk.

[eurobot/public.git] / build / gumstix / qt / Makefile.omk

diff --git a/build/gumstix/qt/Makefile.omk b/build/gumstix/qt/Makefile.omk
index 6bb4938c8ef047c6c8a51f3f2b8588b771ed8a6e..915db778490d90879344c5b1f78acbde1b878901 100644 (file)
--- a/build/gumstix/qt/Makefile.omk
+++ b/build/gumstix/qt/Makefile.omk
@@ -4,15 +4,16 @@ library-pass_HOOKS = install-qt
 
 config.status: $(SOURCES_DIR)/qt-src/configure
        cp -a $(SOURCES_DIR)/linux-arm-gumstix-g++ $(SOURCES_DIR)/qt-src/mkspecs/qws
-       $< -embedded arm --prefix=$(OUTPUT_DIR)/_compiled/qt -xplatform qws/linux-arm-gumstix-g++ -opensource -confirm-license -little-endian -qt-gfx-linuxfb
+       cp -arv $(SOURCES_DIR)linux.conf $(SOURCES_DIR)/qt-src/mkspecs/common
+       $< -embedded arm --prefix=$(OUTPUT_DIR)/_compiled/qt -xplatform qws/linux-arm-gumstix-g++ -opensource -confirm-license -little-endian -qt-gfx-linuxfb -qt3support -opengl es2 -depths 16,24,32  -plugin-gfx-powervr -qtlibinfix E -plugin-mouse-tslib -qt-mouse-pc -qt-mouse-linuxinput -qt-kbd-tty -qt-kbd-linuxinput -DQT_KEYPAD_NAVIGATION
 
-lib/libQtCore.so: config.status
+lib/libQtCoreE.so: config.status
        $(MAKE)
 
-$(OUTPUT_DIR)/_compiled/qt/libQtCore.so: lib/libQtCore.so
+$(OUTPUT_DIR)/_compiled/qt/libQtCoreE.so: lib/libQtCoreE.so
        echo $@: $^
        $(MAKE) install
        touch $@
 
 .PHONY: install-qt
-install-qt: $(OUTPUT_DIR)/_compiled/qt/libQtCore.so
+install-qt: $(OUTPUT_DIR)/_compiled/qt/libQtCoreE.so