From c4d5da00901b3cbc0d0a884628204de1495cf19b Mon Sep 17 00:00:00 2001
From: Camilla Berglund <elmindreda@elmindreda.org>
Date: Wed, 12 Sep 2012 21:23:04 +0200
Subject: [PATCH] Moved DllMain into Win32 init module.

---
 src/CMakeLists.txt  |  2 +-
 src/win32_dllmain.c | 49 ---------------------------------------------
 src/win32_init.c    | 12 +++++++++++
 3 files changed, 13 insertions(+), 50 deletions(-)
 delete mode 100644 src/win32_dllmain.c

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index ec5508c2..8a7bdec3 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -22,7 +22,7 @@ elseif (_GLFW_WIN32_WGL)
     set(glfw_HEADERS ${common_HEADERS} win32_platform.h)
     set(glfw_SOURCES ${common_SOURCES} win32_clipboard.c win32_fullscreen.c
                      win32_gamma.c win32_init.c win32_input.c win32_joystick.c
-                     win32_opengl.c win32_time.c win32_window.c win32_dllmain.c)
+                     win32_opengl.c win32_time.c win32_window.c)
 
     if (GLFW_NATIVE_API)
         list(APPEND glfw_SOURCES win32_native.c)
diff --git a/src/win32_dllmain.c b/src/win32_dllmain.c
deleted file mode 100644
index 98f9ab2a..00000000
--- a/src/win32_dllmain.c
+++ /dev/null
@@ -1,49 +0,0 @@
-//========================================================================
-// GLFW - An OpenGL library
-// Platform:    Win32
-// API version: 3.0
-// WWW:         http://www.glfw.org/
-//------------------------------------------------------------------------
-// Copyright (c) 2002-2006 Marcus Geelnard
-// Copyright (c) 2006-2010 Camilla Berglund <elmindreda@elmindreda.org>
-//
-// This software is provided 'as-is', without any express or implied
-// warranty. In no event will the authors be held liable for any damages
-// arising from the use of this software.
-//
-// Permission is granted to anyone to use this software for any purpose,
-// including commercial applications, and to alter it and redistribute it
-// freely, subject to the following restrictions:
-//
-// 1. The origin of this software must not be misrepresented; you must not
-//    claim that you wrote the original software. If you use this software
-//    in a product, an acknowledgment in the product documentation would
-//    be appreciated but is not required.
-//
-// 2. Altered source versions must be plainly marked as such, and must not
-//    be misrepresented as being the original software.
-//
-// 3. This notice may not be removed or altered from any source
-//    distribution.
-//
-//========================================================================
-
-#include "internal.h"
-
-
-#if defined(_GLFW_BUILD_DLL)
-
-//========================================================================
-// GLFW DLL entry point
-//========================================================================
-
-BOOL WINAPI DllMain(HINSTANCE instance, DWORD reason, LPVOID reserved)
-{
-    // NOTE: Some compilers complains about instance and x never being used -
-    // never mind that (we don't want to use them)!
-
-    return TRUE;
-}
-
-#endif // _GLFW_BUILD_DLL
-
diff --git a/src/win32_init.c b/src/win32_init.c
index 41444b97..21de415b 100644
--- a/src/win32_init.c
+++ b/src/win32_init.c
@@ -39,6 +39,18 @@
 #endif // __BORLANDC__
 
 
+//========================================================================
+// GLFW DLL entry point
+//========================================================================
+
+#if defined(_GLFW_BUILD_DLL)
+BOOL WINAPI DllMain(HINSTANCE instance, DWORD reason, LPVOID reserved)
+{
+    return TRUE;
+}
+#endif // _GLFW_BUILD_DLL
+
+
 //========================================================================
 // Load necessary libraries (DLLs)
 //========================================================================