diff options
| author | alex <alex@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2001-12-09 17:14:39 +0000 |
|---|---|---|
| committer | alex <alex@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2001-12-09 17:14:39 +0000 |
| commit | 8f606b18080f11edd477eae1ddc7c3a30af029ee (patch) | |
| tree | 5fa033cbb0e82e9372bb7be0beba317faea66410 /loader | |
| parent | 55a015e6cfe1d15e5ecbe7cb66e38d9af388174b (diff) | |
| download | mpv-8f606b18080f11edd477eae1ddc7c3a30af029ee.tar.bz2 mpv-8f606b18080f11edd477eae1ddc7c3a30af029ee.tar.xz | |
updated for avifile compilance
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@3406 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'loader')
| -rw-r--r-- | loader/win32.c | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/loader/win32.c b/loader/win32.c index 90197aad5e..f65e6aed7f 100644 --- a/loader/win32.c +++ b/loader/win32.c @@ -864,6 +864,7 @@ void WINAPI expGetSystemInfo(SYSTEM_INFO* si) cachedsi.wProcessorLevel = 5; /* pentium */ cachedsi.wProcessorRevision = 0x0101; +#ifdef USE_WIN32DLL /* mplayer's way to detect PF's */ { #include "../cpudetect.h" @@ -896,9 +897,10 @@ void WINAPI expGetSystemInfo(SYSTEM_INFO* si) cachedsi.wProcessorRevision = gCpuCaps.cpuStepping; cachedsi.dwNumberOfProcessors = 1; /* hardcoded */ } +#endif /* disable cpuid based detection (mplayer's cpudetect.c does this - see above) */ -#if 0 +#ifndef USE_WIN32DLL #if defined(__FreeBSD__) || defined(__NetBSD__) || defined(__svr4__) do_cpuid(1, regs); switch ((regs[0] >> 8) & 0xf) { // cpu family @@ -929,10 +931,11 @@ void WINAPI expGetSystemInfo(SYSTEM_INFO* si) PF[PF_AMD3D_INSTRUCTIONS_AVAILABLE] = TRUE; cachedsi.dwNumberOfProcessors=1; #endif -#endif /* if 0 */ +#endif /* USE_WIN32DLL */ + -/* linux detection enabled (based on proc/cpuinfo) for checking - fdiv_bug and fpu emulation flags -- alex */ +/* MPlayer: linux detection enabled (based on proc/cpuinfo) for checking + fdiv_bug and fpu emulation flags -- alex/MPlayer */ #ifdef __linux__ { char buf[20]; |