From eb878a1bd61f324c20efb8d5bcc1d935d28d2f36 Mon Sep 17 00:00:00 2001 From: rdb Date: Wed, 24 Mar 2010 14:58:42 +0000 Subject: [PATCH] Let's disable awesomium on Linux/OSX/FreeBSD until Bei gets a chance to actually make sure it compiles on non-Windows systems --- makepanda/makepanda.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/makepanda/makepanda.py b/makepanda/makepanda.py index 6348282bc4..15acbe40fd 100755 --- a/makepanda/makepanda.py +++ b/makepanda/makepanda.py @@ -400,7 +400,7 @@ if (COMPILER=="MSVC"): 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("AWESOMIUM")==0): LibName("AWESOMIUM", GetThirdpartyDir() + "awesomium/lib/Awesomium.lib") + if (PkgSkip("AWESOMIUM")==0):LibName("AWESOMIUM", GetThirdpartyDir() + "awesomium/lib/Awesomium.lib") if (PkgSkip("SWSCALE")==0): PkgDisable("SWSCALE") if (PkgSkip("WX")==0): LibName("WX", GetThirdpartyDir() + "wx/lib/wxbase28u.lib") @@ -437,6 +437,7 @@ if (COMPILER=="MSVC"): AddToPathEnv("PATH", SDK["PHYSX"]+"/../Bin/win32/") if (COMPILER=="LINUX"): + PkgDisable("AWESOMIUM") if (PkgSkip("PYTHON")==0): IncDirectory("ALWAYS", SDK["PYTHON"]) if (sys.platform == "darwin"):