From 47db7878fc8fb867e33d72d88698746889b81b9f Mon Sep 17 00:00:00 2001 From: badlogic Date: Thu, 12 Dec 2019 16:08:48 +0100 Subject: [PATCH 1/2] [cocos2dx] Fix macOS target configuration. --- .../proj.ios_mac/spine-cocos2d-x.xcodeproj/project.pbxproj | 2 ++ 1 file changed, 2 insertions(+) diff --git a/spine-cocos2dx/example/proj.ios_mac/spine-cocos2d-x.xcodeproj/project.pbxproj b/spine-cocos2dx/example/proj.ios_mac/spine-cocos2d-x.xcodeproj/project.pbxproj index cf8d971a9..794b142eb 100644 --- a/spine-cocos2dx/example/proj.ios_mac/spine-cocos2d-x.xcodeproj/project.pbxproj +++ b/spine-cocos2dx/example/proj.ios_mac/spine-cocos2d-x.xcodeproj/project.pbxproj @@ -171,6 +171,7 @@ 76798D1E22A95AEF00F77964 /* ConstraintData.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 76798D1C22A95AB300F77964 /* ConstraintData.cpp */; }; 767D80E322B29F22000BD703 /* MixAndMatchExample.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 767D80E022B29F22000BD703 /* MixAndMatchExample.cpp */; }; 767D80E422B2A003000BD703 /* MixAndMatchExample.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 767D80E022B29F22000BD703 /* MixAndMatchExample.cpp */; }; + 76A7269023A28F5600A3FA95 /* SkeletonRenderer.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 763A8A97239FDC0400FBEDDC /* SkeletonRenderer.cpp */; }; 76AAA3C01D180F7C00C54FCB /* AppDelegate.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 76AAA3B31D180F7C00C54FCB /* AppDelegate.cpp */; }; 76AAA3C11D180F7C00C54FCB /* BatchingExample.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 76AAA3B61D180F7C00C54FCB /* BatchingExample.cpp */; }; 76AAA3C21D180F7C00C54FCB /* GoblinsExample.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 76AAA3B81D180F7C00C54FCB /* GoblinsExample.cpp */; }; @@ -959,6 +960,7 @@ isa = PBXSourcesBuildPhase; buildActionMask = 2147483647; files = ( + 76A7269023A28F5600A3FA95 /* SkeletonRenderer.cpp in Sources */, 76D28ACE239FAF2C00FB142D /* SkeletonBatch.cpp in Sources */, 76D28AD0239FAF2C00FB142D /* SkeletonTwoColorBatch.cpp in Sources */, 767D80E422B2A003000BD703 /* MixAndMatchExample.cpp in Sources */, From 1daedd3f1c2bcfa7c1da6b3141570f83def92e7e Mon Sep 17 00:00:00 2001 From: badlogic Date: Thu, 12 Dec 2019 16:27:20 +0100 Subject: [PATCH 2/2] [cocos2dx] Disable cocos2d spine editor support for our example project. --- spine-cocos2dx/example-v4/CMakeLists.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/spine-cocos2dx/example-v4/CMakeLists.txt b/spine-cocos2dx/example-v4/CMakeLists.txt index 8c18a0b5b..f63e558af 100644 --- a/spine-cocos2dx/example-v4/CMakeLists.txt +++ b/spine-cocos2dx/example-v4/CMakeLists.txt @@ -28,6 +28,7 @@ cmake_minimum_required(VERSION 3.6) set(APP_NAME spine-cocos2dx-example) project(${APP_NAME}) +option(BUILD_EDITOR_SPINE "Build editor support for spine" ON) if(XCODE) if(NOT DEFINED CMAKE_XCODE_ATTRIBUTE_IPHONEOS_DEPLOYMENT_TARGET)