Skip to content

Commit 2e7a83f

Browse files
IceBBBBBIceBBBBB
committed
ohos code rollback
Signed-off-by: 冰冰冰 <[email protected]>
1 parent 45f4929 commit 2e7a83f

File tree

303 files changed

+75
-25442
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

303 files changed

+75
-25442
lines changed

‎.gitmodules‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
[submodule "tools/cocos2d-console"]
22
path = tools/cocos2d-console
3-
url = https://github.com/cocos2d/cocos2d-console.git
3+
url = git://github.com/cocos2d/cocos2d-console.git
44
[submodule "tools/bindings-generator"]
55
path = tools/bindings-generator
6-
url = https://github.com/cocos2d/bindings-generator.git
6+
url = git://github.com/cocos2d/bindings-generator.git
77
[submodule "tests/cpp-tests/Resources/ccs-res"]
88
path = tests/cpp-tests/Resources/ccs-res
9-
url = https://github.com/dumganhar/ccs-res.git
9+
url = git://github.com/dumganhar/ccs-res.git

‎.travis.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ matrix:
2929
language: android
3030
sudo: required
3131
dist: xenial
32-
android_lua cmake
32+
# android_lua cmake
3333
- os: linux
3434
env: BUILD_TARGET=android_lua_cmake
3535
language: android

‎cmake/Modules/CocosConfigDefine.cmake‎

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -10,14 +10,11 @@ endif()
1010
#IOS = iOS
1111
#MACOSX = MacOS X
1212
#LINUX = Linux
13-
#OHOS = OHOS
1413
if(${CMAKE_SYSTEM_NAME} MATCHES "Windows")
1514
set(WINDOWS TRUE)
1615
set(PLATFORM_FOLDER win32)
1716
elseif(${CMAKE_SYSTEM_NAME} MATCHES "Android")
1817
set(PLATFORM_FOLDER android)
19-
elseif(CMAKE_SYSTEM_NAME MATCHES "OHOS")
20-
set(PLATFORM_FOLDER ohos)
2118
elseif(${CMAKE_SYSTEM_NAME} MATCHES "Linux")
2219
if(ANDROID)
2320
set(PLATFORM_FOLDER android)
@@ -63,11 +60,7 @@ define_property(TARGET
6360
# check c++ standard
6461
set(CMAKE_C_STANDARD 99)
6562
set(CMAKE_C_STANDARD_REQUIRED ON)
66-
if(OHOS)
67-
set(CMAKE_CXX_STANDARD 14)
68-
else()
6963
set(CMAKE_CXX_STANDARD 11)
70-
endif()
7164
set(CMAKE_CXX_STANDARD_REQUIRED ON)
7265
set(CMAKE_CXX_EXTENSIONS OFF)
7366

@@ -99,9 +92,6 @@ endif()
9992
elseif(ANDROID)
10093
target_compile_definitions(${target} PUBLIC ANDROID)
10194
target_compile_definitions(${target} PUBLIC USE_FILE32API)
102-
elseif(OHOS)
103-
target_compile_definitions(${target} PUBLIC OHOS)
104-
target_compile_definitions(${target} PUBLIC USE_FILE32API)
10595
elseif(WINDOWS)
10696
target_compile_definitions(${target}
10797
PUBLIC WIN32

‎cmake/Modules/CocosConfigDepend.cmake‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,8 +21,6 @@ macro(cocos2dx_depend)
2121
set(THREADS_LIBRARIES ${CMAKE_THREAD_LIBS_INIT})
2222
elseif(ANDROID)
2323
list(APPEND PLATFORM_SPECIFIC_LIBS GLESv2 EGL log android OpenSLES)
24-
elseif(OHOS)
25-
list(APPEND PLATFORM_SPECIFIC_LIBS native_drawing EGL GLESv3 hilog_ndk.z ace_ndk.z ace_napi.z uv rawfile.z OpenSLES)
2624
elseif(APPLE)
2725

2826
include_directories(/System/Library/Frameworks)

‎cocos/CMakeLists.txt‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -118,10 +118,6 @@ use_cocos2dx_compile_define(cocos2d)
118118
use_cocos2dx_compile_options(cocos2d)
119119

120120
# use all platform related system libs
121-
if (OHOS)
122-
123-
target_link_libraries(cocos2d ${Drawing-lib} ${libace-lib} ${GLES-lib} ${libnapi-lib} ${libuv-lib} ${rawfile-lib} ${EGL-lib} ${hilog-lib} libohaudio.so libavplayer.so libnative_window.so libnative_buffer.so)
124-
endif()
125121
use_cocos2dx_libs_depend(cocos2d)
126122

127123
target_include_directories(cocos2d

‎cocos/audio/AudioEngine.cpp‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -39,8 +39,6 @@
3939
#include "audio/win32/AudioEngine-win32.h"
4040
#elif CC_TARGET_PLATFORM == CC_PLATFORM_LINUX
4141
#include "audio/linux/AudioEngine-linux.h"
42-
#elif CC_TARGET_PLATFORM == CC_PLATFORM_OHOS
43-
#include "audio/ohos/AudioEngine-inl.h"
4442
#endif
4543

4644
#define TIME_DELAY_PRECISION 0.0001

‎cocos/audio/CMakeLists.txt‎

Lines changed: 0 additions & 72 deletions
Original file line numberDiff line numberDiff line change
@@ -105,78 +105,6 @@ elseif(ANDROID)
105105
audio/android/tinysndfile.cpp
106106
)
107107

108-
elseif(OHOS)
109-
set(COCOS_AUDIO_PLATFORM_HEADER
110-
audio/ohos/PcmAudioService.h
111-
audio/ohos/AudioBufferProvider.h
112-
audio/ohos/IAudioPlayer.h
113-
audio/ohos/AudioResampler.h
114-
audio/ohos/AudioDecoder.h
115-
audio/ohos/AudioResamplerPublic.h
116-
audio/ohos/AudioMixer.h
117-
audio/ohos/tinysndfile.h
118-
audio/ohos/mp3reader.h
119-
audio/ohos/AudioMixerOps.h
120-
audio/ohos/cutils/bitops.h
121-
audio/ohos/cutils/log.h
122-
audio/ohos/audio.h
123-
audio/ohos/AudioPlayerProvider.h
124-
audio/ohos/utils/Utils.h
125-
audio/ohos/utils/Errors.h
126-
audio/ohos/utils/Compat.h
127-
audio/ohos/AudioDecoderOgg.h
128-
audio/ohos/Track.h
129-
audio/ohos/OpenSLHelper.h
130-
audio/ohos/PcmAudioPlayer.h
131-
audio/ohos/AssetFd.h
132-
audio/ohos/PcmBufferProvider.h
133-
audio/ohos/CCThreadPool.h
134-
audio/ohos/audio_utils/include/audio_utils/minifloat.h
135-
audio/ohos/audio_utils/include/audio_utils/primitives.h
136-
audio/ohos/audio_utils/AudioDef.h
137-
audio/ohos/audio_utils/RefCounted.h
138-
audio/ohos/ICallerThreadUtils.h
139-
audio/ohos/AudioDecoderWav.h
140-
audio/ohos/AudioDecoderProvider.h
141-
audio/ohos/UrlAudioPlayer.h
142-
audio/ohos/AudioDecoderSLES.h
143-
audio/ohos/AudioDecoderMp3.h
144-
audio/ohos/PcmData.h
145-
audio/ohos/AudioMixerController.h
146-
audio/ohos/AudioResamplerCubic.h
147-
audio/ohos/AudioEngine-inl.h
148-
audio/ohos/IVolumeProvider.h
149-
audio/ohos/Macros.h
150-
)
151-
152-
set(COCOS_AUDIO_PLATFORM_SRC
153-
audio/ohos/AudioEngine-inl.cpp
154-
audio/ohos/CCThreadPool.cpp
155-
audio/ohos/AssetFd.cpp
156-
audio/ohos/AudioDecoder.cpp
157-
audio/ohos/AudioDecoderProvider.cpp
158-
audio/ohos/AudioDecoderSLES.cpp
159-
audio/ohos/AudioDecoderOgg.cpp
160-
audio/ohos/AudioDecoderMp3.cpp
161-
audio/ohos/AudioDecoderWav.cpp
162-
audio/ohos/AudioPlayerProvider.cpp
163-
audio/ohos/AudioResampler.cpp
164-
audio/ohos/AudioResamplerCubic.cpp
165-
audio/ohos/PcmBufferProvider.cpp
166-
audio/ohos/PcmAudioPlayer.cpp
167-
audio/ohos/PcmData.cpp
168-
audio/ohos/PcmAudioService.cpp
169-
audio/ohos/UrlAudioPlayer.cpp
170-
audio/ohos/AudioMixerController.cpp
171-
audio/ohos/AudioMixer.cpp
172-
audio/ohos/mp3reader.cpp
173-
audio/ohos/tinysndfile.cpp
174-
audio/ohos/Track.cpp
175-
audio/ohos/audio_utils/RefCounted.cpp
176-
audio/ohos/audio_utils/minifloat.cpp
177-
audio/ohos/audio_utils/primitives.cpp
178-
audio/ohos/utils/Utils.cpp
179-
)
180108
elseif(LINUX)
181109
set(COCOS_AUDIO_PLATFORM_HEADER
182110
audio/linux/AudioEngine-linux.h

‎cocos/audio/ohos/AssetFd.cpp‎

Lines changed: 0 additions & 45 deletions
This file was deleted.

‎cocos/audio/ohos/AssetFd.h‎

Lines changed: 0 additions & 42 deletions
This file was deleted.

‎cocos/audio/ohos/AudioBufferProvider.h‎

Lines changed: 0 additions & 62 deletions
This file was deleted.

0 commit comments

Comments
 (0)