mirror of
https://github.com/cocos/cocos4.git
synced 2026-11-21 08:02:39 +08:00
remove CCPlatformConfig.h / 3d-gfx (#2555)
This commit is contained in:
+17
-1
@@ -1,25 +1,42 @@
|
||||
|
||||
|
||||
set(CC_PLATFORM_MAC_IOS 1)
|
||||
set(CC_PLATFORM_WINDOWS 2)
|
||||
set(CC_PLATFORM_ANDROID 3)
|
||||
set(CC_PLATFORM_MAC_OSX 4)
|
||||
set(CC_PLATFORM 1)
|
||||
|
||||
if(${CMAKE_SYSTEM_NAME} MATCHES "Windows")
|
||||
set(WINDOWS TRUE)
|
||||
set(PLATFORM_FOLDER win32)
|
||||
set(CC_PLATFORM ${CC_PLATFORM_WINDOWS})
|
||||
elseif(${CMAKE_SYSTEM_NAME} MATCHES "Android")
|
||||
set(PLATFORM_FOLDER android)
|
||||
set(ANDROID TRUE)
|
||||
set(CC_PLATFORM ${CC_PLATFORM_ANDROID})
|
||||
elseif(${CMAKE_SYSTEM_NAME} MATCHES "Darwin")
|
||||
set(APPLE TRUE)
|
||||
set(MACOSX TRUE)
|
||||
set(PLATFORM_FOLDER mac)
|
||||
set(CC_PLATFORM ${CC_PLATFORM_MAC_OSX})
|
||||
elseif(${CMAKE_SYSTEM_NAME} MATCHES "iOS")
|
||||
set(APPLE TRUE)
|
||||
set(IOS TRUE)
|
||||
set(PLATFORM_FOLDER ios)
|
||||
set(CC_PLATFORM ${CC_PLATFORM_MAC_IOS})
|
||||
else()
|
||||
message(FATAL_ERROR "Unsupported platform, CMake will exit")
|
||||
return()
|
||||
endif()
|
||||
|
||||
# platform macros
|
||||
|
||||
add_definitions(-DCC_PLATFORM_WINDOWS=${CC_PLATFORM_WINDOWS} )
|
||||
add_definitions(-DCC_PLATFORM_MAC_OSX=${CC_PLATFORM_MAC_OSX} )
|
||||
add_definitions(-DCC_PLATFORM_MAC_IOS=${CC_PLATFORM_MAC_IOS} )
|
||||
add_definitions(-DCC_PLATFORM_ANDROID=${CC_PLATFORM_ANDROID} )
|
||||
add_definitions(-DCC_PLATFORM=${CC_PLATFORM})
|
||||
|
||||
# generators that are capable of organizing into a hierarchy of folders
|
||||
set_property(GLOBAL PROPERTY USE_FOLDERS ON)
|
||||
# simplify generator condition, please use them everywhere
|
||||
@@ -353,7 +370,6 @@ cocos_source_files(
|
||||
cocos/platform/CCFileUtils.h
|
||||
cocos/platform/CCImage.cpp
|
||||
cocos/platform/CCImage.h
|
||||
cocos/platform/CCPlatformConfig.h
|
||||
cocos/platform/CCPlatformDefine.h
|
||||
cocos/platform/CCSAXParser.cpp
|
||||
cocos/platform/CCSAXParser.h
|
||||
|
||||
@@ -23,8 +23,6 @@
|
||||
THE SOFTWARE.
|
||||
****************************************************************************/
|
||||
|
||||
#include "platform/CCPlatformConfig.h"
|
||||
|
||||
#include "audio/include/AudioEngine.h"
|
||||
#include "platform/CCFileUtils.h"
|
||||
#include "base/ccUtils.h"
|
||||
|
||||
@@ -25,7 +25,6 @@
|
||||
|
||||
#pragma once
|
||||
|
||||
#include "platform/CCPlatformConfig.h"
|
||||
#if CC_PLATFORM == CC_PLATFORM_MAC_IOS || CC_PLATFORM == CC_PLATFORM_MAC_OSX
|
||||
|
||||
#import <OpenAL/al.h>
|
||||
|
||||
@@ -25,7 +25,6 @@
|
||||
|
||||
#define LOG_TAG "AudioCache"
|
||||
|
||||
#include "platform/CCPlatformConfig.h"
|
||||
#if CC_PLATFORM == CC_PLATFORM_MAC_IOS || CC_PLATFORM == CC_PLATFORM_MAC_OSX
|
||||
|
||||
#include "audio/apple/AudioCache.h"
|
||||
|
||||
@@ -23,7 +23,6 @@
|
||||
THE SOFTWARE.
|
||||
****************************************************************************/
|
||||
|
||||
#include "platform/CCPlatformConfig.h"
|
||||
#if CC_PLATFORM == CC_PLATFORM_MAC_IOS || CC_PLATFORM == CC_PLATFORM_MAC_OSX
|
||||
|
||||
#ifndef __AUDIO_ENGINE_INL_H_
|
||||
|
||||
@@ -25,7 +25,7 @@
|
||||
|
||||
#define LOG_TAG "AudioEngine-inl.mm"
|
||||
|
||||
#include "platform/CCPlatformConfig.h"
|
||||
|
||||
#if CC_PLATFORM == CC_PLATFORM_MAC_IOS || CC_PLATFORM == CC_PLATFORM_MAC_OSX
|
||||
|
||||
#include "audio/apple/AudioEngine-inl.h"
|
||||
|
||||
@@ -25,7 +25,7 @@
|
||||
|
||||
#pragma once
|
||||
|
||||
#include "platform/CCPlatformConfig.h"
|
||||
|
||||
#if CC_PLATFORM == CC_PLATFORM_MAC_IOS || CC_PLATFORM == CC_PLATFORM_MAC_OSX
|
||||
|
||||
#include "base/ccMacros.h"
|
||||
|
||||
@@ -25,7 +25,7 @@
|
||||
|
||||
#define LOG_TAG "AudioPlayer"
|
||||
|
||||
#include "platform/CCPlatformConfig.h"
|
||||
|
||||
#if CC_PLATFORM == CC_PLATFORM_MAC_IOS || CC_PLATFORM == CC_PLATFORM_MAC_OSX
|
||||
|
||||
#import <Foundation/Foundation.h>
|
||||
|
||||
@@ -25,7 +25,7 @@
|
||||
|
||||
#pragma once
|
||||
|
||||
#include "platform/CCPlatformConfig.h"
|
||||
|
||||
#include "base/ccMacros.h"
|
||||
#include "audio/include/Export.h"
|
||||
|
||||
|
||||
@@ -25,7 +25,7 @@
|
||||
|
||||
#define LOG_TAG "AudioCache"
|
||||
|
||||
#include "platform/CCPlatformConfig.h"
|
||||
|
||||
|
||||
#if CC_PLATFORM == CC_PLATFORM_WINDOWS
|
||||
|
||||
|
||||
@@ -25,7 +25,7 @@
|
||||
|
||||
#pragma once
|
||||
|
||||
#include "platform/CCPlatformConfig.h"
|
||||
|
||||
|
||||
#if CC_PLATFORM == CC_PLATFORM_WINDOWS
|
||||
|
||||
|
||||
@@ -24,7 +24,7 @@
|
||||
****************************************************************************/
|
||||
#define LOG_TAG "AudioEngine-Win32"
|
||||
|
||||
#include "platform/CCPlatformConfig.h"
|
||||
|
||||
|
||||
#if CC_PLATFORM == CC_PLATFORM_WINDOWS
|
||||
|
||||
|
||||
@@ -22,7 +22,7 @@
|
||||
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
|
||||
THE SOFTWARE.
|
||||
****************************************************************************/
|
||||
#include "platform/CCPlatformConfig.h"
|
||||
|
||||
|
||||
#if CC_PLATFORM == CC_PLATFORM_WINDOWS
|
||||
|
||||
|
||||
@@ -25,7 +25,7 @@
|
||||
|
||||
#define LOG_TAG "AudioPlayer"
|
||||
|
||||
#include "platform/CCPlatformConfig.h"
|
||||
|
||||
|
||||
#if CC_PLATFORM == CC_PLATFORM_WINDOWS
|
||||
#include "audio/win32/AudioPlayer.h"
|
||||
|
||||
@@ -25,7 +25,6 @@
|
||||
|
||||
#pragma once
|
||||
|
||||
#include "platform/CCPlatformConfig.h"
|
||||
|
||||
#if CC_PLATFORM == CC_PLATFORM_WINDOWS
|
||||
|
||||
|
||||
@@ -29,7 +29,7 @@ THE SOFTWARE.
|
||||
#ifndef __CCCONFIG_H__
|
||||
#define __CCCONFIG_H__
|
||||
|
||||
#include "platform/CCPlatformConfig.h"
|
||||
|
||||
|
||||
/**
|
||||
* @file
|
||||
|
||||
@@ -73,7 +73,6 @@ THE SOFTWARE.
|
||||
#include "platform/CCDevice.h"
|
||||
#include "platform/CCFileUtils.h"
|
||||
#include "platform/CCImage.h"
|
||||
#include "platform/CCPlatformConfig.h"
|
||||
#include "base/ccMacros.h"
|
||||
#include "platform/CCSAXParser.h"
|
||||
#include "platform/CCCanvasRenderingContext2D.h"
|
||||
|
||||
@@ -27,7 +27,7 @@
|
||||
#define __HTTPASYNCONNECTION_H__
|
||||
/// @cond DO_NOT_SHOW
|
||||
|
||||
#include "platform/CCPlatformConfig.h"
|
||||
|
||||
#if (CC_PLATFORM == CC_PLATFORM_MAC_OSX) || (CC_PLATFORM == CC_PLATFORM_MAC_IOS)
|
||||
|
||||
#import <Foundation/Foundation.h>
|
||||
|
||||
@@ -22,7 +22,7 @@
|
||||
THE SOFTWARE.
|
||||
****************************************************************************/
|
||||
|
||||
#include "platform/CCPlatformConfig.h"
|
||||
|
||||
#if (CC_PLATFORM == CC_PLATFORM_MAC_OSX) || (CC_PLATFORM == CC_PLATFORM_MAC_IOS)
|
||||
|
||||
#import "network/HttpAsynConnection-apple.h"
|
||||
|
||||
@@ -25,7 +25,7 @@
|
||||
THE SOFTWARE.
|
||||
****************************************************************************/
|
||||
|
||||
#include "platform/CCPlatformConfig.h"
|
||||
|
||||
#if (CC_PLATFORM == CC_PLATFORM_ANDROID)
|
||||
|
||||
#include "network/HttpClient.h"
|
||||
|
||||
@@ -28,7 +28,7 @@ THE SOFTWARE.
|
||||
#include <memory>
|
||||
#include <thread> // // std::this_thread::sleep_for
|
||||
#include "base/ccMacros.h"
|
||||
#include "platform/CCPlatformConfig.h"
|
||||
|
||||
#include "platform/CCPlatformDefine.h"
|
||||
#include "scripting/js-bindings/event/EventDispatcher.h"
|
||||
#include "base/CCScheduler.h"
|
||||
|
||||
@@ -1,65 +0,0 @@
|
||||
/****************************************************************************
|
||||
Copyright (c) 2010-2012 cocos2d-x.org
|
||||
Copyright (c) 2013-2016 Chukong Technologies Inc.
|
||||
Copyright (c) 2017-2018 Xiamen Yaji Software Co., Ltd.
|
||||
|
||||
http://www.cocos2d-x.org
|
||||
|
||||
Permission is hereby granted, free of charge, to any person obtaining a copy
|
||||
of this software and associated documentation files (the "Software"), to deal
|
||||
in the Software without restriction, including without limitation the rights
|
||||
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
|
||||
copies of the Software, and to permit persons to whom the Software is
|
||||
furnished to do so, subject to the following conditions:
|
||||
|
||||
The above copyright notice and this permission notice shall be included in
|
||||
all copies or substantial portions of the Software.
|
||||
|
||||
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
|
||||
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
|
||||
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
|
||||
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
|
||||
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
|
||||
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
|
||||
THE SOFTWARE.
|
||||
****************************************************************************/
|
||||
#pragma once
|
||||
|
||||
/// @cond DO_NOT_SHOW
|
||||
|
||||
// Initial platform stuff to set.
|
||||
#define CC_PLATFORM_WINDOWS 1
|
||||
#define CC_PLATFORM_LINUX 2
|
||||
#define CC_PLATFORM_MAC_OSX 3
|
||||
#define CC_PLATFORM_MAC_IOS 4
|
||||
#define CC_PLATFORM_ANDROID 5
|
||||
#define CC_PLATFORM_NACL 6
|
||||
|
||||
// Platform recognition
|
||||
#if defined(_WIN32) || defined(__WIN32__) || defined(WIN32) || defined(_WIN64) || defined(__WIN64__) || defined(WIN64)
|
||||
# define CC_PLATFORM CC_PLATFORM_WINDOWS
|
||||
#elif defined(__APPLE_CC__)
|
||||
// Device Simulator
|
||||
// Both requiring OS version 4.0 or greater
|
||||
# if __ENVIRONMENT_IPHONE_OS_VERSION_MIN_REQUIRED__ >= 40000 || __IPHONE_OS_VERSION_MIN_REQUIRED >= 40000
|
||||
# define CC_PLATFORM CC_PLATFORM_MAC_IOS
|
||||
# else
|
||||
# define CC_PLATFORM CC_PLATFORM_MAC_OSX
|
||||
# endif
|
||||
#elif defined(__ANDROID__)
|
||||
# define CC_PLATFORM CC_PLATFORM_ANDROID
|
||||
#elif defined(linux) || defined(__linux) || defined(__linux__)
|
||||
# define CC_PLATFORM CC_PLATFORM_LINUX
|
||||
#elif defined(__native_client__)
|
||||
# define CC_PLATFORM CC_PLATFORM_NACL
|
||||
#else
|
||||
# error "Couldn't recognize platform"
|
||||
#endif
|
||||
|
||||
#if (CC_PLATFORM == CC_PLATFORM_WINDOWS)
|
||||
#ifndef __MINGW32__
|
||||
#pragma warning (disable:4127)
|
||||
#endif
|
||||
#endif
|
||||
|
||||
/// @endcond
|
||||
@@ -28,7 +28,7 @@ THE SOFTWARE.
|
||||
#define __PLATFORM_CCPLATFORMDEFINE_H__
|
||||
/// @cond DO_NOT_SHOW
|
||||
|
||||
#include "platform/CCPlatformConfig.h"
|
||||
|
||||
|
||||
#if CC_PLATFORM == CC_PLATFORM_MAC_OSX
|
||||
#include "platform/mac/CCPlatformDefine-mac.h"
|
||||
|
||||
@@ -27,7 +27,7 @@
|
||||
#define __CCSAXPARSER_H__
|
||||
/// @cond DO_NOT_SHOW
|
||||
|
||||
#include "platform/CCPlatformConfig.h"
|
||||
|
||||
#include "base/ccMacros.h"
|
||||
#include <string>
|
||||
|
||||
|
||||
@@ -23,7 +23,7 @@ THE SOFTWARE.
|
||||
****************************************************************************/
|
||||
#pragma once
|
||||
|
||||
#include "platform/CCPlatformConfig.h"
|
||||
|
||||
|
||||
#if CC_PLATFORM == CC_PLATFORM_WINDOWS
|
||||
|
||||
|
||||
@@ -24,7 +24,7 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
|
||||
THE SOFTWARE.
|
||||
****************************************************************************/
|
||||
|
||||
#include "platform/CCPlatformConfig.h"
|
||||
|
||||
#if CC_PLATFORM == CC_PLATFORM_ANDROID
|
||||
|
||||
#include "platform/CCDevice.h"
|
||||
|
||||
@@ -24,7 +24,7 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
|
||||
THE SOFTWARE.
|
||||
****************************************************************************/
|
||||
|
||||
#include "platform/CCPlatformConfig.h"
|
||||
|
||||
#if CC_PLATFORM == CC_PLATFORM_ANDROID
|
||||
|
||||
#include "platform/android/CCFileUtils-android.h"
|
||||
|
||||
@@ -26,7 +26,7 @@ Copyright (c) 2017-2018 Xiamen Yaji Software Co., Ltd.
|
||||
#ifndef __CC_FILEUTILS_ANDROID_H__
|
||||
#define __CC_FILEUTILS_ANDROID_H__
|
||||
|
||||
#include "platform/CCPlatformConfig.h"
|
||||
|
||||
#if CC_PLATFORM == CC_PLATFORM_ANDROID
|
||||
|
||||
#include "platform/CCFileUtils.h"
|
||||
|
||||
@@ -27,7 +27,7 @@ THE SOFTWARE.
|
||||
#ifndef __CCPLATFORMDEFINE_H__
|
||||
#define __CCPLATFORMDEFINE_H__
|
||||
|
||||
#include "platform/CCPlatformConfig.h"
|
||||
|
||||
#if CC_PLATFORM == CC_PLATFORM_ANDROID
|
||||
|
||||
#include <android/log.h>
|
||||
|
||||
@@ -24,7 +24,7 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
|
||||
THE SOFTWARE.
|
||||
****************************************************************************/
|
||||
|
||||
#include "platform/CCPlatformConfig.h"
|
||||
|
||||
#if CC_PLATFORM == CC_PLATFORM_MAC_IOS
|
||||
|
||||
#import "platform/CCImage.h"
|
||||
|
||||
@@ -26,7 +26,7 @@ THE SOFTWARE.
|
||||
#ifndef __CCPLATFORMDEFINE_H__
|
||||
#define __CCPLATFORMDEFINE_H__
|
||||
|
||||
#include "platform/CCPlatformConfig.h"
|
||||
|
||||
#if CC_PLATFORM == CC_PLATFORM_MAC_IOS
|
||||
|
||||
#include <assert.h>
|
||||
|
||||
@@ -24,7 +24,7 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
|
||||
THE SOFTWARE.
|
||||
****************************************************************************/
|
||||
|
||||
#include "platform/CCPlatformConfig.h"
|
||||
|
||||
#if CC_PLATFORM == CC_PLATFORM_MAC_OSX
|
||||
|
||||
#include "platform/CCDevice.h"
|
||||
|
||||
@@ -27,7 +27,7 @@ THE SOFTWARE.
|
||||
#ifndef __CCPLATFORMDEFINE_H__
|
||||
#define __CCPLATFORMDEFINE_H__
|
||||
|
||||
#include "platform/CCPlatformConfig.h"
|
||||
|
||||
#if CC_PLATFORM == CC_PLATFORM_MAC_OSX
|
||||
|
||||
#include <assert.h>
|
||||
|
||||
@@ -24,7 +24,7 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
|
||||
THE SOFTWARE.
|
||||
****************************************************************************/
|
||||
|
||||
#include "platform/CCPlatformConfig.h"
|
||||
|
||||
#if CC_PLATFORM == CC_PLATFORM_WINDOWS
|
||||
|
||||
#include "platform/CCDevice.h"
|
||||
|
||||
@@ -24,7 +24,7 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
|
||||
THE SOFTWARE.
|
||||
****************************************************************************/
|
||||
|
||||
#include "platform/CCPlatformConfig.h"
|
||||
|
||||
#if CC_PLATFORM == CC_PLATFORM_WINDOWS
|
||||
|
||||
#include "platform/win32/CCFileUtils-win32.h"
|
||||
|
||||
@@ -26,7 +26,7 @@ THE SOFTWARE.
|
||||
#ifndef __CC_FILEUTILS_WIN32_H__
|
||||
#define __CC_FILEUTILS_WIN32_H__
|
||||
|
||||
#include "platform/CCPlatformConfig.h"
|
||||
|
||||
#if CC_PLATFORM == CC_PLATFORM_WINDOWS
|
||||
|
||||
#include "platform/CCFileUtils.h"
|
||||
|
||||
@@ -26,7 +26,7 @@ THE SOFTWARE.
|
||||
#ifndef __CCPLATFORMDEFINE_H__
|
||||
#define __CCPLATFORMDEFINE_H__
|
||||
|
||||
#include "platform/CCPlatformConfig.h"
|
||||
|
||||
#if CC_PLATFORM == CC_PLATFORM_WINDOWS
|
||||
|
||||
#ifdef __MINGW32__
|
||||
|
||||
@@ -32,7 +32,7 @@
|
||||
#ifndef _MSC_STDINT_H_ // [
|
||||
#define _MSC_STDINT_H_
|
||||
|
||||
#include "platform/CCPlatformConfig.h"
|
||||
|
||||
#if CC_PLATFORM == CC_PLATFORM_WINDOWS
|
||||
|
||||
#ifndef _MSC_VER // [
|
||||
|
||||
@@ -962,7 +962,8 @@ clang_flags = -nostdinc -x c++ -std=c++11 -fsigned-char -U__SSE__
|
||||
cocos_headers = -I%(cocosdir)s/cocos -I%(cocosdir)s/cocos/platform/android -I%(cocosdir)s/external/sources
|
||||
|
||||
# Configure building parameters for Cocos2D-X
|
||||
cocos_flags = -DANDROID
|
||||
cocos_flags = -DANDROID -DCC_PLATFORM=3 -DCC_PLATFORM_MAC_IOS=1 -DCC_PLATFORM_MAC_OSX=4 -DCC_PLATFORM_WINDOWS=2 -DCC_PLATFORM_ANDROID=3
|
||||
|
||||
|
||||
# Configure extra building parameters
|
||||
extra_arguments = %(android_headers)s %(clang_headers)s %(cxxgenerator_headers)s %(cocos_headers)s %(android_flags)s %(clang_flags)s %(cocos_flags)s %(extra_flags)s
|
||||
|
||||
@@ -950,7 +950,8 @@ clang_flags = -nostdinc -x c++ -std=c++11 -fsigned-char -U__SSE__
|
||||
cocos_headers = -I%(cocosdir)s/cocos -I%(cocosdir)s/cocos/platform/android -I%(cocosdir)s/external/sources
|
||||
|
||||
# 配置引擎编译参数
|
||||
cocos_flags = -DANDROID
|
||||
cocos_flags = -DANDROID -DCC_PLATFORM=3 -DCC_PLATFORM_MAC_IOS=1 -DCC_PLATFORM_MAC_OSX=4 -DCC_PLATFORM_WINDOWS=2 -DCC_PLATFORM_ANDROID=3
|
||||
|
||||
|
||||
# 配置额外的编译参数
|
||||
extra_arguments = %(android_headers)s %(clang_headers)s %(cxxgenerator_headers)s %(cocos_headers)s %(android_flags)s %(clang_flags)s %(cocos_flags)s %(extra_flags)s
|
||||
|
||||
@@ -23,7 +23,7 @@
|
||||
THE SOFTWARE.
|
||||
****************************************************************************/
|
||||
#include "ScriptEngine.hpp"
|
||||
#include "platform/CCPlatformConfig.h"
|
||||
|
||||
|
||||
#if SCRIPT_ENGINE_TYPE == SCRIPT_ENGINE_V8
|
||||
|
||||
|
||||
@@ -3,7 +3,7 @@
|
||||
#include "scripting/js-bindings/manual/jsb_global.h"
|
||||
#include "scripting/js-bindings/jswrapper/SeApi.h"
|
||||
#include "scripting/js-bindings/auto/jsb_gfx_auto.hpp"
|
||||
#include "platform/CCPlatformConfig.h"
|
||||
|
||||
|
||||
#if (CC_PLATFORM == CC_PLATFORM_ANDROID || CC_PLATFORM == CC_PLATFORM_WINDOWS)
|
||||
#define USE_VULKAN
|
||||
|
||||
Vendored
+2
-2
@@ -1,9 +1,9 @@
|
||||
{
|
||||
"version": "v3d-gfx-15",
|
||||
"version": "v3d-gfx-16",
|
||||
"from": {
|
||||
"type": "github",
|
||||
"owner": "cocos-creator",
|
||||
"name": "cocos2d-x-lite-external",
|
||||
"checkout": "v3d-gfx-15"
|
||||
"checkout": "v3d-gfx-16"
|
||||
}
|
||||
}
|
||||
|
||||
@@ -197,7 +197,6 @@
|
||||
"cocos/platform/CCFileUtils.h",
|
||||
"cocos/platform/CCImage.cpp",
|
||||
"cocos/platform/CCImage.h",
|
||||
"cocos/platform/CCPlatformConfig.h",
|
||||
"cocos/platform/CCPlatformDefine.h",
|
||||
"cocos/platform/CCSAXParser.cpp",
|
||||
"cocos/platform/CCSAXParser.h",
|
||||
|
||||
@@ -14,7 +14,8 @@ clang_headers = -I%(clangllvmdir)s/%(clang_include)s
|
||||
clang_flags = -nostdinc -x c++ -std=c++11 -U __SSE__
|
||||
|
||||
cocos_headers = -I%(anysdk_appstore_dir)s
|
||||
cocos_flags = -DANDROID
|
||||
cocos_flags = -DANDROID -DCC_PLATFORM=3 -DCC_PLATFORM_MAC_IOS=1 -DCC_PLATFORM_MAC_OSX=4 -DCC_PLATFORM_WINDOWS=2 -DCC_PLATFORM_ANDROID=3
|
||||
|
||||
|
||||
cxxgenerator_headers =
|
||||
|
||||
|
||||
@@ -17,7 +17,8 @@ cocos_headers = -I%(anysdk_common_dir)s
|
||||
|
||||
replace_headers = extensions/anysdk/js-bindings/jsb_anysdk_protocols_auto.hpp::jsb_anysdk_protocols_auto.hpp
|
||||
|
||||
cocos_flags = -DANDROID
|
||||
cocos_flags = -DANDROID -DCC_PLATFORM=3 -DCC_PLATFORM_MAC_IOS=1 -DCC_PLATFORM_MAC_OSX=4 -DCC_PLATFORM_WINDOWS=2 -DCC_PLATFORM_ANDROID=3
|
||||
|
||||
|
||||
cxxgenerator_headers =
|
||||
|
||||
|
||||
@@ -15,7 +15,8 @@ clang_headers =
|
||||
clang_flags = -nostdinc -x c++ -std=c++11 -fsigned-char -U__SSE__
|
||||
|
||||
cocos_headers = -I%(cocosdir)s/cocos -I%(cocosdir)s/cocos/platform/android -I%(cocosdir)s/external/sources
|
||||
cocos_flags = -DANDROID
|
||||
cocos_flags = -DANDROID -DCC_PLATFORM=3 -DCC_PLATFORM_MAC_IOS=1 -DCC_PLATFORM_MAC_OSX=4 -DCC_PLATFORM_WINDOWS=2 -DCC_PLATFORM_ANDROID=3
|
||||
|
||||
|
||||
cxxgenerator_headers =
|
||||
|
||||
|
||||
@@ -17,7 +17,8 @@ clang_headers =
|
||||
clang_flags = -nostdinc -x c++ -std=c++11 -fsigned-char -U__SSE__
|
||||
|
||||
cocos_headers = -I%(cocosdir)s -I%(cocosdir)s/cocos -I%(cocosdir)s/cocos/platform/android -I%(cocosdir)s/external/sources
|
||||
cocos_flags = -DANDROID
|
||||
cocos_flags = -DANDROID -DCC_PLATFORM=3 -DCC_PLATFORM_MAC_IOS=1 -DCC_PLATFORM_MAC_OSX=4 -DCC_PLATFORM_WINDOWS=2 -DCC_PLATFORM_ANDROID=3
|
||||
|
||||
|
||||
cxxgenerator_headers =
|
||||
|
||||
|
||||
@@ -15,7 +15,8 @@ clang_flags = -nostdinc -x c++ -std=c++11 -fsigned-char -U__SSE__
|
||||
|
||||
cocos_headers = -I%(cocosdir)s -I%(cocosdir)s/cocos -I%(cocosdir)s/cocos/platform/android -I%(cocosdir)s/external/sources
|
||||
|
||||
cocos_flags = -DANDROID
|
||||
cocos_flags = -DANDROID -DCC_PLATFORM=3 -DCC_PLATFORM_MAC_IOS=1 -DCC_PLATFORM_MAC_OSX=4 -DCC_PLATFORM_WINDOWS=2 -DCC_PLATFORM_ANDROID=3
|
||||
|
||||
|
||||
cxxgenerator_headers =
|
||||
|
||||
|
||||
@@ -17,7 +17,8 @@ clang_headers =
|
||||
clang_flags = -nostdinc -x c++ -std=c++11 -fsigned-char -U__SSE__
|
||||
|
||||
cocos_headers = -I%(cocosdir)s/cocos -I%(cocosdir)s/cocos/platform/android -I%(cocosdir)s/external/sources
|
||||
cocos_flags = -DANDROID
|
||||
cocos_flags = -DANDROID -DCC_PLATFORM=3 -DCC_PLATFORM_MAC_IOS=1 -DCC_PLATFORM_MAC_OSX=4 -DCC_PLATFORM_WINDOWS=2 -DCC_PLATFORM_ANDROID=3
|
||||
|
||||
|
||||
cxxgenerator_headers =
|
||||
|
||||
|
||||
@@ -18,7 +18,8 @@ clang_flags = -nostdinc -x c++ -std=c++11 -fsigned-char -U__SSE__
|
||||
|
||||
cocos_headers = -I%(cocosdir)s/cocos -I%(cocosdir)s/cocos/platform/android -I%(cocosdir)s/external/sources
|
||||
|
||||
cocos_flags = -DANDROID
|
||||
cocos_flags = -DANDROID -DCC_PLATFORM=3 -DCC_PLATFORM_MAC_IOS=1 -DCC_PLATFORM_MAC_OSX=4 -DCC_PLATFORM_WINDOWS=2 -DCC_PLATFORM_ANDROID=3
|
||||
|
||||
|
||||
cxxgenerator_headers =
|
||||
|
||||
|
||||
@@ -17,7 +17,8 @@ clang_headers =
|
||||
clang_flags = -nostdinc -x c++ -std=c++11 -fsigned-char -U__SSE__
|
||||
|
||||
cocos_headers = -I%(cocosdir)s/cocos -I%(cocosdir)s/cocos/renderer -I%(cocosdir)s/cocos/renderer/core-I%(cocosdir)s/cocos/math -I%(cocosdir)s/cocos/platform/android -I%(cocosdir)s/external/source
|
||||
cocos_flags = -DANDROID
|
||||
cocos_flags = -DANDROID -DCC_PLATFORM=3 -DCC_PLATFORM_MAC_IOS=1 -DCC_PLATFORM_MAC_OSX=4 -DCC_PLATFORM_WINDOWS=2 -DCC_PLATFORM_ANDROID=3
|
||||
|
||||
|
||||
cxxgenerator_headers =
|
||||
|
||||
|
||||
@@ -17,7 +17,8 @@ clang_headers =
|
||||
clang_flags = -nostdinc -x c++ -std=c++11 -fsigned-char -U__SSE__
|
||||
|
||||
cocos_headers = -I%(cocosdir)s/cocos -I%(cocosdir)s/cocos/renderer -I%(cocosdir)s/cocos/renderer/core -I%(cocosdir)s/cocos/renderer/gfx-gles2 -I%(cocosdir)s/cocos/math -I%(cocosdir)s/cocos/platform/android -I%(cocosdir)s/external/source
|
||||
cocos_flags = -DANDROID
|
||||
cocos_flags = -DANDROID -DCC_PLATFORM=3 -DCC_PLATFORM_MAC_IOS=1 -DCC_PLATFORM_MAC_OSX=4 -DCC_PLATFORM_WINDOWS=2 -DCC_PLATFORM_ANDROID=3
|
||||
|
||||
|
||||
cxxgenerator_headers =
|
||||
|
||||
|
||||
@@ -17,7 +17,8 @@ clang_headers =
|
||||
clang_flags = -nostdinc -x c++ -std=c++11 -fsigned-char -U__SSE__
|
||||
|
||||
cocos_headers = -I%(cocosdir)s/cocos -I%(cocosdir)s/cocos/renderer -I%(cocosdir)s/cocos/renderer/core -I%(cocosdir)s/cocos/renderer/gfx-gles3 -I%(cocosdir)s/cocos/math -I%(cocosdir)s/cocos/platform/android -I%(cocosdir)s/external/source
|
||||
cocos_flags = -DANDROID
|
||||
cocos_flags = -DANDROID -DCC_PLATFORM=3 -DCC_PLATFORM_MAC_IOS=1 -DCC_PLATFORM_MAC_OSX=4 -DCC_PLATFORM_WINDOWS=2 -DCC_PLATFORM_ANDROID=3
|
||||
|
||||
|
||||
cxxgenerator_headers =
|
||||
|
||||
|
||||
@@ -17,7 +17,8 @@ clang_headers =
|
||||
clang_flags = -nostdinc -x c++ -std=c++11 -fsigned-char -U__SSE__
|
||||
|
||||
cocos_headers = -I%(cocosdir)s/cocos -I%(cocosdir)s/cocos/renderer -I%(cocosdir)s/cocos/renderer/core -I%(cocosdir)s/cocos/renderer/gfx-metal -I%(cocosdir)s/cocos/math -I%(cocosdir)s/cocos/platform/android -I%(cocosdir)s/external/source
|
||||
cocos_flags = -DANDROID
|
||||
cocos_flags = -DANDROID -DCC_PLATFORM=3 -DCC_PLATFORM_MAC_IOS=1 -DCC_PLATFORM_MAC_OSX=4 -DCC_PLATFORM_WINDOWS=2 -DCC_PLATFORM_ANDROID=3
|
||||
|
||||
|
||||
cxxgenerator_headers =
|
||||
|
||||
|
||||
@@ -17,7 +17,8 @@ clang_headers =
|
||||
clang_flags = -nostdinc -x c++ -std=c++11 -fsigned-char -U__SSE__
|
||||
|
||||
cocos_headers = -I%(cocosdir)s/cocos -I%(cocosdir)s/cocos/renderer -I%(cocosdir)s/cocos/renderer/core -I%(cocosdir)s/cocos/renderer/gfx-vulkan -I%(cocosdir)s/cocos/math -I%(cocosdir)s/cocos/platform/android -I%(cocosdir)s/external/source
|
||||
cocos_flags = -DANDROID
|
||||
cocos_flags = -DANDROID -DCC_PLATFORM=3 -DCC_PLATFORM_MAC_IOS=1 -DCC_PLATFORM_MAC_OSX=4 -DCC_PLATFORM_WINDOWS=2 -DCC_PLATFORM_ANDROID=3
|
||||
|
||||
|
||||
cxxgenerator_headers =
|
||||
|
||||
|
||||
Reference in New Issue
Block a user