From 0ecf9da3a60a2ed4525f4870bf8b8bbc347ebdb9 Mon Sep 17 00:00:00 2001
From: James Chen <jianhua.chen@cocos2d-x.org>
Date: Fri, 12 Apr 2013 14:27:29 +0800
Subject: [PATCH] Adding Box2D and chipmunk dependence for TestLua. Removing
 the definition of GL_RGB565 in CCTexture2D.pkg.

---
 cocos2d-win32.vc2010.sln                                  | 8 +++++---
 .../lua/cocos2dx_support/LuaCocos2d.cpp.REMOVED.git-id    | 2 +-
 tools/tolua++/CCTexture2D.pkg                             | 3 ++-
 3 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/cocos2d-win32.vc2010.sln b/cocos2d-win32.vc2010.sln
index 8cb99bb8c3..087a8fd5c9 100644
--- a/cocos2d-win32.vc2010.sln
+++ b/cocos2d-win32.vc2010.sln
@@ -36,6 +36,8 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "TestLua", "samples\Lua\Test
 		{21B2C324-891F-48EA-AD1A-5AE13DE12E28} = {21B2C324-891F-48EA-AD1A-5AE13DE12E28}
 		{DDC3E27F-004D-4DD4-9DD3-931A013D2159} = {DDC3E27F-004D-4DD4-9DD3-931A013D2159}
 		{98A51BA8-FC3A-415B-AC8F-8C7BD464E93E} = {98A51BA8-FC3A-415B-AC8F-8C7BD464E93E}
+		{207BC7A9-CCF1-4F2F-A04D-45F72242AE25} = {207BC7A9-CCF1-4F2F-A04D-45F72242AE25}
+		{929480E7-23C0-4DF6-8456-096D71547116} = {929480E7-23C0-4DF6-8456-096D71547116}
 		{F8EDD7FA-9A51-4E80-BAEB-860825D2EAC6} = {F8EDD7FA-9A51-4E80-BAEB-860825D2EAC6}
 	EndProjectSection
 EndProject
@@ -97,9 +99,6 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "AssetsManagerTest", "sample
 	EndProjectSection
 EndProject
 Global
-	GlobalSection(DPCodeReviewSolutionGUID) = preSolution
-		DPCodeReviewSolutionGUID = {00000000-0000-0000-0000-000000000000}
-	EndGlobalSection
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Win32 = Debug|Win32
 		Release|Win32 = Release|Win32
@@ -196,4 +195,7 @@ Global
 		{39379840-825A-45A0-B363-C09FFEF864BD} = {68B43009-A1C1-41B2-8AF7-77278B70E897}
 		{9A17D9A4-4B11-4E32-94F6-895FF4909EC5} = {68B43009-A1C1-41B2-8AF7-77278B70E897}
 	EndGlobalSection
+	GlobalSection(DPCodeReviewSolutionGUID) = preSolution
+		DPCodeReviewSolutionGUID = {00000000-0000-0000-0000-000000000000}
+	EndGlobalSection
 EndGlobal
diff --git a/scripting/lua/cocos2dx_support/LuaCocos2d.cpp.REMOVED.git-id b/scripting/lua/cocos2dx_support/LuaCocos2d.cpp.REMOVED.git-id
index f8669094d0..d92cea9692 100644
--- a/scripting/lua/cocos2dx_support/LuaCocos2d.cpp.REMOVED.git-id
+++ b/scripting/lua/cocos2dx_support/LuaCocos2d.cpp.REMOVED.git-id
@@ -1 +1 @@
-4388416b6a84c1a36cb168a4bd094a3ee3805d86
\ No newline at end of file
+cb1a7783c5a0b775d06a2ea09e9df514e45c90b4
\ No newline at end of file
diff --git a/tools/tolua++/CCTexture2D.pkg b/tools/tolua++/CCTexture2D.pkg
index db7218cd26..f1ddc98a5d 100644
--- a/tools/tolua++/CCTexture2D.pkg
+++ b/tools/tolua++/CCTexture2D.pkg
@@ -386,7 +386,8 @@
 
 #define GL_RGBA4                                            0x8056
 #define GL_RGB5_A1                                          0x8057
-#define GL_RGB565                                           0x8D62
+//comment nextline since it wasn't defined in glew.h of windows
+// #define GL_RGB565                                           0x8D62
 #define GL_DEPTH_COMPONENT16                                0x81A5
 #define GL_STENCIL_INDEX                                    0x1901
 #define GL_STENCIL_INDEX8                                   0x8D48