44857e5137
Merge pull request #2093 from sbc100/linux_build_system
...
Linux build system
2013-03-06 19:09:49 -08:00
7ad171d8ee
Use same top level Makefile for nacl and linux builds.
...
Also, re-use some of the concepts from the linux build
system (such as quite by default) in the nacl build.
Fix remaining warnings in NaCl builds.
2013-03-06 13:02:55 -08:00
8677dad3c6
Improved build system from linux.
...
This change makes several fundamental improvements to the linux
build system:
- Remove duplication: a lot of the common make logic is now in
a central shared makefile: cocos2dx/proj.linux/cocos2dx.mk
- Quiet by default: unless you specify V=1 on the commandline
the output is now very clean and quiet.
- Dependencies: gcc's automatic dependancy generation is now
used (-MMD). This means that if you change a header file
then all the object that depend on it now get rebuilt.
- Don't store objects in the source tree: previously object
files were stored alongside the sources, which meant that
debug and release object clobbered each other which leads
to confusion and lots of unnecessary rebuilding.Q
- Library dependencies: each binary now depends on the libraries
it links aginst. This means that if the cocos2dx library
changes then all examples will get re-linked.
- Top level Makefile: there is now a top level Makefile that
can be shared/used by any platform the uses make as the
build system (for example NaCl). Everything can be built
by simply running 'make' at the top level. e.g:
make DEBUG=1
make DEBUG=1 clean
2013-03-06 13:02:55 -08:00
3aaa18f7f4
Merge branch 'master' into iss1425-lua
...
Conflicts:
scripting/lua/cocos2dx_support/LuaCocos2d.cpp
2013-03-06 20:39:01 +08:00
38878b084b
Fix all compiler warnings produced by gcc.
...
This allows the linux and NaCl builds (and perhaps others)
to be compiles with -Wall and -Werror, and it makes the build
output much less noisy.
2013-03-05 17:01:00 -08:00
bdbdbc27f5
issue #1425:exist lua test case is ok!
...
1.add some lua test case
2.add ccset.pkg
3.fixed ParticleSystem error in lua test case
2013-03-05 14:46:18 +08:00
33c422d1d5
Add new port: Native Client
2013-03-02 12:15:24 -08:00
dcb591eadb
Add missing ccGLServerState to CCNode.pkg.
...
Without this missing enum the resuling cpp file would generate
an unused function warning.
Also, remove the duplication between build_macosx.xml and build.xml.
They only differed in single property. Instead use build.sh, which
should work on all UNIXs, no just maxosx.
2013-03-02 11:28:04 -08:00
f7802a0794
Merge pull request #2072 from yuezang/iss1425-luatest
...
issue #1425 : exist lua test case is ok.
2013-03-01 01:17:15 -08:00
8867766241
issue #1425 : exist lua test case is ok.
...
1.fixed some bugs in some lua test case;
2.modify touch event and node event type;
3.fixed some bugs in CCParticleSystem.pkg
2013-03-01 17:09:42 +08:00
bc159f1ba7
cocos2dxmatoMac-mini : updating submodule reference to latest autogenerated bindings
2013-03-01 16:30:34 +08:00
bee13bd7d5
cocos2dxmatoMac-mini : updating submodule reference to latest autogenerated bindings
2013-03-01 11:04:33 +08:00
86891fb15f
cocos2dxmatoMac-mini : updating submodule reference to latest autogenerated bindings
2013-03-01 09:31:09 +08:00
b4e13af460
issue #1425 :
1.fixed some bugs in .lua file. like this:local b = a:copy():autorelease()
...
2.fixed bug of CCShakyTiles3D's create() in CCActionTilesGrid.pkg
3.delete method copyWithZone in .pkg files
2013-02-28 10:23:30 +08:00
dfc1cb8139
cocos2dxmatoMac-mini : updating submodule reference to latest autogenerated bindings
2013-02-28 09:51:31 +08:00
537abaec42
fixed #1753 : Android works ok now.
2013-02-27 16:57:36 +08:00
0d70e6f92f
issue #1753 : Win32 works ok.
2013-02-27 15:45:23 +08:00
473e8e6139
issue #1753 : Upgrading SpiderMonkey to Firefox19.0, iOS works ok.
2013-02-27 15:16:49 +08:00
19ef02ffa5
Merge pull request #2039 from dumganhar/iss1747-jsb-animation
...
fixed #1747 : Crash occurs when passing null to cc.AnimationFrame.initWithSpriteFrame.
2013-02-24 22:27:40 -08:00
9c9e64283e
fixed #1747 : Crash occurs when passing null to cc.AnimationFrame.initWithSpriteFrame.
2013-02-25 14:20:38 +08:00
70612a722b
Fix CCRepeat#create is recieved bad argument on Lua binding.
...
CCRepeat#create must be recieved CCFiniteTimeAction as first argument.
But, CCActionInterval recieved in LuaCocos2d.cpp
2013-02-22 20:24:22 +09:00
e3745b0078
cocos2dxmatoMac-mini : updating submodule reference to latest autogenerated bindings
2013-02-22 12:12:11 +08:00
397457aa68
cocos2dxmatoMac-mini : updating submodule reference to latest autogenerated bindings
2013-02-22 10:54:39 +08:00
486f7941a7
Merge pull request #2023 from nicolasgramlich/patch-7
...
fixed #1740 : Added cleanup and reset methods to ScriptingCore.
2013-02-21 17:56:55 -08:00
84aae750a9
Converted tabs to spaces since that seemed to be the predominant choice in this file.
2013-02-21 08:34:51 -08:00
b993c6fa08
Added cleanup and reset methods to ScriptingCore.
2013-02-21 08:33:37 -08:00
06ad046c2f
cocos2dxmatoMac-mini : updating submodule reference to latest autogenerated bindings
2013-02-21 10:24:44 +08:00
cf33a4538d
fixed #1730 : Binds CCScrollView and CCTableView to js.
2013-02-21 10:06:22 +08:00
ab00de629a
Removed the definition of the touch event type .
2013-02-20 12:06:12 +08:00
599f22f1e2
Merge pull request #1997 from minggo/iss1731-lua-declaration
...
issue #1731:change CCSize, CCPoint and CCRect to struct in pkg files
2013-02-18 18:19:00 -08:00
1b743b37c9
issue #1731:change CCSize, CCPoint and CCRect to struct in pkg files
2013-02-19 10:08:25 +08:00
ac0fa1251b
cocos2dxmatoMac-mini : updating submodule reference to latest autogenerated bindings
2013-02-19 10:05:12 +08:00
1c798d111b
Merge pull request #1991 from SevInf/patch-1
...
fixed #1729 : Making ScriptingCore.cpp compiled fine with C++11 on iOS
2013-02-18 02:18:39 -08:00
7c6a2e47ce
fixed #1726 : JSB application crashs on android device with armv6 architecture
2013-02-18 17:50:43 +08:00
0b8713c80c
Make ScriptingCore.cpp compile with C++11 on iOS
...
When compiling with clang -stdlib=libc++ -std=c++11, write, read, and close functions are part of the unistd.h header file.
2013-02-18 09:12:39 +02:00
7a902b494c
issue #1724 : fixed errors for HelloJavascript of win32 port.
2013-02-18 14:51:36 +08:00
9f9d69b14f
cocos2dxmatoMac-mini : updating submodule reference to latest autogenerated bindings
2013-02-16 11:21:03 +08:00
3949f0c70f
Merge pull request #1972 from theGoodEvil/fix_texparams_js
...
Use correct arg type for ccTexParams
2013-02-15 18:01:20 -08:00
5f3a63e794
Use correct arg type for ccTexParams
...
In the JavaScript bindings, ccTexParams was initialized with (signed) GLint
values, even though it consists of (unsigned) GLuint values.
2013-02-11 11:09:35 +01:00
0c5bcb3f7b
issue #1702:fix a typo error
2013-02-06 18:04:40 +08:00
8c261c1789
issue #1770 : Updating linux makefile.
2013-02-06 15:59:29 +08:00
c42ef7e44a
Merge pull request #1953 from dualface/add_CCFileUtils_Lua_support
...
issue #1687 : Adding CCFileUtils Lua support. Adding CCFileUtils::addSearchPath, addSearchResolutionsOrder.
2013-02-04 18:59:49 -08:00
4506214cef
issue #1689 : Adding some missing files.
2013-02-04 15:01:44 +08:00
07cd6d2bb2
issue #1689:modify lua samples to make them work correctly
2013-02-04 14:50:45 +08:00
5904512ac6
add CCFileUtils Lua support
2013-02-04 12:41:24 +08:00
a771bc8183
issue #1689:modify lua Android.mk
2013-02-04 12:02:21 +08:00
744bfb3cb2
Merge pull request #1945 from dualface/add_CCLuaObjcBridge
...
add CCLuaObjcBridge
2013-02-03 19:32:17 -08:00
74e497bb2b
restore CCLuaEngine missed methods
2013-02-04 11:28:09 +08:00
d3086850c7
cocos2dxmatoMac-mini : updating submodule reference to latest autogenerated bindings
2013-02-03 14:55:53 +08:00
7839ceb45b
add CCLuaObjcBridge
2013-02-02 02:05:52 +08:00
minggo