Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

update external to v5-deps-3 #4

Merged
merged 2 commits into from
Nov 25, 2019
Merged

update external to v5-deps-3 #4

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b723ae8
Update config.json
halx99 Nov 25, 2019
7efc643
fix ios compile issue, merge header AudioCache.h
halx99 Nov 25, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion cocos/audio/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -79,7 +79,7 @@ elseif(APPLE)
set(COCOS_AUDIO_PLATFORM_HEADER
audio/apple/AudioDecoder.h
audio/apple/AudioPlayer.h
audio/apple/AudioCache.h
audio/include/AudioCache.h
audio/apple/AudioEngineImpl.h
)
set(COCOS_AUDIO_PLATFORM_SRC
Expand Down
115 changes: 0 additions & 115 deletions cocos/audio/apple/AudioCache.h
View file
Open in desktop

This file was deleted.

2 changes: 1 addition & 1 deletion cocos/audio/apple/AudioCache.mm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ of this software and associated documentation files (the "Software"), to deal
#include "platform/CCPlatformConfig.h"
#if CC_TARGET_PLATFORM == CC_PLATFORM_IOS || CC_TARGET_PLATFORM == CC_PLATFORM_MAC

#include "audio/apple/AudioCache.h"
#include "audio/include/AudioCache.h"

#import <Foundation/Foundation.h>
#import <OpenAL/alc.h>
Expand Down
2 changes: 1 addition & 1 deletion cocos/audio/apple/AudioDecoder.mm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ of this software and associated documentation files (the "Software"), to deal
****************************************************************************/

#include "audio/apple/AudioDecoder.h"
#include "audio/apple/AudioMacros.h"
#include "audio/include/AudioMacros.h"

#import <Foundation/Foundation.h>

Expand Down
2 changes: 1 addition & 1 deletion cocos/audio/apple/AudioEngineImpl.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@

#include "base/CCRef.h"
#include "audio/include/AudioMacros.h"
#include "audio/apple/AudioCache.h"
#include "audio/include/AudioCache.h"
#include "audio/apple/AudioPlayer.h"

NS_CC_BEGIN
Expand Down
2 changes: 1 addition & 1 deletion cocos/audio/apple/AudioPlayer.mm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ of this software and associated documentation files (the "Software"), to deal
#import <Foundation/Foundation.h>

#include "audio/apple/AudioPlayer.h"
#include "audio/apple/AudioCache.h"
#include "audio/include/AudioCache.h"
#include "platform/CCFileUtils.h"
#include "audio/apple/AudioDecoder.h"

Expand Down
9 changes: 9 additions & 0 deletions cocos/audio/include/AudioCache.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,11 +31,20 @@
#include <mutex>
#include <vector>
#include <memory>

#if CC_TARGET_PLATFORM == CC_PLATFORM_IOS || CC_TARGET_PLATFORM == CC_PLATFORM_MAC
#import <OpenAL/al.h>

#else

#ifdef OPENAL_PLAIN_INCLUDES
#include <al.h>
#else
#include <AL/al.h>
#endif

#endif

#include "platform/CCPlatformMacros.h"
#include "audio/include/AudioMacros.h"

Expand Down
4 changes: 2 additions & 2 deletions external/config.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"version": "v5-deps-2",
"zip_file_size": "103868975",
"version": "v5-deps-3",
"zip_file_size": "104632743",
"repo_name": "engine-v5-3rd",
"repo_parent": "https://github.com/simdsoft/",
"move_dirs": {
Expand Down