From dcb1d57d464f945bbc92edab19f8d59c564d2dfb Mon Sep 17 00:00:00 2001 From: HALX99 Date: Mon, 25 Nov 2019 20:08:29 +0800 Subject: [PATCH 1/5] Update README.md --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 90b379dca4..cb6d60b9d7 100644 --- a/README.md +++ b/README.md @@ -35,7 +35,7 @@ _USRSTUDIOPDLL - [x] 2. Remove SimpleAudio - [ ] 3. Remove offthread file operation - [x] 4. Remove getSutiableFOpen, avoid reduce performance, there is another better solution for support: ```just doesn't convert path to utf-8 in FileUtils manually implementation``` - - [x] 5. Optimize CCDownloader, curl for all platforms + - [x] 5. Refactor CCDownloader, curl for all platforms, don't use scheduler to retrive progress info, make it more reuseable - [ ] 7. Refactor engine-v5-deps, all compile as vs2019 MSVC 19.22.27905.0 - [x] 8. minizip-1.2.0 - [x] 9. ccMessageBox From 60662af6714b26184d0010cccd9c71a3fc7014c3 Mon Sep 17 00:00:00 2001 From: HALX99 Date: Mon, 25 Nov 2019 20:32:43 +0800 Subject: [PATCH 2/5] skip gen luabindings for ci --- tools/travis-scripts/run-script.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/travis-scripts/run-script.sh b/tools/travis-scripts/run-script.sh index e416797a71..d6c221ec4f 100755 --- a/tools/travis-scripts/run-script.sh +++ b/tools/travis-scripts/run-script.sh @@ -119,7 +119,7 @@ function genernate_binding_codes() echo "Create auto-generated luabinding glue codes." pushd "$COCOS2DX_ROOT/tools/tolua" - python ./genbindings.py + # python ./genbindings.py popd } From 9aeb04de4b996b7937bcbdfa7f298a21f6565c1c Mon Sep 17 00:00:00 2001 From: HALX99 Date: Mon, 25 Nov 2019 20:55:41 +0800 Subject: [PATCH 3/5] fix CMakeLists.txt for apple --- cocos/audio/CMakeLists.txt | 1 - 1 file changed, 1 deletion(-) diff --git a/cocos/audio/CMakeLists.txt b/cocos/audio/CMakeLists.txt index 578828a7af..18c1a881e1 100644 --- a/cocos/audio/CMakeLists.txt +++ b/cocos/audio/CMakeLists.txt @@ -79,7 +79,6 @@ elseif(APPLE) set(COCOS_AUDIO_PLATFORM_HEADER audio/apple/AudioDecoder.h audio/apple/AudioPlayer.h - audio/apple/AudioMacros.h audio/apple/AudioCache.h audio/apple/AudioEngineImpl.h ) From 9e7ffd7eaf6332b37cbab8221025f3e2c13062c9 Mon Sep 17 00:00:00 2001 From: HALX99 Date: Mon, 25 Nov 2019 21:13:58 +0800 Subject: [PATCH 4/5] update deps to v5-deps-2 --- external/config.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/external/config.json b/external/config.json index fe89e20cb4..6f74a174ec 100644 --- a/external/config.json +++ b/external/config.json @@ -1,6 +1,6 @@ { - "version": "v5-deps-1", - "zip_file_size": "103868946", + "version": "v5-deps-2", + "zip_file_size": "103868975", "repo_name": "engine-v5-3rd", "repo_parent": "https://github.com/simdsoft/", "move_dirs": { From 8cb40c339aab6718b751b70db332a4e72967e572 Mon Sep 17 00:00:00 2001 From: HALX99 Date: Mon, 25 Nov 2019 21:23:29 +0800 Subject: [PATCH 5/5] Update ProgramStateRegistry.cpp --- cocos/renderer/backend/ProgramStateRegistry.cpp | 2 -- 1 file changed, 2 deletions(-) diff --git a/cocos/renderer/backend/ProgramStateRegistry.cpp b/cocos/renderer/backend/ProgramStateRegistry.cpp index be905f5961..8eee6a3e46 100644 --- a/cocos/renderer/backend/ProgramStateRegistry.cpp +++ b/cocos/renderer/backend/ProgramStateRegistry.cpp @@ -1,5 +1,3 @@ -#pragma once - #include "ProgramStateRegistry.h" CC_BACKEND_BEGIN