James Chen
|
a3813ca294
|
closed #3823: Reverts a line in lua template.
|
2014-01-23 17:24:03 +08:00 |
James Chen
|
e97dd396ba
|
issue #3823: Removes glfw, curl include and library path. They are installed to system.
|
2014-01-23 01:05:48 -08:00 |
James Chen
|
5dfcb76398
|
Updates template CMakeLists.txt.
|
2014-01-23 11:07:54 +08:00 |
James Chen
|
1be11f8a82
|
Uses CMAKE_BINARY_DIR instead of CMAKE_SOURCE_DIR for template.
|
2014-01-06 23:55:57 -08:00 |
James Chen
|
9183a69873
|
Simplifies linux template, build.sh is not needed now.
|
2014-01-06 19:34:48 -08:00 |
chuanweizhang
|
623e205256
|
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into develop
Conflicts:
cocos/scripting/auto-generated
samples/Cpp/TestCpp/Classes/Box2DTestBed/Box2dView.cpp
samples/Cpp/TestCpp/Classes/Box2DTestBed/Box2dView.h
samples/Cpp/TestCpp/Classes/ClippingNodeTest/ClippingNodeTest.cpp
samples/Cpp/TestCpp/Classes/ClippingNodeTest/ClippingNodeTest.h
samples/Cpp/TestCpp/Classes/LabelTest/LabelTestNew.cpp
samples/Cpp/TestCpp/Classes/LabelTest/LabelTestNew.h
tools/bindings-generator
tools/tolua/cocos2dx_studio.ini
reset modify
|
2013-12-30 14:51:51 +08:00 |
chengstory
|
26df681915
|
fixed #3457 remove jsoncpp.
|
2013-12-26 22:45:23 +08:00 |
chuanweizhang
|
c9135eb6b9
|
modify linux template
|
2013-12-26 10:22:39 +08:00 |
chuanweizhang
|
23192a883c
|
modify linux tempalte
|
2013-12-25 18:32:23 +08:00 |
chuanweizhang
|
067d4fed0e
|
modify template
|
2013-12-25 11:01:23 +08:00 |
chuanweizhang
|
2308e94c2f
|
modify template
|
2013-12-24 09:42:37 +08:00 |
James Chen
|
ca1e1275ee
|
issue #2171: Updates CMakeLists.txt.
|
2013-12-17 15:51:32 +08:00 |
Dhilan007
|
39280d55f3
|
new label:add support for distanceField
PerformanceTest:add performance test for label.
|
2013-12-13 12:42:15 +08:00 |
James Chen
|
eeedab78b2
|
[LINUX] Adding template CMake files for linux.
|
2013-11-08 18:13:24 +08:00 |