Mercurial > mplayer.hg
comparison configure @ 32323:afb76e48fc32
Move config.asm back to root and append a '/' to SRC_PATH
to fix compilation issues with nasm.
| author | reimar |
|---|---|
| date | Wed, 29 Sep 2010 18:53:39 +0000 |
| parents | dd8cc174b597 |
| children | 40d17eafa1e7 |
comparison
equal
deleted
inserted
replaced
| 32322:dd8cc174b597 | 32323:afb76e48fc32 |
|---|---|
| 8260 YASM = $_yasm | 8260 YASM = $_yasm |
| 8261 YASMDEP = $_yasm | 8261 YASMDEP = $_yasm |
| 8262 YASMFLAGS = $YASMFLAGS | 8262 YASMFLAGS = $YASMFLAGS |
| 8263 | 8263 |
| 8264 CONFIG_STATIC = yes | 8264 CONFIG_STATIC = yes |
| 8265 SRC_PATH = ../.. | 8265 SRC_PATH = ../../ |
| 8266 BUILD_ROOT = .. | 8266 BUILD_ROOT = .. |
| 8267 LIBPREF = lib | 8267 LIBPREF = lib |
| 8268 LIBSUF = .a | 8268 LIBSUF = .a |
| 8269 LIBNAME = \$(LIBPREF)\$(NAME)\$(LIBSUF) | 8269 LIBNAME = \$(LIBPREF)\$(NAME)\$(LIBSUF) |
| 8270 FULLNAME = \$(NAME)\$(BUILDSUF) | 8270 FULLNAME = \$(NAME)\$(BUILDSUF) |
| 8848 for part in $arch $subarch; do | 8848 for part in $arch $subarch; do |
| 8849 part=$(echo $part | tr '[a-z]' '[A-Z]') | 8849 part=$(echo $part | tr '[a-z]' '[A-Z]') |
| 8850 echo "%define ARCH_${part}" >> "$TMPS" | 8850 echo "%define ARCH_${part}" >> "$TMPS" |
| 8851 done | 8851 done |
| 8852 | 8852 |
| 8853 cmp -s "$TMPS" ffmpeg/config.asm || mv -f "$TMPS" ffmpeg/config.asm | 8853 cmp -s "$TMPS" config.asm || mv -f "$TMPS" config.asm |
| 8854 fi | 8854 fi |
| 8855 | 8855 |
| 8856 | 8856 |
| 8857 # Create a config.mak for FFmpeg that includes MPlayer's config.mak. | 8857 # Create a config.mak for FFmpeg that includes MPlayer's config.mak. |
| 8858 cat > ffmpeg/config.mak << EOF | 8858 cat > ffmpeg/config.mak << EOF |