Lothario
/
axmol
mirror of https://github.com/axmolengine/axmol.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix linux ci

This commit is contained in:
halx99 2022-02-24 19:00:49 +08:00
parent ddd150d321
commit d8b858203e
2 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
tests/cpp-tests/CMakeLists.txt
View File

@ -339,10 +339,12 @@ list(APPEND GAME_SOURCE
Classes/ZipTest/ZipTests.cpp
)
list(APPEND GAME_HEADER
Classes/UITest/CocoStudioGUITest/UIVideoPlayerTest/UIVideoPlayerTest.h)
list(APPEND GAME_SOURCE
Classes/UITest/CocoStudioGUITest/UIVideoPlayerTest/UIVideoPlayerTest.cpp)
if(ANDROID OR IOS OR WIN32)
list(APPEND GAME_HEADER
Classes/UITest/CocoStudioGUITest/UIVideoPlayerTest/UIVideoPlayerTest.h)
list(APPEND GAME_SOURCE
Classes/UITest/CocoStudioGUITest/UIVideoPlayerTest/UIVideoPlayerTest.cpp)
endif()
if(ANDROID OR IOS)
list(APPEND GAME_HEADER

6
tests/cpp-tests/Classes/UITest/CocoStudioGUITest/CocosGUIScene.cpp
View File

@ -44,7 +44,8 @@
#include "UIFocusTest/UIFocusTest.h"
#include "UITabControlTest/UITabControlTest.h"
#if !defined(CC_TARGET_OS_TVOS)
#if (CC_TARGET_PLATFORM == CC_PLATFORM_ANDROID || CC_TARGET_PLATFORM == CC_PLATFORM_IOS || \
CC_TARGET_PLATFORM == CC_PLATFORM_WIN32) !defined(CC_TARGET_OS_TVOS)
# include "UIVideoPlayerTest/UIVideoPlayerTest.h"
#endif
@ -62,7 +63,8 @@
GUIDynamicCreateTests::GUIDynamicCreateTests()
{
#if !defined(CC_TARGET_OS_TVOS)
#if (CC_TARGET_PLATFORM == CC_PLATFORM_ANDROID || CC_TARGET_PLATFORM == CC_PLATFORM_IOS || \
CC_TARGET_PLATFORM == CC_PLATFORM_WIN32) !defined(CC_TARGET_OS_TVOS)
addTest("VideoPlayer Test", []() { return new VideoPlayerTests; });
#endif
#if (CC_TARGET_PLATFORM == CC_PLATFORM_ANDROID || CC_TARGET_PLATFORM == CC_PLATFORM_IOS) && \