Merge pull request #1696 from fape/lua_marmalade

fixed #1591: Update for Lua marmalade.
* Add ignore marmalade generated Visual Studio directory
* Update Lua and HelloLua marmalade project file
* Add TestLua marmalade project

.gitignore

@@ -47,8 +47,9 @@ local.properties
 # Ignore python compiled files
 *.pyc
 
-# Ignore files build by airplay
+# Ignore files build by airplay and marmalade
 build_*_xcode/
+build_*_vc10/
 
 # Ignore files build by xcode
 *.mode*v*

AUTHORS

@@ -111,7 +111,7 @@ Developers:
 
     Mat Hopwood( Marmalade official engineer )
         Marmalade support for gles20 branch
-
+		
     Carlos Sessa
 	implement the accelerometer module for Android port
 
@@ -149,6 +149,9 @@ Developers:
     johnangel
         OpenGL framebuffer access violation fix.
 
+	Peter Farkas (fape)
+		contributes Marmalade port for gles20 branch.
+	
 Retired Core Developers:
     WenSheng Yang
 	Author of windows port, CCTextField, 

samples/HelloLua/proj.marmalade/HelloLua.mkb

@@ -47,16 +47,6 @@ files
 	(../Classes)
 	AppDelegate.h
 	AppDelegate.cpp
-
-	[cocos2dx_support]
-	../../../scripting/lua/cocos2dx_support/CCLuaEngine.cpp
-	../../../scripting/lua/cocos2dx_support/CCLuaEngine.h
-	../../../scripting/lua/cocos2dx_support/Cocos2dxLuaLoader.cpp
-	../../../scripting/lua/cocos2dx_support/Cocos2dxLuaLoader.h
-	../../../scripting/lua/cocos2dx_support/LuaCocos2d.cpp
-	../../../scripting/lua/cocos2dx_support/LuaCocos2d.h
-	../../../scripting/lua/cocos2dx_support/tolua_fix.c
-	../../../scripting/lua/cocos2dx_support/tolua_fix.h
 }
 
 

samples/TestLua/proj.marmalade/TestLua.mkb

@@ -0,0 +1,49 @@
+options
+{
+	module_path="../../../cocos2dx/proj.marmalade/;../../../CocosDenshion/proj.marmalade/;../../../scripting/lua/proj.marmalade/;../../../extensions/proj.marmalade/;../../../external/chipmunk/proj.marmalade/;../../../external/Box2D/proj.marmalade/"
+	s3e-data-dir = "../Resources"
+}
+
+includepaths
+{
+	../Classes
+	../../../scripting/lua/cocos2dx_support/
+}
+subprojects
+{
+	IwGL
+	cocos2dx
+	CocosDenshion
+	cocos2dx-ext
+	Box2D
+	lua
+}
+
+defines
+{
+	CC_ENABLE_BOX2D_INTEGRATION=1
+}
+
+assets
+{
+	(../Resources)
+	.
+
+	(../../TestCpp/Resources)
+	.
+}
+
+
+files
+{
+	[Main]
+	(src)
+	Main.h
+	Main.cpp
+
+	(../Classes)
+	AppDelegate.h
+	AppDelegate.cpp
+}
+
+

samples/TestLua/proj.marmalade/src/Main.cpp

@@ -0,0 +1,19 @@
+// Application main file.
+
+#include "Main.h"
+#include "../Classes/AppDelegate.h"
+
+// Cocos2dx headers
+#include "cocos2d.h"
+
+// Marmalade headers
+#include "IwGL.h"
+
+USING_NS_CC;
+
+int main()
+{
+	AppDelegate app;
+
+	return cocos2d::CCApplication::sharedApplication()->Run();
+}

samples/TestLua/proj.marmalade/src/Main.h

@@ -0,0 +1,4 @@
+#ifndef MAIN_H
+#define MAIN_H
+
+#endif

scripting/lua/proj.marmalade/lua.mkf

@@ -2,15 +2,24 @@ includepaths
 {
     ../lua/
     ../tolua/
+	../cocos2dx_support/
 }
 
 files
 {
+	[lua]
 	("../lua")
 	"*.h"
 	"*.c"
-
+	
+	[tolua]
 	("../tolua")
 	"*.h"
 	"*.c"
+	
+	[cocos2dxSupport]
+	("../cocos2dx_support")
+	"*.h"
+	"*.c"
+	"*.cpp"
 }