Lothario
/
axmol
mirror of https://github.com/axmolengine/axmol.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
11,380 Commits 2 Branches 31 Tags 1.1 GiB
Commit Graph

113 Commits

Author SHA1 Message Date
godyZ f648a3f907 modify linux makefile 2013-08-08 17:06:42 +08:00
boyu0 684e005ce7 issue #2345: edit for linux compile error 2013-08-07 14:10:42 +08:00
boyu0 ec6343a9b8 fix js and linux compile error 2013-08-07 10:34:30 +08:00
boyu0 dc6503f7d4 Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into iss2345_refactor_ccimage 2013-08-06 13:37:38 +08:00
James Chen eaabd93051 issue #2170: Fixing compilaction errors on Emscripten. 2013-08-05 11:10:12 +08:00
James Chen a2fbf0c2b8 issue #2179: Fixing compilation errors on Linux. 2013-08-05 10:29:20 +08:00
boyu0 6afa77ddc3 issue #2345: update the png, jpeg and tiff libraries. Fix the testFormatForPvrTCSupport return incorrect answer when GL_COMPRESSED_RGB_PVRTC_2BPPV1_IMG undefined. 2013-08-02 16:02:40 +08:00
James Chen f61f4e58fd Merge pull request #3094 from sergey-shambir/linux_sdl 
closed 2458: Linux: added SDL backend as alternative to GLFW.
 2013-07-31 01:55:37 -07:00
minggo 0530109a9f Merge pull request #3178 from boyu0/2345 
Refactor CCImage and CCTexture2D
 2013-07-31 01:21:18 -07:00
Sergey Shambir d23d486720 Linux: added SDL2 backend as replacement for GLFW. 
Initially planned as alternative, made replacement after discussion with
minggo.

Summary:
GLFW v.3 released in June. New version breaks API without real need:
http://cocos2d-x.org/boards/6/topics/31277
Meanwhile SDL2 is very stable. SDL2 used in Steam Runtime and will be
part of Ubuntu SDK, it's supported by other distributions.

Completed:
- OpenGL initialization and window handling with SDL
- Keyboard, IME emulation, mouse and touches support with SDL
- Window title now contains app name on Linux
- Backspace correctly handled with new backend

Note:
- SDL on X11 have no proper multitouch, but backend handles multitouch
events to support future Linux graphics.
 2013-07-30 23:08:26 +04:00
Éloi Rivard 524b6903a5 Added clang support for linux. 2013-07-30 14:49:44 +02:00
boyu0 31da5ebeb7 fix some compile error and pass the linux compile 2013-07-30 13:45:50 +08:00
boyu0 6b12ac9a5a edit for linux 2013-07-30 10:25:20 +08:00
minggo acdd1cfe9d issue #2430:move GLProgram enum into class 2013-07-25 17:48:22 +08:00
minggo 7704ab9161 issue #2412:remove platform.cpp/.h 2013-07-19 13:42:45 +08:00
minggo eada29ee40 issue #2404:created CCDprecated.h and move all global functions and variables into it 2013-07-15 16:14:26 +08:00
Éloi Rivard e6354bbf0a Various linux eclipse projects compilation fixes 2013-07-09 15:23:19 +02:00
Éloi Rivard e5db95d2b9 Added deprecated functions ignoring in libcocos2d eclipse project 2013-07-09 15:23:19 +02:00
Éloi Rivard d853934f1b Added -std=c++0x flag in C++ eclipse projects 2013-07-09 15:23:19 +02:00
James Chen 582baa0bac issue #2379: Removing CCZone.cpp for Makefile. 2013-07-09 15:31:28 +08:00
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