Darragh Coy
7b67794826
Fix a potential crash SimpleAudioEngineOpenSL::playEffect
...
Fix a crash in SimpleAudioEngineOpenSL::playEffect which would occur when OpenSLEngine::preloadEffect returned FILE_NOT_FOUND. In the case where the sound fails to preload, we should not attempt to call OpenSLEngine::setEffectLooping on that sound.
2013-05-14 17:48:50 +01:00
minggo
98e3e8b37e
Merge pull request #2434 from ggggamer/master
...
memory leak when preloadEffect
2013-05-07 22:49:55 -07:00
James Gregory
041fdac48a
Add missing file from CocosDenshion.
2013-05-06 21:00:39 -07:00
James Gregory
d529287cfa
Remove LOG prefixes from emscripten makefiles
2013-05-06 21:00:38 -07:00
James Gregory
c45e5797cf
Add Makefiles for Emscripten + Emscripten external
2013-05-06 20:58:02 -07:00
James Chen
edc8444ca4
Updating blackberry project configurations.
2013-04-27 14:07:54 +08:00
GGGGamer
a858613de1
memory leak when preloadEffect
2013-04-24 12:10:18 +08:00
Éloi Rivard
b9ec3ead65
* Fixed CocosDenshionTestBug
2013-03-29 09:32:50 +01:00
Éloi Rivard
8c013fe619
* Basic Linux OpenAL support.
2013-03-28 12:07:09 +01:00
minggo
ee256e0e0d
Merge pull request #2091 from jsambuo/linux-audio-twice-fix
...
fix for SimpleAudioEngine::playEffect() and playBackgroundMusic() playing twice on linux
2013-03-07 20:50:26 -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
minggo
3ce5a99c8d
Merge pull request #2092 from sbc100/fix_all_warnings
...
Fix all compiler warnings produced by gcc.
2013-03-05 17:59:35 -08:00
Sam Clegg
4d0aa01c4b
Fix all gcc warnings in NaCl build.
2013-03-05 17:01:40 -08:00
Sam Clegg
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
waiter
814feca53b
fix OpenSLEngine can't load resources from SD card
2013-03-04 14:54:43 +08:00
minggo
96c5be91e3
Merge pull request #2076 from sbc100/cocos_nacl
...
Native Client port
2013-03-03 18:24:04 -08:00
jsambuo
2487528a72
fixing bug where SimpleAudioEngine::playEffect() and SimpleAudioEngine::playBackgroundMusic() on linux plays twice
2013-03-03 11:57:01 -05:00
jsambuo
54a582b3da
fixing issue with SimpleAudioEngine::getEffectsVolume() for linux
...
SimpleAudioEngine::getEffectsVolume() was returning the background music volume when run on linux.
2013-03-03 11:55:51 -05:00
Sam Clegg
33c422d1d5
Add new port: Native Client
2013-03-02 12:15:24 -08:00
jiang xiaohua
efc5a4bf2f
del include path
2013-02-28 10:35:56 +08:00
jiang xiaohua
3d451400db
delete search path
2013-02-25 10:30:34 +08:00
jiang xiaohua
5a5e25a1fa
delete searpath
2013-02-25 10:28:37 +08:00
jiang xiaohua
323453d31b
add the CocosDenshion project
2013-02-21 14:04:30 +08:00
James Chen
2626005d20
issue #1712 : Updating project setting for blackberry.
2013-02-17 16:26:08 +08:00
moadib
b5fd738ec5
s_backgroundMusics map value should be released when stopBackground called with bReleaseData=true
2013-02-13 11:38:50 +04:00
moadib
f7996aa691
Added support for multiple background music sources to CocosDenshion for Blackberry
2013-02-12 19:06:26 +04:00
James Chen
1e5431bcc5
issue #1770 : Adding webp support for blackberry and marmalade.
2013-02-06 10:52:13 +08:00
James Chen
e18c6a73c2
Updating CocosDenshion eclipse project for linux.
2013-01-29 12:07:05 +08:00
James Chen
75d926f810
issue #1683 : Fixing complication errors for blackberry.
2013-01-28 21:16:01 +08:00
James Chen
fa7175f6f7
issue #1683 : Using full path in CocosDenshion API.
2013-01-27 21:10:53 +08:00
James Chen
7c27cbfd22
Updating Makefile of CocosDenshion for linux port.
2013-01-27 19:57:54 +08:00
James Chen
eec0ba3c19
Getting full path in before playing sound.
2013-01-27 19:20:49 +08:00
James Chen
2235f745d3
issue #1683 : Fixed compilation error for Win32.
2013-01-25 22:30:16 +08:00
James Chen
6f3b22031f
Using new API of getting full path for file name.
2013-01-25 20:51:52 +08:00
James Chen
4d900c2d15
Removing `assets/` in the full path since it isn't needed for the API of playing sound.
2013-01-25 20:51:00 +08:00
James Chen
bc76cf09c4
Added filename lookup support for win32.
2013-01-18 21:54:48 +08:00
James Chen
0a42829428
issue #1667 : Adding file name lookup support for iOS and Android, TBD: Other platform supports.
2013-01-18 18:05:32 +08:00
johnangel
0d476604e0
Detect VS2012 Update 1
2013-01-08 10:58:38 +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
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
johnangel
08cd9e37fc
Setting PlatformToolSet to v110_xp for Visual Studio 2012 only.
2012-12-24 10:27:56 +01:00
James Chen
f323b77548
Merge branch 'lnximprove' of https://github.com/ivzave/cocos2d-x into linux
2012-12-24 09:52:55 +08:00
Denis Mingulov
6d895e634c
Compilation fix for Android clang 3.1
2012-12-22 07:58:30 +02:00
ivzave
fcce930188
repair linux eclipse build & add 64-bit project configurations
2012-12-22 07:14:59 +04:00
unknown
adb68ddbb6
Enable Windows XP support in Visual Studio 2012 Update 1.
...
Not tested with Visual Studio 2010, not sure will it work with PlatformToolset v110_xp.
2012-12-19 19:28:25 +01:00
dualface
98ea80329e
fix android compile warning
2012-12-14 18:01:54 +08:00
Mat Hopwood
cd219162e0
CocosDenshion fix
2012-12-04 11:03:34 +08:00
James Chen
f2e0df4de3
issue #1565 : Removed VS2008 support.
2012-11-19 14:42:27 +08:00