Remove DllMain() from static angle library

Bug: chromium:1179061 Change-Id: I89167eb9c6ed244072e00500b47c7df83ac2e80d Reviewed-on: https://chromium-review.googlesource.com/c/angle/angle/+/2699188Reviewed-by: Jamie Madill <jmadill@chromium.org> Commit-Queue: Peng Huang <penghuang@chromium.org>

Remove DllMain() from static angle library
e99828e4 · Peng Huang · Commit Bot · 64b5b3d3 · e99828e4 · e99828e4
Commit e99828e4 authored Feb 16, 2021 by Peng Huang Committed by Commit Bot Feb 17, 2021
Hide whitespace changes
Inline Side-by-side

Showing with 3 additions and 2 deletions

BUILD.gn BUILD.gn +1 -0

global_state.cpp src/libGLESv2/global_state.cpp +2 -2

No files found.
--- a/BUILD.gn
+++ b/BUILD.gn
@@ -927,6 +927,7 @@ config("library_name_config") {
 config("angle_static") {
  defines = [
    "ANGLE_EXPORT=",
+    "ANGLE_STATIC=1",
    "ANGLE_UTIL_EXPORT=",
    "EGLAPI=",
    "GL_APICALL=",

--- a/src/libGLESv2/global_state.cpp
+++ b/src/libGLESv2/global_state.cpp
@@ -122,7 +122,7 @@ void GenerateContextLostErrorOnCurrentGlobalContext()
 }
 }  // namespace gl

-#ifdef ANGLE_PLATFORM_WINDOWS
+#if defined(ANGLE_PLATFORM_WINDOWS) && !defined(ANGLE_STATIC)
 namespace egl
 {

@@ -238,4 +238,4 @@ extern "C" BOOL WINAPI DllMain(HINSTANCE instance, DWORD reason, LPVOID)

    return TRUE;
 }
-#endif  // ANGLE_PLATFORM_WINDOWS
+#endif  // defined(ANGLE_PLATFORM_WINDOWS) && !defined(ANGLE_STATIC)