mirror of
https://github.com/cocos/cocos4.git
synced 2026-11-21 16:12:40 +08:00
fix ci compile issue (#2433)
* fix CI compil issue * fix CI compile issue * fix ANDROID_PLATFORM * fix macors
This commit is contained in:
+12
-12
@@ -6,18 +6,18 @@ matrix:
|
||||
env:
|
||||
- BUILD_TARGET=windows_cmake
|
||||
language: cpp
|
||||
# - os: osx
|
||||
# env:
|
||||
# - BUILD_TARGET=macosx_cmake
|
||||
# language: cpp
|
||||
# osx_image: xcode10.3
|
||||
# sudo: required
|
||||
# - os: osx
|
||||
# env:
|
||||
# - BUILD_TARGET=ios_cmake
|
||||
# language: cpp
|
||||
# osx_image: xcode10.3
|
||||
# sudo: required
|
||||
- os: osx
|
||||
env:
|
||||
- BUILD_TARGET=macosx_cmake
|
||||
language: cpp
|
||||
osx_image: xcode10.3
|
||||
sudo: required
|
||||
- os: osx
|
||||
env:
|
||||
- BUILD_TARGET=ios_cmake
|
||||
language: cpp
|
||||
osx_image: xcode10.3
|
||||
sudo: required
|
||||
- os: linux
|
||||
dist: xenial
|
||||
sudo: required
|
||||
|
||||
@@ -306,15 +306,15 @@ Note:
|
||||
#define CC_TOSTR(s) #s
|
||||
|
||||
#if (CC_PLATFORM == CC_PLATFORM_WINDOWS)
|
||||
//# ifdef CC_STATIC
|
||||
//# define CC_CORE_API
|
||||
//# else
|
||||
# ifdef CC_STATIC
|
||||
# define CC_CORE_API
|
||||
# else
|
||||
# ifdef CC_CORE_EXPORTS
|
||||
# define CC_CORE_API __declspec(dllexport)
|
||||
# else
|
||||
# define CC_CORE_API __declspec(dllimport)
|
||||
# endif
|
||||
//# endif
|
||||
# endif
|
||||
#else
|
||||
# define CC_CORE_API
|
||||
#endif
|
||||
|
||||
@@ -13,6 +13,7 @@ public:
|
||||
virtual bool initialize(const GFXDeviceInfo& info) override;
|
||||
virtual void destroy() override;
|
||||
virtual void resize(uint width, uint height) override;
|
||||
virtual void begin() override {};
|
||||
virtual void present() override;
|
||||
virtual GFXWindow* createWindow(const GFXWindowInfo& info) override;
|
||||
virtual GFXQueue* createQueue(const GFXQueueInfo& info) override;
|
||||
|
||||
@@ -9,6 +9,10 @@
|
||||
|
||||
#if (CC_PLATFORM == CC_PLATFORM_ANDROID || CC_PLATFORM == CC_PLATFORM_WINDOWS)
|
||||
#define USE_GLES2
|
||||
#elif (CC_PLATFORM == CC_PLATFORM_MAC_IOS)
|
||||
#define USE_GLES3
|
||||
#else
|
||||
#define USE_METAL
|
||||
#endif
|
||||
|
||||
#ifdef USE_GLES2
|
||||
@@ -726,13 +730,11 @@ bool register_all_gfx_manual(se::Object* obj)
|
||||
register_all_gles2(obj);
|
||||
__jsb_cocos2d_GLES2Device_proto->defineFunction("copyBuffersToTexture", _SE(js_gfx_GLES2Device_copyBuffersToTexture));
|
||||
__jsb_cocos2d_GLES2Device_proto->defineFunction("copyTexImagesToTexture", _SE(js_gfx_GLES2Device_copyTexImagesToTexture));
|
||||
#endif // USE_GLES2
|
||||
|
||||
#elif defined USE_GLES3
|
||||
register_all_gles3(obj);
|
||||
__jsb_cocos2d_GLES3Device_proto->defineFunction("copyBuffersToTexture", _SE(js_gfx_GLES3Device_copyBuffersToTexture));
|
||||
__jsb_cocos2d_GLES3Device_proto->defineFunction("copyTexImagesToTexture", _SE(js_gfx_GLES3Device_copyTexImagesToTexture));
|
||||
|
||||
#if (CC_PLATFORM == CC_PLATFORM_MAC_OSX)
|
||||
#elif defined USE_METAL
|
||||
register_all_mtl(obj);
|
||||
__jsb_cocos2d_CCMTLDevice_proto->defineFunction("copyBuffersToTexture", _SE(js_gfx_CCMTLDevice_copyBuffersToTexture));
|
||||
__jsb_cocos2d_CCMTLDevice_proto->defineFunction("copyTexImagesToTexture", _SE(js_gfx_CCMTLDevice_copyTexImagesToTexture));
|
||||
|
||||
Vendored
+1
-1
@@ -1,5 +1,5 @@
|
||||
{
|
||||
"version": "v3d-4",
|
||||
"version": "v3d-10",
|
||||
"zip_file_size": "115677698",
|
||||
"repo_name": "cocos2d-x-lite-external",
|
||||
"repo_parent": "https://github.com/cocos-creator/"
|
||||
|
||||
+1
-1
@@ -17,7 +17,7 @@ android {
|
||||
if (project.hasProperty("PROP_USE_CMAKE")) {
|
||||
cmake {
|
||||
targets "cocos2djs"
|
||||
arguments "-DANDROID_STL=c++_static", "-DANDROID_TOOLCHAIN=clang", "-DANDROID_ARM_NEON=TRUE", "-DCOCOS_X_ROOT=${COCOS_X_ROOT}"
|
||||
arguments "-DANDROID_STL=c++_static", "-DANDROID_PLATFORM=android-$PROP_TARGET_SDK_VERSION", "-DANDROID_TOOLCHAIN=clang", "-DANDROID_ARM_NEON=TRUE", "-DCOCOS_X_ROOT=${COCOS_X_ROOT}"
|
||||
cppFlags "-frtti -fexceptions -fsigned-char"
|
||||
abiFilters.addAll(PROP_APP_ABI.split(':').collect{it as String})
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user