minggo
dfde41b932
issue #2129:fix conflicts
2013-07-05 17:32:50 +08:00
Huabing.Xu
041bef148a
Merge branch 'origin/develop'
...
Conflicts:
cocos2dx/proj.ios/cocos2dx.xcodeproj/project.pbxproj
cocos2dx/proj.win32/cocos2d.vcxproj.filters
2013-07-02 13:47:02 +08:00
Huabing.Xu
4e9e893c8e
1. Add C++ code to decode ETC file
...
2. Configuration and function supportsETC()
2013-07-01 17:40:57 +08:00
Squallium
c770a4bdc8
Added ccFPSImages entity as linked resource
2013-06-30 22:00:29 +02:00
James Chen
e2b9863bf7
issue #2325 : [Linux] KEYBOARD_SUPPORT --> CC_KEYBOARD_SUPPORT.
2013-06-29 11:44:14 +08:00
Squallium
f53e4f692f
removed libxml2 dependence from libcocos2d
2013-06-27 08:30:55 +02:00
James Chen
ad7d606b48
Merge pull request #2703 from sergey-shambir/linux_qmake
...
close #2332 : [Linux] Adding project part for QtCreator.
2013-06-25 21:57:20 -07:00
minggo
cd5bcb87af
issue #2284 : merge master and fixed some conflicts
2013-06-13 17:54:05 +08:00
Rene Klacan
8b16178f9f
Merge pull request from cocos2d/develop
2013-06-06 09:42:18 +02:00
James Chen
2d81a66444
[Linux] Don't treat the warning of deprecated-declarations as error.
2013-06-05 17:48:04 +08:00
Sergey Shambir
f5b9b4580c
Enabled c++0x flag, use OpenAL audio backend by default.
2013-06-04 14:29:29 +04:00
chengstory
cfb424a6c9
1. add Component struct.
2013-06-04 17:38:43 +08:00
Rene Klacan
c4ec15752a
simplified CCKeyboardDispatcher and CCLayer does not inherit from CCKeyboardDelegate
2013-06-03 16:06:33 +02:00
René Klačan
9e4c5bbca3
Merge pull request #3 from cocos2d/develop
...
pull request from main repo
2013-06-03 04:07:43 -07:00
minggo
5c1a408797
issue #2242:use -std=gnu++0x for linux and native client project
2013-06-03 13:50:19 +08:00
minggo
0a64e7a041
enable c++11 for linux and natvie client projects
2013-06-03 11:02:54 +08:00
Rene Klacan
0489ba51fd
deleted defines in proj.linux's Makefile
2013-06-02 13:18:06 +02:00
Sergey Shambir
984ed75b9a
Linux: added project part for QtCreator.
...
Allows easily setup cocos2d on Linux in QtCreator IDE.
2013-06-02 10:15:14 +04:00
Rene Klacan
c8b4291731
keyboard support throught compiler directive
2013-06-02 04:11:43 +02:00
Rene Klacan
50ad3e1c80
KeyboardDispatcher + tests for it on linux
2013-05-31 14:29:32 +02:00
Jaroslaw Lewandowski
3f7c506638
Ability to save/retrieve CCData into/from CCUserDefault
2013-05-29 01:06:41 +01:00
minggo
6f624351b3
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into ETC1-support
2013-05-28 11:36:05 +08:00
minggo
b038741d78
issue #2161 : make linux,marmalade,native client,mac and emscripten project to include CCTextureETC.cpp
2013-05-27 15:06:43 +08:00
Sergey Shambir
06e6048537
Linux port: added libX11 to linked libraries.
...
Otherwise build fails on linux.
2013-05-24 23:36:21 +04:00
James Chen
8448280ed3
issue 2217: Updating Make file and project configuration to add ccFPSImage.c.
2013-05-23 16:50:48 +08:00
James Chen
42427634f2
fixed #2142 : Adding datavisitor support for other platforms except win32.
2013-05-10 15:37:40 +08:00
James Chen
1eb79530c6
fixed #1847 : -DCC_ENABLE_BOX2D_INTEGRATION ~> -DCC_ENABLE_BOX2D_INTEGRATION=1,
...
-DCC_ENABLE_CHIPMUNK_INTEGRATION ~> -DCC_ENABLE_CHIPMUNK_INTEGRATION=1.
2013-04-17 12:49:25 +08:00
Sam Clegg
ffb7360e46
Enable easy swithing between Box2D and chipmunk in linux and nacl
...
The ENABLE_BOX2D/ENABLE_CHIPMUNK defines were previously
hardcoded in the Makefiles. Now you get chipmunk by default
on both platforms and can enble Box2D by setting USE_BOX2D in
your environment.
Also remove erroneous -D__CC_PLATFORM_FILEUTILS_CPP__ and
-D__CC_PLATFORM_IMAGE_CPP__ from linux Makefiles. These should
never be defined globally like this.
2013-04-15 07:35:50 -07:00
James Chen
32406efec2
Merge branch 'newlines_in_cclog' of https://github.com/sbc100/cocos2d-x into sbc100-newlines_in_cclog
...
Conflicts:
cocos2dx/proj.linux/cocos2dx.mk
2013-04-10 14:17:23 +08:00
James Chen
68867b8798
Merge pull request #2212 from rogerzanoni/linux_link
...
fixed #2044 : Fix linux build, libpthread and libGL libraries need to be linked on linux.
2013-04-09 21:50:54 -07:00
Éloi Rivard
8c013fe619
* Basic Linux OpenAL support.
2013-03-28 12:07:09 +01:00
Roger Zanoni
fdb1d69efe
Fix linux build
...
The cocos library uses libpthread and libGL on linux, so we need to link
with them.
2013-03-19 18:44:11 -04:00
Sam Clegg
8b6d23538d
Fix linux library path.
...
linux libraries were being built to "cocos2dx/lib/linux" rather
than just lib/linux.
Always used absolute path for -rpath linker argument.
2013-03-16 09:01:21 -07:00
Sam Clegg
863286b0b9
Fix warning in linux build.
...
Also, define _DEBUG rather then DEBUG in linux and nacl makefiles
by default, and limit the command line definions that are used
when building Box2D.
2013-03-12 16:59:22 -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
minggo
e8d4b17a23
issue #1529:modify CCUserDefault.cpp path in linux makefile
2013-03-08 11:18:34 +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
James Chen
3f74cd8190
fixed #1753 : Adding ccUTF8.h/.cpp for MAC, LINUX and MARMALADE port.
2013-02-28 09:44:37 +08:00
James Chen
fa90ae320b
issue #1733 : Updated cocos2dx/proj.linux/Makefile.
2013-02-19 18:08:58 +08:00
James Chen
541dd357fa
issue #1712 : Getting DPI support for Linux.
2013-02-17 16:54:45 +08:00
ivzave
165faf49df
prevent unintentional tinyxml2.cpp deletion during make clean on linux
2013-02-07 05:17:46 +04:00
minggo
60d36ed3aa
issue #1703:fix conflicts when synchronized to latest codes
2013-02-06 16:18:37 +08:00
James Chen
561f6ca435
issue #1770 : Adding webp image format support for linux 64bit.
2013-02-06 15:47:23 +08:00
minggo
396230bb77
issue #1703:remove dependence of libxml2 for marmalade and linux
2013-02-06 14:16:06 +08:00
minggo
e136476fb3
issue #1703:add tinyxml2 in makefile
2013-02-06 11:55:36 +08:00
James Chen
3a9346e6ff
issue #1687 : Refactoring CCFileUtils, abstracting the same implementations for all platforms.
2013-02-01 11:20:46 +08:00
James Chen
13881ba8a8
issue #1683 : Updating CCApplication.h/.cpp for linux.
2013-01-28 11:56:56 +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