Mercurial > mplayer.hg
changeset 12680:331104f5743c
fix loader build on windows
| author | faust3 |
|---|---|
| date | Sat, 26 Jun 2004 10:40:23 +0000 |
| parents | 6a23658331f8 |
| children | 6d815f12e3e5 |
| files | configure loader/Makefile |
| diffstat | 2 files changed, 10 insertions(+), 9 deletions(-) [+] |
line wrap: on
line diff
--- a/configure Sat Jun 26 10:40:15 2004 +0000 +++ b/configure Sat Jun 26 10:40:23 2004 +0000 @@ -5011,20 +5011,17 @@ if test "$_win32" != no ; then _def_win32_loader='#undef WIN32_LOADER' echocheck "Win32 loader support" + _ld_win32='loader/libloader.a' + _dep_win32='loader/libloader.a' + _codecmodules="win32 $_codecmodules" + if openbsd ; then + x86 && _ld_win32="$_ld_win32 -li386" + fi if not win32 ; then - _ld_win32='loader/libloader.a' - _dep_win32='loader/libloader.a' - _codecmodules="win32 $_codecmodules" - if openbsd ; then - x86 && _ld_win32="$_ld_win32 -li386" - fi _def_win32_loader='#define WIN32_LOADER 1' echores "yes" else - _ld_win32='loader/driver.o loader/vfl.o loader/afl.o' - _dep_win32='loader/driver.o loader/vfl.o loader/afl.o' _ld_win32libs="$_ld_win32libs -ladvapi32 -lole32" - _codecmodules="win32 $_codecmodules" echores "no (using native windows)" fi fi
--- a/loader/Makefile Sat Jun 26 10:40:15 2004 +0000 +++ b/loader/Makefile Sat Jun 26 10:40:23 2004 +0000 @@ -4,9 +4,13 @@ DEFINES=-DMPLAYER -D__WINE__ #-Ddbg_printf=__vprintf \ #-DTRACE=__vprintf # -DDETAILED_OUT +ifeq ($(TARGET_WIN32),yes) +LIB_OBJECTS= driver.o afl.o vfl.o +else LIB_OBJECTS= ldt_keeper.o pe_image.o module.o \ ext.o win32.o driver.o pe_resource.o \ resource.o registry.o elfdll.o afl.o vfl.o wrapper.o +endif # gcc-3.0 produces buggy code for acmStreamOpen() with # "-O3 -fomit-frame-pointer" or "-O2 -fomit-frame-pointer