diff --git a/native/CMakeLists.txt b/native/CMakeLists.txt index 515eac6ef5..f22f4b5f6d 100644 --- a/native/CMakeLists.txt +++ b/native/CMakeLists.txt @@ -220,30 +220,30 @@ cocos_source_files( cocos/base/base64.cpp cocos/base/base64.h cocos/base/CachedArray.h - cocos/base/CCAutoreleasePool.cpp - cocos/base/CCAutoreleasePool.h - cocos/base/ccCArray.cpp - cocos/base/ccCArray.h - cocos/base/ccConfig.h - cocos/base/CCData.cpp - cocos/base/CCData.h - cocos/base/ccMacros.h - cocos/base/CCMap.h - cocos/base/ccRandom.cpp - cocos/base/ccRandom.h - cocos/base/CCRef.cpp - cocos/base/CCRef.h - cocos/base/CCScheduler.cpp - cocos/base/CCScheduler.h - cocos/base/CCThreadPool.cpp - cocos/base/CCThreadPool.h - cocos/base/ccUTF8.cpp - cocos/base/ccUTF8.h - cocos/base/ccUtils.cpp - cocos/base/ccUtils.h - cocos/base/CCValue.cpp - cocos/base/CCValue.h - cocos/base/CCVector.h + cocos/base/AutoreleasePool.cpp + cocos/base/AutoreleasePool.h + cocos/base/Array.cpp + cocos/base/Array.h + cocos/base/Config.h + cocos/base/Data.cpp + cocos/base/Data.h + cocos/base/Macros.h + cocos/base/Map.h + cocos/base/Random.cpp + cocos/base/Random.h + cocos/base/Ref.cpp + cocos/base/Ref.h + cocos/base/Scheduler.cpp + cocos/base/Scheduler.h + cocos/base/ThreadPool.cpp + cocos/base/ThreadPool.h + cocos/base/UTF8.cpp + cocos/base/UTF8.h + cocos/base/Utils.cpp + cocos/base/Utils.h + cocos/base/Value.cpp + cocos/base/Value.h + cocos/base/Vector.h cocos/base/csscolorparser.cpp cocos/base/csscolorparser.h cocos/base/etc1.cpp @@ -279,12 +279,12 @@ cocos_source_files( ##### math cocos_source_files( - cocos/math/CCGeometry.cpp - cocos/math/CCGeometry.h - cocos/math/CCMath.h - cocos/math/CCMathBase.h - cocos/math/CCVertex.cpp - cocos/math/CCVertex.h + cocos/math/Geometry.cpp + cocos/math/Geometry.h + cocos/math/Math.h + cocos/math/MathBase.h + cocos/math/Vertex.cpp + cocos/math/Vertex.h cocos/math/Mat3.cpp cocos/math/Mat3.h cocos/math/Mat4.cpp @@ -312,9 +312,9 @@ cocos_source_files( ##### network cocos_source_files( - cocos/network/CCDownloader.cpp - cocos/network/CCDownloader.h - cocos/network/CCIDownloaderImpl.h + cocos/network/Downloader.cpp + cocos/network/Downloader.h + cocos/network/DownloaderImpl.h cocos/network/HttpClient.h cocos/network/HttpCookie.cpp cocos/network/HttpCookie.h @@ -334,8 +334,8 @@ endif() if(APPLE) cocos_source_files( - cocos/network/CCDownloaderImpl-apple.h - cocos/network/CCDownloaderImpl-apple.mm + cocos/network/DownloaderImpl-apple.h + cocos/network/DownloaderImpl-apple.mm cocos/network/HttpAsynConnection-apple.h cocos/network/HttpAsynConnection-apple.m cocos/network/HttpClient-apple.mm @@ -352,8 +352,8 @@ endif() if(ANDROID) cocos_source_files( - cocos/network/CCDownloader-android.cpp - cocos/network/CCDownloader-android.h + cocos/network/Downloader-android.cpp + cocos/network/Downloader-android.h cocos/network/HttpClient-android.cpp ) endif() @@ -366,8 +366,8 @@ endif() if(WINDOWS) cocos_source_files( - cocos/network/CCDownloader-curl.cpp - cocos/network/CCDownloader-curl.h + cocos/network/Downloader-curl.cpp + cocos/network/Downloader-curl.h ) endif() @@ -380,26 +380,26 @@ endif() ##### platform cocos_source_files( - cocos/platform/CCApplication.h - cocos/platform/CCCanvasRenderingContext2D.h - cocos/platform/CCDevice.h - cocos/platform/CCFileUtils.cpp - cocos/platform/CCFileUtils.h - cocos/platform/CCImage.cpp - cocos/platform/CCImage.h - cocos/platform/CCSAXParser.cpp - cocos/platform/CCSAXParser.h - cocos/platform/CCStdC.h + cocos/platform/Application.h + cocos/platform/CanvasRenderingContext2D.h + cocos/platform/Device.h + cocos/platform/FileUtils.cpp + cocos/platform/FileUtils.h + cocos/platform/Image.cpp + cocos/platform/Image.h + cocos/platform/SAXParser.cpp + cocos/platform/SAXParser.h + cocos/platform/StdC.h ) if(WINDOWS) cocos_source_files( - cocos/platform/win32/CCApplication-win32.cpp - cocos/platform/win32/CCCanvasRenderingContext2D-win32.cpp - cocos/platform/win32/CCDevice-win32.cpp - cocos/platform/win32/CCFileUtils-win32.cpp - cocos/platform/win32/CCFileUtils-win32.h - cocos/platform/win32/CCUtils-win32.cpp - cocos/platform/win32/CCUtils-win32.h + cocos/platform/win32/Application-win32.cpp + cocos/platform/win32/CanvasRenderingContext2D-win32.cpp + cocos/platform/win32/Device-win32.cpp + cocos/platform/win32/FileUtils-win32.cpp + cocos/platform/win32/FileUtils-win32.h + cocos/platform/win32/Utils-win32.cpp + cocos/platform/win32/Utils-win32.h cocos/platform/win32/View-win32.cpp cocos/platform/win32/View-win32.h cocos/platform/win32/compat @@ -409,13 +409,13 @@ if(WINDOWS) ) elseif(ANDROID) cocos_source_files( - cocos/platform/android/CCApplication-android.cpp - cocos/platform/android/CCCanvasRenderingContext2D-android.cpp - cocos/platform/android/CCDevice-android.cpp - cocos/platform/android/CCFileUtils-android.cpp - cocos/platform/android/CCFileUtils-android.h - cocos/platform/android/CCView.cpp - cocos/platform/android/CCView.h + cocos/platform/android/Application-android.cpp + cocos/platform/android/CanvasRenderingContext2D-android.cpp + cocos/platform/android/Device-android.cpp + cocos/platform/android/FileUtils-android.cpp + cocos/platform/android/FileUtils-android.h + cocos/platform/android/View.cpp + cocos/platform/android/View.h cocos/platform/android/jni/JniHelper.cpp cocos/platform/android/jni/JniHelper.h cocos/platform/android/jni/JniImp.cpp @@ -423,32 +423,32 @@ elseif(ANDROID) ) elseif(APPLE) cocos_source_files( - cocos/platform/apple/CCFileUtils-apple.h - cocos/platform/apple/CCDevice-apple.mm - cocos/platform/apple/CCFileUtils-apple.mm - cocos/platform/apple/CCCanvasRenderingContext2D-apple.mm - cocos/platform/apple/CCDevice-apple.h + cocos/platform/apple/FileUtils-apple.h + cocos/platform/apple/Device-apple.mm + cocos/platform/apple/FileUtils-apple.mm + cocos/platform/apple/CanvasRenderingContext2D-apple.mm + cocos/platform/apple/Device-apple.h ) #bad struct cocos_source_files( - cocos/platform/ios/CCReachability.h - cocos/platform/ios/CCReachability.cpp + cocos/platform/ios/Reachability.h + cocos/platform/ios/Reachability.cpp ) if(MACOSX) cocos_source_files( - cocos/platform/mac/CCView.h - cocos/platform/mac/CCKeyCodeHelper.h - cocos/platform/mac/CCView.mm - cocos/platform/mac/CCDevice-mac.mm - cocos/platform/mac/CCApplication-mac.mm - cocos/platform/mac/CCKeyCodeHelper.cpp + cocos/platform/mac/View.h + cocos/platform/mac/KeyCodeHelper.h + cocos/platform/mac/View.mm + cocos/platform/mac/Device-mac.mm + cocos/platform/mac/Application-mac.mm + cocos/platform/mac/KeyCodeHelper.cpp ) elseif(IOS) cocos_source_files( - cocos/platform/ios/CCView.h - cocos/platform/ios/CCView.mm - cocos/platform/ios/CCApplication-ios.mm - cocos/platform/ios/CCDevice-ios.mm + cocos/platform/ios/View.h + cocos/platform/ios/View.mm + cocos/platform/ios/Application-ios.mm + cocos/platform/ios/Device-ios.mm ) endif() endif() @@ -496,8 +496,8 @@ cocos_source_files( cocos/renderer/core/gfx/GFXTexture.h cocos/renderer/core/gfx/GFXFence.h cocos/renderer/core/gfx/GFXFence.cc - cocos/renderer/core/math/CCCoreMath.cc - cocos/renderer/core/math/CCCoreMath.h + cocos/renderer/core/math/CoreMath.cc + cocos/renderer/core/math/CoreMath.h cocos/renderer/pipeline/BatchedBuffer.cpp cocos/renderer/pipeline/BatchedBuffer.h cocos/renderer/pipeline/Define.h @@ -1042,10 +1042,10 @@ endif() cocos_source_files( extensions/assets-manager/AssetsManagerEx.cpp extensions/assets-manager/AssetsManagerEx.h - extensions/assets-manager/CCAsyncTaskPool.cpp - extensions/assets-manager/CCAsyncTaskPool.h - extensions/assets-manager/CCEventAssetsManagerEx.cpp - extensions/assets-manager/CCEventAssetsManagerEx.h + extensions/assets-manager/AsyncTaskPool.cpp + extensions/assets-manager/AsyncTaskPool.h + extensions/assets-manager/EventAssetsManagerEx.cpp + extensions/assets-manager/EventAssetsManagerEx.h extensions/assets-manager/Manifest.cpp extensions/assets-manager/Manifest.h extensions/cocos-ext.h diff --git a/native/cocos/audio/AudioEngine.cpp b/native/cocos/audio/AudioEngine.cpp index 09cfd2ddb5..ed74cf317e 100644 --- a/native/cocos/audio/AudioEngine.cpp +++ b/native/cocos/audio/AudioEngine.cpp @@ -24,8 +24,8 @@ ****************************************************************************/ #include "audio/include/AudioEngine.h" -#include "platform/CCFileUtils.h" -#include "base/ccUtils.h" +#include "platform/FileUtils.h" +#include "base/Utils.h" #include "base/Log.h" #include diff --git a/native/cocos/audio/android/AudioDecoder.h b/native/cocos/audio/android/AudioDecoder.h index 063ec5ad59..4a9fb1e2e7 100644 --- a/native/cocos/audio/android/AudioDecoder.h +++ b/native/cocos/audio/android/AudioDecoder.h @@ -27,7 +27,7 @@ THE SOFTWARE. #include "audio/android/OpenSLHelper.h" #include "audio/android/PcmData.h" -#include "base/CCData.h" +#include "base/Data.h" namespace cc { diff --git a/native/cocos/audio/android/AudioDecoderMp3.cpp b/native/cocos/audio/android/AudioDecoderMp3.cpp index 4db267ff84..8ce265108e 100644 --- a/native/cocos/audio/android/AudioDecoderMp3.cpp +++ b/native/cocos/audio/android/AudioDecoderMp3.cpp @@ -27,7 +27,7 @@ THE SOFTWARE. #include "audio/android/AudioDecoderMp3.h" #include "audio/android/mp3reader.h" -#include "platform/CCFileUtils.h" +#include "platform/FileUtils.h" namespace cc { diff --git a/native/cocos/audio/android/AudioDecoderOgg.cpp b/native/cocos/audio/android/AudioDecoderOgg.cpp index 4afa247760..25baaf03b6 100644 --- a/native/cocos/audio/android/AudioDecoderOgg.cpp +++ b/native/cocos/audio/android/AudioDecoderOgg.cpp @@ -26,7 +26,7 @@ THE SOFTWARE. #define LOG_TAG "AudioDecoderOgg" #include "audio/android/AudioDecoderOgg.h" -#include "platform/CCFileUtils.h" +#include "platform/FileUtils.h" namespace cc { diff --git a/native/cocos/audio/android/AudioDecoderProvider.cpp b/native/cocos/audio/android/AudioDecoderProvider.cpp index 27c170ea6a..4da3e2242b 100644 --- a/native/cocos/audio/android/AudioDecoderProvider.cpp +++ b/native/cocos/audio/android/AudioDecoderProvider.cpp @@ -30,7 +30,7 @@ #include "audio/android/AudioDecoderOgg.h" #include "audio/android/AudioDecoderMp3.h" #include "audio/android/AudioDecoderWav.h" -#include "platform/CCFileUtils.h" +#include "platform/FileUtils.h" namespace cc { diff --git a/native/cocos/audio/android/AudioDecoderSLES.cpp b/native/cocos/audio/android/AudioDecoderSLES.cpp index 18034ab7c8..09878d78c1 100644 --- a/native/cocos/audio/android/AudioDecoderSLES.cpp +++ b/native/cocos/audio/android/AudioDecoderSLES.cpp @@ -26,7 +26,7 @@ THE SOFTWARE. #define LOG_TAG "AudioDecoderSLES" #include "audio/android/AudioDecoderSLES.h" -#include "platform/CCFileUtils.h" +#include "platform/FileUtils.h" #include #include diff --git a/native/cocos/audio/android/AudioDecoderWav.cpp b/native/cocos/audio/android/AudioDecoderWav.cpp index bb5ddf4d90..7b5a3feffb 100644 --- a/native/cocos/audio/android/AudioDecoderWav.cpp +++ b/native/cocos/audio/android/AudioDecoderWav.cpp @@ -27,7 +27,7 @@ THE SOFTWARE. #include "audio/android/AudioDecoderWav.h" #include "audio/android/tinysndfile.h" -#include "platform/CCFileUtils.h" +#include "platform/FileUtils.h" #include diff --git a/native/cocos/audio/android/AudioEngine-inl.cpp b/native/cocos/audio/android/AudioEngine-inl.cpp index 2ae2e29683..ce367ea4df 100644 --- a/native/cocos/audio/android/AudioEngine-inl.cpp +++ b/native/cocos/audio/android/AudioEngine-inl.cpp @@ -39,10 +39,10 @@ #include #include "audio/include/AudioEngine.h" -#include "platform/CCApplication.h" -#include "base/CCScheduler.h" -#include "base/ccUTF8.h" -#include "platform/android/CCFileUtils-android.h" +#include "platform/Application.h" +#include "base/Scheduler.h" +#include "base/UTF8.h" +#include "platform/android/FileUtils-android.h" #include "platform/android/jni/JniImp.h" #include "platform/android/jni/JniHelper.h" diff --git a/native/cocos/audio/android/AudioEngine-inl.h b/native/cocos/audio/android/AudioEngine-inl.h index 818f3e9dc2..be6ddf0a3f 100644 --- a/native/cocos/audio/android/AudioEngine-inl.h +++ b/native/cocos/audio/android/AudioEngine-inl.h @@ -33,8 +33,8 @@ #include #include -#include "base/CCRef.h" -#include "base/ccUtils.h" +#include "base/Ref.h" +#include "base/Utils.h" #define MAX_AUDIOINSTANCES 13 diff --git a/native/cocos/audio/android/AudioPlayerProvider.cpp b/native/cocos/audio/android/AudioPlayerProvider.cpp index 1bb3a73bf0..c311930cf3 100644 --- a/native/cocos/audio/android/AudioPlayerProvider.cpp +++ b/native/cocos/audio/android/AudioPlayerProvider.cpp @@ -25,7 +25,7 @@ THE SOFTWARE. #define LOG_TAG "AudioPlayerProvider" -#include "base/CCThreadPool.h" +#include "base/ThreadPool.h" #include "audio/android/AudioPlayerProvider.h" #include "audio/android/UrlAudioPlayer.h" #include "audio/android/PcmAudioPlayer.h" diff --git a/native/cocos/audio/apple/AudioCache.h b/native/cocos/audio/apple/AudioCache.h index b951484aa7..455daca91b 100644 --- a/native/cocos/audio/apple/AudioCache.h +++ b/native/cocos/audio/apple/AudioCache.h @@ -33,7 +33,7 @@ #include #include -#include "base/ccMacros.h" +#include "base/Macros.h" #include "audio/apple/AudioMacros.h" namespace cc { diff --git a/native/cocos/audio/apple/AudioCache.mm b/native/cocos/audio/apple/AudioCache.mm index 1f85e682c7..1679200d2e 100644 --- a/native/cocos/audio/apple/AudioCache.mm +++ b/native/cocos/audio/apple/AudioCache.mm @@ -32,8 +32,8 @@ #import #import #include -#include "platform/CCApplication.h" -#include "base/CCScheduler.h" +#include "platform/Application.h" +#include "base/Scheduler.h" #include "audio/apple/AudioDecoder.h" diff --git a/native/cocos/audio/apple/AudioEngine-inl.h b/native/cocos/audio/apple/AudioEngine-inl.h index 3b18fec56d..75529c43cc 100644 --- a/native/cocos/audio/apple/AudioEngine-inl.h +++ b/native/cocos/audio/apple/AudioEngine-inl.h @@ -31,7 +31,7 @@ #include #include -#include "base/CCRef.h" +#include "base/Ref.h" #include "audio/apple/AudioCache.h" #include "audio/apple/AudioPlayer.h" diff --git a/native/cocos/audio/apple/AudioEngine-inl.mm b/native/cocos/audio/apple/AudioEngine-inl.mm index 56c5c95c08..5763fb2c77 100644 --- a/native/cocos/audio/apple/AudioEngine-inl.mm +++ b/native/cocos/audio/apple/AudioEngine-inl.mm @@ -37,10 +37,10 @@ #endif #include "audio/include/AudioEngine.h" -#include "platform/CCFileUtils.h" -#include "platform/CCApplication.h" -#include "base/CCScheduler.h" -#include "base/ccUtils.h" +#include "platform/FileUtils.h" +#include "platform/Application.h" +#include "base/Scheduler.h" +#include "base/Utils.h" using namespace cc; diff --git a/native/cocos/audio/apple/AudioPlayer.h b/native/cocos/audio/apple/AudioPlayer.h index dbce20c9d2..ff5587bae6 100644 --- a/native/cocos/audio/apple/AudioPlayer.h +++ b/native/cocos/audio/apple/AudioPlayer.h @@ -28,7 +28,7 @@ #if CC_PLATFORM == CC_PLATFORM_MAC_IOS || CC_PLATFORM == CC_PLATFORM_MAC_OSX -#include "base/ccMacros.h" +#include "base/Macros.h" #include "audio/apple/AudioMacros.h" #include diff --git a/native/cocos/audio/apple/AudioPlayer.mm b/native/cocos/audio/apple/AudioPlayer.mm index 75fdf2a342..8cc6050456 100644 --- a/native/cocos/audio/apple/AudioPlayer.mm +++ b/native/cocos/audio/apple/AudioPlayer.mm @@ -32,7 +32,7 @@ #include "audio/apple/AudioPlayer.h" #include "audio/apple/AudioCache.h" -#include "platform/CCFileUtils.h" +#include "platform/FileUtils.h" #include "audio/apple/AudioDecoder.h" #ifdef VERY_VERY_VERBOSE_LOGGING diff --git a/native/cocos/audio/include/AudioEngine.h b/native/cocos/audio/include/AudioEngine.h index 14c04463b3..002f861776 100644 --- a/native/cocos/audio/include/AudioEngine.h +++ b/native/cocos/audio/include/AudioEngine.h @@ -26,7 +26,7 @@ #pragma once -#include "base/ccMacros.h" +#include "base/Macros.h" #include "audio/include/Export.h" #include "scripting/js-bindings/event/EventDispatcher.h" diff --git a/native/cocos/audio/win32/AudioCache.cpp b/native/cocos/audio/win32/AudioCache.cpp index 7977ab7877..7b18c61dad 100644 --- a/native/cocos/audio/win32/AudioCache.cpp +++ b/native/cocos/audio/win32/AudioCache.cpp @@ -31,8 +31,8 @@ #include "audio/win32/AudioCache.h" #include -#include "platform/CCApplication.h" -#include "base/CCScheduler.h" +#include "platform/Application.h" +#include "base/Scheduler.h" #include "audio/win32/AudioDecoderManager.h" #include "audio/win32/AudioDecoder.h" diff --git a/native/cocos/audio/win32/AudioCache.h b/native/cocos/audio/win32/AudioCache.h index d5314d0716..b987700a58 100644 --- a/native/cocos/audio/win32/AudioCache.h +++ b/native/cocos/audio/win32/AudioCache.h @@ -39,7 +39,7 @@ #else #include #endif -#include "base/ccMacros.h" +#include "base/Macros.h" #include "audio/win32/AudioMacros.h" namespace cc { diff --git a/native/cocos/audio/win32/AudioDecoder.cpp b/native/cocos/audio/win32/AudioDecoder.cpp index 394388918c..fb7650290e 100644 --- a/native/cocos/audio/win32/AudioDecoder.cpp +++ b/native/cocos/audio/win32/AudioDecoder.cpp @@ -25,7 +25,7 @@ #include "audio/win32/AudioDecoder.h" #include "audio/win32/AudioMacros.h" -#include "platform/CCFileUtils.h" +#include "platform/FileUtils.h" #define LOG_TAG "AudioDecoder" diff --git a/native/cocos/audio/win32/AudioDecoderManager.cpp b/native/cocos/audio/win32/AudioDecoderManager.cpp index 5568f13c73..400950c223 100644 --- a/native/cocos/audio/win32/AudioDecoderManager.cpp +++ b/native/cocos/audio/win32/AudioDecoderManager.cpp @@ -29,7 +29,7 @@ THE SOFTWARE. #include "audio/win32/AudioDecoderOgg.h" #include "audio/win32/AudioDecoderMp3.h" #include "audio/win32/AudioMacros.h" -#include "platform/CCFileUtils.h" +#include "platform/FileUtils.h" #include "mpg123/mpg123.h" namespace cc { diff --git a/native/cocos/audio/win32/AudioDecoderMp3.cpp b/native/cocos/audio/win32/AudioDecoderMp3.cpp index b46a45bff8..37f43cc222 100644 --- a/native/cocos/audio/win32/AudioDecoderMp3.cpp +++ b/native/cocos/audio/win32/AudioDecoderMp3.cpp @@ -25,7 +25,7 @@ #include "audio/win32/AudioDecoderMp3.h" #include "audio/win32/AudioMacros.h" -#include "platform/CCFileUtils.h" +#include "platform/FileUtils.h" #include "mpg123/mpg123.h" diff --git a/native/cocos/audio/win32/AudioDecoderOgg.cpp b/native/cocos/audio/win32/AudioDecoderOgg.cpp index dc8a8c0da0..491f09806c 100644 --- a/native/cocos/audio/win32/AudioDecoderOgg.cpp +++ b/native/cocos/audio/win32/AudioDecoderOgg.cpp @@ -25,7 +25,7 @@ #include "audio/win32/AudioDecoderOgg.h" #include "audio/win32/AudioMacros.h" -#include "platform/CCFileUtils.h" +#include "platform/FileUtils.h" #define LOG_TAG "AudioDecoderOgg" diff --git a/native/cocos/audio/win32/AudioEngine-win32.cpp b/native/cocos/audio/win32/AudioEngine-win32.cpp index 65d0254416..384bfe07b7 100644 --- a/native/cocos/audio/win32/AudioEngine-win32.cpp +++ b/native/cocos/audio/win32/AudioEngine-win32.cpp @@ -38,9 +38,9 @@ #include "OpenalSoft/alext.h" #endif #include "audio/include/AudioEngine.h" -#include "platform/CCApplication.h" -#include "base/CCScheduler.h" -#include "platform/CCFileUtils.h" +#include "platform/Application.h" +#include "base/Scheduler.h" +#include "platform/FileUtils.h" #include "audio/win32/AudioDecoderManager.h" #include diff --git a/native/cocos/audio/win32/AudioEngine-win32.h b/native/cocos/audio/win32/AudioEngine-win32.h index 86084ad434..64b9450db2 100644 --- a/native/cocos/audio/win32/AudioEngine-win32.h +++ b/native/cocos/audio/win32/AudioEngine-win32.h @@ -31,7 +31,7 @@ #include -#include "base/CCRef.h" +#include "base/Ref.h" #include "audio/win32/AudioCache.h" #include "audio/win32/AudioPlayer.h" diff --git a/native/cocos/audio/win32/AudioPlayer.cpp b/native/cocos/audio/win32/AudioPlayer.cpp index 7805aec636..8761a38282 100644 --- a/native/cocos/audio/win32/AudioPlayer.cpp +++ b/native/cocos/audio/win32/AudioPlayer.cpp @@ -30,7 +30,7 @@ #if CC_PLATFORM == CC_PLATFORM_WINDOWS #include "audio/win32/AudioPlayer.h" #include "audio/win32/AudioCache.h" -#include "platform/CCFileUtils.h" +#include "platform/FileUtils.h" #include "audio/win32/AudioDecoderManager.h" #include "audio/win32/Audiodecoder.h" diff --git a/native/cocos/audio/win32/AudioPlayer.h b/native/cocos/audio/win32/AudioPlayer.h index 79195f3f0b..9f13408273 100644 --- a/native/cocos/audio/win32/AudioPlayer.h +++ b/native/cocos/audio/win32/AudioPlayer.h @@ -38,7 +38,7 @@ #else #include #endif -#include "base/ccMacros.h" +#include "base/Macros.h" namespace cc { diff --git a/native/cocos/base/ccCArray.cpp b/native/cocos/base/Array.cpp similarity index 99% rename from native/cocos/base/ccCArray.cpp rename to native/cocos/base/Array.cpp index 10b39beabc..a510e87488 100644 --- a/native/cocos/base/ccCArray.cpp +++ b/native/cocos/base/Array.cpp @@ -25,7 +25,7 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. ****************************************************************************/ #include "base/Log.h" -#include "base/ccCArray.h" +#include "base/Array.h" namespace cc { diff --git a/native/cocos/base/ccCArray.h b/native/cocos/base/Array.h similarity index 99% rename from native/cocos/base/ccCArray.h rename to native/cocos/base/Array.h index defc590a80..82ab8e5c44 100644 --- a/native/cocos/base/ccCArray.h +++ b/native/cocos/base/Array.h @@ -45,8 +45,8 @@ THE SOFTWARE. #define CC_ARRAY_H /// @cond DO_NOT_SHOW -#include "base/ccMacros.h" -#include "base/CCRef.h" +#include "base/Macros.h" +#include "base/Ref.h" #include #include diff --git a/native/cocos/base/CCAutoreleasePool.cpp b/native/cocos/base/AutoreleasePool.cpp similarity index 99% rename from native/cocos/base/CCAutoreleasePool.cpp rename to native/cocos/base/AutoreleasePool.cpp index 93edaccee4..4ed8dbc13d 100644 --- a/native/cocos/base/CCAutoreleasePool.cpp +++ b/native/cocos/base/AutoreleasePool.cpp @@ -23,7 +23,7 @@ LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. ****************************************************************************/ -#include "base/CCAutoreleasePool.h" +#include "base/AutoreleasePool.h" #include "base/Log.h" namespace cc { diff --git a/native/cocos/base/CCAutoreleasePool.h b/native/cocos/base/AutoreleasePool.h similarity index 99% rename from native/cocos/base/CCAutoreleasePool.h rename to native/cocos/base/AutoreleasePool.h index 97f226fd14..00c19870eb 100644 --- a/native/cocos/base/CCAutoreleasePool.h +++ b/native/cocos/base/AutoreleasePool.h @@ -28,7 +28,7 @@ THE SOFTWARE. #include #include -#include "base/CCRef.h" +#include "base/Ref.h" /** * @addtogroup base diff --git a/native/cocos/base/ccConfig.h b/native/cocos/base/Config.h similarity index 100% rename from native/cocos/base/ccConfig.h rename to native/cocos/base/Config.h diff --git a/native/cocos/base/CCData.cpp b/native/cocos/base/Data.cpp similarity index 99% rename from native/cocos/base/CCData.cpp rename to native/cocos/base/Data.cpp index 57058bff75..e26789530e 100644 --- a/native/cocos/base/CCData.cpp +++ b/native/cocos/base/Data.cpp @@ -24,7 +24,7 @@ THE SOFTWARE. ****************************************************************************/ -#include "base/CCData.h" +#include "base/Data.h" #include "base/Log.h" namespace cc { diff --git a/native/cocos/base/CCData.h b/native/cocos/base/Data.h similarity index 99% rename from native/cocos/base/CCData.h rename to native/cocos/base/Data.h index b55f707229..8e5dd0b5ae 100644 --- a/native/cocos/base/CCData.h +++ b/native/cocos/base/Data.h @@ -27,7 +27,7 @@ #ifndef __CCDATA_H__ #define __CCDATA_H__ -#include "base/ccMacros.h" +#include "base/Macros.h" #include // for ssize_t on android #include // for ssize_t on linux diff --git a/native/cocos/base/Log.h b/native/cocos/base/Log.h index bf9bb08625..c946a6fceb 100755 --- a/native/cocos/base/Log.h +++ b/native/cocos/base/Log.h @@ -1,7 +1,7 @@ #ifndef CC_CORE_KERNEL_LOG_H_ #define CC_CORE_KERNEL_LOG_H_ -#include "ccMacros.h" +#include "Macros.h" #include namespace cc { diff --git a/native/cocos/base/ccMacros.h b/native/cocos/base/Macros.h similarity index 100% rename from native/cocos/base/ccMacros.h rename to native/cocos/base/Macros.h diff --git a/native/cocos/base/CCMap.h b/native/cocos/base/Map.h similarity index 99% rename from native/cocos/base/CCMap.h rename to native/cocos/base/Map.h index 27736db4e8..269e3d5a1d 100644 --- a/native/cocos/base/CCMap.h +++ b/native/cocos/base/Map.h @@ -35,8 +35,8 @@ #endif #include "base/Log.h" -#include "base/ccRandom.h" -#include "base/CCRef.h" +#include "base/Random.h" +#include "base/Ref.h" /** * @addtogroup base diff --git a/native/cocos/base/ccRandom.cpp b/native/cocos/base/Random.cpp similarity index 98% rename from native/cocos/base/ccRandom.cpp rename to native/cocos/base/Random.cpp index 57706b531d..97b35770cf 100644 --- a/native/cocos/base/ccRandom.cpp +++ b/native/cocos/base/Random.cpp @@ -24,4 +24,4 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. ****************************************************************************/ -#include "base/ccRandom.h" +#include "base/Random.h" diff --git a/native/cocos/base/ccRandom.h b/native/cocos/base/Random.h similarity index 99% rename from native/cocos/base/ccRandom.h rename to native/cocos/base/Random.h index 1479d25e2e..7b2b2c035f 100644 --- a/native/cocos/base/ccRandom.h +++ b/native/cocos/base/Random.h @@ -30,7 +30,7 @@ THE SOFTWARE. #include #include -#include "base/ccMacros.h" +#include "base/Macros.h" /** * @addtogroup base diff --git a/native/cocos/base/CCRef.cpp b/native/cocos/base/Ref.cpp similarity index 98% rename from native/cocos/base/CCRef.cpp rename to native/cocos/base/Ref.cpp index facf5f311b..7d25c06202 100644 --- a/native/cocos/base/CCRef.cpp +++ b/native/cocos/base/Ref.cpp @@ -24,9 +24,9 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. ****************************************************************************/ -#include "base/CCRef.h" -#include "base/CCAutoreleasePool.h" -#include "base/ccMacros.h" +#include "base/Ref.h" +#include "base/AutoreleasePool.h" +#include "base/Macros.h" #if CC_REF_LEAK_DETECTION #include // std::find diff --git a/native/cocos/base/CCRef.h b/native/cocos/base/Ref.h similarity index 98% rename from native/cocos/base/CCRef.h rename to native/cocos/base/Ref.h index fb9969cb25..ba0c5d5882 100644 --- a/native/cocos/base/CCRef.h +++ b/native/cocos/base/Ref.h @@ -27,8 +27,8 @@ THE SOFTWARE. #ifndef __BASE_CCREF_H__ #define __BASE_CCREF_H__ -#include "base/ccMacros.h" -#include "base/ccConfig.h" +#include "base/Macros.h" +#include "base/Config.h" #define CC_REF_LEAK_DETECTION 0 diff --git a/native/cocos/base/CCScheduler.cpp b/native/cocos/base/Scheduler.cpp similarity index 99% rename from native/cocos/base/CCScheduler.cpp rename to native/cocos/base/Scheduler.cpp index 1ecdf5ddf3..254bd4c572 100644 --- a/native/cocos/base/CCScheduler.cpp +++ b/native/cocos/base/Scheduler.cpp @@ -25,10 +25,10 @@ LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. ****************************************************************************/ -#include "base/CCScheduler.h" -#include "base/ccMacros.h" +#include "base/Scheduler.h" +#include "base/Macros.h" #include "base/utlist.h" -#include "base/ccCArray.h" +#include "base/Array.h" #define CC_REPEAT_FOREVER (UINT_MAX -1) diff --git a/native/cocos/base/CCScheduler.h b/native/cocos/base/Scheduler.h similarity index 99% rename from native/cocos/base/CCScheduler.h rename to native/cocos/base/Scheduler.h index c9422fd4e6..2b7b773cf4 100644 --- a/native/cocos/base/CCScheduler.h +++ b/native/cocos/base/Scheduler.h @@ -31,8 +31,8 @@ THE SOFTWARE. #include #include -#include "base/CCRef.h" -#include "base/CCVector.h" +#include "base/Ref.h" +#include "base/Vector.h" #include "base/uthash.h" namespace cc { diff --git a/native/cocos/base/StringUtil.h b/native/cocos/base/StringUtil.h index 417770ff4f..83dffac04e 100755 --- a/native/cocos/base/StringUtil.h +++ b/native/cocos/base/StringUtil.h @@ -1,7 +1,7 @@ #ifndef CC_CORE_KERNEL_UTIL_STRING_UTIL_H_ #define CC_CORE_KERNEL_UTIL_STRING_UTIL_H_ -#include "ccMacros.h" +#include "Macros.h" #include "TypeDef.h" namespace cc { diff --git a/native/cocos/base/CCThreadPool.cpp b/native/cocos/base/ThreadPool.cpp similarity index 99% rename from native/cocos/base/CCThreadPool.cpp rename to native/cocos/base/ThreadPool.cpp index 82fc3f2ba8..abc9ebba8c 100644 --- a/native/cocos/base/CCThreadPool.cpp +++ b/native/cocos/base/ThreadPool.cpp @@ -25,8 +25,8 @@ ****************************************************************************/ -#include "base/CCThreadPool.h" -#include "platform/CCStdC.h" +#include "base/ThreadPool.h" +#include "platform/StdC.h" #include #include diff --git a/native/cocos/base/CCThreadPool.h b/native/cocos/base/ThreadPool.h similarity index 99% rename from native/cocos/base/CCThreadPool.h rename to native/cocos/base/ThreadPool.h index c39b3e6240..c8593fd3b7 100644 --- a/native/cocos/base/CCThreadPool.h +++ b/native/cocos/base/ThreadPool.h @@ -26,7 +26,7 @@ ****************************************************************************/ #pragma once -#include "base/ccUtils.h" +#include "base/Utils.h" #include #include diff --git a/native/cocos/base/ccUTF8.cpp b/native/cocos/base/UTF8.cpp similarity index 99% rename from native/cocos/base/ccUTF8.cpp rename to native/cocos/base/UTF8.cpp index b85bea2665..97c5fabc6b 100644 --- a/native/cocos/base/ccUTF8.cpp +++ b/native/cocos/base/UTF8.cpp @@ -24,7 +24,7 @@ THE SOFTWARE. ****************************************************************************/ -#include "base/ccUTF8.h" +#include "base/UTF8.h" #include "base/Log.h" #include "ConvertUTF/ConvertUTF.h" diff --git a/native/cocos/base/ccUTF8.h b/native/cocos/base/UTF8.h similarity index 99% rename from native/cocos/base/ccUTF8.h rename to native/cocos/base/UTF8.h index 5f205260ac..2f79e5e853 100644 --- a/native/cocos/base/ccUTF8.h +++ b/native/cocos/base/UTF8.h @@ -27,7 +27,7 @@ #ifndef __cocos2dx__ccUTF8__ #define __cocos2dx__ccUTF8__ -#include "base/ccMacros.h" +#include "base/Macros.h" #include #include #include diff --git a/native/cocos/base/UTFString.h b/native/cocos/base/UTFString.h index 7c6f7afc39..c61afcdea8 100755 --- a/native/cocos/base/UTFString.h +++ b/native/cocos/base/UTFString.h @@ -1,7 +1,7 @@ #ifndef CC_CORE_KERNEL_UTF_STRING_H_ #define CC_CORE_KERNEL_UTF_STRING_H_ -#include "ccMacros.h" +#include "Macros.h" #include "memory/StlAlloc.h" #if (CC_COMPILER == CC_COMPILER_MSVC && (CC_COMPILER_VERSION >= 70 && CC_COMPILER_VERSION < 100)) diff --git a/native/cocos/base/ccUtils.cpp b/native/cocos/base/Utils.cpp similarity index 97% rename from native/cocos/base/ccUtils.cpp rename to native/cocos/base/Utils.cpp index 71348819f6..561a1c64a2 100644 --- a/native/cocos/base/ccUtils.cpp +++ b/native/cocos/base/Utils.cpp @@ -24,9 +24,9 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. ****************************************************************************/ -#include "base/ccUtils.h" +#include "base/Utils.h" #include "base/base64.h" -#include "platform/CCFileUtils.h" +#include "platform/FileUtils.h" #if CC_PLATFORM == CC_PLATFORM_MAC_IOS || CC_PLATFORM == CC_PLATFORM_MAC_OSX #include diff --git a/native/cocos/base/ccUtils.h b/native/cocos/base/Utils.h similarity index 98% rename from native/cocos/base/ccUtils.h rename to native/cocos/base/Utils.h index 372747e2fe..8bbd32ee08 100644 --- a/native/cocos/base/ccUtils.h +++ b/native/cocos/base/Utils.h @@ -27,7 +27,7 @@ THE SOFTWARE. #include #include -#include "base/ccMacros.h" +#include "base/Macros.h" /** @file ccUtils.h Misc free functions diff --git a/native/cocos/base/CCValue.cpp b/native/cocos/base/Value.cpp similarity index 99% rename from native/cocos/base/CCValue.cpp rename to native/cocos/base/Value.cpp index 9c14ea8841..4308a01fae 100644 --- a/native/cocos/base/CCValue.cpp +++ b/native/cocos/base/Value.cpp @@ -23,8 +23,8 @@ THE SOFTWARE. ****************************************************************************/ -#include "base/CCValue.h" -#include "base/ccUtils.h" +#include "base/Value.h" +#include "base/Utils.h" #include #include diff --git a/native/cocos/base/CCValue.h b/native/cocos/base/Value.h similarity index 99% rename from native/cocos/base/CCValue.h rename to native/cocos/base/Value.h index 70299bd153..ee7599246b 100644 --- a/native/cocos/base/CCValue.h +++ b/native/cocos/base/Value.h @@ -24,7 +24,7 @@ ****************************************************************************/ #pragma once -#include "base/ccMacros.h" +#include "base/Macros.h" #include "base/memory/StlAlloc.h" namespace cc { diff --git a/native/cocos/base/CCVector.h b/native/cocos/base/Vector.h similarity index 99% rename from native/cocos/base/CCVector.h rename to native/cocos/base/Vector.h index 2bf528ddfc..29f6257893 100644 --- a/native/cocos/base/CCVector.h +++ b/native/cocos/base/Vector.h @@ -30,9 +30,9 @@ THE SOFTWARE. #include #include // for std::find -#include "base/ccMacros.h" -#include "base/ccRandom.h" -#include "base/CCRef.h" +#include "base/Macros.h" +#include "base/Random.h" +#include "base/Ref.h" #include "base/Log.h" /** diff --git a/native/cocos/base/ZipUtils.cpp b/native/cocos/base/ZipUtils.cpp index 51b75094c9..85c5121c48 100644 --- a/native/cocos/base/ZipUtils.cpp +++ b/native/cocos/base/ZipUtils.cpp @@ -37,8 +37,8 @@ #include #include -#include "base/CCData.h" -#include "platform/CCFileUtils.h" +#include "base/Data.h" +#include "platform/FileUtils.h" #include // IDEA: Other platforms should use upstream minizip like mingw-w64 diff --git a/native/cocos/base/ZipUtils.h b/native/cocos/base/ZipUtils.h index 20e1ff082f..94329dff99 100644 --- a/native/cocos/base/ZipUtils.h +++ b/native/cocos/base/ZipUtils.h @@ -28,15 +28,15 @@ THE SOFTWARE. #define __SUPPORT_ZIPUTILS_H__ /// @cond DO_NOT_SHOW -#include "base/ccMacros.h" -#include "platform/CCFileUtils.h" +#include "base/Macros.h" +#include "platform/FileUtils.h" #include #if (CC_PLATFORM == CC_PLATFORM_ANDROID) -#include "platform/android/CCFileUtils-android.h" +#include "platform/android/FileUtils-android.h" #elif(CC_PLATFORM == CC_PLATFORM_WINDOWS) || (CC_PLATFORM == CC_PLATFORM_WINRT) // for import ssize_t on win32 platform -#include "platform/CCStdC.h" +#include "platform/StdC.h" #endif /** diff --git a/native/cocos/base/base64.h b/native/cocos/base/base64.h index fb706883a6..7d5b6e9b53 100644 --- a/native/cocos/base/base64.h +++ b/native/cocos/base/base64.h @@ -28,7 +28,7 @@ THE SOFTWARE. #define __SUPPORT_BASE64_H__ /// @cond DO_NOT_SHOW -#include "base/ccMacros.h" +#include "base/Macros.h" #ifdef __cplusplus extern "C" { diff --git a/native/cocos/base/memory/AllocatedObj.h b/native/cocos/base/memory/AllocatedObj.h index c0a0438314..c2b02aa547 100755 --- a/native/cocos/base/memory/AllocatedObj.h +++ b/native/cocos/base/memory/AllocatedObj.h @@ -1,7 +1,7 @@ #ifndef CC_CORE_ALLOCATED_OBJ_H_ #define CC_CORE_ALLOCATED_OBJ_H_ -#include "../ccMacros.h" +#include "../Macros.h" // Anything that has done a #define new will screw operator new definitions up // so undefine diff --git a/native/cocos/base/memory/NedPooling.h b/native/cocos/base/memory/NedPooling.h index 3b8c87b792..0693b6e9a7 100755 --- a/native/cocos/base/memory/NedPooling.h +++ b/native/cocos/base/memory/NedPooling.h @@ -1,7 +1,7 @@ #ifndef CC_CORE_NED_POOLING_H_ #define CC_CORE_NED_POOLING_H_ -#include "base/ccMacros.h" +#include "base/Macros.h" #if (CC_MEMORY_ALLOCATOR == CC_MEMORY_ALLOCATOR_NEDPOOLING) diff --git a/native/cocos/base/memory/StdAlloc.h b/native/cocos/base/memory/StdAlloc.h index b0145ba14b..c8f1298aea 100755 --- a/native/cocos/base/memory/StdAlloc.h +++ b/native/cocos/base/memory/StdAlloc.h @@ -3,7 +3,7 @@ #if (CC_MEMORY_ALLOCATOR == CC_MEMORY_ALLOCATOR_STD) -#include "base/ccMacros.h" +#include "base/Macros.h" #include #include diff --git a/native/cocos/cocos2d.cpp b/native/cocos/cocos2d.cpp index f724ce952b..ae4358b7a6 100644 --- a/native/cocos/cocos2d.cpp +++ b/native/cocos/cocos2d.cpp @@ -26,7 +26,7 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. ****************************************************************************/ -#include "base/ccMacros.h" +#include "base/Macros.h" namespace cc { diff --git a/native/cocos/cocos2d.h b/native/cocos/cocos2d.h index 076289da31..5b887a0a7d 100644 --- a/native/cocos/cocos2d.h +++ b/native/cocos/cocos2d.h @@ -36,26 +36,26 @@ THE SOFTWARE. // // all cocos2d include files // -#include "base/ccConfig.h" +#include "base/Config.h" // base -#include "base/CCAutoreleasePool.h" -#include "base/CCData.h" -#include "base/CCMap.h" -#include "base/CCRef.h" -#include "base/CCValue.h" -#include "base/CCVector.h" +#include "base/AutoreleasePool.h" +#include "base/Data.h" +#include "base/Map.h" +#include "base/Ref.h" +#include "base/Value.h" +#include "base/Vector.h" #include "base/ZipUtils.h" #include "base/base64.h" -#include "base/ccConfig.h" -#include "base/ccMacros.h" -#include "base/ccUTF8.h" -#include "base/ccUtils.h" +#include "base/Config.h" +#include "base/Macros.h" +#include "base/UTF8.h" +#include "base/Utils.h" // math -#include "math/CCGeometry.h" -#include "math/CCVertex.h" +#include "math/Geometry.h" +#include "math/Vertex.h" #include "math/Mat4.h" #include "math/MathUtil.h" #include "math/Quaternion.h" @@ -69,12 +69,12 @@ THE SOFTWARE. // renderer // platform -#include "platform/CCDevice.h" -#include "platform/CCFileUtils.h" -#include "platform/CCImage.h" -#include "base/ccMacros.h" -#include "platform/CCSAXParser.h" -#include "platform/CCCanvasRenderingContext2D.h" +#include "platform/Device.h" +#include "platform/FileUtils.h" +#include "platform/Image.h" +#include "base/Macros.h" +#include "platform/SAXParser.h" +#include "platform/CanvasRenderingContext2D.h" namespace cc { diff --git a/native/cocos/math/CCGeometry.cpp b/native/cocos/math/Geometry.cpp similarity index 99% rename from native/cocos/math/CCGeometry.cpp rename to native/cocos/math/Geometry.cpp index 8c8ac66c7a..215a8ba705 100644 --- a/native/cocos/math/CCGeometry.cpp +++ b/native/cocos/math/Geometry.cpp @@ -24,11 +24,11 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. ****************************************************************************/ -#include "math/CCGeometry.h" +#include "math/Geometry.h" #include #include -#include "base/ccMacros.h" +#include "base/Macros.h" // implementation of Vec2 namespace cc { diff --git a/native/cocos/math/CCGeometry.h b/native/cocos/math/Geometry.h similarity index 99% rename from native/cocos/math/CCGeometry.h rename to native/cocos/math/Geometry.h index 412599cee4..dcac3b0540 100644 --- a/native/cocos/math/CCGeometry.h +++ b/native/cocos/math/Geometry.h @@ -27,8 +27,8 @@ THE SOFTWARE. #ifndef __MATH_CCGEOMETRY_H__ #define __MATH_CCGEOMETRY_H__ -#include "base/ccMacros.h" -#include "math/CCMath.h" +#include "base/Macros.h" +#include "math/Math.h" /** * @addtogroup base diff --git a/native/cocos/math/Mat3.cpp b/native/cocos/math/Mat3.cpp index 871cde51bc..8dd8a05cd3 100644 --- a/native/cocos/math/Mat3.cpp +++ b/native/cocos/math/Mat3.cpp @@ -27,7 +27,7 @@ #include #include "math/Quaternion.h" #include "math/MathUtil.h" -#include "base/ccMacros.h" +#include "base/Macros.h" NS_CC_MATH_BEGIN diff --git a/native/cocos/math/Mat3.h b/native/cocos/math/Mat3.h index 098087f445..0920558b4a 100644 --- a/native/cocos/math/Mat3.h +++ b/native/cocos/math/Mat3.h @@ -27,7 +27,7 @@ #define MATRIX3_SIZE ( sizeof(float) * 9) -#include "base/ccMacros.h" +#include "base/Macros.h" #include "math/Vec2.h" #include "math/Vec3.h" diff --git a/native/cocos/math/Mat4.h b/native/cocos/math/Mat4.h index 1367f27ebd..56fb55edf5 100644 --- a/native/cocos/math/Mat4.h +++ b/native/cocos/math/Mat4.h @@ -23,7 +23,7 @@ #ifndef MATH_MAT4_H #define MATH_MAT4_H -#include "base/ccMacros.h" +#include "base/Macros.h" #include "math/Vec3.h" #include "math/Vec4.h" diff --git a/native/cocos/math/CCMath.h b/native/cocos/math/Math.h similarity index 100% rename from native/cocos/math/CCMath.h rename to native/cocos/math/Math.h diff --git a/native/cocos/math/CCMathBase.h b/native/cocos/math/MathBase.h similarity index 99% rename from native/cocos/math/CCMathBase.h rename to native/cocos/math/MathBase.h index d6e3ee3b18..adf8f2202d 100644 --- a/native/cocos/math/CCMathBase.h +++ b/native/cocos/math/MathBase.h @@ -28,7 +28,7 @@ #include #include -#include "base/ccMacros.h" +#include "base/Macros.h" /** * @addtogroup base * @{ diff --git a/native/cocos/math/MathUtil.cpp b/native/cocos/math/MathUtil.cpp index 494f87d1cc..ccc0492884 100644 --- a/native/cocos/math/MathUtil.cpp +++ b/native/cocos/math/MathUtil.cpp @@ -21,7 +21,7 @@ This file was modified to fit the cocos2d-x project */ #include "math/MathUtil.h" -#include "base/ccMacros.h" +#include "base/Macros.h" #if (CC_PLATFORM == CC_PLATFORM_ANDROID) #include diff --git a/native/cocos/math/MathUtil.h b/native/cocos/math/MathUtil.h index 599d1ca1d7..87c28e4a8b 100644 --- a/native/cocos/math/MathUtil.h +++ b/native/cocos/math/MathUtil.h @@ -27,7 +27,7 @@ #include #endif -#include "math/CCMathBase.h" +#include "math/MathBase.h" /** * @addtogroup base diff --git a/native/cocos/math/Quaternion.cpp b/native/cocos/math/Quaternion.cpp index c6e4efc17e..89d5b46b55 100644 --- a/native/cocos/math/Quaternion.cpp +++ b/native/cocos/math/Quaternion.cpp @@ -23,7 +23,7 @@ #include "math/Quaternion.h" #include -#include "base/ccMacros.h" +#include "base/Macros.h" NS_CC_MATH_BEGIN diff --git a/native/cocos/math/Vec2.cpp b/native/cocos/math/Vec2.cpp index 9fee1f899d..4f5c59af16 100644 --- a/native/cocos/math/Vec2.cpp +++ b/native/cocos/math/Vec2.cpp @@ -22,7 +22,7 @@ #include "math/Vec2.h" #include "math/MathUtil.h" -#include "base/ccMacros.h" +#include "base/Macros.h" NS_CC_MATH_BEGIN diff --git a/native/cocos/math/Vec2.h b/native/cocos/math/Vec2.h index 7e7d9ee9d7..32c2dc3795 100644 --- a/native/cocos/math/Vec2.h +++ b/native/cocos/math/Vec2.h @@ -26,7 +26,7 @@ #include #include #include -#include "math/CCMathBase.h" +#include "math/MathBase.h" /** * @addtogroup base diff --git a/native/cocos/math/Vec3.cpp b/native/cocos/math/Vec3.cpp index 2180cd8ee2..43ba243838 100644 --- a/native/cocos/math/Vec3.cpp +++ b/native/cocos/math/Vec3.cpp @@ -23,7 +23,7 @@ #include "math/Vec3.h" #include "math/Mat3.h" #include "math/MathUtil.h" -#include "base/ccMacros.h" +#include "base/Macros.h" #include "math/Quaternion.h" NS_CC_MATH_BEGIN diff --git a/native/cocos/math/Vec3.h b/native/cocos/math/Vec3.h index 915645af76..9496f4b8c9 100644 --- a/native/cocos/math/Vec3.h +++ b/native/cocos/math/Vec3.h @@ -24,7 +24,7 @@ #define MATH_VEC3_H #include -#include "math/CCMathBase.h" +#include "math/MathBase.h" /** * @addtogroup base diff --git a/native/cocos/math/Vec4.cpp b/native/cocos/math/Vec4.cpp index 8414474b13..90de3b97a3 100644 --- a/native/cocos/math/Vec4.cpp +++ b/native/cocos/math/Vec4.cpp @@ -24,7 +24,7 @@ #include #include "math/MathUtil.h" -#include "base/ccMacros.h" +#include "base/Macros.h" NS_CC_MATH_BEGIN diff --git a/native/cocos/math/Vec4.h b/native/cocos/math/Vec4.h index 4dfde870b0..38b79e72e4 100644 --- a/native/cocos/math/Vec4.h +++ b/native/cocos/math/Vec4.h @@ -27,7 +27,7 @@ #include #endif -#include "math/CCMathBase.h" +#include "math/MathBase.h" /** * @addtogroup base diff --git a/native/cocos/math/CCVertex.cpp b/native/cocos/math/Vertex.cpp similarity index 98% rename from native/cocos/math/CCVertex.cpp rename to native/cocos/math/Vertex.cpp index b3a50b9cc6..f408f171f3 100644 --- a/native/cocos/math/CCVertex.cpp +++ b/native/cocos/math/Vertex.cpp @@ -25,8 +25,8 @@ THE SOFTWARE. ****************************************************************************/ -#include "math/CCVertex.h" -#include "base/ccMacros.h" +#include "math/Vertex.h" +#include "base/Macros.h" namespace cc { diff --git a/native/cocos/math/CCVertex.h b/native/cocos/math/Vertex.h similarity index 98% rename from native/cocos/math/CCVertex.h rename to native/cocos/math/Vertex.h index 37c841c2e9..aed1c66965 100644 --- a/native/cocos/math/CCVertex.h +++ b/native/cocos/math/Vertex.h @@ -27,7 +27,7 @@ #ifndef __CCVERTEX_H__ #define __CCVERTEX_H__ -#include "base/ccMacros.h" +#include "base/Macros.h" #include "math/Vec2.h" /** diff --git a/native/cocos/network/CCDownloader-android.cpp b/native/cocos/network/Downloader-android.cpp similarity index 99% rename from native/cocos/network/CCDownloader-android.cpp rename to native/cocos/network/Downloader-android.cpp index 03e62eea4f..bd41a8a666 100644 --- a/native/cocos/network/CCDownloader-android.cpp +++ b/native/cocos/network/Downloader-android.cpp @@ -23,14 +23,14 @@ THE SOFTWARE. ****************************************************************************/ -#include "network/CCDownloader-android.h" +#include "network/Downloader-android.h" -#include "network/CCDownloader.h" +#include "network/Downloader.h" #include "platform/android/jni/JniHelper.h" #include "platform/android/jni/JniImp.h" #include -#include +#include #ifndef JCLS_DOWNLOADER #define JCLS_DOWNLOADER "org/cocos2dx/lib/Cocos2dxDownloader" diff --git a/native/cocos/network/CCDownloader-android.h b/native/cocos/network/Downloader-android.h similarity index 98% rename from native/cocos/network/CCDownloader-android.h rename to native/cocos/network/Downloader-android.h index 2de56f333e..a699b5f842 100644 --- a/native/cocos/network/CCDownloader-android.h +++ b/native/cocos/network/Downloader-android.h @@ -25,7 +25,7 @@ #pragma once -#include "network/CCIDownloaderImpl.h" +#include "network/DownloaderImpl.h" class _jobject; diff --git a/native/cocos/network/CCDownloader-curl.cpp b/native/cocos/network/Downloader-curl.cpp similarity index 99% rename from native/cocos/network/CCDownloader-curl.cpp rename to native/cocos/network/Downloader-curl.cpp index 159861b752..b15148576c 100644 --- a/native/cocos/network/CCDownloader-curl.cpp +++ b/native/cocos/network/Downloader-curl.cpp @@ -22,16 +22,16 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. ****************************************************************************/ -#include "network/CCDownloader-curl.h" +#include "network/Downloader-curl.h" #include #include #include -#include "base/CCScheduler.h" -#include "platform/CCFileUtils.h" -#include "platform/CCApplication.h" -#include "network/CCDownloader.h" +#include "base/Scheduler.h" +#include "platform/FileUtils.h" +#include "platform/Application.h" +#include "network/Downloader.h" // **NOTE** // In the file: diff --git a/native/cocos/network/CCDownloader-curl.h b/native/cocos/network/Downloader-curl.h similarity index 98% rename from native/cocos/network/CCDownloader-curl.h rename to native/cocos/network/Downloader-curl.h index 05ed1be772..a4a1593164 100644 --- a/native/cocos/network/CCDownloader-curl.h +++ b/native/cocos/network/Downloader-curl.h @@ -25,7 +25,7 @@ #pragma once -#include "network/CCIDownloaderImpl.h" +#include "network/DownloaderImpl.h" namespace cc { class Scheduler; diff --git a/native/cocos/network/CCDownloader.cpp b/native/cocos/network/Downloader.cpp similarity index 97% rename from native/cocos/network/CCDownloader.cpp rename to native/cocos/network/Downloader.cpp index 373ee87b93..e2adaca0ed 100644 --- a/native/cocos/network/CCDownloader.cpp +++ b/native/cocos/network/Downloader.cpp @@ -24,22 +24,22 @@ THE SOFTWARE. ****************************************************************************/ -#include "network/CCDownloader.h" +#include "network/Downloader.h" // include platform specific implement class #if (CC_PLATFORM == CC_PLATFORM_MAC_OSX || CC_PLATFORM == CC_PLATFORM_MAC_IOS) -#include "network/CCDownloaderImpl-apple.h" +#include "network/DownloaderImpl-apple.h" #define DownloaderImpl DownloaderApple #elif (CC_PLATFORM == CC_PLATFORM_ANDROID) -#include "network/CCDownloader-android.h" +#include "network/Downloader-android.h" #define DownloaderImpl DownloaderAndroid #else -#include "network/CCDownloader-curl.h" +#include "network/Downloader-curl.h" #define DownloaderImpl DownloaderCURL #endif diff --git a/native/cocos/network/CCDownloader.h b/native/cocos/network/Downloader.h similarity index 99% rename from native/cocos/network/CCDownloader.h rename to native/cocos/network/Downloader.h index 8f8d2ac98b..aa6fab6258 100644 --- a/native/cocos/network/CCDownloader.h +++ b/native/cocos/network/Downloader.h @@ -32,7 +32,7 @@ #include #include -#include "base/ccMacros.h" +#include "base/Macros.h" namespace cc { namespace network { diff --git a/native/cocos/network/CCDownloaderImpl-apple.h b/native/cocos/network/DownloaderImpl-apple.h similarity index 97% rename from native/cocos/network/CCDownloaderImpl-apple.h rename to native/cocos/network/DownloaderImpl-apple.h index d98b0c0cae..1b0cd72cc2 100644 --- a/native/cocos/network/CCDownloaderImpl-apple.h +++ b/native/cocos/network/DownloaderImpl-apple.h @@ -25,7 +25,7 @@ #pragma once -#include "network/CCIDownloaderImpl.h" +#include "network/DownloaderImpl.h" namespace cc { namespace network { diff --git a/native/cocos/network/CCDownloaderImpl-apple.mm b/native/cocos/network/DownloaderImpl-apple.mm similarity index 99% rename from native/cocos/network/CCDownloaderImpl-apple.mm rename to native/cocos/network/DownloaderImpl-apple.mm index a9e4f3a6de..91db47076c 100644 --- a/native/cocos/network/CCDownloaderImpl-apple.mm +++ b/native/cocos/network/DownloaderImpl-apple.mm @@ -23,12 +23,12 @@ THE SOFTWARE. ****************************************************************************/ -#include "network/CCDownloaderImpl-apple.h" +#include "network/DownloaderImpl-apple.h" #include #import -#include "network/CCDownloader.h" -#include "base/ccUTF8.h" +#include "network/Downloader.h" +#include "base/UTF8.h" //////////////////////////////////////////////////////////////////////////////// diff --git a/native/cocos/network/CCIDownloaderImpl.h b/native/cocos/network/DownloaderImpl.h similarity index 98% rename from native/cocos/network/CCIDownloaderImpl.h rename to native/cocos/network/DownloaderImpl.h index 9ef3aa20f7..42190cd2cc 100644 --- a/native/cocos/network/CCIDownloaderImpl.h +++ b/native/cocos/network/DownloaderImpl.h @@ -31,7 +31,7 @@ THE SOFTWARE. #include #include -#include "base/ccMacros.h" +#include "base/Macros.h" //#define CC_DOWNLOADER_DEBUG #ifdef CC_DOWNLOADER_DEBUG diff --git a/native/cocos/network/HttpClient-android.cpp b/native/cocos/network/HttpClient-android.cpp index 46581c8c68..0aef78cb50 100644 --- a/native/cocos/network/HttpClient-android.cpp +++ b/native/cocos/network/HttpClient-android.cpp @@ -35,11 +35,11 @@ #include #include -#include "platform/CCApplication.h" -#include "platform/CCFileUtils.h" +#include "platform/Application.h" +#include "platform/FileUtils.h" #include "platform/android/jni/JniHelper.h" -#include "base/ccUTF8.h" +#include "base/UTF8.h" #include "base/Log.h" #ifndef JCLS_HTTPCLIENT diff --git a/native/cocos/network/HttpClient-apple.mm b/native/cocos/network/HttpClient-apple.mm index 6c517864b7..d53433c5ba 100644 --- a/native/cocos/network/HttpClient-apple.mm +++ b/native/cocos/network/HttpClient-apple.mm @@ -31,8 +31,8 @@ #import "network/HttpAsynConnection-apple.h" #include "network/HttpCookie.h" -#include "platform/CCFileUtils.h" -#include "platform/CCApplication.h" +#include "platform/FileUtils.h" +#include "platform/Application.h" namespace cc { diff --git a/native/cocos/network/HttpClient.cpp b/native/cocos/network/HttpClient.cpp index 134ae3255e..5cb984cf66 100644 --- a/native/cocos/network/HttpClient.cpp +++ b/native/cocos/network/HttpClient.cpp @@ -29,9 +29,9 @@ #include #include #include -#include "platform/CCFileUtils.h" -#include "platform/CCApplication.h" -#include "platform/CCStdC.h" +#include "platform/FileUtils.h" +#include "platform/Application.h" +#include "platform/StdC.h" #include "base/Log.h" namespace cc { diff --git a/native/cocos/network/HttpClient.h b/native/cocos/network/HttpClient.h index 6561bb1052..5d2259c25b 100644 --- a/native/cocos/network/HttpClient.h +++ b/native/cocos/network/HttpClient.h @@ -30,11 +30,11 @@ #include #include -#include "base/CCVector.h" +#include "base/Vector.h" #include "network/HttpRequest.h" #include "network/HttpResponse.h" #include "network/HttpCookie.h" -#include "base/CCScheduler.h" +#include "base/Scheduler.h" /** * @addtogroup network diff --git a/native/cocos/network/HttpCookie.cpp b/native/cocos/network/HttpCookie.cpp index 0e7470a180..55187affea 100644 --- a/native/cocos/network/HttpCookie.cpp +++ b/native/cocos/network/HttpCookie.cpp @@ -24,7 +24,7 @@ ****************************************************************************/ #include "network/HttpCookie.h" -#include "platform/CCFileUtils.h" +#include "platform/FileUtils.h" #include #include diff --git a/native/cocos/network/HttpRequest.h b/native/cocos/network/HttpRequest.h index a283eb4ed3..b905bb894c 100644 --- a/native/cocos/network/HttpRequest.h +++ b/native/cocos/network/HttpRequest.h @@ -28,8 +28,8 @@ #define __HTTP_REQUEST_H__ -#include "base/CCRef.h" -#include "base/ccMacros.h" +#include "base/Ref.h" +#include "base/Macros.h" #include #include diff --git a/native/cocos/network/SocketIO.cpp b/native/cocos/network/SocketIO.cpp index d2c595fef0..1e1427c631 100644 --- a/native/cocos/network/SocketIO.cpp +++ b/native/cocos/network/SocketIO.cpp @@ -33,9 +33,9 @@ #include #include #include -#include "base/ccUTF8.h" +#include "base/UTF8.h" #include "base/Log.h" -#include "platform/CCApplication.h" +#include "platform/Application.h" #include "network/WebSocket.h" #include "network/HttpClient.h" diff --git a/native/cocos/network/SocketIO.h b/native/cocos/network/SocketIO.h index 8e3a5a638e..37e6cfcb04 100644 --- a/native/cocos/network/SocketIO.h +++ b/native/cocos/network/SocketIO.h @@ -61,8 +61,8 @@ in the onClose method the pointer should be set to NULL or used to connect to a #include #include #include -#include "base/ccMacros.h" -#include "base/CCMap.h" +#include "base/Macros.h" +#include "base/Map.h" /** diff --git a/native/cocos/network/Uri.h b/native/cocos/network/Uri.h index aa59f14984..6bb0b1cf05 100644 --- a/native/cocos/network/Uri.h +++ b/native/cocos/network/Uri.h @@ -19,7 +19,7 @@ #pragma once -#include "base/ccMacros.h" +#include "base/Macros.h" #include #include diff --git a/native/cocos/network/WebSocket-apple.mm b/native/cocos/network/WebSocket-apple.mm index f96a37b315..fd2742af22 100644 --- a/native/cocos/network/WebSocket-apple.mm +++ b/native/cocos/network/WebSocket-apple.mm @@ -23,7 +23,7 @@ THE SOFTWARE. ****************************************************************************/ #include "network/WebSocket.h" -#include "base/CCData.h" +#include "base/Data.h" #import "SocketRocket/SocketRocket.h" diff --git a/native/cocos/network/WebSocket-libwebsockets.cpp b/native/cocos/network/WebSocket-libwebsockets.cpp index 182c7c8971..75e1cbf1d8 100644 --- a/native/cocos/network/WebSocket-libwebsockets.cpp +++ b/native/cocos/network/WebSocket-libwebsockets.cpp @@ -42,10 +42,10 @@ #include #include "network/WebSocket.h" #include "network/Uri.h" -#include "base/CCScheduler.h" -#include "platform/CCFileUtils.h" -#include "platform/CCApplication.h" -#include "platform/CCStdC.h" +#include "base/Scheduler.h" +#include "platform/FileUtils.h" +#include "platform/Application.h" +#include "platform/StdC.h" #define NS_NETWORK_BEGIN namespace cc { namespace network { #define NS_NETWORK_END }} diff --git a/native/cocos/network/WebSocket.h b/native/cocos/network/WebSocket.h index 029de52b5e..3eb0446d4b 100644 --- a/native/cocos/network/WebSocket.h +++ b/native/cocos/network/WebSocket.h @@ -27,9 +27,9 @@ #pragma once -#include "base/ccMacros.h" -#include "base/CCRef.h" -#include "platform/CCStdC.h" +#include "base/Macros.h" +#include "base/Ref.h" +#include "platform/StdC.h" #include #include diff --git a/native/cocos/platform/CCApplication.h b/native/cocos/platform/Application.h similarity index 98% rename from native/cocos/platform/CCApplication.h rename to native/cocos/platform/Application.h index b16569e04b..bd8083dfdf 100644 --- a/native/cocos/platform/CCApplication.h +++ b/native/cocos/platform/Application.h @@ -27,11 +27,11 @@ THE SOFTWARE. #include #include #include // // std::this_thread::sleep_for -#include "base/ccMacros.h" +#include "base/Macros.h" #include "scripting/js-bindings/event/EventDispatcher.h" -#include "base/CCScheduler.h" -#include "base/CCAutoreleasePool.h" +#include "base/Scheduler.h" +#include "base/AutoreleasePool.h" #include "base/TypeDef.h" #include "math/Vec2.h" diff --git a/native/cocos/platform/CCCanvasRenderingContext2D.h b/native/cocos/platform/CanvasRenderingContext2D.h similarity index 98% rename from native/cocos/platform/CCCanvasRenderingContext2D.h rename to native/cocos/platform/CanvasRenderingContext2D.h index e97a565a10..1c02d8ae20 100644 --- a/native/cocos/platform/CCCanvasRenderingContext2D.h +++ b/native/cocos/platform/CanvasRenderingContext2D.h @@ -24,9 +24,9 @@ #pragma once -#include "base/ccMacros.h" -#include "base/CCData.h" -#include "math/CCGeometry.h" +#include "base/Macros.h" +#include "base/Data.h" +#include "math/Geometry.h" #include diff --git a/native/cocos/platform/CCDevice.h b/native/cocos/platform/Device.h similarity index 98% rename from native/cocos/platform/CCDevice.h rename to native/cocos/platform/Device.h index a1dfdf681c..515c2e5efc 100644 --- a/native/cocos/platform/CCDevice.h +++ b/native/cocos/platform/Device.h @@ -27,8 +27,8 @@ THE SOFTWARE. #ifndef __CCDEVICE_H__ #define __CCDEVICE_H__ -#include "base/ccMacros.h" -#include "base/CCData.h" +#include "base/Macros.h" +#include "base/Data.h" #include "math/Vec4.h" namespace cc { diff --git a/native/cocos/platform/CCFileUtils.cpp b/native/cocos/platform/FileUtils.cpp similarity index 99% rename from native/cocos/platform/CCFileUtils.cpp rename to native/cocos/platform/FileUtils.cpp index 581e2b8cb2..d10db4fe8e 100644 --- a/native/cocos/platform/CCFileUtils.cpp +++ b/native/cocos/platform/FileUtils.cpp @@ -24,13 +24,13 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. ****************************************************************************/ -#include "platform/CCFileUtils.h" +#include "platform/FileUtils.h" #include -#include "base/CCData.h" +#include "base/Data.h" #include "base/Log.h" -#include "platform/CCSAXParser.h" +#include "platform/SAXParser.h" #include "tinyxml2/tinyxml2.h" #include "tinydir/tinydir.h" diff --git a/native/cocos/platform/CCFileUtils.h b/native/cocos/platform/FileUtils.h similarity index 99% rename from native/cocos/platform/CCFileUtils.h rename to native/cocos/platform/FileUtils.h index 53f25982d1..24579a3548 100644 --- a/native/cocos/platform/CCFileUtils.h +++ b/native/cocos/platform/FileUtils.h @@ -31,9 +31,9 @@ THE SOFTWARE. #include #include -#include "base/ccMacros.h" -#include "base/CCValue.h" -#include "base/CCData.h" +#include "base/Macros.h" +#include "base/Value.h" +#include "base/Data.h" namespace cc { diff --git a/native/cocos/platform/CCImage.cpp b/native/cocos/platform/Image.cpp similarity index 99% rename from native/cocos/platform/CCImage.cpp rename to native/cocos/platform/Image.cpp index bfd7d87603..678c11ebd7 100644 --- a/native/cocos/platform/CCImage.cpp +++ b/native/cocos/platform/Image.cpp @@ -24,17 +24,17 @@ THE SOFTWARE. ****************************************************************************/ -#include "CCImage.h" +#include "Image.h" #include #include #include -#include "base/ccConfig.h" // CC_USE_JPEG, CC_USE_WEBP +#include "base/Config.h" // CC_USE_JPEG, CC_USE_WEBP #if CC_USE_JPEG #include "jpeg/jpeglib.h" #endif // CC_USE_JPEG -#include "base/CCData.h" -#include "base/ccUtils.h" +#include "base/Data.h" +#include "base/Utils.h" #include "renderer/core/Core.h" extern "C" @@ -51,10 +51,10 @@ extern "C" #include "webp/decode.h" #endif // CC_USE_WEBP -#include "platform/CCFileUtils.h" +#include "platform/FileUtils.h" #include "base/ZipUtils.h" #if (CC_PLATFORM == CC_PLATFORM_ANDROID) -#include "platform/android/CCFileUtils-android.h" +#include "platform/android/FileUtils-android.h" #endif #include diff --git a/native/cocos/platform/CCImage.h b/native/cocos/platform/Image.h similarity index 99% rename from native/cocos/platform/CCImage.h rename to native/cocos/platform/Image.h index 0389c6f7a7..951143703b 100644 --- a/native/cocos/platform/CCImage.h +++ b/native/cocos/platform/Image.h @@ -24,7 +24,7 @@ THE SOFTWARE. ****************************************************************************/ #pragma once -#include "base/CCRef.h" +#include "base/Ref.h" #include #include diff --git a/native/cocos/platform/CCSAXParser.cpp b/native/cocos/platform/SAXParser.cpp similarity index 98% rename from native/cocos/platform/CCSAXParser.cpp rename to native/cocos/platform/SAXParser.cpp index 91e6f797c3..ae5a31fe12 100644 --- a/native/cocos/platform/CCSAXParser.cpp +++ b/native/cocos/platform/SAXParser.cpp @@ -24,11 +24,11 @@ THE SOFTWARE. ****************************************************************************/ -#include "platform/CCSAXParser.h" +#include "platform/SAXParser.h" #include // because its based on windows 8 build :P -#include "platform/CCFileUtils.h" +#include "platform/FileUtils.h" #include "tinyxml2/tinyxml2.h" diff --git a/native/cocos/platform/CCSAXParser.h b/native/cocos/platform/SAXParser.h similarity index 99% rename from native/cocos/platform/CCSAXParser.h rename to native/cocos/platform/SAXParser.h index 9c3b0d4d23..3fad552c5e 100644 --- a/native/cocos/platform/CCSAXParser.h +++ b/native/cocos/platform/SAXParser.h @@ -28,7 +28,7 @@ /// @cond DO_NOT_SHOW -#include "base/ccMacros.h" +#include "base/Macros.h" #include namespace cc { diff --git a/native/cocos/platform/CCStdC.h b/native/cocos/platform/StdC.h similarity index 100% rename from native/cocos/platform/CCStdC.h rename to native/cocos/platform/StdC.h diff --git a/native/cocos/platform/android/CCApplication-android.cpp b/native/cocos/platform/android/Application-android.cpp similarity index 98% rename from native/cocos/platform/android/CCApplication-android.cpp rename to native/cocos/platform/android/Application-android.cpp index b4f26d1fc3..dc88cb8260 100644 --- a/native/cocos/platform/android/CCApplication-android.cpp +++ b/native/cocos/platform/android/Application-android.cpp @@ -23,17 +23,17 @@ LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. ****************************************************************************/ -#include "platform/CCApplication.h" +#include "platform/Application.h" #include #include #include "platform/android/jni/JniImp.h" -#include "base/CCScheduler.h" +#include "base/Scheduler.h" #include "audio/include/AudioEngine.h" #include "scripting/js-bindings/jswrapper/SeApi.h" #include "scripting/js-bindings/event/EventDispatcher.h" #include "platform/android/jni/JniHelper.h" -#define LOG_APP_TAG "CCApplication_android Debug" +#define LOG_APP_TAG "Application_android Debug" #define LOGD(...) __android_log_print(ANDROID_LOG_DEBUG,LOG_APP_TAG,__VA_ARGS__) // IDEA: using ndk-r10c will cause the next function could not be found. It may be a bug of ndk-r10c. diff --git a/native/cocos/platform/android/CCCanvasRenderingContext2D-android.cpp b/native/cocos/platform/android/CanvasRenderingContext2D-android.cpp similarity index 99% rename from native/cocos/platform/android/CCCanvasRenderingContext2D-android.cpp rename to native/cocos/platform/android/CanvasRenderingContext2D-android.cpp index a76d8815ce..da2e201320 100644 --- a/native/cocos/platform/android/CCCanvasRenderingContext2D-android.cpp +++ b/native/cocos/platform/android/CanvasRenderingContext2D-android.cpp @@ -1,4 +1,4 @@ -#include "platform/CCCanvasRenderingContext2D.h" +#include "platform/CanvasRenderingContext2D.h" #include "base/csscolorparser.h" #include "cocos/scripting/js-bindings/jswrapper/SeApi.h" diff --git a/native/cocos/platform/android/CCDevice-android.cpp b/native/cocos/platform/android/Device-android.cpp similarity index 98% rename from native/cocos/platform/android/CCDevice-android.cpp rename to native/cocos/platform/android/Device-android.cpp index 7c04a82e7f..a87db88de0 100644 --- a/native/cocos/platform/android/CCDevice-android.cpp +++ b/native/cocos/platform/android/Device-android.cpp @@ -27,7 +27,7 @@ THE SOFTWARE. #if CC_PLATFORM == CC_PLATFORM_ANDROID -#include "platform/CCDevice.h" +#include "platform/Device.h" #include #include #include @@ -35,8 +35,8 @@ THE SOFTWARE. #include #include #include "platform/android/jni/JniHelper.h" -#include "platform/CCFileUtils.h" -#include "base/ccUTF8.h" +#include "platform/FileUtils.h" +#include "base/UTF8.h" #ifndef JCLS_HELPER #define JCLS_HELPER "org/cocos2dx/lib/Cocos2dxHelper" diff --git a/native/cocos/platform/android/CCFileUtils-android.cpp b/native/cocos/platform/android/FileUtils-android.cpp similarity index 98% rename from native/cocos/platform/android/CCFileUtils-android.cpp rename to native/cocos/platform/android/FileUtils-android.cpp index eb1520e06b..bca0dc9265 100644 --- a/native/cocos/platform/android/CCFileUtils-android.cpp +++ b/native/cocos/platform/android/FileUtils-android.cpp @@ -27,7 +27,7 @@ THE SOFTWARE. #if CC_PLATFORM == CC_PLATFORM_ANDROID -#include "platform/android/CCFileUtils-android.h" +#include "platform/android/FileUtils-android.h" #include "platform/android/jni/JniHelper.h" #include "platform/android/jni/JniImp.h" #include "android/asset_manager.h" @@ -37,7 +37,7 @@ THE SOFTWARE. #include #include -#define LOG_TAG "CCFileUtils-android.cpp" +#define LOG_TAG "FileUtils-android.cpp" #define LOGD(...) __android_log_print(ANDROID_LOG_DEBUG,LOG_TAG,__VA_ARGS__) #define ASSETS_FOLDER_NAME "@assets/" diff --git a/native/cocos/platform/android/CCFileUtils-android.h b/native/cocos/platform/android/FileUtils-android.h similarity index 97% rename from native/cocos/platform/android/CCFileUtils-android.h rename to native/cocos/platform/android/FileUtils-android.h index f5c91ef73a..4c250703ba 100644 --- a/native/cocos/platform/android/CCFileUtils-android.h +++ b/native/cocos/platform/android/FileUtils-android.h @@ -29,8 +29,8 @@ Copyright (c) 2017-2018 Xiamen Yaji Software Co., Ltd. #if CC_PLATFORM == CC_PLATFORM_ANDROID -#include "platform/CCFileUtils.h" -#include "base/ccMacros.h" +#include "platform/FileUtils.h" +#include "base/Macros.h" #include #include #include "jni.h" diff --git a/native/cocos/platform/android/CCView.cpp b/native/cocos/platform/android/View.cpp similarity index 99% rename from native/cocos/platform/android/CCView.cpp rename to native/cocos/platform/android/View.cpp index 91f4cb6a38..28d8ee5af5 100644 --- a/native/cocos/platform/android/CCView.cpp +++ b/native/cocos/platform/android/View.cpp @@ -23,11 +23,11 @@ Copyright (c) 2017-2018 Xiamen Yaji Software Co., Ltd. OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. ****************************************************************************/ -#include "CCView.h" +#include "View.h" #include #include "scripting/js-bindings/event/EventDispatcher.h" #include "scripting/js-bindings/event/CustomEventTypes.h" -#include "platform/CCApplication.h" +#include "platform/Application.h" namespace { diff --git a/native/cocos/platform/android/CCView.h b/native/cocos/platform/android/View.h similarity index 98% rename from native/cocos/platform/android/CCView.h rename to native/cocos/platform/android/View.h index 0f19609a1f..0f80f544a9 100644 --- a/native/cocos/platform/android/CCView.h +++ b/native/cocos/platform/android/View.h @@ -23,7 +23,7 @@ ****************************************************************************/ #pragma once -#include "base/ccMacros.h" +#include "base/Macros.h" #include struct android_app; diff --git a/native/cocos/platform/android/jni/JniHelper.cpp b/native/cocos/platform/android/jni/JniHelper.cpp index b4b055eb06..3019b5226f 100644 --- a/native/cocos/platform/android/jni/JniHelper.cpp +++ b/native/cocos/platform/android/jni/JniHelper.cpp @@ -24,13 +24,13 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. ****************************************************************************/ #include "platform/android/jni/JniHelper.h" -#include "platform/android/CCFileUtils-android.h" +#include "platform/android/FileUtils-android.h" #include #include #include #include -#include "base/ccUTF8.h" +#include "base/UTF8.h" #define LOG_TAG "JniHelper" #define LOGD(...) __android_log_print(ANDROID_LOG_DEBUG,LOG_TAG,__VA_ARGS__) diff --git a/native/cocos/platform/android/jni/JniHelper.h b/native/cocos/platform/android/jni/JniHelper.h index 4dc8262d44..e546bafae9 100644 --- a/native/cocos/platform/android/jni/JniHelper.h +++ b/native/cocos/platform/android/jni/JniHelper.h @@ -31,7 +31,7 @@ THE SOFTWARE. #include #include #include -#include "base/ccMacros.h" +#include "base/Macros.h" #include "math/Vec3.h" //The macro must be used this way to find the native method. The principle is not well understood. diff --git a/native/cocos/platform/apple/CCCanvasRenderingContext2D-apple.mm b/native/cocos/platform/apple/CanvasRenderingContext2D-apple.mm similarity index 99% rename from native/cocos/platform/apple/CCCanvasRenderingContext2D-apple.mm rename to native/cocos/platform/apple/CanvasRenderingContext2D-apple.mm index 07c07c7ce0..bfd8caa220 100644 --- a/native/cocos/platform/apple/CCCanvasRenderingContext2D-apple.mm +++ b/native/cocos/platform/apple/CanvasRenderingContext2D-apple.mm @@ -1,4 +1,4 @@ -#include "platform/CCCanvasRenderingContext2D.h" +#include "platform/CanvasRenderingContext2D.h" #include "base/csscolorparser.h" #include "cocos/scripting/js-bindings/jswrapper/SeApi.h" diff --git a/native/cocos/platform/apple/CCDevice-apple.h b/native/cocos/platform/apple/Device-apple.h similarity index 97% rename from native/cocos/platform/apple/CCDevice-apple.h rename to native/cocos/platform/apple/Device-apple.h index 4b2273aa9d..1f45e5a835 100644 --- a/native/cocos/platform/apple/CCDevice-apple.h +++ b/native/cocos/platform/apple/Device-apple.h @@ -27,6 +27,6 @@ #ifndef CCDevice_apple_hpp #define CCDevice_apple_hpp -#include "platform/CCDevice.h" +#include "platform/Device.h" #endif /* CCDevice_apple_hpp */ diff --git a/native/cocos/platform/apple/CCDevice-apple.mm b/native/cocos/platform/apple/Device-apple.mm similarity index 95% rename from native/cocos/platform/apple/CCDevice-apple.mm rename to native/cocos/platform/apple/Device-apple.mm index a6092943c9..e29aad34b2 100644 --- a/native/cocos/platform/apple/CCDevice-apple.mm +++ b/native/cocos/platform/apple/Device-apple.mm @@ -24,8 +24,8 @@ THE SOFTWARE. ****************************************************************************/ -#include "platform/apple/CCDevice-apple.h" -#include "platform/CCApplication.h" +#include "platform/apple/Device-apple.h" +#include "platform/Application.h" #if CC_PLATFORM == CC_PLATFORM_MAC_OSX #import diff --git a/native/cocos/platform/apple/CCFileUtils-apple.h b/native/cocos/platform/apple/FileUtils-apple.h similarity index 97% rename from native/cocos/platform/apple/CCFileUtils-apple.h rename to native/cocos/platform/apple/FileUtils-apple.h index e74a5448e5..a4b77c214c 100644 --- a/native/cocos/platform/apple/CCFileUtils-apple.h +++ b/native/cocos/platform/apple/FileUtils-apple.h @@ -31,8 +31,8 @@ #include #include -#include "platform/CCFileUtils.h" -#include "base/ccMacros.h" +#include "platform/FileUtils.h" +#include "base/Macros.h" namespace cc { diff --git a/native/cocos/platform/apple/CCFileUtils-apple.mm b/native/cocos/platform/apple/FileUtils-apple.mm similarity index 99% rename from native/cocos/platform/apple/CCFileUtils-apple.mm rename to native/cocos/platform/apple/FileUtils-apple.mm index aed2c391db..7c7313292f 100644 --- a/native/cocos/platform/apple/CCFileUtils-apple.mm +++ b/native/cocos/platform/apple/FileUtils-apple.mm @@ -26,15 +26,15 @@ THE SOFTWARE. ****************************************************************************/ #import -#include "platform/apple/CCFileUtils-apple.h" +#include "platform/apple/FileUtils-apple.h" #include #include #include -#include "platform/CCFileUtils.h" -#include "platform/CCSAXParser.h" +#include "platform/FileUtils.h" +#include "platform/SAXParser.h" #include "base/Log.h" namespace cc { diff --git a/native/cocos/platform/ios/CCApplication-ios.mm b/native/cocos/platform/ios/Application-ios.mm similarity index 98% rename from native/cocos/platform/ios/CCApplication-ios.mm rename to native/cocos/platform/ios/Application-ios.mm index c849b2231c..a565516ccf 100644 --- a/native/cocos/platform/ios/CCApplication-ios.mm +++ b/native/cocos/platform/ios/Application-ios.mm @@ -22,10 +22,10 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. ****************************************************************************/ -#import "CCApplication.h" +#import "Application.h" #import -#include "base/CCScheduler.h" -#include "base/CCAutoreleasePool.h" +#include "base/Scheduler.h" +#include "base/AutoreleasePool.h" #include "scripting/js-bindings/event/EventDispatcher.h" #include "scripting/js-bindings/jswrapper/SeApi.h" #include "audio/include/AudioEngine.h" diff --git a/native/cocos/platform/ios/CCDevice-ios.mm b/native/cocos/platform/ios/Device-ios.mm similarity index 98% rename from native/cocos/platform/ios/CCDevice-ios.mm rename to native/cocos/platform/ios/Device-ios.mm index 3ae257e3a8..5f5e73c324 100644 --- a/native/cocos/platform/ios/CCDevice-ios.mm +++ b/native/cocos/platform/ios/Device-ios.mm @@ -23,13 +23,13 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. ****************************************************************************/ -#include "CCApplication.h" -#include "platform/CCDevice.h" +#include "Application.h" +#include "platform/Device.h" // Vibrate #import -#include "platform/apple/CCDevice-apple.h" -#include "CCReachability.h" +#include "platform/apple/Device-apple.h" +#include "Reachability.h" #import // Accelerometer diff --git a/native/cocos/platform/ios/CCReachability.cpp b/native/cocos/platform/ios/Reachability.cpp similarity index 99% rename from native/cocos/platform/ios/CCReachability.cpp rename to native/cocos/platform/ios/Reachability.cpp index 3c5af99156..b07dbb50b2 100644 --- a/native/cocos/platform/ios/CCReachability.cpp +++ b/native/cocos/platform/ios/Reachability.cpp @@ -22,8 +22,8 @@ THE SOFTWARE. ****************************************************************************/ -#include "CCReachability.h" -#include "base/ccMacros.h" +#include "Reachability.h" +#include "base/Macros.h" #include #include diff --git a/native/cocos/platform/ios/CCReachability.h b/native/cocos/platform/ios/Reachability.h similarity index 99% rename from native/cocos/platform/ios/CCReachability.h rename to native/cocos/platform/ios/Reachability.h index 60ece3d58d..a107b62269 100644 --- a/native/cocos/platform/ios/CCReachability.h +++ b/native/cocos/platform/ios/Reachability.h @@ -23,7 +23,7 @@ ****************************************************************************/ #pragma once -#include "base/CCRef.h" +#include "base/Ref.h" #include #include diff --git a/native/cocos/platform/ios/CCView.h b/native/cocos/platform/ios/View.h similarity index 100% rename from native/cocos/platform/ios/CCView.h rename to native/cocos/platform/ios/View.h diff --git a/native/cocos/platform/ios/CCView.mm b/native/cocos/platform/ios/View.mm similarity index 99% rename from native/cocos/platform/ios/CCView.mm rename to native/cocos/platform/ios/View.mm index 9cccf5edbc..3e5bcf90cf 100644 --- a/native/cocos/platform/ios/CCView.mm +++ b/native/cocos/platform/ios/View.mm @@ -21,7 +21,7 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. ****************************************************************************/ -#import "CCView.h" +#import "View.h" #include "scripting/js-bindings/event/EventDispatcher.h" namespace { diff --git a/native/cocos/platform/mac/CCApplication-mac.mm b/native/cocos/platform/mac/Application-mac.mm similarity index 99% rename from native/cocos/platform/mac/CCApplication-mac.mm rename to native/cocos/platform/mac/Application-mac.mm index 51abbc4e20..d4e695706e 100644 --- a/native/cocos/platform/mac/CCApplication-mac.mm +++ b/native/cocos/platform/mac/Application-mac.mm @@ -23,10 +23,10 @@ LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. ****************************************************************************/ -#include "platform/CCApplication.h" +#include "platform/Application.h" #include #include -#include "base/CCScheduler.h" +#include "base/Scheduler.h" #include "scripting/js-bindings/jswrapper/SeApi.h" #include "audio/include/AudioEngine.h" diff --git a/native/cocos/platform/mac/CCDevice-mac.mm b/native/cocos/platform/mac/Device-mac.mm similarity index 97% rename from native/cocos/platform/mac/CCDevice-mac.mm rename to native/cocos/platform/mac/Device-mac.mm index 8d96215789..19f353ec7e 100644 --- a/native/cocos/platform/mac/CCDevice-mac.mm +++ b/native/cocos/platform/mac/Device-mac.mm @@ -27,9 +27,9 @@ THE SOFTWARE. #if CC_PLATFORM == CC_PLATFORM_MAC_OSX -#include "platform/CCDevice.h" -#include "platform/apple/CCDevice-apple.h" -#include "CCReachability.h" +#include "platform/Device.h" +#include "platform/apple/Device-apple.h" +#include "Reachability.h" #include #include diff --git a/native/cocos/platform/mac/CCKeyCodeHelper.cpp b/native/cocos/platform/mac/KeyCodeHelper.cpp similarity index 99% rename from native/cocos/platform/mac/CCKeyCodeHelper.cpp rename to native/cocos/platform/mac/KeyCodeHelper.cpp index 486f2278fd..71e21c18c7 100644 --- a/native/cocos/platform/mac/CCKeyCodeHelper.cpp +++ b/native/cocos/platform/mac/KeyCodeHelper.cpp @@ -21,7 +21,7 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. ****************************************************************************/ -#include "CCKeyCodeHelper.h" +#include "KeyCodeHelper.h" #include // Copy from glfw3.h diff --git a/native/cocos/platform/mac/CCKeyCodeHelper.h b/native/cocos/platform/mac/KeyCodeHelper.h similarity index 100% rename from native/cocos/platform/mac/CCKeyCodeHelper.h rename to native/cocos/platform/mac/KeyCodeHelper.h diff --git a/native/cocos/platform/mac/CCView.h b/native/cocos/platform/mac/View.h similarity index 100% rename from native/cocos/platform/mac/CCView.h rename to native/cocos/platform/mac/View.h diff --git a/native/cocos/platform/mac/CCView.mm b/native/cocos/platform/mac/View.mm similarity index 98% rename from native/cocos/platform/mac/CCView.mm rename to native/cocos/platform/mac/View.mm index 2426f68cb7..9222ef5f04 100644 --- a/native/cocos/platform/mac/CCView.mm +++ b/native/cocos/platform/mac/View.mm @@ -21,12 +21,12 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. ****************************************************************************/ -#import "CCView.h" +#import "View.h" #import #import -#import "CCKeyCodeHelper.h" +#import "KeyCodeHelper.h" #import "scripting/js-bindings/event/EventDispatcher.h" -#include "platform/CCApplication.h" +#include "platform/Application.h" @implementation View { cc::MouseEvent _mouseEvent; diff --git a/native/cocos/platform/win32/CCApplication-win32.cpp b/native/cocos/platform/win32/Application-win32.cpp similarity index 97% rename from native/cocos/platform/win32/CCApplication-win32.cpp rename to native/cocos/platform/win32/Application-win32.cpp index 0e7c820a7f..d3d5c1ead6 100644 --- a/native/cocos/platform/win32/CCApplication-win32.cpp +++ b/native/cocos/platform/win32/Application-win32.cpp @@ -23,20 +23,20 @@ LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. ****************************************************************************/ -#include "platform/CCApplication.h" -#include "platform/CCStdC.h" // need it to include Windows.h +#include "platform/Application.h" +#include "platform/StdC.h" // need it to include Windows.h #include #include #include #include #include #include -#include "platform/CCFileUtils.h" +#include "platform/FileUtils.h" #include "platform/win32/View-win32.h" #include "scripting/js-bindings/jswrapper/SeApi.h" #include "scripting/js-bindings/event/EventDispatcher.h" -#include "base/CCScheduler.h" -#include "base/CCAutoreleasePool.h" +#include "base/Scheduler.h" +#include "base/AutoreleasePool.h" #include "audio/include/AudioEngine.h" extern std::shared_ptr cc_get_application_view(); diff --git a/native/cocos/platform/win32/CCCanvasRenderingContext2D-win32.cpp b/native/cocos/platform/win32/CanvasRenderingContext2D-win32.cpp similarity index 99% rename from native/cocos/platform/win32/CCCanvasRenderingContext2D-win32.cpp rename to native/cocos/platform/win32/CanvasRenderingContext2D-win32.cpp index 1d0b26cc40..7dfe49f338 100644 --- a/native/cocos/platform/win32/CCCanvasRenderingContext2D-win32.cpp +++ b/native/cocos/platform/win32/CanvasRenderingContext2D-win32.cpp @@ -1,9 +1,9 @@ -#include "platform/CCCanvasRenderingContext2D.h" +#include "platform/CanvasRenderingContext2D.h" #include #include "base/csscolorparser.h" #include "cocos/scripting/js-bindings/jswrapper/SeApi.h" #include "cocos/scripting/js-bindings/manual/jsb_platform.h" -#include "platform/CCFileUtils.h" +#include "platform/FileUtils.h" #include #include #include diff --git a/native/cocos/platform/win32/CCDevice-win32.cpp b/native/cocos/platform/win32/Device-win32.cpp similarity index 96% rename from native/cocos/platform/win32/CCDevice-win32.cpp rename to native/cocos/platform/win32/Device-win32.cpp index 0eeaea5162..69f44e5188 100644 --- a/native/cocos/platform/win32/CCDevice-win32.cpp +++ b/native/cocos/platform/win32/Device-win32.cpp @@ -27,9 +27,9 @@ THE SOFTWARE. #if CC_PLATFORM == CC_PLATFORM_WINDOWS -#include "platform/CCDevice.h" -#include "platform/CCFileUtils.h" -#include "platform/CCStdC.h" +#include "platform/Device.h" +#include "platform/FileUtils.h" +#include "platform/StdC.h" namespace cc { diff --git a/native/cocos/platform/win32/CCFileUtils-win32.cpp b/native/cocos/platform/win32/FileUtils-win32.cpp similarity index 99% rename from native/cocos/platform/win32/CCFileUtils-win32.cpp rename to native/cocos/platform/win32/FileUtils-win32.cpp index 4d620bbaf9..026003ec3f 100644 --- a/native/cocos/platform/win32/CCFileUtils-win32.cpp +++ b/native/cocos/platform/win32/FileUtils-win32.cpp @@ -27,8 +27,8 @@ THE SOFTWARE. #if CC_PLATFORM == CC_PLATFORM_WINDOWS -#include "platform/win32/CCFileUtils-win32.h" -#include "platform/win32/CCUtils-win32.h" +#include "platform/win32/FileUtils-win32.h" +#include "platform/win32/Utils-win32.h" #include "base/Log.h" #include #include diff --git a/native/cocos/platform/win32/CCFileUtils-win32.h b/native/cocos/platform/win32/FileUtils-win32.h similarity index 98% rename from native/cocos/platform/win32/CCFileUtils-win32.h rename to native/cocos/platform/win32/FileUtils-win32.h index cc666f0b7a..c6fd946555 100644 --- a/native/cocos/platform/win32/CCFileUtils-win32.h +++ b/native/cocos/platform/win32/FileUtils-win32.h @@ -29,8 +29,8 @@ THE SOFTWARE. #if CC_PLATFORM == CC_PLATFORM_WINDOWS -#include "platform/CCFileUtils.h" -#include "base/ccMacros.h" +#include "platform/FileUtils.h" +#include "base/Macros.h" #include #include diff --git a/native/cocos/platform/win32/CCUtils-win32.cpp b/native/cocos/platform/win32/Utils-win32.cpp similarity index 97% rename from native/cocos/platform/win32/CCUtils-win32.cpp rename to native/cocos/platform/win32/Utils-win32.cpp index b715e0f0b4..7f79a11611 100644 --- a/native/cocos/platform/win32/CCUtils-win32.cpp +++ b/native/cocos/platform/win32/Utils-win32.cpp @@ -23,8 +23,8 @@ LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. ****************************************************************************/ -#include "platform/win32/CCUtils-win32.h" -#include "platform/CCStdC.h" +#include "platform/win32/Utils-win32.h" +#include "platform/StdC.h" #include #include "base/Log.h" diff --git a/native/cocos/platform/win32/CCUtils-win32.h b/native/cocos/platform/win32/Utils-win32.h similarity index 98% rename from native/cocos/platform/win32/CCUtils-win32.h rename to native/cocos/platform/win32/Utils-win32.h index cf3071fba2..252feb38a2 100644 --- a/native/cocos/platform/win32/CCUtils-win32.h +++ b/native/cocos/platform/win32/Utils-win32.h @@ -27,7 +27,7 @@ THE SOFTWARE. #ifndef __CC_UTILS_WIN32_H__ #define __CC_UTILS_WIN32_H__ -#include "base/ccMacros.h" +#include "base/Macros.h" #include diff --git a/native/cocos/platform/win32/View-win32.h b/native/cocos/platform/win32/View-win32.h index 01119cb437..3306524741 100644 --- a/native/cocos/platform/win32/View-win32.h +++ b/native/cocos/platform/win32/View-win32.h @@ -25,8 +25,8 @@ THE SOFTWARE. #pragma once -#include "base/ccMacros.h" -#include "platform/CCStdC.h" +#include "base/Macros.h" +#include "platform/StdC.h" #include #include #include diff --git a/native/cocos/renderer/core/CoreStd.h b/native/cocos/renderer/core/CoreStd.h index fedf3caba1..331db0169b 100644 --- a/native/cocos/renderer/core/CoreStd.h +++ b/native/cocos/renderer/core/CoreStd.h @@ -1,7 +1,7 @@ #ifndef CC_CORE_CORE_STD_H_ #define CC_CORE_CORE_STD_H_ -#include "base/ccMacros.h" +#include "base/Macros.h" // STD including #include @@ -32,7 +32,7 @@ #include "base/TypeDef.h" #include "base/memory/Memory.h" -#include "math/CCCoreMath.h" +#include "math/CoreMath.h" #include "base/Log.h" #include "base/Object.h" #include "gfx/GFXObject.h" diff --git a/native/cocos/renderer/core/math/CCCoreMath.cc b/native/cocos/renderer/core/math/CoreMath.cc similarity index 99% rename from native/cocos/renderer/core/math/CCCoreMath.cc rename to native/cocos/renderer/core/math/CoreMath.cc index b34a34453a..e8af09d36f 100755 --- a/native/cocos/renderer/core/math/CCCoreMath.cc +++ b/native/cocos/renderer/core/math/CoreMath.cc @@ -1,5 +1,5 @@ #include "CoreStd.h" -#include "CCCoreMath.h" +#include "CoreMath.h" CC_MATH_NAMESPACE_BEGIN diff --git a/native/cocos/renderer/core/math/CCCoreMath.h b/native/cocos/renderer/core/math/CoreMath.h similarity index 100% rename from native/cocos/renderer/core/math/CCCoreMath.h rename to native/cocos/renderer/core/math/CoreMath.h diff --git a/native/cocos/renderer/gfx-metal/MTLDevice.mm b/native/cocos/renderer/gfx-metal/MTLDevice.mm index 6367c36d78..1f445bdacb 100644 --- a/native/cocos/renderer/gfx-metal/MTLDevice.mm +++ b/native/cocos/renderer/gfx-metal/MTLDevice.mm @@ -18,7 +18,7 @@ #include "MTLStateCache.h" #include "MTLTexture.h" #include "MTLUtils.h" -#include +#include #import diff --git a/native/cocos/renderer/pipeline/Define.h b/native/cocos/renderer/pipeline/Define.h index 7f1428904c..160786de35 100644 --- a/native/cocos/renderer/pipeline/Define.h +++ b/native/cocos/renderer/pipeline/Define.h @@ -1,6 +1,6 @@ #pragma once -#include "base/CCValue.h" +#include "base/Value.h" #include "core/CoreStd.h" namespace cc { diff --git a/native/cocos/renderer/pipeline/forward/ForwardPipeline.cpp b/native/cocos/renderer/pipeline/forward/ForwardPipeline.cpp index 518c767c55..186661aaa0 100644 --- a/native/cocos/renderer/pipeline/forward/ForwardPipeline.cpp +++ b/native/cocos/renderer/pipeline/forward/ForwardPipeline.cpp @@ -6,7 +6,7 @@ #include "ForwardFlow.h" #include "gfx/GFXDevice.h" #include "gfx/GFXRenderPass.h" -#include "platform/CCApplication.h" +#include "platform/Application.h" namespace cc { namespace pipeline { diff --git a/native/cocos/renderer/pipeline/forward/SceneCulling.cpp b/native/cocos/renderer/pipeline/forward/SceneCulling.cpp index c26fb294ef..0c051c8c54 100644 --- a/native/cocos/renderer/pipeline/forward/SceneCulling.cpp +++ b/native/cocos/renderer/pipeline/forward/SceneCulling.cpp @@ -3,7 +3,7 @@ #include "../RenderView.h" #include "../helper/SharedMemory.h" #include "ForwardPipeline.h" -#include "platform/CCApplication.h" +#include "platform/Application.h" namespace cc { namespace pipeline { diff --git a/native/cocos/renderer/pipeline/helper/DefineMap.h b/native/cocos/renderer/pipeline/helper/DefineMap.h index b415758258..854de177b3 100644 --- a/native/cocos/renderer/pipeline/helper/DefineMap.h +++ b/native/cocos/renderer/pipeline/helper/DefineMap.h @@ -1,6 +1,6 @@ #pragma once -#include "base/CCValue.h" +#include "base/Value.h" #include "core/CoreStd.h" namespace cc { diff --git a/native/cocos/scripting/dop/ArrayPool.h b/native/cocos/scripting/dop/ArrayPool.h index 305d030e71..a68def453f 100644 --- a/native/cocos/scripting/dop/ArrayPool.h +++ b/native/cocos/scripting/dop/ArrayPool.h @@ -3,7 +3,7 @@ #include "cocos/base/Object.h" #include "cocos/scripting/js-bindings/jswrapper/Object.h" #include "cocos/base/memory/StlAlloc.h" -#include "cocos/base/ccMacros.h" +#include "cocos/base/Macros.h" #include "cocos/base/TypeDef.h" #include "PoolType.h" diff --git a/native/cocos/scripting/dop/BufferPool.cpp b/native/cocos/scripting/dop/BufferPool.cpp index 95d27949b0..f792df2dd1 100644 --- a/native/cocos/scripting/dop/BufferPool.cpp +++ b/native/cocos/scripting/dop/BufferPool.cpp @@ -23,7 +23,7 @@ THE SOFTWARE. ****************************************************************************/ #include "BufferPool.h" -#include "base/ccMacros.h" +#include "base/Macros.h" #include "base/memory/Memory.h" using namespace se; diff --git a/native/cocos/scripting/dop/BufferPool.h b/native/cocos/scripting/dop/BufferPool.h index 2c0dba3903..067cb7bc54 100644 --- a/native/cocos/scripting/dop/BufferPool.h +++ b/native/cocos/scripting/dop/BufferPool.h @@ -27,7 +27,7 @@ THE SOFTWARE. #include "cocos/base/Object.h" #include "cocos/base/memory/StlAlloc.h" #include "cocos/scripting/js-bindings/jswrapper/Object.h" -#include "cocos/base/ccMacros.h" +#include "cocos/base/Macros.h" #include "cocos/base/TypeDef.h" #include "PoolType.h" diff --git a/native/cocos/scripting/dop/ObjectPool.h b/native/cocos/scripting/dop/ObjectPool.h index e90871f059..919a23941b 100644 --- a/native/cocos/scripting/dop/ObjectPool.h +++ b/native/cocos/scripting/dop/ObjectPool.h @@ -27,7 +27,7 @@ THE SOFTWARE. #include "cocos/base/Object.h" #include "cocos/scripting/js-bindings/jswrapper/Object.h" #include "cocos/base/memory/StlAlloc.h" -#include "cocos/base/ccMacros.h" +#include "cocos/base/Macros.h" #include "cocos/base/TypeDef.h" #include "PoolType.h" diff --git a/native/cocos/scripting/js-bindings/auto/jsb_cocos2dx_audioengine_auto.h b/native/cocos/scripting/js-bindings/auto/jsb_cocos2dx_audioengine_auto.h index a64f31e48b..93de8bbe31 100644 --- a/native/cocos/scripting/js-bindings/auto/jsb_cocos2dx_audioengine_auto.h +++ b/native/cocos/scripting/js-bindings/auto/jsb_cocos2dx_audioengine_auto.h @@ -1,5 +1,5 @@ #pragma once -#include "base/ccConfig.h" +#include "base/Config.h" #if (USE_AUDIO > 0) && (CC_PLATFORM == CC_PLATFORM_ANDROID || CC_PLATFORM == CC_PLATFORM_MAC_IOS || CC_PLATFORM == CC_PLATFORM_MAC_OSX || CC_PLATFORM == CC_PLATFORM_WINDOWS) #include "cocos/scripting/js-bindings/jswrapper/SeApi.h" diff --git a/native/cocos/scripting/js-bindings/auto/jsb_cocos2dx_auto.h b/native/cocos/scripting/js-bindings/auto/jsb_cocos2dx_auto.h index 92e5161328..96d3b0c1e2 100644 --- a/native/cocos/scripting/js-bindings/auto/jsb_cocos2dx_auto.h +++ b/native/cocos/scripting/js-bindings/auto/jsb_cocos2dx_auto.h @@ -1,5 +1,5 @@ #pragma once -#include "base/ccConfig.h" +#include "base/Config.h" #include "cocos/scripting/js-bindings/jswrapper/SeApi.h" diff --git a/native/cocos/scripting/js-bindings/auto/jsb_cocos2dx_extension_auto.h b/native/cocos/scripting/js-bindings/auto/jsb_cocos2dx_extension_auto.h index 4162799424..7f539e06c1 100644 --- a/native/cocos/scripting/js-bindings/auto/jsb_cocos2dx_extension_auto.h +++ b/native/cocos/scripting/js-bindings/auto/jsb_cocos2dx_extension_auto.h @@ -1,5 +1,5 @@ #pragma once -#include "base/ccConfig.h" +#include "base/Config.h" #include "cocos/scripting/js-bindings/jswrapper/SeApi.h" diff --git a/native/cocos/scripting/js-bindings/auto/jsb_cocos2dx_network_auto.cpp b/native/cocos/scripting/js-bindings/auto/jsb_cocos2dx_network_auto.cpp index 4f30f6167f..0e357c2d85 100644 --- a/native/cocos/scripting/js-bindings/auto/jsb_cocos2dx_network_auto.cpp +++ b/native/cocos/scripting/js-bindings/auto/jsb_cocos2dx_network_auto.cpp @@ -2,7 +2,7 @@ #if (CC_PLATFORM == CC_PLATFORM_ANDROID || CC_PLATFORM == CC_PLATFORM_MAC_IOS || CC_PLATFORM == CC_PLATFORM_MAC_OSX || CC_PLATFORM == CC_PLATFORM_WINDOWS) #include "scripting/js-bindings/manual/jsb_conversions.h" #include "scripting/js-bindings/manual/jsb_global.h" -#include "network/CCDownloader.h" +#include "network/Downloader.h" #ifndef JSB_ALLOC #define JSB_ALLOC(kls, ...) new (std::nothrow) kls(__VA_ARGS__) diff --git a/native/cocos/scripting/js-bindings/auto/jsb_cocos2dx_network_auto.h b/native/cocos/scripting/js-bindings/auto/jsb_cocos2dx_network_auto.h index 84017e5ad0..385b44660c 100644 --- a/native/cocos/scripting/js-bindings/auto/jsb_cocos2dx_network_auto.h +++ b/native/cocos/scripting/js-bindings/auto/jsb_cocos2dx_network_auto.h @@ -1,5 +1,5 @@ #pragma once -#include "base/ccConfig.h" +#include "base/Config.h" #if (CC_PLATFORM == CC_PLATFORM_ANDROID || CC_PLATFORM == CC_PLATFORM_MAC_IOS || CC_PLATFORM == CC_PLATFORM_MAC_OSX || CC_PLATFORM == CC_PLATFORM_WINDOWS) #include "cocos/scripting/js-bindings/jswrapper/SeApi.h" diff --git a/native/cocos/scripting/js-bindings/auto/jsb_gfx_auto.h b/native/cocos/scripting/js-bindings/auto/jsb_gfx_auto.h index 97e44dbd0e..22a102dde5 100644 --- a/native/cocos/scripting/js-bindings/auto/jsb_gfx_auto.h +++ b/native/cocos/scripting/js-bindings/auto/jsb_gfx_auto.h @@ -1,5 +1,5 @@ #pragma once -#include "base/ccConfig.h" +#include "base/Config.h" #include "cocos/scripting/js-bindings/jswrapper/SeApi.h" diff --git a/native/cocos/scripting/js-bindings/auto/jsb_gles2_auto.h b/native/cocos/scripting/js-bindings/auto/jsb_gles2_auto.h index 62eb16f7f4..ef324426f9 100644 --- a/native/cocos/scripting/js-bindings/auto/jsb_gles2_auto.h +++ b/native/cocos/scripting/js-bindings/auto/jsb_gles2_auto.h @@ -1,5 +1,5 @@ #pragma once -#include "base/ccConfig.h" +#include "base/Config.h" #include "cocos/scripting/js-bindings/jswrapper/SeApi.h" diff --git a/native/cocos/scripting/js-bindings/auto/jsb_gles3_auto.h b/native/cocos/scripting/js-bindings/auto/jsb_gles3_auto.h index e5e6757336..80b285bd6d 100644 --- a/native/cocos/scripting/js-bindings/auto/jsb_gles3_auto.h +++ b/native/cocos/scripting/js-bindings/auto/jsb_gles3_auto.h @@ -1,5 +1,5 @@ #pragma once -#include "base/ccConfig.h" +#include "base/Config.h" #include "cocos/scripting/js-bindings/jswrapper/SeApi.h" diff --git a/native/cocos/scripting/js-bindings/auto/jsb_mtl_auto.h b/native/cocos/scripting/js-bindings/auto/jsb_mtl_auto.h index c4239a30e0..58d590248c 100644 --- a/native/cocos/scripting/js-bindings/auto/jsb_mtl_auto.h +++ b/native/cocos/scripting/js-bindings/auto/jsb_mtl_auto.h @@ -1,5 +1,5 @@ #pragma once -#include "base/ccConfig.h" +#include "base/Config.h" #include "cocos/scripting/js-bindings/jswrapper/SeApi.h" diff --git a/native/cocos/scripting/js-bindings/auto/jsb_video_auto.h b/native/cocos/scripting/js-bindings/auto/jsb_video_auto.h index 3dbd5da453..0575af35e2 100644 --- a/native/cocos/scripting/js-bindings/auto/jsb_video_auto.h +++ b/native/cocos/scripting/js-bindings/auto/jsb_video_auto.h @@ -1,5 +1,5 @@ #pragma once -#include "base/ccConfig.h" +#include "base/Config.h" #if (USE_VIDEO > 0) && (CC_PLATFORM == CC_PLATFORM_ANDROID || CC_PLATFORM == CC_PLATFORM_MAC_IOS) && !defined(CC_TARGET_OS_TVOS) #include "cocos/scripting/js-bindings/jswrapper/SeApi.h" diff --git a/native/cocos/scripting/js-bindings/auto/jsb_vk_auto.h b/native/cocos/scripting/js-bindings/auto/jsb_vk_auto.h index 1b63339854..6e19dc467b 100644 --- a/native/cocos/scripting/js-bindings/auto/jsb_vk_auto.h +++ b/native/cocos/scripting/js-bindings/auto/jsb_vk_auto.h @@ -1,5 +1,5 @@ #pragma once -#include "base/ccConfig.h" +#include "base/Config.h" #include "cocos/scripting/js-bindings/jswrapper/SeApi.h" diff --git a/native/cocos/scripting/js-bindings/jswrapper/v8/ScriptEngine.cpp b/native/cocos/scripting/js-bindings/jswrapper/v8/ScriptEngine.cpp index 288ece6d42..dd527db8fb 100644 --- a/native/cocos/scripting/js-bindings/jswrapper/v8/ScriptEngine.cpp +++ b/native/cocos/scripting/js-bindings/jswrapper/v8/ScriptEngine.cpp @@ -32,7 +32,7 @@ #include "Utils.h" #include "../State.h" #include "../MappingUtils.h" -#include "platform/CCFileUtils.h" +#include "platform/FileUtils.h" #include diff --git a/native/cocos/scripting/js-bindings/jswrapper/v8/debugger/inspector_io.cpp b/native/cocos/scripting/js-bindings/jswrapper/v8/debugger/inspector_io.cpp index 03e65b8e54..da42186741 100644 --- a/native/cocos/scripting/js-bindings/jswrapper/v8/debugger/inspector_io.cpp +++ b/native/cocos/scripting/js-bindings/jswrapper/v8/debugger/inspector_io.cpp @@ -18,7 +18,7 @@ #include #include -#include "base/ccUTF8.h" //cjh added +#include "base/UTF8.h" //cjh added namespace node { diff --git a/native/cocos/scripting/js-bindings/manual/JavaScriptJavaBridge.cpp b/native/cocos/scripting/js-bindings/manual/JavaScriptJavaBridge.cpp index ebb5ad1bfb..41232cbc8b 100644 --- a/native/cocos/scripting/js-bindings/manual/JavaScriptJavaBridge.cpp +++ b/native/cocos/scripting/js-bindings/manual/JavaScriptJavaBridge.cpp @@ -25,7 +25,7 @@ #include "platform/android/jni/JniHelper.h" #include "cocos/scripting/js-bindings/jswrapper/SeApi.h" #include "cocos/scripting/js-bindings/manual/jsb_conversions.h" -#include "cocos/base/ccUTF8.h" +#include "cocos/base/UTF8.h" #include #include diff --git a/native/cocos/scripting/js-bindings/manual/jsb_cocos2dx_network_manual.cpp b/native/cocos/scripting/js-bindings/manual/jsb_cocos2dx_network_manual.cpp index 73e80f93a4..e9fb699749 100644 --- a/native/cocos/scripting/js-bindings/manual/jsb_cocos2dx_network_manual.cpp +++ b/native/cocos/scripting/js-bindings/manual/jsb_cocos2dx_network_manual.cpp @@ -22,12 +22,12 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. ****************************************************************************/ -#include "base/ccConfig.h" +#include "base/Config.h" #include "jsb_cocos2dx_network_manual.h" #if (CC_PLATFORM == CC_PLATFORM_ANDROID || CC_PLATFORM == CC_PLATFORM_MAC_IOS || CC_PLATFORM == CC_PLATFORM_MAC_OSX || CC_PLATFORM == CC_PLATFORM_WINDOWS) #include "scripting/js-bindings/manual/jsb_conversions.h" #include "scripting/js-bindings/manual/jsb_global.h" -#include "network/CCDownloader.h" +#include "network/Downloader.h" #include "scripting/js-bindings/auto/jsb_cocos2dx_network_auto.h" static bool js_cocos2dx_network_Downloader_createDownloadFileTask(se::State &s) { diff --git a/native/cocos/scripting/js-bindings/manual/jsb_conversions.h b/native/cocos/scripting/js-bindings/manual/jsb_conversions.h index 4257c47961..8e0c52eb47 100644 --- a/native/cocos/scripting/js-bindings/manual/jsb_conversions.h +++ b/native/cocos/scripting/js-bindings/manual/jsb_conversions.h @@ -30,7 +30,7 @@ #include "cocos2d.h" #include "extensions/cocos-ext.h" -#include "network/CCDownloader.h" +#include "network/Downloader.h" //#include "Box2D/Box2D.h" diff --git a/native/cocos/scripting/js-bindings/manual/jsb_global.cpp b/native/cocos/scripting/js-bindings/manual/jsb_global.cpp index 33522dfc53..c102661a18 100644 --- a/native/cocos/scripting/js-bindings/manual/jsb_global.cpp +++ b/native/cocos/scripting/js-bindings/manual/jsb_global.cpp @@ -27,10 +27,10 @@ #include "jsb_conversions.h" #include "xxtea/xxtea.h" -#include "base/CCScheduler.h" -#include "base/CCThreadPool.h" +#include "base/Scheduler.h" +#include "base/ThreadPool.h" #include "network/HttpClient.h" -#include "platform/CCApplication.h" +#include "platform/Application.h" #include "renderer/core/Core.h" #include "ui/edit-box/EditBox.h" diff --git a/native/cocos/scripting/js-bindings/manual/jsb_helper.h b/native/cocos/scripting/js-bindings/manual/jsb_helper.h index 553b4d1bfb..05046e69d3 100644 --- a/native/cocos/scripting/js-bindings/manual/jsb_helper.h +++ b/native/cocos/scripting/js-bindings/manual/jsb_helper.h @@ -25,7 +25,7 @@ #pragma once -#include "base/CCRef.h" +#include "base/Ref.h" #include diff --git a/native/cocos/scripting/js-bindings/manual/jsb_platform_android.cpp b/native/cocos/scripting/js-bindings/manual/jsb_platform_android.cpp index 3de03c6071..e8adc6b211 100644 --- a/native/cocos/scripting/js-bindings/manual/jsb_platform_android.cpp +++ b/native/cocos/scripting/js-bindings/manual/jsb_platform_android.cpp @@ -28,7 +28,7 @@ #include "cocos/scripting/js-bindings/jswrapper/SeApi.h" #include "cocos/scripting/js-bindings/manual/jsb_conversions.h" #include "cocos/scripting/js-bindings/manual/jsb_global.h" -#include "cocos/platform/CCFileUtils.h" +#include "cocos/platform/FileUtils.h" #include diff --git a/native/cocos/scripting/js-bindings/manual/jsb_platfrom_apple.mm b/native/cocos/scripting/js-bindings/manual/jsb_platfrom_apple.mm index ae3055773a..4773c3d220 100644 --- a/native/cocos/scripting/js-bindings/manual/jsb_platfrom_apple.mm +++ b/native/cocos/scripting/js-bindings/manual/jsb_platfrom_apple.mm @@ -28,7 +28,7 @@ #include "cocos/scripting/js-bindings/jswrapper/SeApi.h" #include "cocos/scripting/js-bindings/manual/jsb_conversions.h" #include "cocos/scripting/js-bindings/manual/jsb_global.h" -#include "cocos/platform/CCFileUtils.h" +#include "cocos/platform/FileUtils.h" #import #import diff --git a/native/cocos/scripting/js-bindings/manual/jsb_platfrom_win32.cpp b/native/cocos/scripting/js-bindings/manual/jsb_platfrom_win32.cpp index 856b9c2a2d..2a1a3039a5 100644 --- a/native/cocos/scripting/js-bindings/manual/jsb_platfrom_win32.cpp +++ b/native/cocos/scripting/js-bindings/manual/jsb_platfrom_win32.cpp @@ -28,7 +28,7 @@ #include "cocos/scripting/js-bindings/jswrapper/SeApi.h" #include "cocos/scripting/js-bindings/manual/jsb_conversions.h" #include "cocos/scripting/js-bindings/manual/jsb_global.h" -#include "cocos/platform/CCFileUtils.h" +#include "cocos/platform/FileUtils.h" #include diff --git a/native/cocos/scripting/js-bindings/manual/jsb_socketio.cpp b/native/cocos/scripting/js-bindings/manual/jsb_socketio.cpp index 99457ae6d4..706fdca615 100644 --- a/native/cocos/scripting/js-bindings/manual/jsb_socketio.cpp +++ b/native/cocos/scripting/js-bindings/manual/jsb_socketio.cpp @@ -30,8 +30,8 @@ #include "cocos/scripting/js-bindings/manual/jsb_global.h" #include "cocos/network/SocketIO.h" -#include "base/ccUTF8.h" -#include "platform/CCApplication.h" +#include "base/UTF8.h" +#include "platform/Application.h" using namespace cc; using namespace cc::network; diff --git a/native/cocos/scripting/js-bindings/manual/jsb_websocket.cpp b/native/cocos/scripting/js-bindings/manual/jsb_websocket.cpp index b821a68a41..fe7944fc41 100644 --- a/native/cocos/scripting/js-bindings/manual/jsb_websocket.cpp +++ b/native/cocos/scripting/js-bindings/manual/jsb_websocket.cpp @@ -22,15 +22,15 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. ****************************************************************************/ -#include "base/ccConfig.h" +#include "base/Config.h" #include "jsb_websocket.h" #if (USE_SOCKET > 0) && (CC_PLATFORM == CC_PLATFORM_ANDROID || CC_PLATFORM == CC_PLATFORM_MAC_IOS || CC_PLATFORM == CC_PLATFORM_MAC_OSX || CC_PLATFORM == CC_PLATFORM_WINDOWS) #include "cocos/scripting/js-bindings/jswrapper/SeApi.h" #include "cocos/scripting/js-bindings/manual/jsb_conversions.h" #include "cocos/scripting/js-bindings/manual/jsb_global.h" -#include "base/ccUTF8.h" -#include "platform/CCApplication.h" +#include "base/UTF8.h" +#include "platform/Application.h" using namespace cc; using namespace cc::network; diff --git a/native/cocos/scripting/js-bindings/manual/jsb_xmlhttprequest.cpp b/native/cocos/scripting/js-bindings/manual/jsb_xmlhttprequest.cpp index 6635dd07b2..3a2dab0cf1 100644 --- a/native/cocos/scripting/js-bindings/manual/jsb_xmlhttprequest.cpp +++ b/native/cocos/scripting/js-bindings/manual/jsb_xmlhttprequest.cpp @@ -30,7 +30,7 @@ // Created by James Chen on 5/15/17. // // -#include "base/ccConfig.h" +#include "base/Config.h" #include "jsb_xmlhttprequest.h" #if (CC_PLATFORM == CC_PLATFORM_ANDROID || CC_PLATFORM == CC_PLATFORM_MAC_IOS || CC_PLATFORM == CC_PLATFORM_MAC_OSX || CC_PLATFORM == CC_PLATFORM_WINDOWS) #include @@ -41,8 +41,8 @@ #include "cocos/scripting/js-bindings/jswrapper/SeApi.h" #include "cocos/scripting/js-bindings/manual/jsb_conversions.h" #include "cocos/network/HttpClient.h" -#include "cocos/base/CCData.h" -#include "platform/CCApplication.h" +#include "cocos/base/Data.h" +#include "platform/Application.h" using namespace cc; using namespace cc::network; diff --git a/native/cocos/storage/local-storage/LocalStorage-android.cpp b/native/cocos/storage/local-storage/LocalStorage-android.cpp index 7aa4be62a3..5dd032f8b2 100644 --- a/native/cocos/storage/local-storage/LocalStorage-android.cpp +++ b/native/cocos/storage/local-storage/LocalStorage-android.cpp @@ -31,7 +31,7 @@ */ #include "storage/local-storage/LocalStorage.h" -#include "base/ccMacros.h" +#include "base/Macros.h" #if (CC_PLATFORM == CC_PLATFORM_ANDROID) diff --git a/native/cocos/storage/local-storage/LocalStorage.cpp b/native/cocos/storage/local-storage/LocalStorage.cpp index cf6e9c7d61..00a286cdbf 100644 --- a/native/cocos/storage/local-storage/LocalStorage.cpp +++ b/native/cocos/storage/local-storage/LocalStorage.cpp @@ -30,7 +30,7 @@ */ #include "storage/local-storage/LocalStorage.h" -#include "base/ccMacros.h" +#include "base/Macros.h" #if (CC_PLATFORM != CC_PLATFORM_ANDROID) diff --git a/native/cocos/storage/local-storage/LocalStorage.h b/native/cocos/storage/local-storage/LocalStorage.h index 7b536b0d8e..59c8ce9518 100644 --- a/native/cocos/storage/local-storage/LocalStorage.h +++ b/native/cocos/storage/local-storage/LocalStorage.h @@ -28,7 +28,7 @@ THE SOFTWARE. #define __JSB_LOCALSTORAGE_H #include -#include "base/ccMacros.h" +#include "base/Macros.h" /** * @addtogroup storage diff --git a/native/cocos/ui/edit-box/EditBox-android.cpp b/native/cocos/ui/edit-box/EditBox-android.cpp index 3bc65bb73e..dd464972e4 100644 --- a/native/cocos/ui/edit-box/EditBox-android.cpp +++ b/native/cocos/ui/edit-box/EditBox-android.cpp @@ -23,7 +23,7 @@ ****************************************************************************/ #include -#include +#include #include "EditBox.h" #include "platform/android/jni/JniHelper.h" #include "cocos/scripting/js-bindings/jswrapper/SeApi.h" diff --git a/native/cocos/ui/edit-box/EditBox-ios.mm b/native/cocos/ui/edit-box/EditBox-ios.mm index 80b9d26860..063956e915 100644 --- a/native/cocos/ui/edit-box/EditBox-ios.mm +++ b/native/cocos/ui/edit-box/EditBox-ios.mm @@ -22,7 +22,7 @@ THE SOFTWARE. ****************************************************************************/ #include "EditBox.h" -#include "platform/CCApplication.h" +#include "platform/Application.h" #include "cocos/scripting/js-bindings/jswrapper/SeApi.h" #include "cocos/scripting/js-bindings/manual/jsb_global.h" diff --git a/native/cocos/ui/edit-box/EditBox-mac.mm b/native/cocos/ui/edit-box/EditBox-mac.mm index f09a833acb..95e5e76109 100644 --- a/native/cocos/ui/edit-box/EditBox-mac.mm +++ b/native/cocos/ui/edit-box/EditBox-mac.mm @@ -22,7 +22,7 @@ THE SOFTWARE. ****************************************************************************/ #include "EditBox.h" -#include "platform/CCApplication.h" +#include "platform/Application.h" #include "cocos/scripting/js-bindings/jswrapper/SeApi.h" #include "cocos/scripting/js-bindings/manual/jsb_global.h" diff --git a/native/cocos/ui/edit-box/EditBox-win32.cpp b/native/cocos/ui/edit-box/EditBox-win32.cpp index 65f4d54c42..d98b3009a6 100644 --- a/native/cocos/ui/edit-box/EditBox-win32.cpp +++ b/native/cocos/ui/edit-box/EditBox-win32.cpp @@ -22,7 +22,7 @@ THE SOFTWARE. ****************************************************************************/ #include "EditBox.h" -#include "platform/CCApplication.h" +#include "platform/Application.h" #include "platform/win32/View-win32.h" #include "cocos/scripting/js-bindings/jswrapper/SeApi.h" #include "cocos/scripting/js-bindings/manual/jsb_global.h" diff --git a/native/cocos/ui/edit-box/EditBox.h b/native/cocos/ui/edit-box/EditBox.h index 89321b8ec5..4b127ec8b3 100644 --- a/native/cocos/ui/edit-box/EditBox.h +++ b/native/cocos/ui/edit-box/EditBox.h @@ -24,7 +24,7 @@ #pragma once #include -#include "base/ccMacros.h" +#include "base/Macros.h" namespace cc { diff --git a/native/cocos/ui/videoplayer/VideoPlayer-android.cpp b/native/cocos/ui/videoplayer/VideoPlayer-android.cpp index 5696abdac1..8163905564 100644 --- a/native/cocos/ui/videoplayer/VideoPlayer-android.cpp +++ b/native/cocos/ui/videoplayer/VideoPlayer-android.cpp @@ -29,10 +29,10 @@ #include #include #include -#include "platform/CCApplication.h" +#include "platform/Application.h" #include "platform/android/jni/JniHelper.h" -#include "platform/CCFileUtils.h" -#include "../../platform/CCApplication.h" +#include "platform/FileUtils.h" +#include "../../platform/Application.h" //----------------------------------------------------------------------------------------------------------- diff --git a/native/cocos/ui/videoplayer/VideoPlayer-ios.mm b/native/cocos/ui/videoplayer/VideoPlayer-ios.mm index 3f1a557582..f84b95f687 100644 --- a/native/cocos/ui/videoplayer/VideoPlayer-ios.mm +++ b/native/cocos/ui/videoplayer/VideoPlayer-ios.mm @@ -33,9 +33,9 @@ using namespace cc; #import #import -#include "platform/CCApplication.h" -#include "platform/ios/CCEAGLView-ios.h" -#include "platform/CCFileUtils.h" +#include "platform/Application.h" +#include "platform/ios/EAGLView-ios.h" +#include "platform/FileUtils.h" @interface UIVideoViewWrapperIos : NSObject diff --git a/native/cocos/ui/videoplayer/VideoPlayer.h b/native/cocos/ui/videoplayer/VideoPlayer.h index 3d54658b87..93d63fdb06 100644 --- a/native/cocos/ui/videoplayer/VideoPlayer.h +++ b/native/cocos/ui/videoplayer/VideoPlayer.h @@ -24,8 +24,8 @@ #pragma once -#include "base/ccMacros.h" -#include "base/CCRef.h" +#include "base/Macros.h" +#include "base/Ref.h" #include #include #include diff --git a/native/extensions/assets-manager/AssetsManagerEx.cpp b/native/extensions/assets-manager/AssetsManagerEx.cpp index 89a06e593f..4697b13076 100644 --- a/native/extensions/assets-manager/AssetsManagerEx.cpp +++ b/native/extensions/assets-manager/AssetsManagerEx.cpp @@ -24,8 +24,8 @@ THE SOFTWARE. ****************************************************************************/ #include "AssetsManagerEx.h" -#include "base/ccUTF8.h" -#include "CCAsyncTaskPool.h" +#include "base/UTF8.h" +#include "AsyncTaskPool.h" #include #include diff --git a/native/extensions/assets-manager/AssetsManagerEx.h b/native/extensions/assets-manager/AssetsManagerEx.h index 319dd961d6..b1e2b8d8c7 100644 --- a/native/extensions/assets-manager/AssetsManagerEx.h +++ b/native/extensions/assets-manager/AssetsManagerEx.h @@ -31,10 +31,10 @@ #include #include -#include "platform/CCFileUtils.h" -#include "network/CCDownloader.h" +#include "platform/FileUtils.h" +#include "network/Downloader.h" -#include "CCEventAssetsManagerEx.h" +#include "EventAssetsManagerEx.h" #include "Manifest.h" #include "extensions/ExtensionMacros.h" diff --git a/native/extensions/assets-manager/CCAsyncTaskPool.cpp b/native/extensions/assets-manager/AsyncTaskPool.cpp similarity index 98% rename from native/extensions/assets-manager/CCAsyncTaskPool.cpp rename to native/extensions/assets-manager/AsyncTaskPool.cpp index 456289fe31..38367ad3d5 100644 --- a/native/extensions/assets-manager/CCAsyncTaskPool.cpp +++ b/native/extensions/assets-manager/AsyncTaskPool.cpp @@ -24,7 +24,7 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. ****************************************************************************/ -#include "CCAsyncTaskPool.h" +#include "AsyncTaskPool.h" namespace cc { diff --git a/native/extensions/assets-manager/CCAsyncTaskPool.h b/native/extensions/assets-manager/AsyncTaskPool.h similarity index 99% rename from native/extensions/assets-manager/CCAsyncTaskPool.h rename to native/extensions/assets-manager/AsyncTaskPool.h index 3ba275b39b..e30e6c6ed7 100644 --- a/native/extensions/assets-manager/CCAsyncTaskPool.h +++ b/native/extensions/assets-manager/AsyncTaskPool.h @@ -26,8 +26,8 @@ THE SOFTWARE. #ifndef __CCSYNC_TASK_POOL_H_ #define __CCSYNC_TASK_POOL_H_ -#include "platform/CCApplication.h" -#include "base/CCScheduler.h" +#include "platform/Application.h" +#include "base/Scheduler.h" #include #include #include diff --git a/native/extensions/assets-manager/CCEventAssetsManagerEx.cpp b/native/extensions/assets-manager/EventAssetsManagerEx.cpp similarity index 97% rename from native/extensions/assets-manager/CCEventAssetsManagerEx.cpp rename to native/extensions/assets-manager/EventAssetsManagerEx.cpp index 5649133879..75ca356ac4 100644 --- a/native/extensions/assets-manager/CCEventAssetsManagerEx.cpp +++ b/native/extensions/assets-manager/EventAssetsManagerEx.cpp @@ -23,8 +23,8 @@ THE SOFTWARE. ****************************************************************************/ -#include "CCEventAssetsManagerEx.h" -#include "base/ccMacros.h" +#include "EventAssetsManagerEx.h" +#include "base/Macros.h" #include #include "AssetsManagerEx.h" diff --git a/native/extensions/assets-manager/CCEventAssetsManagerEx.h b/native/extensions/assets-manager/EventAssetsManagerEx.h similarity index 99% rename from native/extensions/assets-manager/CCEventAssetsManagerEx.h rename to native/extensions/assets-manager/EventAssetsManagerEx.h index bd0b116b8b..a0e8f0c498 100644 --- a/native/extensions/assets-manager/CCEventAssetsManagerEx.h +++ b/native/extensions/assets-manager/EventAssetsManagerEx.h @@ -27,7 +27,7 @@ #define __cocos2d_libs__CCEventAssetsManagerEx__ #include -#include "base/CCRef.h" +#include "base/Ref.h" #include "extensions/ExtensionMacros.h" #include "extensions/ExtensionExport.h" diff --git a/native/extensions/assets-manager/Manifest.h b/native/extensions/assets-manager/Manifest.h index c305ed009b..2b06ecbfbf 100644 --- a/native/extensions/assets-manager/Manifest.h +++ b/native/extensions/assets-manager/Manifest.h @@ -31,11 +31,11 @@ #include #include -#include "base/CCRef.h" +#include "base/Ref.h" #include "extensions/ExtensionMacros.h" #include "extensions/ExtensionExport.h" -#include "network/CCDownloader.h" -#include "platform/CCFileUtils.h" +#include "network/Downloader.h" +#include "platform/FileUtils.h" #include "json/document-wrapper.h" diff --git a/native/extensions/cocos-ext.h b/native/extensions/cocos-ext.h index b893118815..4010171bf9 100644 --- a/native/extensions/cocos-ext.h +++ b/native/extensions/cocos-ext.h @@ -29,7 +29,7 @@ #include "ExtensionMacros.h" #include "assets-manager/AssetsManagerEx.h" -#include "assets-manager/CCEventAssetsManagerEx.h" +#include "assets-manager/EventAssetsManagerEx.h" #include "assets-manager/Manifest.h" #endif /* __COCOS2D_EXT_H__ */ diff --git a/native/external/config.json b/native/external/config.json index 64ead4c911..5ee5c2797d 100644 --- a/native/external/config.json +++ b/native/external/config.json @@ -1,5 +1,5 @@ { - "version": "v3d-gfx-22", + "version": "v3d-gfx-23", "from": { "type": "github", "owner": "cocos-creator", diff --git a/native/templates/template-link/common/Classes/Game.h b/native/templates/template-link/common/Classes/Game.h index e3a57ea846..1caa08b145 100644 --- a/native/templates/template-link/common/Classes/Game.h +++ b/native/templates/template-link/common/Classes/Game.h @@ -24,7 +24,7 @@ ****************************************************************************/ #pragma once -#include "platform/CCApplication.h" +#include "platform/Application.h" /** @brief The cocos2d Application. diff --git a/native/templates/template-link/platforms/android/app/jni/hellojavascript/main.cpp b/native/templates/template-link/platforms/android/app/jni/hellojavascript/main.cpp index b1b2b730da..55814d91eb 100644 --- a/native/templates/template-link/platforms/android/app/jni/hellojavascript/main.cpp +++ b/native/templates/template-link/platforms/android/app/jni/hellojavascript/main.cpp @@ -27,7 +27,7 @@ #include #include #include "platform/android/jni/JniHelper.h" -#include "platform/android/CCView.h" +#include "platform/android/View.h" #include "Game.h" #define LOG_TAG "main" diff --git a/native/templates/template-link/platforms/ios/AppDelegate.mm b/native/templates/template-link/platforms/ios/AppDelegate.mm index 7ff38fd7fb..f13cd5779e 100644 --- a/native/templates/template-link/platforms/ios/AppDelegate.mm +++ b/native/templates/template-link/platforms/ios/AppDelegate.mm @@ -25,7 +25,7 @@ ****************************************************************************/ #import "AppDelegate.h" #import "ViewController.h" -#import "platform/ios/CCView.h" +#import "platform/ios/View.h" #include "SDKWrapper.h" #include "Game.h" diff --git a/native/templates/template-link/platforms/mac/ViewController.mm b/native/templates/template-link/platforms/mac/ViewController.mm index 85f9eeb239..631658cad6 100644 --- a/native/templates/template-link/platforms/mac/ViewController.mm +++ b/native/templates/template-link/platforms/mac/ViewController.mm @@ -1,5 +1,5 @@ #import "ViewController.h" -#import "platform/mac/CCView.h" +#import "platform/mac/View.h" @implementation ViewController { diff --git a/native/templates/template-link/platforms/win32/AppDelegate.cpp b/native/templates/template-link/platforms/win32/AppDelegate.cpp index ba41b10d3b..f6211fa982 100644 --- a/native/templates/template-link/platforms/win32/AppDelegate.cpp +++ b/native/templates/template-link/platforms/win32/AppDelegate.cpp @@ -5,7 +5,7 @@ #include #include -#include "platform/CCStdC.h" +#include "platform/StdC.h" #include "platform/win32/View-win32.h" #include "scripting/js-bindings/jswrapper/SeApi.h" diff --git a/native/templates/template-link/platforms/win32/main.h b/native/templates/template-link/platforms/win32/main.h index 1f01f6369c..458f7687b4 100644 --- a/native/templates/template-link/platforms/win32/main.h +++ b/native/templates/template-link/platforms/win32/main.h @@ -32,6 +32,6 @@ #include // C RunTime Header Files -#include "CCStdC.h" +#include "StdC.h" #endif // __WINMAIN_H__ diff --git a/native/tools/bindings-generator b/native/tools/bindings-generator index 3261138393..497a8b0057 160000 --- a/native/tools/bindings-generator +++ b/native/tools/bindings-generator @@ -1 +1 @@ -Subproject commit 32611383936d319199e9b15d7b0ef7f9901132db +Subproject commit 497a8b00579736af21d3cf49e99b4596ebab9b19 diff --git a/native/tools/tojs/cocos2dx_network.ini b/native/tools/tojs/cocos2dx_network.ini index 40054d6c00..ca825aa58f 100644 --- a/native/tools/tojs/cocos2dx_network.ini +++ b/native/tools/tojs/cocos2dx_network.ini @@ -26,7 +26,7 @@ cxxgenerator_headers = extra_arguments = %(android_headers)s %(clang_headers)s %(cxxgenerator_headers)s %(cocos_headers)s %(android_flags)s %(clang_flags)s %(cocos_flags)s %(extra_flags)s # what headers to parse -headers = %(cocosdir)s/cocos/network/CCDownloader.h +headers = %(cocosdir)s/cocos/network/Downloader.h # cpp_headers = network/js_network_manual.h diff --git a/native/tools/tojs/gles2.ini b/native/tools/tojs/gles2.ini index 6d3e2fc88f..40e5e2606b 100644 --- a/native/tools/tojs/gles2.ini +++ b/native/tools/tojs/gles2.ini @@ -16,7 +16,7 @@ android_flags = -target armv7-none-linux-androideabi -D_LIBCPP_DISABLE_VISIBILIT clang_headers = clang_flags = -nostdinc -x c++ -std=c++11 -fsigned-char -U__SSE__ -cocos_headers = -I%(cocosdir)s/cocos -I%(cocosdir)s/cocos/renderer -I%(cocosdir)s/cocos/renderer/core -I%(cocosdir)s/cocos/renderer/gfx-gles2 -I%(cocosdir)s/cocos/math -I%(cocosdir)s/cocos/platform/android -I%(cocosdir)s/external/source +cocos_headers = -I%(cocosdir)s/cocos -I%(cocosdir)s/cocos/renderer -I%(cocosdir)s/cocos/renderer/core -I%(cocosdir)s/cocos/renderer/gfx-gles2 -I%(cocosdir)s/cocos/platform/android -I%(cocosdir)s/external/source cocos_flags = -DANDROID -DCC_PLATFORM=3 -DCC_PLATFORM_MAC_IOS=1 -DCC_PLATFORM_MAC_OSX=4 -DCC_PLATFORM_WINDOWS=2 -DCC_PLATFORM_ANDROID=3 diff --git a/native/tools/tojs/gles3.ini b/native/tools/tojs/gles3.ini index 105cf4eee1..9289c4f2fd 100644 --- a/native/tools/tojs/gles3.ini +++ b/native/tools/tojs/gles3.ini @@ -16,7 +16,7 @@ android_flags = -target armv7-none-linux-androideabi -D_LIBCPP_DISABLE_VISIBILIT clang_headers = clang_flags = -nostdinc -x c++ -std=c++11 -fsigned-char -U__SSE__ -cocos_headers = -I%(cocosdir)s/cocos -I%(cocosdir)s/cocos/renderer -I%(cocosdir)s/cocos/renderer/core -I%(cocosdir)s/cocos/renderer/gfx-gles3 -I%(cocosdir)s/cocos/math -I%(cocosdir)s/cocos/platform/android -I%(cocosdir)s/external/source +cocos_headers = -I%(cocosdir)s/cocos -I%(cocosdir)s/cocos/renderer -I%(cocosdir)s/cocos/renderer/core -I%(cocosdir)s/cocos/renderer/gfx-gles3 -I%(cocosdir)s/cocos/platform/android -I%(cocosdir)s/external/source cocos_flags = -DANDROID -DCC_PLATFORM=3 -DCC_PLATFORM_MAC_IOS=1 -DCC_PLATFORM_MAC_OSX=4 -DCC_PLATFORM_WINDOWS=2 -DCC_PLATFORM_ANDROID=3 diff --git a/native/tools/tojs/metal.ini b/native/tools/tojs/metal.ini index bf1fa72c89..7821bc24a0 100644 --- a/native/tools/tojs/metal.ini +++ b/native/tools/tojs/metal.ini @@ -16,7 +16,7 @@ android_flags = -target armv7-none-linux-androideabi -D_LIBCPP_DISABLE_VISIBILIT clang_headers = clang_flags = -nostdinc -x c++ -std=c++11 -fsigned-char -U__SSE__ -cocos_headers = -I%(cocosdir)s/cocos -I%(cocosdir)s/cocos/renderer -I%(cocosdir)s/cocos/renderer/core -I%(cocosdir)s/cocos/renderer/gfx-metal -I%(cocosdir)s/cocos/math -I%(cocosdir)s/cocos/platform/android -I%(cocosdir)s/external/source +cocos_headers = -I%(cocosdir)s/cocos -I%(cocosdir)s/cocos/renderer -I%(cocosdir)s/cocos/renderer/core -I%(cocosdir)s/cocos/renderer/gfx-metal -I%(cocosdir)s/cocos/platform/android -I%(cocosdir)s/external/source cocos_flags = -DANDROID -DCC_PLATFORM=3 -DCC_PLATFORM_MAC_IOS=1 -DCC_PLATFORM_MAC_OSX=4 -DCC_PLATFORM_WINDOWS=2 -DCC_PLATFORM_ANDROID=3 diff --git a/native/tools/tojs/vulkan.ini b/native/tools/tojs/vulkan.ini index 0f656a2e81..1fe0d7a6e6 100644 --- a/native/tools/tojs/vulkan.ini +++ b/native/tools/tojs/vulkan.ini @@ -16,7 +16,7 @@ android_flags = -target armv7-none-linux-androideabi -D_LIBCPP_DISABLE_VISIBILIT clang_headers = clang_flags = -nostdinc -x c++ -std=c++11 -fsigned-char -U__SSE__ -cocos_headers = -I%(cocosdir)s/cocos -I%(cocosdir)s/cocos/renderer -I%(cocosdir)s/cocos/renderer/core -I%(cocosdir)s/cocos/renderer/gfx-vulkan -I%(cocosdir)s/cocos/math -I%(cocosdir)s/cocos/platform/android -I%(cocosdir)s/external/source +cocos_headers = -I%(cocosdir)s/cocos -I%(cocosdir)s/cocos/renderer -I%(cocosdir)s/cocos/renderer/core -I%(cocosdir)s/cocos/renderer/gfx-vulkan -I%(cocosdir)s/cocos/platform/android -I%(cocosdir)s/external/source cocos_flags = -DANDROID -DCC_PLATFORM=3 -DCC_PLATFORM_MAC_IOS=1 -DCC_PLATFORM_MAC_OSX=4 -DCC_PLATFORM_WINDOWS=2 -DCC_PLATFORM_ANDROID=3