mirror of https://github.com/mpv-player/mpv
fix loader build on windows
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@12681 b3059339-0415-0410-9bf9-f77b7e298cf2
This commit is contained in:
parent
64963c3541
commit
4bf094ac51
|
@ -5011,20 +5011,17 @@ fi
|
||||||
if test "$_win32" != no ; then
|
if test "$_win32" != no ; then
|
||||||
_def_win32_loader='#undef WIN32_LOADER'
|
_def_win32_loader='#undef WIN32_LOADER'
|
||||||
echocheck "Win32 loader support"
|
echocheck "Win32 loader support"
|
||||||
if not win32 ; then
|
|
||||||
_ld_win32='loader/libloader.a'
|
_ld_win32='loader/libloader.a'
|
||||||
_dep_win32='loader/libloader.a'
|
_dep_win32='loader/libloader.a'
|
||||||
_codecmodules="win32 $_codecmodules"
|
_codecmodules="win32 $_codecmodules"
|
||||||
if openbsd ; then
|
if openbsd ; then
|
||||||
x86 && _ld_win32="$_ld_win32 -li386"
|
x86 && _ld_win32="$_ld_win32 -li386"
|
||||||
fi
|
fi
|
||||||
|
if not win32 ; then
|
||||||
_def_win32_loader='#define WIN32_LOADER 1'
|
_def_win32_loader='#define WIN32_LOADER 1'
|
||||||
echores "yes"
|
echores "yes"
|
||||||
else
|
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"
|
_ld_win32libs="$_ld_win32libs -ladvapi32 -lole32"
|
||||||
_codecmodules="win32 $_codecmodules"
|
|
||||||
echores "no (using native windows)"
|
echores "no (using native windows)"
|
||||||
fi
|
fi
|
||||||
fi
|
fi
|
||||||
|
|
|
@ -4,9 +4,13 @@ include ../config.mak
|
||||||
DEFINES=-DMPLAYER -D__WINE__ #-Ddbg_printf=__vprintf \
|
DEFINES=-DMPLAYER -D__WINE__ #-Ddbg_printf=__vprintf \
|
||||||
#-DTRACE=__vprintf # -DDETAILED_OUT
|
#-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 \
|
LIB_OBJECTS= ldt_keeper.o pe_image.o module.o \
|
||||||
ext.o win32.o driver.o pe_resource.o \
|
ext.o win32.o driver.o pe_resource.o \
|
||||||
resource.o registry.o elfdll.o afl.o vfl.o wrapper.o
|
resource.o registry.o elfdll.o afl.o vfl.o wrapper.o
|
||||||
|
endif
|
||||||
|
|
||||||
# gcc-3.0 produces buggy code for acmStreamOpen() with
|
# gcc-3.0 produces buggy code for acmStreamOpen() with
|
||||||
# "-O3 -fomit-frame-pointer" or "-O2 -fomit-frame-pointer
|
# "-O3 -fomit-frame-pointer" or "-O2 -fomit-frame-pointer
|
||||||
|
|
Loading…
Reference in New Issue