Lothario
/
axmol
mirror of https://github.com/axmolengine/axmol.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

fix macro

This commit is contained in:
Dhilan007 2014-09-30 09:57:28 +08:00
parent 18307d52da
commit db45794625
7 changed files with 15 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
cocos/audio/apple/AudioPlayer.h
View File

@ -30,12 +30,9 @@
#include <condition_variable>
#include <mutex>
<<<<<<< HEAD:cocos/audio/ios/AudioPlayer.h
#include <string>
#import <OpenAL/al.h>
=======
#include <thread>
>>>>>>> f1a01c54627e01cfeaa54332967695c8d33e3a00:cocos/audio/apple/AudioPlayer.h
#import <OpenAL/al.h>
#include "CCPlatformMacros.h"
NS_CC_BEGIN

4
cocos/audio/win32/AudioCache.cpp
View File

@ -21,7 +21,10 @@
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
THE SOFTWARE.
****************************************************************************/
#include "platform/CCPlatformConfig.h"
#if CC_TARGET_PLATFORM == CC_PLATFORM_WIN32
#include "AudioCache.h"
#include <thread>
#include <algorithm>
@ -29,7 +32,6 @@
#include "mpg123.h"
#include "vorbis/codec.h"
#include "vorbis/vorbisfile.h"
#include "base/ccUtils.h"
#define PCMDATA_CACHEMAXSIZE 2621440

2
cocos/audio/win32/AudioCache.h
View File

@ -21,6 +21,8 @@
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
THE SOFTWARE.
****************************************************************************/
#include "platform/CCPlatformConfig.h"
#if CC_TARGET_PLATFORM == CC_PLATFORM_WIN32
#ifndef __AUDIO_CACHE_H_

3
cocos/audio/win32/AudioEngine-win32.cpp
View File

@ -21,7 +21,10 @@
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
THE SOFTWARE.
****************************************************************************/
#include "platform/CCPlatformConfig.h"
#if CC_TARGET_PLATFORM == CC_PLATFORM_WIN32
#include "AudioEngine-win32.h"
#include <condition_variable>
#include "AL/alc.h"

2
cocos/audio/win32/AudioEngine-win32.h
View File

@ -21,6 +21,8 @@
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
THE SOFTWARE.
****************************************************************************/
#include "platform/CCPlatformConfig.h"
#if CC_TARGET_PLATFORM == CC_PLATFORM_WIN32
#ifndef __AUDIO_ENGINE_INL_H_

2
cocos/audio/win32/AudioPlayer.cpp
View File

@ -21,6 +21,8 @@
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
THE SOFTWARE.
****************************************************************************/
#include "platform/CCPlatformConfig.h"
#if CC_TARGET_PLATFORM == CC_PLATFORM_WIN32
#include "AudioPlayer.h"
#include "AudioCache.h"

2
cocos/audio/win32/AudioPlayer.h
View File

@ -21,6 +21,8 @@
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
THE SOFTWARE.
****************************************************************************/
#include "platform/CCPlatformConfig.h"
#if CC_TARGET_PLATFORM == CC_PLATFORM_WIN32
#ifndef __AUDIO_PLAYER_H_