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

diff --git a/build/gumstix/INSTALL b/build/gumstix/INSTALL
index a4e1a65feaa6fa0b87c2671bac2ad4472c2a0998..66d809fe41fc5f2384997d14222cec6d646f725b 100644 (file)
--- a/build/gumstix/INSTALL
+++ b/build/gumstix/INSTALL
@@ -2,9 +2,7 @@ Postup pro uspesnou kompilaci (zatim s puvodnim toolchainem od P. Pisy):
 
 #      1. Nejprve je nutne pridat do PATHu cestu k toolchainu - pro jeho velikost zatim nedavam do gitu, ma totiz 50MB
 2. Je nutne stahnout archiv s Qt: ftp://ftp.trolltech.com/qt/source/qt-everywhere-opensource-src-4.6.3.tar.gz a rozbalit do slozky soft/src/3rdparty/qt a to tak, aby qt byla korenova slozka
-3. Potrebujeme nahradit soubor soft/src/3rdparty/qt/mkspecs/common/linux.conf nasim vlastnim z teto slozky - obsahuje spravnou konfiguraci pro OpenGL
-4. Prekopirovat linux-arm-gumstix-g++ do soft/src/3rdparty/qt/mkspecs/qws/
-#      5. nastavit platformu hosta v qt/Makefile.omk, pro 64bitu -platform qws/linux-x86_64-g++, pro 32bitu -platform qws/linux-x86-g++
+#      3. nastavit platformu hosta v qt/Makefile.omk, pro 64bitu -platform qws/linux-x86_64-g++, pro 32bitu -platform qws/linux-x86-g++
 
 TODO
 1. Aplikace patchu pro opravu prace s pismy a s kurzorem - v Qt v rootfs v Gumstixu je opraveno

diff --git a/build/gumstix/qt/Makefile.omk b/build/gumstix/qt/Makefile.omk
index a8602e503cd982d893c5e84d50db5cf4bbed30e0..915db778490d90879344c5b1f78acbde1b878901 100644 (file)
--- a/build/gumstix/qt/Makefile.omk
+++ b/build/gumstix/qt/Makefile.omk
@@ -3,6 +3,8 @@
 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
+       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/libQtCoreE.so: config.status

diff --git a/build/gumstix/linux.conf b/build/gumstix/qt/linux.conf
similarity index 100%
rename from build/gumstix/linux.conf
rename to build/gumstix/qt/linux.conf