From 7b2ef5d88280e030efbf27798e5783ae458153bf Mon Sep 17 00:00:00 2001 From: PP Date: Thu, 28 Jan 2021 15:02:19 +0800 Subject: [PATCH] remove header cocos2d-x.h on win32 (#3259) --- .../frameworks/runtime-src/proj.win32/SimulatorWin.cpp | 2 ++ .../frameworks/runtime-src/proj.win32/SimulatorWin.h | 1 - .../lib/platform/win32/PlayerEditBoxServiceWin.cpp | 3 ++- .../lib/platform/win32/PlayerFileDialogServiceWin.cpp | 4 +++- .../libsimulator/lib/platform/win32/PlayerMenuServiceWin.cpp | 2 ++ .../libsimulator/lib/platform/win32/PlayerMenuServiceWin.h | 2 +- .../lib/platform/win32/PlayerMessageBoxServiceWin.cpp | 3 ++- .../lib/platform/win32/PlayerMessageBoxServiceWin.h | 1 - .../libsimulator/lib/platform/win32/PlayerTaskServiceWin.cpp | 2 ++ .../libsimulator/lib/platform/win32/PlayerTaskServiceWin.h | 1 + .../simulator/libsimulator/lib/platform/win32/PlayerWin.h | 1 - .../tools/simulator/libsimulator/proj.win32/Runtime_win32.cpp | 1 - 12 files changed, 15 insertions(+), 8 deletions(-) diff --git a/native/tools/simulator/frameworks/runtime-src/proj.win32/SimulatorWin.cpp b/native/tools/simulator/frameworks/runtime-src/proj.win32/SimulatorWin.cpp index 78684b7f86..b959a1f098 100755 --- a/native/tools/simulator/frameworks/runtime-src/proj.win32/SimulatorWin.cpp +++ b/native/tools/simulator/frameworks/runtime-src/proj.win32/SimulatorWin.cpp @@ -27,6 +27,7 @@ #pragma comment(lib, "comctl32.lib") #pragma comment(linker, "\"/manifestdependency:type='Win32' name='Microsoft.Windows.Common-Controls' version='6.0.0.0' processorArchitecture='X86' publicKeyToken='6595b64144ccf1df' language='*'\"") +#include "cocos/base/UTF8.h" #include "stdafx.h" #include #include @@ -56,6 +57,7 @@ #include "platform/Application.h" #include "platform/win32/PlayerWin.h" #include "platform/win32/PlayerMenuServiceWin.h" +#include "platform/FileUtils.h" #include "platform/StdC.h" #include "cocos/bindings/jswrapper/SeApi.h" diff --git a/native/tools/simulator/frameworks/runtime-src/proj.win32/SimulatorWin.h b/native/tools/simulator/frameworks/runtime-src/proj.win32/SimulatorWin.h index ac218b2751..27a507e7ba 100755 --- a/native/tools/simulator/frameworks/runtime-src/proj.win32/SimulatorWin.h +++ b/native/tools/simulator/frameworks/runtime-src/proj.win32/SimulatorWin.h @@ -27,7 +27,6 @@ #include "stdafx.h" #include "Resource.h" -#include "cocos2d.h" #include "Game.h" #include "ProjectConfig/ProjectConfig.h" #include "ProjectConfig/SimulatorConfig.h" diff --git a/native/tools/simulator/libsimulator/lib/platform/win32/PlayerEditBoxServiceWin.cpp b/native/tools/simulator/libsimulator/lib/platform/win32/PlayerEditBoxServiceWin.cpp index 9c7870bd8b..7bf4df2594 100755 --- a/native/tools/simulator/libsimulator/lib/platform/win32/PlayerEditBoxServiceWin.cpp +++ b/native/tools/simulator/libsimulator/lib/platform/win32/PlayerEditBoxServiceWin.cpp @@ -26,8 +26,9 @@ #include +#include "cocos/base/UTF8.h" +#include "cocos/base/Log.h" #include "stdafx.h" -#include "cocos2d.h" #include "PlayerEditBoxServiceWin.h" PLAYER_NS_BEGIN diff --git a/native/tools/simulator/libsimulator/lib/platform/win32/PlayerFileDialogServiceWin.cpp b/native/tools/simulator/libsimulator/lib/platform/win32/PlayerFileDialogServiceWin.cpp index b93fd35c20..18eec33818 100755 --- a/native/tools/simulator/libsimulator/lib/platform/win32/PlayerFileDialogServiceWin.cpp +++ b/native/tools/simulator/libsimulator/lib/platform/win32/PlayerFileDialogServiceWin.cpp @@ -26,12 +26,14 @@ #include +#include "cocos/base/UTF8.h" +#include "cocos/base/Log.h" #include "stdafx.h" #include #include #include +#include -#include "cocos2d.h" #include "PlayerUtils.h" #include "PlayerFileDialogServiceWin.h" diff --git a/native/tools/simulator/libsimulator/lib/platform/win32/PlayerMenuServiceWin.cpp b/native/tools/simulator/libsimulator/lib/platform/win32/PlayerMenuServiceWin.cpp index 6808e9a5ff..b79a68c664 100755 --- a/native/tools/simulator/libsimulator/lib/platform/win32/PlayerMenuServiceWin.cpp +++ b/native/tools/simulator/libsimulator/lib/platform/win32/PlayerMenuServiceWin.cpp @@ -24,6 +24,8 @@ ****************************************************************************/ +#include "cocos/base/UTF8.h" +#include "cocos/base/Log.h" #include "PlayerMenuServiceWin.h" PLAYER_NS_BEGIN diff --git a/native/tools/simulator/libsimulator/lib/platform/win32/PlayerMenuServiceWin.h b/native/tools/simulator/libsimulator/lib/platform/win32/PlayerMenuServiceWin.h index 3928da7ac3..f2821169e7 100755 --- a/native/tools/simulator/libsimulator/lib/platform/win32/PlayerMenuServiceWin.h +++ b/native/tools/simulator/libsimulator/lib/platform/win32/PlayerMenuServiceWin.h @@ -30,7 +30,7 @@ #include #include -#include "cocos2d.h" +#include "cocos/base/Vector.h" #include "stdafx.h" #include "PlayerMenuServiceProtocol.h" #include "SimulatorExport.h" diff --git a/native/tools/simulator/libsimulator/lib/platform/win32/PlayerMessageBoxServiceWin.cpp b/native/tools/simulator/libsimulator/lib/platform/win32/PlayerMessageBoxServiceWin.cpp index dec95ff6af..40d60f7999 100755 --- a/native/tools/simulator/libsimulator/lib/platform/win32/PlayerMessageBoxServiceWin.cpp +++ b/native/tools/simulator/libsimulator/lib/platform/win32/PlayerMessageBoxServiceWin.cpp @@ -23,7 +23,8 @@ THE SOFTWARE. ****************************************************************************/ - +#include "cocos/base/UTF8.h" +#include "cocos/base/Log.h" #include "PlayerMessageBoxServiceWin.h" PLAYER_NS_BEGIN diff --git a/native/tools/simulator/libsimulator/lib/platform/win32/PlayerMessageBoxServiceWin.h b/native/tools/simulator/libsimulator/lib/platform/win32/PlayerMessageBoxServiceWin.h index c59b65eea1..51399f8167 100755 --- a/native/tools/simulator/libsimulator/lib/platform/win32/PlayerMessageBoxServiceWin.h +++ b/native/tools/simulator/libsimulator/lib/platform/win32/PlayerMessageBoxServiceWin.h @@ -30,7 +30,6 @@ #include #include "stdafx.h" -#include "cocos2d.h" #include "PlayerMessageBoxServiceProtocol.h" PLAYER_NS_BEGIN diff --git a/native/tools/simulator/libsimulator/lib/platform/win32/PlayerTaskServiceWin.cpp b/native/tools/simulator/libsimulator/lib/platform/win32/PlayerTaskServiceWin.cpp index b7e0fd865f..b534257b9d 100755 --- a/native/tools/simulator/libsimulator/lib/platform/win32/PlayerTaskServiceWin.cpp +++ b/native/tools/simulator/libsimulator/lib/platform/win32/PlayerTaskServiceWin.cpp @@ -26,6 +26,8 @@ #include +#include "cocos/base/UTF8.h" +#include "cocos/base/Log.h" #include "stdafx.h" #include "shellapi.h" #include "PlayerTaskServiceWin.h" diff --git a/native/tools/simulator/libsimulator/lib/platform/win32/PlayerTaskServiceWin.h b/native/tools/simulator/libsimulator/lib/platform/win32/PlayerTaskServiceWin.h index 1402018965..e99f068a0f 100755 --- a/native/tools/simulator/libsimulator/lib/platform/win32/PlayerTaskServiceWin.h +++ b/native/tools/simulator/libsimulator/lib/platform/win32/PlayerTaskServiceWin.h @@ -28,6 +28,7 @@ #define __PLAYER_TASK_SERVICE_WIN_H_ #include +#include "cocos/base/Map.h" #include "PlayerTaskServiceProtocol.h" diff --git a/native/tools/simulator/libsimulator/lib/platform/win32/PlayerWin.h b/native/tools/simulator/libsimulator/lib/platform/win32/PlayerWin.h index 42bc9624a8..62438f459e 100755 --- a/native/tools/simulator/libsimulator/lib/platform/win32/PlayerWin.h +++ b/native/tools/simulator/libsimulator/lib/platform/win32/PlayerWin.h @@ -25,7 +25,6 @@ #pragma once -#include "cocos2d.h" #include "PlayerMacros.h" #include "PlayerProtocol.h" diff --git a/native/tools/simulator/libsimulator/proj.win32/Runtime_win32.cpp b/native/tools/simulator/libsimulator/proj.win32/Runtime_win32.cpp index ea96a03fd7..dc4dfdcf71 100755 --- a/native/tools/simulator/libsimulator/proj.win32/Runtime_win32.cpp +++ b/native/tools/simulator/libsimulator/proj.win32/Runtime_win32.cpp @@ -33,7 +33,6 @@ #include #pragma comment(lib,"ws2_32.lib") -#include "cocos2d.h" #include "runtime/ConfigParser.h" using namespace std;