minggo
afb91e752d
include cocos2d.h to make android template work
2013-04-27 17:16:27 +08:00
minggo
d4efbcfcef
don't include unneeded header file
2013-04-23 10:10:14 +08:00
minggo
78d3c7f048
fixed #1613:not reload resources on Android platform after return from background
2013-04-17 15:34:57 +08:00
billy1380
cdfe693583
- changed cocos2d mac project to support universal build and x86
...
- fixed issues associated with that
2013-03-23 16:04:51 +00:00
fape
e9343c2d8a
- update README files
...
- format javascript sample README files like cpp samples
2013-03-21 16:04:53 +01:00
minggo
0a8b4f923f
delete parameter(-o igncr) when running build_native.sh in eclipse project
2013-03-19 13:48:32 +08:00
minggo
58618172e6
merge pull request and fix some conflicts
2013-03-18 16:15:48 +08:00
minggo
19cf6665c4
Merge pull request #2176 from folecr/easierandroidbuild
...
Improvements to android build setup and samples' build scripts
2013-03-17 18:58:11 -07:00
folecr
6dba49f25b
Android build_native.sh now reads local.properties for environment variables
2013-03-15 16:44:16 -07:00
Ricardo Quesada
59ca1e198a
README.md eclipse improvements
...
Includes screenshots, fixes instructions, looks better
2013-03-15 15:20:39 -07:00
James Chen
ae1c64573e
Merge pull request #2046 from rohankuruvilla/eclipse
...
fixed #1827 : Eclipse Project import - Documentation Added and Tested.
2013-03-12 01:36:17 -07:00
Sam Clegg
9eb9524659
Add 'make run' target for linux projects.
...
Also, a few other linux build system improvements:
- Add linux build of SimpleGame
- Update multi-platform templates to use new common
build system.
- Remove redundant main.h files.
2013-03-08 10:01:03 -08:00
Rohan Kuruvilla
7149f0598d
Adding missing eclipse project files
2013-03-07 12:13:50 -08:00
Rohan Kuruvilla
360519dad5
Removing /bin/bash for executing build command, and keep only bash
2013-03-07 12:09:17 -08:00
Sam Clegg
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
Sam Clegg
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
Sam Clegg
4d0aa01c4b
Fix all gcc warnings in NaCl build.
2013-03-05 17:01:40 -08:00
Rohan Kuruvilla
7d90fc2254
Adding README files to each sample project
2013-03-04 11:50:39 -08:00
Rohan Kuruvilla
4d14afa686
Modifying C++ project files to remove dependency on scripting
2013-03-04 11:50:39 -08:00
Rohan Kuruvilla
1ba2b5d169
Adding eclipse project files for TestCpp and HelloCpp
2013-03-04 11:50:39 -08:00
Sam Clegg
33c422d1d5
Add new port: Native Client
2013-03-02 12:15:24 -08:00
James Chen
a9fede525a
issue #1733 : Marmalade ok.
2013-02-19 18:26:00 +08:00
James Chen
339a60a649
Adding execute permissions for list.sh.
2013-02-19 14:21:56 +08:00
mutoo
4bc06c7fcb
changed fileformat of list.sh to unix
...
list.sh doesn't work in linux/mac due to its fileformat
2013-02-19 12:20:02 +08:00
James Chen
2626005d20
issue #1712 : Updating project setting for blackberry.
2013-02-17 16:26:08 +08:00
James Chen
1e5431bcc5
issue #1770 : Adding webp support for blackberry and marmalade.
2013-02-06 10:52:13 +08:00
James Chen
2694cb150b
CCFileUtils::s|gSearchPath -> CCFileUtils::s\gSearchPaths.
2013-01-29 09:56:38 +08:00
James Chen
2e421304ca
Merge pull request #1911 from dumganhar/iss1683-ccfileutils
...
issue #1683 : Updating CCFileUtils for Blackberry and Marmalade.
2013-01-28 05:43:41 -08:00
minggo
249b935be8
fix some warnins
2013-01-28 20:34:52 +08:00
James Chen
59f2ae13f8
issue #1683 : Updating CCFileUtils for Blackberry and Marmalade.
2013-01-28 20:12:48 +08:00
James Chen
733a334ec2
issue #1683 : Fixed compilation errors for linux.
2013-01-28 18:32:34 +08:00
James Chen
c19b9885fe
Adding COCOS2D_DEBUG=1 for sample projects.
2013-01-28 10:22:32 +08:00
James Chen
d532670640
Removing some CCLOG.
2013-01-27 20:16:46 +08:00
James Chen
de8a237d73
Merge pull request #1881 from dumganhar/linux-fix
...
fixed #1676 : Refactoring Makefile and eclipse project configuration for LINUX port.
2013-01-22 03:22:41 -08:00
James Chen
3f57b01f94
Fix for 32bit.
2013-01-22 18:30:16 +08:00
James
1d7650767b
Updated Makefile and project configurations for linux port.
2013-01-22 16:45:35 +08:00
James
680fbe3517
Fixed compilation errors for linux port.
2013-01-22 15:21:37 +08:00
moadib
e39829269d
Added <uses-feature android:glEsVersion="0x00020000" /> to AndroidManifest.xml
2013-01-21 13:03:55 +04:00
johnangel
16269d952d
Detect VS2012 Update 1
2013-01-10 11:55:30 +01:00
johnangel
674bb8e728
Setting PlatformToolSet to v110_xp instead of default v110 in Visual Studio 2012 for Windows XP support, leaving default v100 in Visual Studio 2010.
2013-01-07 11:51:05 +01:00
James Chen
3263d06830
Merge pull request #1814 from fape/marmalade_simplegame
...
fixed #1631 : Making SimpleGame force landscape for Marmalade.
2013-01-03 19:07:41 -08:00
fape
f3f67f62e1
.gitignores moved
2013-01-03 15:16:11 +01:00
Dale Ducharme
611db78b39
Removing grskia dependancy and adding in freetype support to the builds.
2013-01-02 18:53:31 -05:00
James Chen
d2ad820a48
fixed #1627 : Adding view name for sample applications.
2012-12-29 14:50:00 +08:00
James Chen
9bd302e35b
fixed #1627 : VS version check in project file.
2012-12-29 13:54:46 +08:00
James Chen
f2f3aa55bf
Merge branch 'gles20' of https://github.com/johnangel/cocos2d-x into iss-vs2012
...
Conflicts:
samples/Cpp/HelloCpp/proj.win32/HelloCpp.vcxproj
samples/Cpp/TestCpp/proj.win32/TestCpp.vcxproj
samples/Javascript/CocosDragonJS/proj.win32/CocosDragonJS.vcxproj
samples/Javascript/MoonWarriors/proj.win32/MoonWarriors.vcxproj
samples/Javascript/TestJavascript/proj.win32/TestJavascript.vcxproj
samples/Javascript/WatermelonWithMe/proj.win32/WatermelonWithMe.vcxproj
samples/Lua/HelloLua/proj.win32/HelloLua.vcxproj
samples/Lua/TestLua/proj.win32/TestLua.win32.vcxproj
scripting/javascript/bindings/generated
scripting/lua/proj.win32/liblua.vcxproj
2012-12-29 09:48:22 +08:00
ivzave
fcce930188
repair linux eclipse build & add 64-bit project configurations
2012-12-22 07:14:59 +04:00
minggo
89fb58e791
issue #1603:change pathes of android codes
2012-12-21 17:28:14 +08:00
minggo
f71f13fc53
issue #1536:add permissions and modify module path error
2012-12-21 14:40:34 +08:00
James Chen
a36446cba2
Merge branch 'iss1603-adjust-directory' of https://github.com/minggo/cocos2d-x into iss1603-adjust-directory
2012-12-20 18:39:52 +08:00