OSDN Git Service
(root)
/
handbrake-jp
/
handbrake-jp-git.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
LinGui: make Help->Guide work on windows/mingw
[handbrake-jp/handbrake-jp-git.git]
/
contrib
/
ffmpeg
/
module.defs
diff --git
a/contrib/ffmpeg/module.defs
b/contrib/ffmpeg/module.defs
index
60979b4
..
7b96168
100644
(file)
--- a/
contrib/ffmpeg/module.defs
+++ b/
contrib/ffmpeg/module.defs
@@
-1,7
+1,7
@@
$(eval $(call import.MODULE.defs,FFMPEG,ffmpeg,BZIP2 FAAD2 ZLIB))
$(eval $(call import.CONTRIB.defs,FFMPEG))
$(eval $(call import.MODULE.defs,FFMPEG,ffmpeg,BZIP2 FAAD2 ZLIB))
$(eval $(call import.CONTRIB.defs,FFMPEG))
-FFMPEG.FETCH.url = http://download.m0k.org/handbrake/contrib/ffmpeg-r2
0817
.tar.bz2
+FFMPEG.FETCH.url = http://download.m0k.org/handbrake/contrib/ffmpeg-r2
2950
.tar.bz2
FFMPEG.CONFIGURE.deps =
FFMPEG.CONFIGURE.env =
FFMPEG.CONFIGURE.deps =
FFMPEG.CONFIGURE.env =
@@
-32,12
+32,13
@@
ifeq (0-cygwin,$(BUILD.cross)-$(BUILD.system))
FFMPEG.GCC.args.extra = -fno-common
else ifeq (darwin,$(BUILD.system))
## section for darwin-archs
FFMPEG.GCC.args.extra = -fno-common
else ifeq (darwin,$(BUILD.system))
## section for darwin-archs
- FFMPEG.CONFIGURE.extra += --enable-pthreads --enable-cross-compile --arch=$(BUILD.machine)
+ FFMPEG.CONFIGURE.extra += --enable-pthreads --enable-cross-compile --arch=$(BUILD.machine)
--target-os=darwin
else ifeq (1-mingw,$(BUILD.cross)-$(BUILD.system))
FFMPEG.CONFIGURE.extra += \
--enable-w32threads \
--enable-memalign-hack \
--target-os=mingw32 \
else ifeq (1-mingw,$(BUILD.cross)-$(BUILD.system))
FFMPEG.CONFIGURE.extra += \
--enable-w32threads \
--enable-memalign-hack \
--target-os=mingw32 \
+ --arch=i386 \
--enable-cross-compile --cross-prefix=$(BUILD.cross.prefix)
FFMPEG.GCC.args.extra += -fno-common
else
--enable-cross-compile --cross-prefix=$(BUILD.cross.prefix)
FFMPEG.GCC.args.extra += -fno-common
else