Skip to content

A
angle
Commit d308f3a9 by Geoff Lang
Options

Remove system.h.

The gyp files already define NOMINMAX and WIN32_LEAN_AND_MEAN. windows.h is also included via the D3D includes. This ends up speeding up the build process significantly by not having windows.h included in nearly every file. Also fixes issues on non-windows systems by not having stdarg.h included in debug.cpp. Change-Id: Id32d9aac37a5a29df832a062dd8024302a798a1c Reviewed-on: https://chromium-review.googlesource.com/182810Reviewed-by: 's avatarShannon Woods <shannonwoods@chromium.org> Tested-by: 's avatarGeoff Lang <geofflang@chromium.org>
parent 06976597
Showing with 7 additions and 57 deletions
projects/src/libEGL.vcxproj
...@@ -122,7 +122,6 @@ ...@@ -122,7 +122,6 @@
<ClInclude Include="..\..\src\libEGL\Config.h"/> <ClInclude Include="..\..\src\libEGL\Config.h"/>
<ClInclude Include="..\..\src\common\event_tracer.h"/> <ClInclude Include="..\..\src\common\event_tracer.h"/>
<ClInclude Include="..\..\src\common\version.h"/> <ClInclude Include="..\..\src\common\version.h"/>
<ClInclude Include="..\..\src\common\system.h"/>
<ClInclude Include="..\..\src\common\RefCountObject.h"/> <ClInclude Include="..\..\src\common\RefCountObject.h"/>
<ClInclude Include="..\..\src\common\commit.h"/> <ClInclude Include="..\..\src\common\commit.h"/>
<ClInclude Include="..\..\src\common\debug.h"/> <ClInclude Include="..\..\src\common\debug.h"/>
......
projects/src/libEGL.vcxproj.filters
...@@ -31,9 +31,6 @@ ...@@ -31,9 +31,6 @@
<ClCompile Include="..\..\src\libEGL\main.cpp"> <ClCompile Include="..\..\src\libEGL\main.cpp">
<Filter>libEGL</Filter> <Filter>libEGL</Filter>
</ClCompile> </ClCompile>
<None Include="..\..\src\libEGL\libEGL.def">
<Filter>libEGL</Filter>
</None>
<ClCompile Include="..\..\src\libEGL\Display.cpp"> <ClCompile Include="..\..\src\libEGL\Display.cpp">
<Filter>libEGL</Filter> <Filter>libEGL</Filter>
</ClCompile> </ClCompile>
...@@ -46,15 +43,15 @@ ...@@ -46,15 +43,15 @@
<ClCompile Include="..\..\src\libEGL\libEGL.cpp"> <ClCompile Include="..\..\src\libEGL\libEGL.cpp">
<Filter>libEGL</Filter> <Filter>libEGL</Filter>
</ClCompile> </ClCompile>
<None Include="..\..\src\libEGL\libEGL.def">
<Filter>libEGL</Filter>
</None>
<ClInclude Include="..\..\src\common\event_tracer.h"> <ClInclude Include="..\..\src\common\event_tracer.h">
<Filter>common</Filter> <Filter>common</Filter>
</ClInclude> </ClInclude>
<ClInclude Include="..\..\src\common\version.h"> <ClInclude Include="..\..\src\common\version.h">
<Filter>common</Filter> <Filter>common</Filter>
</ClInclude> </ClInclude>
<ClInclude Include="..\..\src\common\system.h">
<Filter>common</Filter>
</ClInclude>
<ClCompile Include="..\..\src\common\event_tracer.cpp"> <ClCompile Include="..\..\src\common\event_tracer.cpp">
<Filter>common</Filter> <Filter>common</Filter>
</ClCompile> </ClCompile>
...@@ -70,11 +67,11 @@ ...@@ -70,11 +67,11 @@
<ClInclude Include="..\..\src\common\debug.h"> <ClInclude Include="..\..\src\common\debug.h">
<Filter>common</Filter> <Filter>common</Filter>
</ClInclude> </ClInclude>
<ClCompile Include="..\..\src\common\debug.cpp">
<Filter>common</Filter>
</ClCompile>
<ClInclude Include="..\..\src\common\angleutils.h"> <ClInclude Include="..\..\src\common\angleutils.h">
<Filter>common</Filter> <Filter>common</Filter>
</ClInclude> </ClInclude>
<ClCompile Include="..\..\src\common\debug.cpp">
<Filter>common</Filter>
</ClCompile>
</ItemGroup> </ItemGroup>
</Project> </Project>
projects/src/libGLESv2.vcxproj
...@@ -205,7 +205,6 @@ ...@@ -205,7 +205,6 @@
<ClInclude Include="..\..\src\common\commit.h"/> <ClInclude Include="..\..\src\common\commit.h"/>
<ClInclude Include="..\..\src\common\debug.h"/> <ClInclude Include="..\..\src\common\debug.h"/>
<ClInclude Include="..\..\src\common\version.h"/> <ClInclude Include="..\..\src\common\version.h"/>
<ClInclude Include="..\..\src\common\system.h"/>
<ClInclude Include="..\..\src\common\angleutils.h"/> <ClInclude Include="..\..\src\common\angleutils.h"/>
<ClInclude Include="..\..\src\third_party\murmurhash\MurmurHash3.h"/> <ClInclude Include="..\..\src\third_party\murmurhash\MurmurHash3.h"/>
</ItemGroup> </ItemGroup>
......
projects/src/libGLESv2.vcxproj.filters
...@@ -490,9 +490,6 @@ ...@@ -490,9 +490,6 @@
<ClInclude Include="..\..\src\common\version.h"> <ClInclude Include="..\..\src\common\version.h">
<Filter>common</Filter> <Filter>common</Filter>
</ClInclude> </ClInclude>
<ClInclude Include="..\..\src\common\system.h">
<Filter>common</Filter>
</ClInclude>
<ClInclude Include="..\..\src\common\angleutils.h"> <ClInclude Include="..\..\src\common\angleutils.h">
<Filter>common</Filter> <Filter>common</Filter>
</ClInclude> </ClInclude>
......
projects/src/translator.vcxproj
...@@ -122,7 +122,6 @@ ...@@ -122,7 +122,6 @@
<ClInclude Include="..\..\src\common\event_tracer.h"/> <ClInclude Include="..\..\src\common\event_tracer.h"/>
<ClInclude Include="..\..\src\common\version.h"/> <ClInclude Include="..\..\src\common\version.h"/>
<ClInclude Include="..\..\src\common\commit.h"/> <ClInclude Include="..\..\src\common\commit.h"/>
<ClInclude Include="..\..\src\common\system.h"/>
<ClInclude Include="..\..\src\common\angleutils.h"/> <ClInclude Include="..\..\src\common\angleutils.h"/>
<ClInclude Include="..\..\src\compiler\translator\BaseTypes.h"/> <ClInclude Include="..\..\src\compiler\translator\BaseTypes.h"/>
<ClInclude Include="..\..\src\compiler\translator\OutputESSL.h"/> <ClInclude Include="..\..\src\compiler\translator\OutputESSL.h"/>
......
projects/src/translator.vcxproj.filters
...@@ -55,9 +55,6 @@ ...@@ -55,9 +55,6 @@
<ClInclude Include="..\..\src\common\commit.h"> <ClInclude Include="..\..\src\common\commit.h">
<Filter>common</Filter> <Filter>common</Filter>
</ClInclude> </ClInclude>
<ClInclude Include="..\..\src\common\system.h">
<Filter>common</Filter>
</ClInclude>
<ClCompile Include="..\..\src\common\RefCountObject.cpp"> <ClCompile Include="..\..\src\common\RefCountObject.cpp">
<Filter>common</Filter> <Filter>common</Filter>
</ClCompile> </ClCompile>
......
projects/src/translator_static.vcxproj
...@@ -122,7 +122,6 @@ ...@@ -122,7 +122,6 @@
<ClInclude Include="..\..\src\common\event_tracer.h"/> <ClInclude Include="..\..\src\common\event_tracer.h"/>
<ClInclude Include="..\..\src\common\version.h"/> <ClInclude Include="..\..\src\common\version.h"/>
<ClInclude Include="..\..\src\common\commit.h"/> <ClInclude Include="..\..\src\common\commit.h"/>
<ClInclude Include="..\..\src\common\system.h"/>
<ClInclude Include="..\..\src\common\angleutils.h"/> <ClInclude Include="..\..\src\common\angleutils.h"/>
<ClInclude Include="..\..\src\compiler\translator\BaseTypes.h"/> <ClInclude Include="..\..\src\compiler\translator\BaseTypes.h"/>
<ClInclude Include="..\..\src\compiler\translator\OutputESSL.h"/> <ClInclude Include="..\..\src\compiler\translator\OutputESSL.h"/>
......
projects/src/translator_static.vcxproj.filters
...@@ -55,9 +55,6 @@ ...@@ -55,9 +55,6 @@
<ClInclude Include="..\..\src\common\commit.h"> <ClInclude Include="..\..\src\common\commit.h">
<Filter>common</Filter> <Filter>common</Filter>
</ClInclude> </ClInclude>
<ClInclude Include="..\..\src\common\system.h">
<Filter>common</Filter>
</ClInclude>
<ClCompile Include="..\..\src\common\RefCountObject.cpp"> <ClCompile Include="..\..\src\common\RefCountObject.cpp">
<Filter>common</Filter> <Filter>common</Filter>
</ClCompile> </ClCompile>
......
src/common/debug.cpp
...@@ -7,7 +7,7 @@ ...@@ -7,7 +7,7 @@
// debug.cpp: Debugging utilities. // debug.cpp: Debugging utilities.
#include "common/debug.h" #include "common/debug.h"
#include "common/system.h" #include <stdarg.h>
#if defined(ANGLE_ENABLE_PERF) #if defined(ANGLE_ENABLE_PERF)
#include <d3d9.h> #include <d3d9.h>
......
src/common/system.h deleted 100644 → 0
//
// Copyright (c) 2002-2012 The ANGLE Project Authors. All rights reserved.
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
//
// system.h: Includes Windows system headers and undefines macros that conflict.
#ifndef COMMON_SYSTEM_H
#define COMMON_SYSTEM_H
#if defined(_WIN32)
#if !defined(WIN32_LEAN_AND_MEAN)
#define WIN32_LEAN_AND_MEAN
#endif
#include <windows.h>
#if defined(min)
#undef min
#endif
#if defined(max)
#undef max
#endif
#endif // _WIN32
#endif // COMMON_SYSTEM_H
src/libEGL/Display.h
...@@ -11,8 +11,6 @@ ...@@ -11,8 +11,6 @@
#ifndef LIBEGL_DISPLAY_H_ #ifndef LIBEGL_DISPLAY_H_
#define LIBEGL_DISPLAY_H_ #define LIBEGL_DISPLAY_H_
#include "common/system.h"
#include <set> #include <set>
#include <vector> #include <vector>
......
src/libGLESv2/main.h
...@@ -10,7 +10,6 @@ ...@@ -10,7 +10,6 @@
#define LIBGLESV2_MAIN_H_ #define LIBGLESV2_MAIN_H_
#include "common/debug.h" #include "common/debug.h"
#include "common/system.h"
namespace egl namespace egl
{ {
......
src/libGLESv2/mathutil.h
...@@ -11,7 +11,6 @@ ...@@ -11,7 +11,6 @@
#include <intrin.h> #include <intrin.h>
#include "common/system.h"
#include "common/debug.h" #include "common/debug.h"
namespace gl namespace gl
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment