Zengtudor/glew
1
0
Fork 0
mirror of https://github.com/nigels-com/glew.git synced 2024-11-22 13:55:07 +00:00
Code Issues Packages Projects Releases Wiki Activity

Moved DLL entry-point for GCC into glew.c rather than a standalone file

Browse Source 
included using CMake.
This commit is contained in:
Wes Tarro 2016-02-15 15:15:33 -05:00
parent 02fc17f511
commit 9548431bd0
3 changed files with 9 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
auto/src/glew_init_tail.c
View File

@ -53,3 +53,12 @@ GLenum GLEWAPIENTRY glewInit (void)
return r; return r;
#endif /* _WIN32 */ #endif /* _WIN32 */
} }
#if defined(_WIN32) && defined(GLEW_BUILD) && defined(__GNUC__)
/* GCC requires a DLL entry point even without any standard library included. */
/* Types extracted from windows.h to avoid polluting the rest of the file. */
int __stdcall DllMainCRTStartup(void* instance, unsigned reason, void* reserved)
{
return 1;
}
#endif

4
build/cmake/CMakeLists.txt
View File

@ -78,10 +78,6 @@ set (GLEW_SRC_FILES ${GLEW_DIR}/src/glew.c)
if (WIN32) if (WIN32)
list (APPEND GLEW_SRC_FILES ${GLEW_DIR}/build/glew.rc) list (APPEND GLEW_SRC_FILES ${GLEW_DIR}/build/glew.rc)
if ((CMAKE_C_COMPILER_ID MATCHES "GNU") OR (CMAKE_C_COMPILER_ID MATCHES "Clang"))
# GCC can't handle not having a DLL entry point, so give it a fake one
list (APPEND GLEW_SRC_FILES ${GLEW_DIR}/src/gcc_dll_entry.c)
endif ()
endif () endif ()
add_library (glew SHARED ${GLEW_SRC_FILES}) add_library (glew SHARED ${GLEW_SRC_FILES})

7
src/gcc_dll_entry.c
View File

@ -1,7 +0,0 @@
#ifdef GLEW_BUILD
#include <windows.h>
BOOL WINAPI DllMainCRTStartup(HINSTANCE instance, DWORD reason, LPVOID reserved)
{
return TRUE;
}
#endif