blob: ebf1ffec8b006407f6c28e0449c54a041118e9a6 (
plain) (
blame)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
|
--- ./configure.orig 2013-06-07 07:16:41.000000000 +0200
+++ ./configure 2013-10-27 23:22:00.000000000 +0100
@@ -916,7 +916,7 @@
CFG_SILENT=no
CFG_GRAPHICS_SYSTEM=default
CFG_RUNTIME_SYSTEM=
-CFG_ALSA=auto
+CFG_ALSA=no
CFG_PULSEAUDIO=auto
CFG_COREWLAN=auto
CFG_ICD=auto
@@ -2704,11 +2704,6 @@
fi
done
- # symlink the mkspecs directory
- mkdir -p "$outpath/mkspecs"
- rm -rf "$outpath"/mkspecs/*
- ln -s "$relpath"/mkspecs/* "$outpath/mkspecs"
- rm -f "$outpath/mkspecs/default"
ShadowMkspecs()
{
@@ -3019,6 +3014,7 @@
PLATFORMS=`find "$relpath/mkspecs/" -type f | grep -v qws | sed "s,$relpath/mkspecs/qws/,,"`
fi
+PLATFORM=`realpath $PLATFORM`
[ -z "$XPLATFORM" ] && XPLATFORM="$PLATFORM"
case `basename "$XPLATFORM"` in win32-g++*) XPLATFORM_MINGW=yes;; esac
@@ -4908,7 +4904,7 @@
}
# build qmake
-if true; then ###[ '!' -f "$outpath/bin/qmake" ];
+if false; then ###[ '!' -f "$outpath/bin/qmake" ];
echo "Creating qmake. Please wait..."
OLD_QCONFIG_H=
@@ -6001,14 +5997,6 @@
X11TESTS_FLAGS="$X11TESTS_FLAGS -fpermissive"
fi
- # Check we actually have X11 :-)
- compileTest x11/xlib "XLib" $X11TESTS_FLAGS
- if [ $? != "0" ]; then
- echo "Basic XLib functionality test failed!"
- echo " You might need to modify the include and library search paths by editing"
- echo " QMAKE_INCDIR_X11 and QMAKE_LIBDIR_X11 in ${XQMAKESPEC}."
- exit 1
- fi
fi
# X11/MINGW/SYMBIAN OpenGL
|
