mirror of
https://github.com/mozilla/gecko-dev.git
synced 2024-10-08 19:04:45 +00:00
Bug 1517055 - Revendor ANGLE mozilla/firefox-66. (1xN texture cherry-pick) r=bholley
Differential Revision: https://phabricator.services.mozilla.com/D17295
This commit is contained in:
parent
7913c220e5
commit
e7c32b9577
@ -1,3 +1,3 @@
|
|||||||
#define ANGLE_COMMIT_HASH "790e8e6b4179"
|
#define ANGLE_COMMIT_HASH "eff6bfdb1db9"
|
||||||
#define ANGLE_COMMIT_HASH_SIZE 12
|
#define ANGLE_COMMIT_HASH_SIZE 12
|
||||||
#define ANGLE_COMMIT_DATE "2018-10-09 17:41:46 -0700"
|
#define ANGLE_COMMIT_DATE "2019-01-22 11:11:06 -0800"
|
||||||
|
@ -124,8 +124,8 @@ void PixelTransfer11::setBufferToTextureCopyParams(const gl::Box &destArea, cons
|
|||||||
{
|
{
|
||||||
StructZero(parametersOut);
|
StructZero(parametersOut);
|
||||||
|
|
||||||
float texelCenterX = 0.5f / static_cast<float>(destSize.width - 1);
|
float texelCenterX = 0.5f / static_cast<float>(destSize.width);
|
||||||
float texelCenterY = 0.5f / static_cast<float>(destSize.height - 1);
|
float texelCenterY = 0.5f / static_cast<float>(destSize.height);
|
||||||
|
|
||||||
unsigned int bytesPerPixel = gl::GetSizedInternalFormatInfo(internalFormat).pixelBytes;
|
unsigned int bytesPerPixel = gl::GetSizedInternalFormatInfo(internalFormat).pixelBytes;
|
||||||
unsigned int alignmentBytes = static_cast<unsigned int>(unpack.alignment);
|
unsigned int alignmentBytes = static_cast<unsigned int>(unpack.alignment);
|
||||||
|
@ -1,3 +1,15 @@
|
|||||||
|
commit eff6bfdb1db99505122a37f2911bdd3b845e19b8
|
||||||
|
Author: Jeff Gilbert <jgilbert@mozilla.com>
|
||||||
|
Date: Thu Jan 3 23:38:44 2019 -0800
|
||||||
|
|
||||||
|
In PixelTransfer11, center offset should be 1/size, not 1/(size-1).
|
||||||
|
|
||||||
|
Bug: angleproject:3039
|
||||||
|
Change-Id: Ie97bfb5aa3cfe7cd2c4b1d22b5b4a8d82a5e5170
|
||||||
|
Reviewed-on: https://chromium-review.googlesource.com/c/1407251
|
||||||
|
Reviewed-by: Jamie Madill <jmadill@chromium.org>
|
||||||
|
Commit-Queue: Jamie Madill <jmadill@chromium.org>
|
||||||
|
|
||||||
commit 790e8e6b417905eca335d06c16ec54c977188110
|
commit 790e8e6b417905eca335d06c16ec54c977188110
|
||||||
Author: Olli Etuaho <oetuaho@nvidia.com>
|
Author: Olli Etuaho <oetuaho@nvidia.com>
|
||||||
Date: Thu Sep 20 13:20:50 2018 +0300
|
Date: Thu Sep 20 13:20:50 2018 +0300
|
||||||
|
@ -31,6 +31,7 @@ DEFINES['_CRT_RAND_S'] = True
|
|||||||
DEFINES['_CRT_SECURE_NO_DEPRECATE'] = True
|
DEFINES['_CRT_SECURE_NO_DEPRECATE'] = True
|
||||||
#DEFINES['_DEBUG'] = True
|
#DEFINES['_DEBUG'] = True
|
||||||
DEFINES['_HAS_EXCEPTIONS'] = '0'
|
DEFINES['_HAS_EXCEPTIONS'] = '0'
|
||||||
|
#DEFINES['_HAS_ITERATOR_DEBUGGING'] = '0'
|
||||||
DEFINES['_SCL_SECURE_NO_DEPRECATE'] = True
|
DEFINES['_SCL_SECURE_NO_DEPRECATE'] = True
|
||||||
DEFINES['_SECURE_ATL'] = True
|
DEFINES['_SECURE_ATL'] = True
|
||||||
DEFINES['_UNICODE'] = True
|
DEFINES['_UNICODE'] = True
|
||||||
@ -67,13 +68,21 @@ LOCAL_INCLUDES += [
|
|||||||
# '/wd4117',
|
# '/wd4117',
|
||||||
# '/wd4121',
|
# '/wd4121',
|
||||||
# '/wd4127',
|
# '/wd4127',
|
||||||
|
# '/wd4200',
|
||||||
|
# '/wd4201',
|
||||||
|
# '/wd4204',
|
||||||
|
# '/wd4221',
|
||||||
# '/wd4244',
|
# '/wd4244',
|
||||||
|
# '/wd4245',
|
||||||
# '/wd4251',
|
# '/wd4251',
|
||||||
|
# '/wd4267',
|
||||||
# '/wd4275',
|
# '/wd4275',
|
||||||
|
# '/wd4305',
|
||||||
# '/wd4312',
|
# '/wd4312',
|
||||||
# '/wd4324',
|
# '/wd4324',
|
||||||
# '/wd4351',
|
# '/wd4351',
|
||||||
# '/wd4355',
|
# '/wd4355',
|
||||||
|
# '/wd4389',
|
||||||
# '/wd4456',
|
# '/wd4456',
|
||||||
# '/wd4457',
|
# '/wd4457',
|
||||||
# '/wd4458',
|
# '/wd4458',
|
||||||
@ -86,7 +95,12 @@ LOCAL_INCLUDES += [
|
|||||||
# '/wd4589',
|
# '/wd4589',
|
||||||
# '/wd4610',
|
# '/wd4610',
|
||||||
# '/wd4611',
|
# '/wd4611',
|
||||||
|
# '/wd4661',
|
||||||
|
# '/wd4701',
|
||||||
# '/wd4702',
|
# '/wd4702',
|
||||||
|
# '/wd4703',
|
||||||
|
# '/wd4706',
|
||||||
|
# '/wd4715',
|
||||||
# '/wd4838',
|
# '/wd4838',
|
||||||
# '/wd4995',
|
# '/wd4995',
|
||||||
# '/wd4996',
|
# '/wd4996',
|
||||||
@ -137,6 +151,7 @@ if CONFIG['OS_ARCH'] not in ('Darwin', 'WINNT'):
|
|||||||
|
|
||||||
#LDFLAGS += [
|
#LDFLAGS += [
|
||||||
# '/DEBUG',
|
# '/DEBUG',
|
||||||
|
# '/pdbaltpath:%_PDB%',
|
||||||
# '/WX',
|
# '/WX',
|
||||||
#]
|
#]
|
||||||
|
|
||||||
|
@ -31,6 +31,7 @@ DEFINES['_CRT_RAND_S'] = True
|
|||||||
DEFINES['_CRT_SECURE_NO_DEPRECATE'] = True
|
DEFINES['_CRT_SECURE_NO_DEPRECATE'] = True
|
||||||
#DEFINES['_DEBUG'] = True
|
#DEFINES['_DEBUG'] = True
|
||||||
DEFINES['_HAS_EXCEPTIONS'] = '0'
|
DEFINES['_HAS_EXCEPTIONS'] = '0'
|
||||||
|
#DEFINES['_HAS_ITERATOR_DEBUGGING'] = '0'
|
||||||
DEFINES['_SCL_SECURE_NO_DEPRECATE'] = True
|
DEFINES['_SCL_SECURE_NO_DEPRECATE'] = True
|
||||||
DEFINES['_SECURE_ATL'] = True
|
DEFINES['_SECURE_ATL'] = True
|
||||||
DEFINES['_UNICODE'] = True
|
DEFINES['_UNICODE'] = True
|
||||||
@ -67,13 +68,21 @@ LOCAL_INCLUDES += [
|
|||||||
# '/wd4117',
|
# '/wd4117',
|
||||||
# '/wd4121',
|
# '/wd4121',
|
||||||
# '/wd4127',
|
# '/wd4127',
|
||||||
|
# '/wd4200',
|
||||||
|
# '/wd4201',
|
||||||
|
# '/wd4204',
|
||||||
|
# '/wd4221',
|
||||||
# '/wd4244',
|
# '/wd4244',
|
||||||
|
# '/wd4245',
|
||||||
# '/wd4251',
|
# '/wd4251',
|
||||||
|
# '/wd4267',
|
||||||
# '/wd4275',
|
# '/wd4275',
|
||||||
|
# '/wd4305',
|
||||||
# '/wd4312',
|
# '/wd4312',
|
||||||
# '/wd4324',
|
# '/wd4324',
|
||||||
# '/wd4351',
|
# '/wd4351',
|
||||||
# '/wd4355',
|
# '/wd4355',
|
||||||
|
# '/wd4389',
|
||||||
# '/wd4456',
|
# '/wd4456',
|
||||||
# '/wd4457',
|
# '/wd4457',
|
||||||
# '/wd4458',
|
# '/wd4458',
|
||||||
@ -86,7 +95,12 @@ LOCAL_INCLUDES += [
|
|||||||
# '/wd4589',
|
# '/wd4589',
|
||||||
# '/wd4610',
|
# '/wd4610',
|
||||||
# '/wd4611',
|
# '/wd4611',
|
||||||
|
# '/wd4661',
|
||||||
|
# '/wd4701',
|
||||||
# '/wd4702',
|
# '/wd4702',
|
||||||
|
# '/wd4703',
|
||||||
|
# '/wd4706',
|
||||||
|
# '/wd4715',
|
||||||
# '/wd4838',
|
# '/wd4838',
|
||||||
# '/wd4995',
|
# '/wd4995',
|
||||||
# '/wd4996',
|
# '/wd4996',
|
||||||
@ -123,6 +137,7 @@ OS_LIBS += [
|
|||||||
|
|
||||||
#LDFLAGS += [
|
#LDFLAGS += [
|
||||||
# '/DEBUG',
|
# '/DEBUG',
|
||||||
|
# '/pdbaltpath:%_PDB%',
|
||||||
# '/WX',
|
# '/WX',
|
||||||
#]
|
#]
|
||||||
|
|
||||||
|
@ -30,6 +30,7 @@ DEFINES['_CRT_RAND_S'] = True
|
|||||||
DEFINES['_CRT_SECURE_NO_DEPRECATE'] = True
|
DEFINES['_CRT_SECURE_NO_DEPRECATE'] = True
|
||||||
#DEFINES['_DEBUG'] = True
|
#DEFINES['_DEBUG'] = True
|
||||||
DEFINES['_HAS_EXCEPTIONS'] = '0'
|
DEFINES['_HAS_EXCEPTIONS'] = '0'
|
||||||
|
#DEFINES['_HAS_ITERATOR_DEBUGGING'] = '0'
|
||||||
DEFINES['_SCL_SECURE_NO_DEPRECATE'] = True
|
DEFINES['_SCL_SECURE_NO_DEPRECATE'] = True
|
||||||
DEFINES['_SECURE_ATL'] = True
|
DEFINES['_SECURE_ATL'] = True
|
||||||
DEFINES['_UNICODE'] = True
|
DEFINES['_UNICODE'] = True
|
||||||
@ -66,13 +67,21 @@ LOCAL_INCLUDES += [
|
|||||||
# '/wd4117',
|
# '/wd4117',
|
||||||
# '/wd4121',
|
# '/wd4121',
|
||||||
# '/wd4127',
|
# '/wd4127',
|
||||||
|
# '/wd4200',
|
||||||
|
# '/wd4201',
|
||||||
|
# '/wd4204',
|
||||||
|
# '/wd4221',
|
||||||
# '/wd4244',
|
# '/wd4244',
|
||||||
|
# '/wd4245',
|
||||||
# '/wd4251',
|
# '/wd4251',
|
||||||
|
# '/wd4267',
|
||||||
# '/wd4275',
|
# '/wd4275',
|
||||||
|
# '/wd4305',
|
||||||
# '/wd4312',
|
# '/wd4312',
|
||||||
# '/wd4324',
|
# '/wd4324',
|
||||||
# '/wd4351',
|
# '/wd4351',
|
||||||
# '/wd4355',
|
# '/wd4355',
|
||||||
|
# '/wd4389',
|
||||||
# '/wd4456',
|
# '/wd4456',
|
||||||
# '/wd4457',
|
# '/wd4457',
|
||||||
# '/wd4458',
|
# '/wd4458',
|
||||||
@ -85,7 +94,12 @@ LOCAL_INCLUDES += [
|
|||||||
# '/wd4589',
|
# '/wd4589',
|
||||||
# '/wd4610',
|
# '/wd4610',
|
||||||
# '/wd4611',
|
# '/wd4611',
|
||||||
|
# '/wd4661',
|
||||||
|
# '/wd4701',
|
||||||
# '/wd4702',
|
# '/wd4702',
|
||||||
|
# '/wd4703',
|
||||||
|
# '/wd4706',
|
||||||
|
# '/wd4715',
|
||||||
# '/wd4838',
|
# '/wd4838',
|
||||||
# '/wd4995',
|
# '/wd4995',
|
||||||
# '/wd4996',
|
# '/wd4996',
|
||||||
@ -116,6 +130,7 @@ DIRS += [
|
|||||||
|
|
||||||
#LDFLAGS += [
|
#LDFLAGS += [
|
||||||
# '/DEBUG',
|
# '/DEBUG',
|
||||||
|
# '/pdbaltpath:%_PDB%',
|
||||||
# '/WX',
|
# '/WX',
|
||||||
#]
|
#]
|
||||||
|
|
||||||
|
@ -36,6 +36,7 @@ DEFINES['_CRT_RAND_S'] = True
|
|||||||
DEFINES['_CRT_SECURE_NO_DEPRECATE'] = True
|
DEFINES['_CRT_SECURE_NO_DEPRECATE'] = True
|
||||||
#DEFINES['_DEBUG'] = True
|
#DEFINES['_DEBUG'] = True
|
||||||
DEFINES['_HAS_EXCEPTIONS'] = '0'
|
DEFINES['_HAS_EXCEPTIONS'] = '0'
|
||||||
|
#DEFINES['_HAS_ITERATOR_DEBUGGING'] = '0'
|
||||||
DEFINES['_SCL_SECURE_NO_DEPRECATE'] = True
|
DEFINES['_SCL_SECURE_NO_DEPRECATE'] = True
|
||||||
DEFINES['_SECURE_ATL'] = True
|
DEFINES['_SECURE_ATL'] = True
|
||||||
DEFINES['_UNICODE'] = True
|
DEFINES['_UNICODE'] = True
|
||||||
@ -72,13 +73,21 @@ LOCAL_INCLUDES += [
|
|||||||
# '/wd4117',
|
# '/wd4117',
|
||||||
# '/wd4121',
|
# '/wd4121',
|
||||||
# '/wd4127',
|
# '/wd4127',
|
||||||
|
# '/wd4200',
|
||||||
|
# '/wd4201',
|
||||||
|
# '/wd4204',
|
||||||
|
# '/wd4221',
|
||||||
# '/wd4244',
|
# '/wd4244',
|
||||||
|
# '/wd4245',
|
||||||
# '/wd4251',
|
# '/wd4251',
|
||||||
|
# '/wd4267',
|
||||||
# '/wd4275',
|
# '/wd4275',
|
||||||
|
# '/wd4305',
|
||||||
# '/wd4312',
|
# '/wd4312',
|
||||||
# '/wd4324',
|
# '/wd4324',
|
||||||
# '/wd4351',
|
# '/wd4351',
|
||||||
# '/wd4355',
|
# '/wd4355',
|
||||||
|
# '/wd4389',
|
||||||
# '/wd4456',
|
# '/wd4456',
|
||||||
# '/wd4457',
|
# '/wd4457',
|
||||||
# '/wd4458',
|
# '/wd4458',
|
||||||
@ -92,7 +101,12 @@ LOCAL_INCLUDES += [
|
|||||||
# '/wd4589',
|
# '/wd4589',
|
||||||
# '/wd4610',
|
# '/wd4610',
|
||||||
# '/wd4611',
|
# '/wd4611',
|
||||||
|
# '/wd4661',
|
||||||
|
# '/wd4701',
|
||||||
# '/wd4702',
|
# '/wd4702',
|
||||||
|
# '/wd4703',
|
||||||
|
# '/wd4706',
|
||||||
|
# '/wd4715',
|
||||||
# '/wd4838',
|
# '/wd4838',
|
||||||
# '/wd4995',
|
# '/wd4995',
|
||||||
# '/wd4996',
|
# '/wd4996',
|
||||||
@ -278,6 +292,7 @@ OS_LIBS += [
|
|||||||
|
|
||||||
#LDFLAGS += [
|
#LDFLAGS += [
|
||||||
# '/DEBUG',
|
# '/DEBUG',
|
||||||
|
# '/pdbaltpath:%_PDB%',
|
||||||
# '/WX',
|
# '/WX',
|
||||||
#]
|
#]
|
||||||
|
|
||||||
|
@ -33,6 +33,7 @@ DEFINES['_CRT_RAND_S'] = True
|
|||||||
DEFINES['_CRT_SECURE_NO_DEPRECATE'] = True
|
DEFINES['_CRT_SECURE_NO_DEPRECATE'] = True
|
||||||
#DEFINES['_DEBUG'] = True
|
#DEFINES['_DEBUG'] = True
|
||||||
DEFINES['_HAS_EXCEPTIONS'] = '0'
|
DEFINES['_HAS_EXCEPTIONS'] = '0'
|
||||||
|
#DEFINES['_HAS_ITERATOR_DEBUGGING'] = '0'
|
||||||
DEFINES['_SCL_SECURE_NO_DEPRECATE'] = True
|
DEFINES['_SCL_SECURE_NO_DEPRECATE'] = True
|
||||||
DEFINES['_SECURE_ATL'] = True
|
DEFINES['_SECURE_ATL'] = True
|
||||||
DEFINES['_UNICODE'] = True
|
DEFINES['_UNICODE'] = True
|
||||||
@ -68,13 +69,21 @@ LOCAL_INCLUDES += [
|
|||||||
# '/wd4117',
|
# '/wd4117',
|
||||||
# '/wd4121',
|
# '/wd4121',
|
||||||
# '/wd4127',
|
# '/wd4127',
|
||||||
|
# '/wd4200',
|
||||||
|
# '/wd4201',
|
||||||
|
# '/wd4204',
|
||||||
|
# '/wd4221',
|
||||||
# '/wd4244',
|
# '/wd4244',
|
||||||
|
# '/wd4245',
|
||||||
# '/wd4251',
|
# '/wd4251',
|
||||||
|
# '/wd4267',
|
||||||
# '/wd4275',
|
# '/wd4275',
|
||||||
|
# '/wd4305',
|
||||||
# '/wd4312',
|
# '/wd4312',
|
||||||
# '/wd4324',
|
# '/wd4324',
|
||||||
# '/wd4351',
|
# '/wd4351',
|
||||||
# '/wd4355',
|
# '/wd4355',
|
||||||
|
# '/wd4389',
|
||||||
# '/wd4456',
|
# '/wd4456',
|
||||||
# '/wd4457',
|
# '/wd4457',
|
||||||
# '/wd4458',
|
# '/wd4458',
|
||||||
@ -87,7 +96,12 @@ LOCAL_INCLUDES += [
|
|||||||
# '/wd4589',
|
# '/wd4589',
|
||||||
# '/wd4610',
|
# '/wd4610',
|
||||||
# '/wd4611',
|
# '/wd4611',
|
||||||
|
# '/wd4661',
|
||||||
|
# '/wd4701',
|
||||||
# '/wd4702',
|
# '/wd4702',
|
||||||
|
# '/wd4703',
|
||||||
|
# '/wd4706',
|
||||||
|
# '/wd4715',
|
||||||
# '/wd4838',
|
# '/wd4838',
|
||||||
# '/wd4995',
|
# '/wd4995',
|
||||||
# '/wd4996',
|
# '/wd4996',
|
||||||
@ -149,6 +163,7 @@ OS_LIBS += [
|
|||||||
# '/INCREMENTAL',
|
# '/INCREMENTAL',
|
||||||
# '/MACHINE:X64',
|
# '/MACHINE:X64',
|
||||||
# '/NXCOMPAT',
|
# '/NXCOMPAT',
|
||||||
|
# '/pdbaltpath:%_PDB%',
|
||||||
# '/SUBSYSTEM:CONSOLE,5.02',
|
# '/SUBSYSTEM:CONSOLE,5.02',
|
||||||
# '/WX',
|
# '/WX',
|
||||||
#]
|
#]
|
||||||
|
@ -37,6 +37,7 @@ DEFINES['_CRT_RAND_S'] = True
|
|||||||
DEFINES['_CRT_SECURE_NO_DEPRECATE'] = True
|
DEFINES['_CRT_SECURE_NO_DEPRECATE'] = True
|
||||||
#DEFINES['_DEBUG'] = True
|
#DEFINES['_DEBUG'] = True
|
||||||
DEFINES['_HAS_EXCEPTIONS'] = '0'
|
DEFINES['_HAS_EXCEPTIONS'] = '0'
|
||||||
|
#DEFINES['_HAS_ITERATOR_DEBUGGING'] = '0'
|
||||||
DEFINES['_SCL_SECURE_NO_DEPRECATE'] = True
|
DEFINES['_SCL_SECURE_NO_DEPRECATE'] = True
|
||||||
DEFINES['_SECURE_ATL'] = True
|
DEFINES['_SECURE_ATL'] = True
|
||||||
DEFINES['_UNICODE'] = True
|
DEFINES['_UNICODE'] = True
|
||||||
@ -73,13 +74,21 @@ LOCAL_INCLUDES += [
|
|||||||
# '/wd4117',
|
# '/wd4117',
|
||||||
# '/wd4121',
|
# '/wd4121',
|
||||||
# '/wd4127',
|
# '/wd4127',
|
||||||
|
# '/wd4200',
|
||||||
|
# '/wd4201',
|
||||||
|
# '/wd4204',
|
||||||
|
# '/wd4221',
|
||||||
# '/wd4244',
|
# '/wd4244',
|
||||||
|
# '/wd4245',
|
||||||
# '/wd4251',
|
# '/wd4251',
|
||||||
|
# '/wd4267',
|
||||||
# '/wd4275',
|
# '/wd4275',
|
||||||
|
# '/wd4305',
|
||||||
# '/wd4312',
|
# '/wd4312',
|
||||||
# '/wd4324',
|
# '/wd4324',
|
||||||
# '/wd4351',
|
# '/wd4351',
|
||||||
# '/wd4355',
|
# '/wd4355',
|
||||||
|
# '/wd4389',
|
||||||
# '/wd4456',
|
# '/wd4456',
|
||||||
# '/wd4457',
|
# '/wd4457',
|
||||||
# '/wd4458',
|
# '/wd4458',
|
||||||
@ -93,7 +102,12 @@ LOCAL_INCLUDES += [
|
|||||||
# '/wd4589',
|
# '/wd4589',
|
||||||
# '/wd4610',
|
# '/wd4610',
|
||||||
# '/wd4611',
|
# '/wd4611',
|
||||||
|
# '/wd4661',
|
||||||
|
# '/wd4701',
|
||||||
# '/wd4702',
|
# '/wd4702',
|
||||||
|
# '/wd4703',
|
||||||
|
# '/wd4706',
|
||||||
|
# '/wd4715',
|
||||||
# '/wd4838',
|
# '/wd4838',
|
||||||
# '/wd4995',
|
# '/wd4995',
|
||||||
# '/wd4996',
|
# '/wd4996',
|
||||||
@ -167,6 +181,7 @@ OS_LIBS += [
|
|||||||
# '/INCREMENTAL',
|
# '/INCREMENTAL',
|
||||||
# '/MACHINE:X64',
|
# '/MACHINE:X64',
|
||||||
# '/NXCOMPAT',
|
# '/NXCOMPAT',
|
||||||
|
# '/pdbaltpath:%_PDB%',
|
||||||
# '/SUBSYSTEM:CONSOLE,5.02',
|
# '/SUBSYSTEM:CONSOLE,5.02',
|
||||||
# '/WX',
|
# '/WX',
|
||||||
#]
|
#]
|
||||||
|
@ -30,6 +30,7 @@ DEFINES['_CRT_RAND_S'] = True
|
|||||||
DEFINES['_CRT_SECURE_NO_DEPRECATE'] = True
|
DEFINES['_CRT_SECURE_NO_DEPRECATE'] = True
|
||||||
#DEFINES['_DEBUG'] = True
|
#DEFINES['_DEBUG'] = True
|
||||||
DEFINES['_HAS_EXCEPTIONS'] = '0'
|
DEFINES['_HAS_EXCEPTIONS'] = '0'
|
||||||
|
#DEFINES['_HAS_ITERATOR_DEBUGGING'] = '0'
|
||||||
DEFINES['_SCL_SECURE_NO_DEPRECATE'] = True
|
DEFINES['_SCL_SECURE_NO_DEPRECATE'] = True
|
||||||
DEFINES['_SECURE_ATL'] = True
|
DEFINES['_SECURE_ATL'] = True
|
||||||
DEFINES['_UNICODE'] = True
|
DEFINES['_UNICODE'] = True
|
||||||
@ -66,13 +67,21 @@ LOCAL_INCLUDES += [
|
|||||||
# '/wd4117',
|
# '/wd4117',
|
||||||
# '/wd4121',
|
# '/wd4121',
|
||||||
# '/wd4127',
|
# '/wd4127',
|
||||||
|
# '/wd4200',
|
||||||
|
# '/wd4201',
|
||||||
|
# '/wd4204',
|
||||||
|
# '/wd4221',
|
||||||
# '/wd4244',
|
# '/wd4244',
|
||||||
|
# '/wd4245',
|
||||||
# '/wd4251',
|
# '/wd4251',
|
||||||
|
# '/wd4267',
|
||||||
# '/wd4275',
|
# '/wd4275',
|
||||||
|
# '/wd4305',
|
||||||
# '/wd4312',
|
# '/wd4312',
|
||||||
# '/wd4324',
|
# '/wd4324',
|
||||||
# '/wd4351',
|
# '/wd4351',
|
||||||
# '/wd4355',
|
# '/wd4355',
|
||||||
|
# '/wd4389',
|
||||||
# '/wd4456',
|
# '/wd4456',
|
||||||
# '/wd4457',
|
# '/wd4457',
|
||||||
# '/wd4458',
|
# '/wd4458',
|
||||||
@ -85,7 +94,12 @@ LOCAL_INCLUDES += [
|
|||||||
# '/wd4589',
|
# '/wd4589',
|
||||||
# '/wd4610',
|
# '/wd4610',
|
||||||
# '/wd4611',
|
# '/wd4611',
|
||||||
|
# '/wd4661',
|
||||||
|
# '/wd4701',
|
||||||
# '/wd4702',
|
# '/wd4702',
|
||||||
|
# '/wd4703',
|
||||||
|
# '/wd4706',
|
||||||
|
# '/wd4715',
|
||||||
# '/wd4838',
|
# '/wd4838',
|
||||||
# '/wd4995',
|
# '/wd4995',
|
||||||
# '/wd4996',
|
# '/wd4996',
|
||||||
@ -123,6 +137,7 @@ DIRS += [
|
|||||||
|
|
||||||
#LDFLAGS += [
|
#LDFLAGS += [
|
||||||
# '/DEBUG',
|
# '/DEBUG',
|
||||||
|
# '/pdbaltpath:%_PDB%',
|
||||||
# '/WX',
|
# '/WX',
|
||||||
#]
|
#]
|
||||||
|
|
||||||
|
@ -33,6 +33,7 @@ DEFINES['_CRT_RAND_S'] = True
|
|||||||
DEFINES['_CRT_SECURE_NO_DEPRECATE'] = True
|
DEFINES['_CRT_SECURE_NO_DEPRECATE'] = True
|
||||||
#DEFINES['_DEBUG'] = True
|
#DEFINES['_DEBUG'] = True
|
||||||
DEFINES['_HAS_EXCEPTIONS'] = '0'
|
DEFINES['_HAS_EXCEPTIONS'] = '0'
|
||||||
|
#DEFINES['_HAS_ITERATOR_DEBUGGING'] = '0'
|
||||||
DEFINES['_SCL_SECURE_NO_DEPRECATE'] = True
|
DEFINES['_SCL_SECURE_NO_DEPRECATE'] = True
|
||||||
DEFINES['_SECURE_ATL'] = True
|
DEFINES['_SECURE_ATL'] = True
|
||||||
DEFINES['_UNICODE'] = True
|
DEFINES['_UNICODE'] = True
|
||||||
@ -69,13 +70,21 @@ LOCAL_INCLUDES += [
|
|||||||
# '/wd4117',
|
# '/wd4117',
|
||||||
# '/wd4121',
|
# '/wd4121',
|
||||||
# '/wd4127',
|
# '/wd4127',
|
||||||
|
# '/wd4200',
|
||||||
|
# '/wd4201',
|
||||||
|
# '/wd4204',
|
||||||
|
# '/wd4221',
|
||||||
# '/wd4244',
|
# '/wd4244',
|
||||||
|
# '/wd4245',
|
||||||
# '/wd4251',
|
# '/wd4251',
|
||||||
|
# '/wd4267',
|
||||||
# '/wd4275',
|
# '/wd4275',
|
||||||
|
# '/wd4305',
|
||||||
# '/wd4312',
|
# '/wd4312',
|
||||||
# '/wd4324',
|
# '/wd4324',
|
||||||
# '/wd4351',
|
# '/wd4351',
|
||||||
# '/wd4355',
|
# '/wd4355',
|
||||||
|
# '/wd4389',
|
||||||
# '/wd4456',
|
# '/wd4456',
|
||||||
# '/wd4457',
|
# '/wd4457',
|
||||||
# '/wd4458',
|
# '/wd4458',
|
||||||
@ -88,7 +97,12 @@ LOCAL_INCLUDES += [
|
|||||||
# '/wd4589',
|
# '/wd4589',
|
||||||
# '/wd4610',
|
# '/wd4610',
|
||||||
# '/wd4611',
|
# '/wd4611',
|
||||||
|
# '/wd4661',
|
||||||
|
# '/wd4701',
|
||||||
# '/wd4702',
|
# '/wd4702',
|
||||||
|
# '/wd4703',
|
||||||
|
# '/wd4706',
|
||||||
|
# '/wd4715',
|
||||||
# '/wd4718',
|
# '/wd4718',
|
||||||
# '/wd4838',
|
# '/wd4838',
|
||||||
# '/wd4995',
|
# '/wd4995',
|
||||||
@ -232,6 +246,7 @@ DIRS += [
|
|||||||
|
|
||||||
#LDFLAGS += [
|
#LDFLAGS += [
|
||||||
# '/DEBUG',
|
# '/DEBUG',
|
||||||
|
# '/pdbaltpath:%_PDB%',
|
||||||
# '/WX',
|
# '/WX',
|
||||||
#]
|
#]
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user