0001-build-fix.patch

From 52326f324335031127c48cdbf57512d537b95117 Mon Sep 17 00:00:00 2001
From: huki <gk7huki@gmail.com>
Date: Wed, 26 Aug 2020 17:56:34 +0530
Subject: [PATCH 1/5] build fix

---
 src/angle.gyp         | 10 +++++-----
 src/common/mathutil.h |  3 +++
 util/util.gyp         |  7 +++++++
 3 files changed, 15 insertions(+), 5 deletions(-)

diff --git a/src/angle.gyp b/src/angle.gyp
index 04c9c4f33..818b45df5 100644
--- a/src/angle.gyp
+++ b/src/angle.gyp
@@ -355,7 +355,7 @@
             [
                 {
                     'destination': '<(angle_gen_path)',
-                    'files': [ 'copy_compiler_dll.bat', '<(angle_id_script_base)' ],
+                    'files': [ '<(angle_id_script_base)' ],
                 },
             ],
             'conditions':
@@ -466,10 +466,10 @@
                                     'outputs': [ '<(PRODUCT_DIR)/d3dcompiler_47.dll' ],
                                     'action':
                                     [
-                                        "<(angle_gen_path)/copy_compiler_dll.bat",
-                                        "$(PlatformName)",
-                                        "<(windows_sdk_path)",
-                                        "<(PRODUCT_DIR)"
+#                                       "<(angle_gen_path)/copy_compiler_dll.bat",
+#                                       "$(PlatformName)",
+#                                       "<(windows_sdk_path)",
+#                                       "<(PRODUCT_DIR)"
                                     ],
                                 },
                             ], #actions
diff --git a/src/common/mathutil.h b/src/common/mathutil.h
index 7e8db3cd8..94a5e8bbc 100644
--- a/src/common/mathutil.h
+++ b/src/common/mathutil.h
@@ -15,6 +15,9 @@
 #include <string.h>
 #include <algorithm>
 #include <limits>
+#include <intrin.h>
+#define __popcnt __builtin_popcount
+#define __popcnt64 __builtin_popcountll
 
 #include <anglebase/numerics/safe_math.h>
 
diff --git a/util/util.gyp b/util/util.gyp
index f53eb6712..c75b7fbf0 100644
--- a/util/util.gyp
+++ b/util/util.gyp
@@ -125,6 +125,13 @@
                         [
                             '<@(util_win32_sources)',
                         ],
+                        'link_settings':
+                        {
+                            'libraries':
+                            [
+                                '-lgdi32',
+                            ]
+                        },
                     }],
                     ['OS=="win" and angle_build_winrt==1',
                     {
-- 
2.28.0