Commit 75d5cb12 authored by Rémi Duraffort's avatar Rémi Duraffort

contribs: blind attempt to fix compilation of x264 on win32.

parent 82d8b16b
--- configure 2008-04-06 09:07:25.000000000 +0200 --- configure 2008-04-06 09:07:25.000000000 +0200
+++ configure 2008-04-06 09:10:52.000000000 +0200 +++ configure 2008-04-06 09:10:52.000000000 +0200
@@ -343,6 +343,7 @@ @@ -516,6 +516,7 @@
# autodetect options that weren't forced nor disabled # autodetect options that weren't forced nor disabled
libpthread="" libpthread=""
...@@ -8,7 +8,7 @@ ...@@ -8,7 +8,7 @@
if test "$pthread" = "auto" ; then if test "$pthread" = "auto" ; then
pthread="no" pthread="no"
case $SYS in case $SYS in
@@ -350,13 +351,13 @@ @@ -523,13 +524,13 @@
pthread="yes" pthread="yes"
;; ;;
MINGW) MINGW)
...@@ -24,19 +24,8 @@ ...@@ -24,19 +24,8 @@
+ elif cc_check pthread.h "-lpthreadGC2 -lwsock32 -DPTW32_STATIC_LIB" "pthread_create(0,0,0,0); pthread_num_processors_np();" ; then + elif cc_check pthread.h "-lpthreadGC2 -lwsock32 -DPTW32_STATIC_LIB" "pthread_create(0,0,0,0); pthread_num_processors_np();" ; then
pthread="yes" pthread="yes"
libpthread="-lpthreadGC2 -lwsock32" libpthread="-lpthreadGC2 -lwsock32"
CFLAGS="$CFLAGS -DPTW32_STATIC_LIB" define PTW32_STATIC_LIB
@@ -443,6 +444,10 @@ @@ -807,7 +808,7 @@
ASFLAGS=$ASFLAGS
GTK=$gtk
EXE=$EXE
+AR=$AR
+STRIP=$STRIP
+AROPTS=$AROPTS
+RANLIB=$RANLIB
VIS=$vis
HAVE_GETOPT_LONG=$HAVE_GETOPT_LONG
DEVNULL=$DEVNULL
@@ -495,7 +500,7 @@
Description: H.264 (MPEG4 AVC) encoder library Description: H.264 (MPEG4 AVC) encoder library
Version: $(grep POINTVER < config.h | sed -e 's/.* "//; s/".*//') Version: $(grep POINTVER < config.h | sed -e 's/.* "//; s/".*//')
Libs: $pclibs Libs: $pclibs
...@@ -44,4 +33,4 @@ ...@@ -44,4 +33,4 @@
+Cflags: -I$includedir $extradef +Cflags: -I$includedir $extradef
EOF EOF
filters="crop select_every"
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment