summaryrefslogtreecommitdiff
blob: fcec220c382f44820882d9667f57be2fa9d578a5 (plain)
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
Index: libs/libswscale/libswscale.pro
===================================================================
--- libs/libswscale/libswscale.pro	(revision 22859)
+++ libs/libswscale/libswscale.pro	(working copy)
@@ -14,6 +14,11 @@
         QMAKE_CFLAGS_DEBUG += -fomit-frame-pointer
 }
 
+# gcc-4.2 and newer can not compile with PIC on x86
+contains(ARCH_X86_32, yes) {
+        QMAKE_CFLAGS_SHLIB =
+}
+
 !profile:QMAKE_CFLAGS_DEBUG += -O
 
 INCLUDEPATH = .. ../..
Index: libs/libavcodec/libavcodec.pro
===================================================================
--- libs/libavcodec/libavcodec.pro	(revision 22859)
+++ libs/libavcodec/libavcodec.pro	(working copy)
@@ -25,7 +25,8 @@
         QMAKE_CFLAGS_DEBUG += -fomit-frame-pointer
 }
 # "-Os" can not compiled with PIC
-contains(CONFIG_SMALL, yes):contains(ARCH_X86_32, yes) {
+# gcc-4.2 and newer can not compile with PIC on x86
+contains(ARCH_X86_32, yes) {
 	QMAKE_CFLAGS_SHLIB =
 }