From eb1a1ed508cf2fb4bb5474be3df3a9192599ec03 Mon Sep 17 00:00:00 2001 From: rdb Date: Fri, 1 Jul 2011 15:02:14 +0000 Subject: [PATCH] upgrade ffmpeg stuff --- makepanda/makepanda.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/makepanda/makepanda.py b/makepanda/makepanda.py index ee2fce2865..1eb3ee6375 100755 --- a/makepanda/makepanda.py +++ b/makepanda/makepanda.py @@ -443,10 +443,10 @@ if (COMPILER=="MSVC"): if (PkgSkip("OPENCV")==0): LibName("OPENCV", GetThirdpartyDir() + "opencv/lib/ml.lib") if (PkgSkip("OPENCV")==0): LibName("OPENCV", GetThirdpartyDir() + "opencv/lib/cxcore.lib") if (PkgSkip("AWESOMIUM")==0):LibName("AWESOMIUM", GetThirdpartyDir() + "awesomium/lib/Awesomium.lib") - if (PkgSkip("FFMPEG")==0): LibName("FFMPEG", GetThirdpartyDir() + "ffmpeg/lib/avcodec-51-panda.lib") - if (PkgSkip("FFMPEG")==0): LibName("FFMPEG", GetThirdpartyDir() + "ffmpeg/lib/avformat-50-panda.lib") - if (PkgSkip("FFMPEG")==0): LibName("FFMPEG", GetThirdpartyDir() + "ffmpeg/lib/avutil-49-panda.lib") - if (PkgSkip("SWSCALE")==0): PkgDisable("SWSCALE") + if (PkgSkip("FFMPEG")==0): LibName("FFMPEG", GetThirdpartyDir() + "ffmpeg/lib/avcodec.lib") + if (PkgSkip("FFMPEG")==0): LibName("FFMPEG", GetThirdpartyDir() + "ffmpeg/lib/avformat.lib") + if (PkgSkip("FFMPEG")==0): LibName("FFMPEG", GetThirdpartyDir() + "ffmpeg/lib/avutil.lib") + if (PkgSkip("SWSCALE")==0): LibName("SWSCALE", GetThirdpartyDir() + "ffmpeg/lib/swscale.lib") if (PkgSkip("OPENAL")==0): if (os.path.exists(GetThirdpartyDir() + "openal/lib/pandaopenal32.lib")): LibName("OPENAL", GetThirdpartyDir() + "openal/lib/pandaopenal32.lib")