6 Commits

Author	SHA1	Message	Date
minggo	4e125d84a4	fix compiling and linking error with ndk r12b	2016-07-08 15:29:35 +08:00
yinjimmy	587ee21e4b	revert lua runtime	2015-04-02 18:27:53 +08:00
SunLightJuly	6c2eb01213	cleanup proj.android	2015-03-10 23:33:09 +08:00
yinjimmy	0978a88b7f	Merge branch 'v3' into combine ... Conflicts: templates/lua-template-default/frameworks/runtime-src/proj.android/jni/Android.mk templates/lua-template-default/frameworks/runtime-src/proj.ios_mac/HelloLua.xcodeproj/project.pbxproj templates/lua-template-default/frameworks/runtime-src/proj.win32/HelloLua.vcxproj templates/lua-template-runtime/frameworks/runtime-src/Classes/AppDelegate.cpp templates/lua-template-runtime/frameworks/runtime-src/proj.ios_mac/HelloLua.xcodeproj/project.pbxproj tools/simulator/frameworks/runtime-src/proj.android/jni/Android.mk tools/simulator/frameworks/runtime-src/proj.win32/simulator.vcxproj	2015-01-12 17:54:58 +08:00
yinjimmy	dea3cf9863	move runtime source to libsimulator project	2015-01-12 12:52:44 +08:00
yinjimmy	82f37fcf72	add libsimulator	2015-01-08 14:10:28 +08:00