Lothario
/
axmol
mirror of https://github.com/axmolengine/axmol.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
axmol/build
History
Ricardo Quesada 4ed2e0d9d2 Merge branch 'develop' into glview_improvements 
Conflicts:
	CHANGELOG
	cocos/2d/platform/linux/CCApplication.cpp
	samples/Cpp/AssetsManagerTest/Classes/AppDelegate.cpp
	samples/Cpp/HelloCpp/Classes/AppDelegate.cpp
	samples/Cpp/HelloCpp/Classes/AppMacros.h
	samples/Cpp/HelloCpp/proj.ios/AppController.mm
	samples/Cpp/HelloCpp/proj.mac/main.cpp
	samples/Cpp/SimpleGame/Classes/AppDelegate.cpp
	samples/Cpp/SimpleGame/proj.ios/AppController.mm
	samples/Cpp/SimpleGame/proj.mac/main.cpp
	samples/Cpp/TestCpp/Classes/AppDelegate.h
	samples/Javascript/CocosDragonJS/Classes/AppDelegate.cpp
	samples/Javascript/CocosDragonJS/proj.ios/AppController.mm
	samples/Javascript/CocosDragonJS/proj.mac/main.cpp
	samples/Javascript/CrystalCraze/Classes/AppDelegate.cpp
	samples/Javascript/CrystalCraze/proj.ios/AppController.mm
	samples/Javascript/CrystalCraze/proj.mac/main.cpp
	samples/Javascript/MoonWarriors/Classes/AppDelegate.cpp
	samples/Javascript/MoonWarriors/proj.ios/AppController.mm
	samples/Javascript/MoonWarriors/proj.mac/main.cpp
	samples/Javascript/WatermelonWithMe/Classes/AppDelegate.cpp
	samples/Javascript/WatermelonWithMe/proj.ios/AppController.mm
	samples/Javascript/WatermelonWithMe/proj.mac/main.cpp
	samples/Lua/HelloLua/Classes/AppDelegate.cpp
	samples/Lua/HelloLua/proj.ios/AppController.mm
	samples/Lua/HelloLua/proj.mac/main.cpp
 		2014-01-28 11:32:25 -08:00
..
cocos2d_libs.xcodeproj Only compile iOS files on iOS 2014-01-27 16:44:10 -08:00
cocos2d_samples.xcodeproj issue #3828: Updates iOS & Mac projects. And update JS-Tests. 2014-01-28 12:55:06 +08:00
BuildHelpers.CMakeLists.txt issue #3113: Updating CMakeLists.txt, Improve Copying files. 2013-11-06 10:57:36 +08:00
android-build.py issue #3828: Updates android build. 2014-01-28 15:33:23 +08:00
build-mingw32-gcc-make.sh added support for msys2 mingwtoolchains and fix x64 cocos/audio on windows platform for MSVC and Mingw. Also fixed a few very bad type casts very important for future Arm64 bit processors 2013-12-05 03:37:27 +00:00
cocos2d-win32.vc2012.sln issue #3828: Updates win32 projects. 2014-01-28 15:49:23 +08:00
install-deps-linux.sh issue #2905:samples build ok on linux 2013-10-22 18:01:56 +08:00
win32-msvc-2012-x86.cmd Setup for testing for every windows user 2013-11-30 09:36:22 +00:00
win32-msvc-2013-x86.cmd Setup for testing for every windows user 2013-11-30 09:36:22 +00:00