From 5efdbaefc8ed57eb3ce306b5aa4c593dd05238ad Mon Sep 17 00:00:00 2001 From: Wes Tarro Date: Fri, 5 Feb 2016 02:53:25 -0500 Subject: [PATCH 01/11] Makes GLEW truly independent of C runtime library on Windows to prevent any issues with mixing compilers and library versions. The Visual Studio Projects need some touching up to get all of the settings synced up for all of the build variants. --- auto/src/glew_head.c | 2 -- auto/src/glew_init_gl.c | 43 +++++++++++++++++----------------- build/cmake/CMakeLists.txt | 26 ++++++++++++++++---- build/vc12/glew_shared.vcxproj | 3 +++ build/vc12/glew_static.vcxproj | 1 + 5 files changed, 47 insertions(+), 28 deletions(-) diff --git a/auto/src/glew_head.c b/auto/src/glew_head.c index 99947de..491156d 100644 --- a/auto/src/glew_head.c +++ b/auto/src/glew_head.c @@ -10,8 +10,6 @@ #endif #include /* For size_t */ -#include /* For bsearch */ -#include /* For memset */ #if defined(GLEW_REGAL) diff --git a/auto/src/glew_init_gl.c b/auto/src/glew_init_gl.c index 6fd86ce..9eb2fff 100644 --- a/auto/src/glew_init_gl.c +++ b/auto/src/glew_init_gl.c @@ -1,10 +1,8 @@ /* ------------------------------------------------------------------------- */ -static int _glewExtensionCompare(const void *a, const void *b) +static int _glewExtensionCompare(const char *s1, const char *s2) { /* http://www.chanduthedev.com/2012/07/strcmp-implementation-in-c.html */ - const char *s1 = (const char *) a; - const char *s2 = *(const char * const *) b; while (*s1 || *s2) { if (*s1 > *s2) @@ -17,31 +15,32 @@ static int _glewExtensionCompare(const void *a, const void *b) return 0; } +static ptrdiff_t _glewBsearchExtension(const char* name) +{ + ptrdiff_t lo = 0, hi = sizeof(_glewExtensionLookup) / sizeof(char*) - 2; + + while (lo <= hi) + { + ptrdiff_t mid = (lo + hi) / 2; + const int cmp = _glewExtensionCompare(name, _glewExtensionLookup[mid]); + if (cmp < 0) hi = mid - 1; + else if (cmp > 0) lo = mid + 1; + else return mid; + } + return -1; +} + static GLboolean *_glewGetExtensionString(const char *name) { - const char **n = (const char **) bsearch(name, _glewExtensionLookup, sizeof(_glewExtensionLookup)/sizeof(char *)-1, sizeof(char *), _glewExtensionCompare); - ptrdiff_t i; - - if (n) - { - i = n-_glewExtensionLookup; - return _glewExtensionString+i; - } - + ptrdiff_t n = _glewBsearchExtension(name); + if (n >= 0) return &_glewExtensionString[n]; return NULL; } static GLboolean *_glewGetExtensionEnable(const char *name) { - const char **n = (const char **) bsearch(name, _glewExtensionLookup, sizeof(_glewExtensionLookup)/sizeof(char *)-1, sizeof(char *), _glewExtensionCompare); - ptrdiff_t i; - - if (n) - { - i = n-_glewExtensionLookup; - return _glewExtensionEnabled[i]; - } - + ptrdiff_t n = _glewBsearchExtension(name); + if (n >= 0) return _glewExtensionEnabled[n]; return NULL; } @@ -117,7 +116,7 @@ static GLenum GLEWAPIENTRY glewContextInit () GLEW_VERSION_1_1 = GLEW_VERSION_1_2 == GL_TRUE || ( major == 1 && minor >= 1 ) ? GL_TRUE : GL_FALSE; } - memset(_glewExtensionString,0,sizeof(_glewExtensionString)); + for (size_t i = 0; i < sizeof(_glewExtensionLookup) / sizeof(char*); ++i) _glewExtensionString[i] = GL_FALSE; if (GLEW_VERSION_3_0) { diff --git a/build/cmake/CMakeLists.txt b/build/cmake/CMakeLists.txt index a8cfec7..95d95bf 100644 --- a/build/cmake/CMakeLists.txt +++ b/build/cmake/CMakeLists.txt @@ -81,10 +81,22 @@ if (WIN32) endif () add_library (glew SHARED ${GLEW_SRC_FILES}) -set_target_properties (glew PROPERTIES COMPILE_DEFINITIONS "GLEW_BUILD" OUTPUT_NAME "${GLEW_LIB_NAME}" PREFIX "${DLL_PREFIX}") +set_target_properties (glew PROPERTIES COMPILE_DEFINITIONS "GLEW_BUILD;VC_EXTRALEAN" OUTPUT_NAME "${GLEW_LIB_NAME}" PREFIX "${DLL_PREFIX}") add_library (glew_s STATIC ${GLEW_SRC_FILES}) +if (MSVC) + # add options from visual studio project and remove stdlib dependency + # kill security checks which are dependent on stdlib + target_compile_options (glew PRIVATE -GS-) + target_compile_options (glew_s PRIVATE -GS-) + target_link_libraries (glew PRIVATE -BASE:0x62AA0000 -nodefaultlib -noentry) +elseif (WIN32 AND ((CMAKE_C_COMPILER_ID MATCHES "GNU") OR (CMAKE_C_COMPILER_ID MATCHES "Clang"))) + # remove stdlib dependency on windows with GCC and Clang (for similar reasons + # as to MSVC - to allow it to be used with any Windows compiler) + # not thoroughly tested yet + target_link_libraries (glew PRIVATE -nostdlibs -lgcc) +endif () set_target_properties (glew_s PROPERTIES COMPILE_DEFINITIONS "GLEW_STATIC" OUTPUT_NAME "${GLEW_LIB_NAME}" PREFIX lib) -target_link_libraries (glew ${GLEW_LIBRARIES}) +target_link_libraries (glew PUBLIC ${GLEW_LIBRARIES}) target_link_libraries (glew_s ${GLEW_LIBRARIES}) if(CMAKE_VERSION VERSION_LESS 2.8.12) @@ -119,14 +131,20 @@ if (BUILD_UTILS) list (APPEND GLEWINFO_SRC_FILES ${GLEW_DIR}/build/glewinfo.rc) endif () add_executable (glewinfo ${GLEWINFO_SRC_FILES}) - target_link_libraries (glewinfo glew ${X11_LIBRARIES}) + target_link_libraries (glewinfo glew) + if (NOT WIN32) + target_link_libraries(glewinfo ${X11_LIBRARIES}) + endif () set (VISUALINFO_SRC_FILES ${GLEW_DIR}/src/visualinfo.c) if (WIN32) list (APPEND VISUALINFO_SRC_FILES ${GLEW_DIR}/build/visualinfo.rc) endif () add_executable (visualinfo ${VISUALINFO_SRC_FILES}) - target_link_libraries (visualinfo glew ${X11_LIBRARIES}) + target_link_libraries (visualinfo glew) + if (NOT WIN32) + target_link_libraries(visualinfo ${X11_LIBRARIES}) + endif () install ( TARGETS glewinfo visualinfo DESTINATION bin) diff --git a/build/vc12/glew_shared.vcxproj b/build/vc12/glew_shared.vcxproj index af9d7b7..8a78a90 100644 --- a/build/vc12/glew_shared.vcxproj +++ b/build/vc12/glew_shared.vcxproj @@ -280,6 +280,7 @@ Level3 $(INCLUDE_DIR) WIN32;WIN32_LEAN_AND_MEAN;VC_EXTRALEAN;GLEW_BUILD;%(PreprocessorDefinitions) + false true @@ -304,6 +305,8 @@ /ignore:4089 + true + true diff --git a/build/vc12/glew_static.vcxproj b/build/vc12/glew_static.vcxproj index 85c4be5..9bcbad1 100644 --- a/build/vc12/glew_static.vcxproj +++ b/build/vc12/glew_static.vcxproj @@ -262,6 +262,7 @@ Level3 ../../include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_LIB;WIN32_LEAN_AND_MEAN;GLEW_STATIC;%(PreprocessorDefinitions) + false 0x0409 From 31cee87b1cbd779045c545bb841cd062dff0adf9 Mon Sep 17 00:00:00 2001 From: Wes Tarro Date: Sat, 6 Feb 2016 10:54:29 -0500 Subject: [PATCH 02/11] Finish taking C runtime out of GLEW on Windows and remove no longer supported MX configurations from Visual Studio projects. --- build/cmake/CMakeLists.txt | 8 +- build/vc12/glew.sln | 36 ----- build/vc12/glew_shared.vcxproj | 231 +-------------------------------- build/vc12/glew_static.vcxproj | 175 +------------------------ build/vc12/glewinfo.vcxproj | 190 --------------------------- build/vc12/visualinfo.vcxproj | 190 --------------------------- 6 files changed, 15 insertions(+), 815 deletions(-) diff --git a/build/cmake/CMakeLists.txt b/build/cmake/CMakeLists.txt index 95d95bf..1ebea14 100644 --- a/build/cmake/CMakeLists.txt +++ b/build/cmake/CMakeLists.txt @@ -81,10 +81,13 @@ if (WIN32) endif () add_library (glew SHARED ${GLEW_SRC_FILES}) -set_target_properties (glew PROPERTIES COMPILE_DEFINITIONS "GLEW_BUILD;VC_EXTRALEAN" OUTPUT_NAME "${GLEW_LIB_NAME}" PREFIX "${DLL_PREFIX}") +set_target_properties (glew PROPERTIES COMPILE_DEFINITIONS "GLEW_BUILD" OUTPUT_NAME "${GLEW_LIB_NAME}" PREFIX "${DLL_PREFIX}") add_library (glew_s STATIC ${GLEW_SRC_FILES}) +set_target_properties (glew_s PROPERTIES COMPILE_DEFINITIONS "GLEW_STATIC" OUTPUT_NAME "${GLEW_LIB_NAME}" PREFIX lib) if (MSVC) # add options from visual studio project and remove stdlib dependency + target_compile_definitions (glew PRIVATE "GLEW_BUILD;VC_EXTRALEAN") + target_compile_definitions (glew_s PRIVATE "GLEW_STATIC;VC_EXTRALEAN") # kill security checks which are dependent on stdlib target_compile_options (glew PRIVATE -GS-) target_compile_options (glew_s PRIVATE -GS-) @@ -92,10 +95,9 @@ if (MSVC) elseif (WIN32 AND ((CMAKE_C_COMPILER_ID MATCHES "GNU") OR (CMAKE_C_COMPILER_ID MATCHES "Clang"))) # remove stdlib dependency on windows with GCC and Clang (for similar reasons # as to MSVC - to allow it to be used with any Windows compiler) - # not thoroughly tested yet + # not thoroughly tested yet! target_link_libraries (glew PRIVATE -nostdlibs -lgcc) endif () -set_target_properties (glew_s PROPERTIES COMPILE_DEFINITIONS "GLEW_STATIC" OUTPUT_NAME "${GLEW_LIB_NAME}" PREFIX lib) target_link_libraries (glew PUBLIC ${GLEW_LIBRARIES}) target_link_libraries (glew_s ${GLEW_LIBRARIES}) diff --git a/build/vc12/glew.sln b/build/vc12/glew.sln index 9a2d169..a3d671e 100644 --- a/build/vc12/glew.sln +++ b/build/vc12/glew.sln @@ -11,76 +11,40 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "visualinfo", "visualinfo.vc EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution - Debug MX|Win32 = Debug MX|Win32 - Debug MX|x64 = Debug MX|x64 Debug|Win32 = Debug|Win32 Debug|x64 = Debug|x64 - Release MX|Win32 = Release MX|Win32 - Release MX|x64 = Release MX|x64 Release|Win32 = Release|Win32 Release|x64 = Release|x64 EndGlobalSection GlobalSection(ProjectConfigurationPlatforms) = postSolution - {55AE3D72-7DE6-F19F-AEF2-9AE8CA26CF3D}.Debug MX|Win32.ActiveCfg = Debug MX|Win32 - {55AE3D72-7DE6-F19F-AEF2-9AE8CA26CF3D}.Debug MX|Win32.Build.0 = Debug MX|Win32 - {55AE3D72-7DE6-F19F-AEF2-9AE8CA26CF3D}.Debug MX|x64.ActiveCfg = Debug MX|x64 - {55AE3D72-7DE6-F19F-AEF2-9AE8CA26CF3D}.Debug MX|x64.Build.0 = Debug MX|x64 {55AE3D72-7DE6-F19F-AEF2-9AE8CA26CF3D}.Debug|Win32.ActiveCfg = Debug|Win32 {55AE3D72-7DE6-F19F-AEF2-9AE8CA26CF3D}.Debug|Win32.Build.0 = Debug|Win32 {55AE3D72-7DE6-F19F-AEF2-9AE8CA26CF3D}.Debug|x64.ActiveCfg = Debug|x64 {55AE3D72-7DE6-F19F-AEF2-9AE8CA26CF3D}.Debug|x64.Build.0 = Debug|x64 - {55AE3D72-7DE6-F19F-AEF2-9AE8CA26CF3D}.Release MX|Win32.ActiveCfg = Release MX|Win32 - {55AE3D72-7DE6-F19F-AEF2-9AE8CA26CF3D}.Release MX|Win32.Build.0 = Release MX|Win32 - {55AE3D72-7DE6-F19F-AEF2-9AE8CA26CF3D}.Release MX|x64.ActiveCfg = Release MX|x64 - {55AE3D72-7DE6-F19F-AEF2-9AE8CA26CF3D}.Release MX|x64.Build.0 = Release MX|x64 {55AE3D72-7DE6-F19F-AEF2-9AE8CA26CF3D}.Release|Win32.ActiveCfg = Release|Win32 {55AE3D72-7DE6-F19F-AEF2-9AE8CA26CF3D}.Release|Win32.Build.0 = Release|Win32 {55AE3D72-7DE6-F19F-AEF2-9AE8CA26CF3D}.Release|x64.ActiveCfg = Release|x64 {55AE3D72-7DE6-F19F-AEF2-9AE8CA26CF3D}.Release|x64.Build.0 = Release|x64 - {664E6F0D-6784-4760-9565-D54F8EB1EDF4}.Debug MX|Win32.ActiveCfg = Debug MX|Win32 - {664E6F0D-6784-4760-9565-D54F8EB1EDF4}.Debug MX|Win32.Build.0 = Debug MX|Win32 - {664E6F0D-6784-4760-9565-D54F8EB1EDF4}.Debug MX|x64.ActiveCfg = Debug MX|x64 - {664E6F0D-6784-4760-9565-D54F8EB1EDF4}.Debug MX|x64.Build.0 = Debug MX|x64 {664E6F0D-6784-4760-9565-D54F8EB1EDF4}.Debug|Win32.ActiveCfg = Debug|Win32 {664E6F0D-6784-4760-9565-D54F8EB1EDF4}.Debug|Win32.Build.0 = Debug|Win32 {664E6F0D-6784-4760-9565-D54F8EB1EDF4}.Debug|x64.ActiveCfg = Debug|x64 {664E6F0D-6784-4760-9565-D54F8EB1EDF4}.Debug|x64.Build.0 = Debug|x64 - {664E6F0D-6784-4760-9565-D54F8EB1EDF4}.Release MX|Win32.ActiveCfg = Release MX|Win32 - {664E6F0D-6784-4760-9565-D54F8EB1EDF4}.Release MX|Win32.Build.0 = Release MX|Win32 - {664E6F0D-6784-4760-9565-D54F8EB1EDF4}.Release MX|x64.ActiveCfg = Release MX|x64 - {664E6F0D-6784-4760-9565-D54F8EB1EDF4}.Release MX|x64.Build.0 = Release MX|x64 {664E6F0D-6784-4760-9565-D54F8EB1EDF4}.Release|Win32.ActiveCfg = Release|Win32 {664E6F0D-6784-4760-9565-D54F8EB1EDF4}.Release|Win32.Build.0 = Release|Win32 {664E6F0D-6784-4760-9565-D54F8EB1EDF4}.Release|x64.ActiveCfg = Release|x64 {664E6F0D-6784-4760-9565-D54F8EB1EDF4}.Release|x64.Build.0 = Release|x64 - {8EFB5DCB-C0C4-1670-5938-A0E0F1A1C5EA}.Debug MX|Win32.ActiveCfg = Debug MX|Win32 - {8EFB5DCB-C0C4-1670-5938-A0E0F1A1C5EA}.Debug MX|Win32.Build.0 = Debug MX|Win32 - {8EFB5DCB-C0C4-1670-5938-A0E0F1A1C5EA}.Debug MX|x64.ActiveCfg = Debug MX|x64 - {8EFB5DCB-C0C4-1670-5938-A0E0F1A1C5EA}.Debug MX|x64.Build.0 = Debug MX|x64 {8EFB5DCB-C0C4-1670-5938-A0E0F1A1C5EA}.Debug|Win32.ActiveCfg = Debug|Win32 {8EFB5DCB-C0C4-1670-5938-A0E0F1A1C5EA}.Debug|Win32.Build.0 = Debug|Win32 {8EFB5DCB-C0C4-1670-5938-A0E0F1A1C5EA}.Debug|x64.ActiveCfg = Debug|x64 {8EFB5DCB-C0C4-1670-5938-A0E0F1A1C5EA}.Debug|x64.Build.0 = Debug|x64 - {8EFB5DCB-C0C4-1670-5938-A0E0F1A1C5EA}.Release MX|Win32.ActiveCfg = Release MX|Win32 - {8EFB5DCB-C0C4-1670-5938-A0E0F1A1C5EA}.Release MX|Win32.Build.0 = Release MX|Win32 - {8EFB5DCB-C0C4-1670-5938-A0E0F1A1C5EA}.Release MX|x64.ActiveCfg = Release MX|x64 - {8EFB5DCB-C0C4-1670-5938-A0E0F1A1C5EA}.Release MX|x64.Build.0 = Release MX|x64 {8EFB5DCB-C0C4-1670-5938-A0E0F1A1C5EA}.Release|Win32.ActiveCfg = Release|Win32 {8EFB5DCB-C0C4-1670-5938-A0E0F1A1C5EA}.Release|Win32.Build.0 = Release|Win32 {8EFB5DCB-C0C4-1670-5938-A0E0F1A1C5EA}.Release|x64.ActiveCfg = Release|x64 {8EFB5DCB-C0C4-1670-5938-A0E0F1A1C5EA}.Release|x64.Build.0 = Release|x64 - {79AA8443-86F4-649A-0BEB-0CB5E51B7D7E}.Debug MX|Win32.ActiveCfg = Debug MX|Win32 - {79AA8443-86F4-649A-0BEB-0CB5E51B7D7E}.Debug MX|Win32.Build.0 = Debug MX|Win32 - {79AA8443-86F4-649A-0BEB-0CB5E51B7D7E}.Debug MX|x64.ActiveCfg = Debug MX|x64 - {79AA8443-86F4-649A-0BEB-0CB5E51B7D7E}.Debug MX|x64.Build.0 = Debug MX|x64 {79AA8443-86F4-649A-0BEB-0CB5E51B7D7E}.Debug|Win32.ActiveCfg = Debug|Win32 {79AA8443-86F4-649A-0BEB-0CB5E51B7D7E}.Debug|Win32.Build.0 = Debug|Win32 {79AA8443-86F4-649A-0BEB-0CB5E51B7D7E}.Debug|x64.ActiveCfg = Debug|x64 {79AA8443-86F4-649A-0BEB-0CB5E51B7D7E}.Debug|x64.Build.0 = Debug|x64 - {79AA8443-86F4-649A-0BEB-0CB5E51B7D7E}.Release MX|Win32.ActiveCfg = Release MX|Win32 - {79AA8443-86F4-649A-0BEB-0CB5E51B7D7E}.Release MX|Win32.Build.0 = Release MX|Win32 - {79AA8443-86F4-649A-0BEB-0CB5E51B7D7E}.Release MX|x64.ActiveCfg = Release MX|x64 - {79AA8443-86F4-649A-0BEB-0CB5E51B7D7E}.Release MX|x64.Build.0 = Release MX|x64 {79AA8443-86F4-649A-0BEB-0CB5E51B7D7E}.Release|Win32.ActiveCfg = Release|Win32 {79AA8443-86F4-649A-0BEB-0CB5E51B7D7E}.Release|Win32.Build.0 = Release|Win32 {79AA8443-86F4-649A-0BEB-0CB5E51B7D7E}.Release|x64.ActiveCfg = Release|x64 diff --git a/build/vc12/glew_shared.vcxproj b/build/vc12/glew_shared.vcxproj index 8a78a90..6605a1c 100644 --- a/build/vc12/glew_shared.vcxproj +++ b/build/vc12/glew_shared.vcxproj @@ -1,14 +1,6 @@  - - Debug MX - Win32 - - - Debug MX - x64 - Debug Win32 @@ -17,14 +9,6 @@ Debug x64 - - Release MX - Win32 - - - Release MX - x64 - Release Win32 @@ -50,16 +34,6 @@ false v120 - - DynamicLibrary - false - v120 - - - DynamicLibrary - false - v120 - DynamicLibrary false @@ -70,16 +44,6 @@ false v120 - - DynamicLibrary - false - v120 - - - DynamicLibrary - false - v120 - @@ -89,37 +53,13 @@ - - - - - - - - - - - - - - $(BIN_DIR)\$(Configuration)\$(PlatformName)\ - tmp\$(TargetName)\$(Configuration)\$(PlatformName)\ - false - glew32mx - - - $(BIN_DIR)\$(Configuration)\$(PlatformName)\ - tmp\$(TargetName)\$(Configuration)\$(PlatformName)\ - false - glew32mx - $(BIN_DIR)\$(Configuration)\$(PlatformName)\ tmp\$(TargetName)\$(Configuration)\$(PlatformName)\ @@ -132,18 +72,6 @@ false glew32 - - $(BIN_DIR)\$(Configuration)\$(PlatformName)\ - tmp\$(TargetName)\$(Configuration)\$(PlatformName)\ - false - glew32mxd - - - $(BIN_DIR)\$(Configuration)\$(PlatformName)\ - tmp\$(TargetName)\$(Configuration)\$(PlatformName)\ - false - glew32mxd - $(BIN_DIR)\$(Configuration)\$(PlatformName)\ tmp\$(TargetName)\$(Configuration)\$(PlatformName)\ @@ -156,81 +84,6 @@ false glew32d - - - MultiThreaded - OnlyExplicitInline - true - true - MaxSpeed - true - Level3 - $(INCLUDE_DIR) - WIN32;WIN32_LEAN_AND_MEAN;VC_EXTRALEAN;GLEW_MX;GLEW_BUILD;%(PreprocessorDefinitions) - - - true - NDEBUG;%(PreprocessorDefinitions) - true - Win32 - - - 0x0409 - NDEBUG;GLEW_MX;%(PreprocessorDefinitions) - - - true - - - true - true - Console - $(OutDir)$(TargetName)$(TargetExt) - $(LIB_DIR)\$(Configuration)\$(PlatformName)\$(TargetName).lib - 0x62AA0000 - opengl32.lib;%(AdditionalDependencies) - /ignore:4089 - - - - - - - MultiThreaded - OnlyExplicitInline - true - true - MaxSpeed - true - Level3 - $(INCLUDE_DIR) - WIN32;WIN32_LEAN_AND_MEAN;VC_EXTRALEAN;GLEW_MX;GLEW_BUILD;%(PreprocessorDefinitions) - - - true - NDEBUG;%(PreprocessorDefinitions) - true - - - 0x0409 - NDEBUG;GLEW_MX;%(PreprocessorDefinitions) - - - true - - - true - true - Console - $(OutDir)$(TargetName)$(TargetExt) - $(LIB_DIR)\$(Configuration)\$(PlatformName)\$(TargetName).lib - 0x62AA0000 - opengl32.lib;%(AdditionalDependencies) - /ignore:4089 - - - - MultiThreaded @@ -242,6 +95,7 @@ Level3 $(INCLUDE_DIR) WIN32;WIN32_LEAN_AND_MEAN;VC_EXTRALEAN;GLEW_BUILD;%(PreprocessorDefinitions) + false true @@ -267,6 +121,8 @@ /ignore:4089 + true + true @@ -309,84 +165,9 @@ true - - - MultiThreadedDebugDLL - Default - false - Disabled - true - Level3 - $(INCLUDE_DIR) - WIN32;WIN32_MEAN_AND_LEAN;VC_EXTRALEAN;GLEW_MX;GLEW_BUILD;%(PreprocessorDefinitions) - EnableFastChecks - - - true - _DEBUG;%(PreprocessorDefinitions) - true - Win32 - - - 0x0409 - _DEBUG;GLEW_MX;%(PreprocessorDefinitions) - - - true - - - true - true - true - Console - $(OutDir)$(TargetName)$(TargetExt) - $(LIB_DIR)\$(Configuration)\$(PlatformName)\$(TargetName).lib - 0x62AA0000 - opengl32.lib;%(AdditionalDependencies) - - - - - - - MultiThreadedDebugDLL - Default - false - Disabled - true - Level3 - $(INCLUDE_DIR) - WIN32;WIN32_MEAN_AND_LEAN;VC_EXTRALEAN;GLEW_MX;GLEW_BUILD;%(PreprocessorDefinitions) - EnableFastChecks - - - true - _DEBUG;%(PreprocessorDefinitions) - true - - - 0x0409 - _DEBUG;GLEW_MX;%(PreprocessorDefinitions) - - - true - - - true - true - true - Console - $(OutDir)$(TargetName)$(TargetExt) - $(LIB_DIR)\$(Configuration)\$(PlatformName)\$(TargetName).lib - 0x62AA0000 - opengl32.lib;%(AdditionalDependencies) - - - - - MultiThreadedDebugDLL + MultiThreadedDebug Default false Disabled @@ -395,6 +176,7 @@ EnableFastChecks Level3 $(INCLUDE_DIR) + false true @@ -424,7 +206,7 @@ - MultiThreadedDebugDLL + MultiThreadedDebug Default false Disabled @@ -433,6 +215,7 @@ EnableFastChecks Level3 $(INCLUDE_DIR) + false true diff --git a/build/vc12/glew_static.vcxproj b/build/vc12/glew_static.vcxproj index 9bcbad1..61adc41 100644 --- a/build/vc12/glew_static.vcxproj +++ b/build/vc12/glew_static.vcxproj @@ -1,14 +1,6 @@  - - Debug MX - Win32 - - - Debug MX - x64 - Debug Win32 @@ -17,14 +9,6 @@ Debug x64 - - Release MX - Win32 - - - Release MX - x64 - Release Win32 @@ -58,18 +42,6 @@ MultiByte v120 - - StaticLibrary - false - MultiByte - v120 - - - StaticLibrary - false - MultiByte - v120 - StaticLibrary false @@ -82,18 +54,6 @@ MultiByte v120 - - StaticLibrary - false - MultiByte - v120 - - - StaticLibrary - false - MultiByte - v120 - @@ -109,35 +69,13 @@ - - - - - - - - - - - - - - $(LIB_DIR)\$(Configuration)\$(PlatformName)\ - tmp\$(TargetName)\$(Configuration)\$(PlatformName)\ - glew32mxsd - - - $(LIB_DIR)\$(Configuration)\$(PlatformName)\ - tmp\$(TargetName)\$(Configuration)\$(PlatformName)\ - glew32mxsd - $(LIB_DIR)\$(Configuration)\$(PlatformName)\ tmp\$(TargetName)\$(Configuration)\$(PlatformName)\ @@ -148,16 +86,6 @@ tmp\$(TargetName)\$(Configuration)\$(PlatformName)\ glew32s - - $(LIB_DIR)\$(Configuration)\$(PlatformName)\ - tmp\$(TargetName)\$(Configuration)\$(PlatformName)\ - glew32mxs - - - $(LIB_DIR)\$(Configuration)\$(PlatformName)\ - tmp\$(TargetName)\$(Configuration)\$(PlatformName)\ - glew32mxs - $(LIB_DIR)\$(Configuration)\$(PlatformName)\ tmp\$(TargetName)\$(Configuration)\$(PlatformName)\ @@ -176,56 +104,6 @@ $(LIB_DIR)\$(Configuration)\$(PlatformName)\ tmp\$(TargetName)\$(Configuration)\$(PlatformName)\ - - - MultiThreadedDebugDLL - Default - false - Disabled - true - Level3 - ../../include;%(AdditionalIncludeDirectories) - WIN32;_DEBUG;_LIB;WIN32_LEAN_AND_MEAN;GLEW_MX;GLEW_STATIC;%(PreprocessorDefinitions) - EnableFastChecks - - - 0x0409 - _DEBUG;GLEW_MX;GLEW_STATIC;%(PreprocessorDefinitions) - - - true - - - true - $(OutDir)$(TargetName)$(TargetExt) - MachineX86 - - - - - MultiThreadedDebugDLL - Default - false - Disabled - true - Level3 - ../../include;%(AdditionalIncludeDirectories) - WIN32;_DEBUG;_LIB;WIN32_LEAN_AND_MEAN;GLEW_MX;GLEW_STATIC;%(PreprocessorDefinitions) - EnableFastChecks - - - 0x0409 - _DEBUG;GLEW_MX;GLEW_STATIC;%(PreprocessorDefinitions) - - - true - - - true - $(OutDir)$(TargetName)$(TargetExt) - MachineX64 - - MultiThreaded @@ -237,6 +115,7 @@ Level3 ../../include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_LIB;WIN32_LEAN_AND_MEAN;GLEW_STATIC;%(PreprocessorDefinitions) + false 0x0409 @@ -277,56 +156,6 @@ MachineX64 - - - MultiThreaded - OnlyExplicitInline - true - true - MaxSpeed - true - Level3 - ../../include;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;_LIB;WIN32_LEAN_AND_MEAN;GLEW_MX;GLEW_STATIC;%(PreprocessorDefinitions) - - - 0x0409 - NDEBUG;GLEW_MX;GLEW_STATIC;%(PreprocessorDefinitions) - - - true - - - true - $(OutDir)$(TargetName)$(TargetExt) - MachineX86 - - - - - MultiThreaded - OnlyExplicitInline - true - true - MaxSpeed - true - Level3 - ../../include;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;_LIB;WIN32_LEAN_AND_MEAN;GLEW_MX;GLEW_STATIC;%(PreprocessorDefinitions) - - - 0x0409 - NDEBUG;GLEW_MX;GLEW_STATIC;%(PreprocessorDefinitions) - - - true - - - true - $(OutDir)$(TargetName)$(TargetExt) - MachineX64 - - MultiThreadedDebugDLL @@ -337,6 +166,7 @@ Level3 WIN32;_DEBUG;_LIB;WIN32_LEAN_AND_MEAN;GLEW_STATIC;%(PreprocessorDefinitions) EnableFastChecks + false 0x0409 @@ -361,6 +191,7 @@ Level3 WIN32;_DEBUG;_LIB;WIN32_LEAN_AND_MEAN;GLEW_STATIC;%(PreprocessorDefinitions) EnableFastChecks + false 0x0409 diff --git a/build/vc12/glewinfo.vcxproj b/build/vc12/glewinfo.vcxproj index 4a82364..8b38665 100644 --- a/build/vc12/glewinfo.vcxproj +++ b/build/vc12/glewinfo.vcxproj @@ -1,14 +1,6 @@  - - Debug MX - Win32 - - - Debug MX - x64 - Debug Win32 @@ -17,14 +9,6 @@ Debug x64 - - Release MX - Win32 - - - Release MX - x64 - Release Win32 @@ -66,26 +50,6 @@ false v120 - - Application - false - v120 - - - Application - false - v120 - - - Application - false - v120 - - - Application - false - v120 - @@ -107,43 +71,7 @@ - - - - - - - - - - - - - - $(BIN_DIR)\$(Configuration)\$(PlatformName)\ - tmp\$(TargetName)\$(Configuration)\$(PlatformName)\ - false - glewinfo-mx - - - $(BIN_DIR)\$(Configuration)\$(PlatformName)\ - tmp\$(TargetName)\$(Configuration)\$(PlatformName)\ - false - glewinfo-mx - - - $(BIN_DIR)\$(Configuration)\$(PlatformName)\ - tmp\$(TargetName)\$(Configuration)\$(PlatformName)\ - false - glewinfo-mxd - - - $(BIN_DIR)\$(Configuration)\$(PlatformName)\ - tmp\$(TargetName)\$(Configuration)\$(PlatformName)\ - false - glewinfo-mxd - $(BIN_DIR)\$(Configuration)\$(PlatformName)\ tmp\$(TargetName)\$(Configuration)\$(PlatformName)\ @@ -178,124 +106,6 @@ glewinfo tmp\$(TargetName)\$(Configuration)\$(PlatformName)\ - - - MultiThreaded - OnlyExplicitInline - true - true - MaxSpeed - true - Level3 - WIN32;WIN32_LEAN_AND_MEAN;GLEW_MX;GLEW_STATIC;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) - - - .\..\..\bin\glewinfo.tlb - - - 0x0409 - NDEBUG;GLEW_MX;%(PreprocessorDefinitions) - - - true - - - true - Console - $(OutDir)$(TargetName)$(TargetExt) - glew32mxs.lib;opengl32.lib;%(AdditionalDependencies) - $(LIB_DIR)\$(Configuration)\$(PlatformName)\ - - - - - MultiThreaded - OnlyExplicitInline - true - true - MaxSpeed - true - Level3 - WIN32;WIN32_LEAN_AND_MEAN;GLEW_MX;GLEW_STATIC;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) - - - .\..\..\bin\glewinfo.tlb - - - 0x0409 - NDEBUG;GLEW_MX;%(PreprocessorDefinitions) - - - true - - - true - Console - $(OutDir)$(TargetName)$(TargetExt) - glew32mxs.lib;opengl32.lib;%(AdditionalDependencies) - $(LIB_DIR)\$(Configuration)\$(PlatformName)\ - - - - - MultiThreadedDebugDLL - Default - false - Disabled - true - Level3 - WIN32;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;GLEW_MX;GLEW_STATIC;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) - EnableFastChecks - - - .\..\..\bin\glewinfo.tlb - - - 0x0409 - _DEBUG;GLEW_MX;%(PreprocessorDefinitions) - - - true - - - true - true - Console - $(OutDir)$(TargetName)$(TargetExt) - glew32mxsd.lib;opengl32.lib;%(AdditionalDependencies) - $(LIB_DIR)\$(Configuration)\$(PlatformName)\ - - - - - MultiThreadedDebugDLL - Default - false - Disabled - true - Level3 - WIN32;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;GLEW_MX;GLEW_STATIC;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) - EnableFastChecks - - - .\..\..\bin\glewinfo.tlb - - - 0x0409 - _DEBUG;GLEW_MX;%(PreprocessorDefinitions) - - - true - - - true - true - Console - $(OutDir)$(TargetName)$(TargetExt) - glew32mxsd.lib;opengl32.lib;%(AdditionalDependencies) - $(LIB_DIR)\$(Configuration)\$(PlatformName)\ - - MultiThreadedDebugDLL diff --git a/build/vc12/visualinfo.vcxproj b/build/vc12/visualinfo.vcxproj index e6e2a8b..20b9e6a 100644 --- a/build/vc12/visualinfo.vcxproj +++ b/build/vc12/visualinfo.vcxproj @@ -1,14 +1,6 @@  - - Debug MX - Win32 - - - Debug MX - x64 - Debug Win32 @@ -17,14 +9,6 @@ Debug x64 - - Release MX - Win32 - - - Release MX - x64 - Release Win32 @@ -56,16 +40,6 @@ false v120 - - Application - false - v120 - - - Application - false - v120 - Application false @@ -76,16 +50,6 @@ false v120 - - Application - false - v120 - - - Application - false - v120 - @@ -101,37 +65,13 @@ - - - - - - - - - - - - - - $(BIN_DIR)\$(Configuration)\$(PlatformName)\ - tmp\$(TargetName)\$(Configuration)\$(PlatformName)\ - false - visualinfo-mxd - - - $(BIN_DIR)\$(Configuration)\$(PlatformName)\ - tmp\$(TargetName)\$(Configuration)\$(PlatformName)\ - false - visualinfo-mxd - $(BIN_DIR)\$(Configuration)\$(PlatformName)\ tmp\$(TargetName)\$(Configuration)\$(PlatformName)\ @@ -144,18 +84,6 @@ false visualinfod - - $(BIN_DIR)\$(Configuration)\$(PlatformName)\ - tmp\$(TargetName)\$(Configuration)\$(PlatformName)\ - false - visualinfo-mx - - - $(BIN_DIR)\$(Configuration)\$(PlatformName)\ - tmp\$(TargetName)\$(Configuration)\$(PlatformName)\ - false - visualinfo-mx - $(BIN_DIR)\$(Configuration)\$(PlatformName)\ tmp\$(TargetName)\$(Configuration)\$(PlatformName)\ @@ -177,66 +105,6 @@ ..\..\bin/ visualinfo - - - MultiThreadedDebugDLL - Default - false - Disabled - true - Level3 - WIN32;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;GLEW_MX;GLEW_STATIC;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) - EnableFastChecks - - - .\..\..\bin\visualinfo.tlb - - - 0x0409 - _DEBUG;GLEW_MX;%(PreprocessorDefinitions) - - - true - - - true - true - Console - $(OutDir)$(TargetName)$(TargetExt) - glew32mxsd.lib;glu32.lib;opengl32.lib;%(AdditionalDependencies) - $(LIB_DIR)\$(Configuration)\$(PlatformName)\ - - - - - MultiThreadedDebugDLL - Default - false - Disabled - true - Level3 - WIN32;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;GLEW_MX;GLEW_STATIC;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) - EnableFastChecks - - - .\..\..\bin\visualinfo.tlb - - - 0x0409 - _DEBUG;GLEW_MX;%(PreprocessorDefinitions) - - - true - - - true - true - Console - $(OutDir)$(TargetName)$(TargetExt) - glew32mxsd.lib;glu32.lib;opengl32.lib;%(AdditionalDependencies) - $(LIB_DIR)\$(Configuration)\$(PlatformName)\ - - MultiThreadedDebugDLL @@ -297,64 +165,6 @@ $(LIB_DIR)\$(Configuration)\$(PlatformName)\ - - - MultiThreaded - OnlyExplicitInline - true - true - MaxSpeed - true - Level3 - WIN32;WIN32_LEAN_AND_MEAN;VC_EXTRALEAN;GLEW_MX;GLEW_STATIC;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) - - - .\..\..\bin\visualinfo.tlb - - - 0x0409 - NDEBUG;GLEW_MX;%(PreprocessorDefinitions) - - - true - - - true - Console - $(OutDir)$(TargetName)$(TargetExt) - glew32mxs.lib;glu32.lib;opengl32.lib;%(AdditionalDependencies) - $(LIB_DIR)\$(Configuration)\$(PlatformName)\ - - - - - MultiThreaded - OnlyExplicitInline - true - true - MaxSpeed - true - Level3 - WIN32;WIN32_LEAN_AND_MEAN;GLEW_MX;GLEW_STATIC;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) - - - .\..\..\bin\visualinfo.tlb - - - 0x0409 - NDEBUG;GLEW_MX;%(PreprocessorDefinitions) - - - true - - - true - Console - $(OutDir)$(TargetName)$(TargetExt) - glew32mxs.lib;glu32.lib;opengl32.lib;%(AdditionalDependencies) - $(LIB_DIR)\$(Configuration)\$(PlatformName)\ - - MultiThreaded From 32b2ea526649b5f02543c4bddec6069778ec0c54 Mon Sep 17 00:00:00 2001 From: Wes Tarro Date: Sat, 6 Feb 2016 13:10:02 -0500 Subject: [PATCH 03/11] Fixed building with GCC - needed different options and had to create a dummy DLL entry to avoid crashes. --- auto/src/glew_init_gl.c | 4 +++- build/cmake/CMakeLists.txt | 15 +++++++++++---- src/gcc_dll_entry.c | 7 +++++++ 3 files changed, 21 insertions(+), 5 deletions(-) create mode 100644 src/gcc_dll_entry.c diff --git a/auto/src/glew_init_gl.c b/auto/src/glew_init_gl.c index 87503c3..7d783bf 100644 --- a/auto/src/glew_init_gl.c +++ b/auto/src/glew_init_gl.c @@ -124,7 +124,9 @@ static GLenum GLEWAPIENTRY glewContextInit () GLEW_VERSION_1_1 = GLEW_VERSION_1_2 == GL_TRUE || ( major == 1 && minor >= 1 ) ? GL_TRUE : GL_FALSE; } - for (size_t i = 0; i < sizeof(_glewExtensionLookup) / sizeof(char*); ++i) _glewExtensionString[i] = GL_FALSE; + size_t n; + for (n = 0; n < sizeof(_glewExtensionString) / sizeof(_glewExtensionString[0]); ++n) + _glewExtensionString[n] = GL_FALSE; if (GLEW_VERSION_3_0) { diff --git a/build/cmake/CMakeLists.txt b/build/cmake/CMakeLists.txt index 1ebea14..a6dbc3e 100644 --- a/build/cmake/CMakeLists.txt +++ b/build/cmake/CMakeLists.txt @@ -78,6 +78,10 @@ set (GLEW_SRC_FILES ${GLEW_DIR}/src/glew.c) if (WIN32) 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 () add_library (glew SHARED ${GLEW_SRC_FILES}) @@ -85,18 +89,21 @@ set_target_properties (glew PROPERTIES COMPILE_DEFINITIONS "GLEW_BUILD" OUTPUT_N add_library (glew_s STATIC ${GLEW_SRC_FILES}) set_target_properties (glew_s PROPERTIES COMPILE_DEFINITIONS "GLEW_STATIC" OUTPUT_NAME "${GLEW_LIB_NAME}" PREFIX lib) if (MSVC) - # add options from visual studio project and remove stdlib dependency + # add options from visual studio project target_compile_definitions (glew PRIVATE "GLEW_BUILD;VC_EXTRALEAN") target_compile_definitions (glew_s PRIVATE "GLEW_STATIC;VC_EXTRALEAN") + target_link_libraries (glew PRIVATE -BASE:0x62AA0000) # kill security checks which are dependent on stdlib target_compile_options (glew PRIVATE -GS-) target_compile_options (glew_s PRIVATE -GS-) - target_link_libraries (glew PRIVATE -BASE:0x62AA0000 -nodefaultlib -noentry) + # remove stdlib dependency + target_link_libraries (glew PRIVATE -nodefaultlib -noentry) elseif (WIN32 AND ((CMAKE_C_COMPILER_ID MATCHES "GNU") OR (CMAKE_C_COMPILER_ID MATCHES "Clang"))) # remove stdlib dependency on windows with GCC and Clang (for similar reasons # as to MSVC - to allow it to be used with any Windows compiler) - # not thoroughly tested yet! - target_link_libraries (glew PRIVATE -nostdlibs -lgcc) + target_compile_options (glew PRIVATE -fno-builtin -fno-stack-protector) + target_compile_options (glew_s PRIVATE -fno-builtin -fno-stack-protector) + target_link_libraries (glew PRIVATE -nostdlib) endif () target_link_libraries (glew PUBLIC ${GLEW_LIBRARIES}) target_link_libraries (glew_s ${GLEW_LIBRARIES}) diff --git a/src/gcc_dll_entry.c b/src/gcc_dll_entry.c new file mode 100644 index 0000000..726f05f --- /dev/null +++ b/src/gcc_dll_entry.c @@ -0,0 +1,7 @@ +#ifdef GLEW_BUILD +#include +BOOL WINAPI DllMainCRTStartup(HINSTANCE instance, DWORD reason, LPVOID reserved) +{ + return TRUE; +} +#endif \ No newline at end of file From 02fc17f511ad38bd09d928a45cf92c2e0ea43951 Mon Sep 17 00:00:00 2001 From: Wes Tarro Date: Sat, 6 Feb 2016 13:30:15 -0500 Subject: [PATCH 04/11] Fix warnings and CMake issue. --- auto/src/glew_init_gl.c | 2 +- build/cmake/CMakeLists.txt | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/auto/src/glew_init_gl.c b/auto/src/glew_init_gl.c index 7d783bf..25c9b74 100644 --- a/auto/src/glew_init_gl.c +++ b/auto/src/glew_init_gl.c @@ -79,6 +79,7 @@ static GLenum GLEWAPIENTRY glewContextInit () const GLubyte* s; GLuint dot; GLint major, minor; + size_t n; /* query opengl version */ getString = (PFNGLGETSTRINGPROC) glewGetProcAddress((const GLubyte*)"glGetString"); @@ -124,7 +125,6 @@ static GLenum GLEWAPIENTRY glewContextInit () GLEW_VERSION_1_1 = GLEW_VERSION_1_2 == GL_TRUE || ( major == 1 && minor >= 1 ) ? GL_TRUE : GL_FALSE; } - size_t n; for (n = 0; n < sizeof(_glewExtensionString) / sizeof(_glewExtensionString[0]); ++n) _glewExtensionString[n] = GL_FALSE; diff --git a/build/cmake/CMakeLists.txt b/build/cmake/CMakeLists.txt index a6dbc3e..3c6d892 100644 --- a/build/cmake/CMakeLists.txt +++ b/build/cmake/CMakeLists.txt @@ -4,7 +4,7 @@ endif () project (glew) -cmake_minimum_required (VERSION 2.4) +cmake_minimum_required (VERSION 2.8.7) if (COMMAND cmake_policy) cmake_policy (SET CMP0003 NEW) @@ -92,20 +92,20 @@ if (MSVC) # add options from visual studio project target_compile_definitions (glew PRIVATE "GLEW_BUILD;VC_EXTRALEAN") target_compile_definitions (glew_s PRIVATE "GLEW_STATIC;VC_EXTRALEAN") - target_link_libraries (glew PRIVATE -BASE:0x62AA0000) + target_link_libraries (glew LINK_PRIVATE -BASE:0x62AA0000) # kill security checks which are dependent on stdlib target_compile_options (glew PRIVATE -GS-) target_compile_options (glew_s PRIVATE -GS-) # remove stdlib dependency - target_link_libraries (glew PRIVATE -nodefaultlib -noentry) + target_link_libraries (glew LINK_PRIVATE -nodefaultlib -noentry) elseif (WIN32 AND ((CMAKE_C_COMPILER_ID MATCHES "GNU") OR (CMAKE_C_COMPILER_ID MATCHES "Clang"))) # remove stdlib dependency on windows with GCC and Clang (for similar reasons # as to MSVC - to allow it to be used with any Windows compiler) target_compile_options (glew PRIVATE -fno-builtin -fno-stack-protector) target_compile_options (glew_s PRIVATE -fno-builtin -fno-stack-protector) - target_link_libraries (glew PRIVATE -nostdlib) + target_link_libraries (glew LINK_PRIVATE -nostdlib) endif () -target_link_libraries (glew PUBLIC ${GLEW_LIBRARIES}) +target_link_libraries (glew LINK_PUBLIC ${GLEW_LIBRARIES}) target_link_libraries (glew_s ${GLEW_LIBRARIES}) if(CMAKE_VERSION VERSION_LESS 2.8.12) From 9548431bd02473acafdd90da65c859613832bf82 Mon Sep 17 00:00:00 2001 From: Wes Tarro Date: Mon, 15 Feb 2016 15:15:33 -0500 Subject: [PATCH 05/11] Moved DLL entry-point for GCC into glew.c rather than a standalone file included using CMake. --- auto/src/glew_init_tail.c | 9 +++++++++ build/cmake/CMakeLists.txt | 4 ---- src/gcc_dll_entry.c | 7 ------- 3 files changed, 9 insertions(+), 11 deletions(-) delete mode 100644 src/gcc_dll_entry.c diff --git a/auto/src/glew_init_tail.c b/auto/src/glew_init_tail.c index 2ef3d5b..c7be402 100644 --- a/auto/src/glew_init_tail.c +++ b/auto/src/glew_init_tail.c @@ -53,3 +53,12 @@ GLenum GLEWAPIENTRY glewInit (void) return r; #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 diff --git a/build/cmake/CMakeLists.txt b/build/cmake/CMakeLists.txt index 3c6d892..d1c367b 100644 --- a/build/cmake/CMakeLists.txt +++ b/build/cmake/CMakeLists.txt @@ -78,10 +78,6 @@ set (GLEW_SRC_FILES ${GLEW_DIR}/src/glew.c) if (WIN32) 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 () add_library (glew SHARED ${GLEW_SRC_FILES}) diff --git a/src/gcc_dll_entry.c b/src/gcc_dll_entry.c deleted file mode 100644 index 726f05f..0000000 --- a/src/gcc_dll_entry.c +++ /dev/null @@ -1,7 +0,0 @@ -#ifdef GLEW_BUILD -#include -BOOL WINAPI DllMainCRTStartup(HINSTANCE instance, DWORD reason, LPVOID reserved) -{ - return TRUE; -} -#endif \ No newline at end of file From e6a74a74878b9862ac4679bb66060271b84f1c26 Mon Sep 17 00:00:00 2001 From: Wes Tarro Date: Mon, 15 Feb 2016 15:25:52 -0500 Subject: [PATCH 06/11] Add windows build updates to Makefile builds. --- config/Makefile.cygming | 9 ++------- config/Makefile.fedora-mingw32 | 4 ++-- config/Makefile.linux-mingw-w64 | 11 +++-------- config/Makefile.linux-mingw32 | 11 +++-------- config/Makefile.linux-mingw64 | 11 +++-------- config/Makefile.mingw | 9 ++------- config/Makefile.msys | 4 ++-- 7 files changed, 17 insertions(+), 42 deletions(-) diff --git a/config/Makefile.cygming b/config/Makefile.cygming index a356c5c..842fba5 100644 --- a/config/Makefile.cygming +++ b/config/Makefile.cygming @@ -4,8 +4,8 @@ BINDIR = /usr/bin LIBDIR = /usr/lib/mingw INCDIR = /usr/include/mingw/GL # use gcc for linking, with ld it does not work -CC := gcc -mno-cygwin -LD := gcc -mno-cygwin +CC := gcc -mno-cygwin -fno-builtin -fno-stack-protector +LD := gcc -mno-cygwin -nostdlib LN := LDFLAGS.GL = -lopengl32 -lgdi32 -luser32 -lkernel32 LDFLAGS.EXTRA = -L$(LIBDIR) @@ -17,8 +17,3 @@ LIB.DEVLNK = lib$(NAME).dll.a # for mingw this is the dll import lib LIB.SHARED = $(NAME).dll LIB.STATIC = lib$(NAME).a # the static lib will be broken LDFLAGS.SO = -shared -Wl,-soname,$(LIB.SONAME) -Wl,--out-implib,lib/$(LIB.DEVLNK) -LIB.SONAME.MX = lib$(NAME)mx.dll -LIB.DEVLNK.MX = lib$(NAME)mx.dll.a # for mingw this is the dll import lib -LIB.SHARED.MX = $(NAME)mx.dll -LIB.STATIC.MX = lib$(NAME)mx.a # the static lib will be broken -LDFLAGS.SO.MX = -shared -Wl,-soname,$(LIB.SONAME.MX) -Wl,--out-implib,lib/$(LIB.DEVLNK.MX) diff --git a/config/Makefile.fedora-mingw32 b/config/Makefile.fedora-mingw32 index f27db34..4110ce7 100644 --- a/config/Makefile.fedora-mingw32 +++ b/config/Makefile.fedora-mingw32 @@ -6,6 +6,6 @@ include config/Makefile.linux-mingw32 -CC := i686-pc-mingw32-gcc -LD := i686-pc-mingw32-ld +CC := i686-pc-mingw32-gcc -fno-builtin -fno-stack-protector +LD := i686-pc-mingw32-ld -nostdlib LDFLAGS.GL += -L/usr/i686-pc-mingw32/sys-root/mingw/lib diff --git a/config/Makefile.linux-mingw-w64 b/config/Makefile.linux-mingw-w64 index 57cd203..2822a1e 100644 --- a/config/Makefile.linux-mingw-w64 +++ b/config/Makefile.linux-mingw-w64 @@ -5,11 +5,11 @@ # NAME := glew32 -CC := i686-w64-mingw32-gcc -LD := i686-w64-mingw32-ld +CC := i686-w64-mingw32-gcc -fno-builtin -fno-stack-protector +LD := i686-w64-mingw32-ld -nostdlib LN := STRIP := -LDFLAGS.GL = -lopengl32 -lgdi32 -lmsvcrt -luser32 -lkernel32 +LDFLAGS.GL = -lopengl32 -lgdi32 -luser32 -lkernel32 WARN = -Wall -W POPT = -O2 BIN.SUFFIX = .exe @@ -18,8 +18,3 @@ LIB.DEVLNK = lib$(NAME).dll.a # for mingw this is the dll import lib LIB.SHARED = $(NAME).dll LIB.STATIC = lib$(NAME).a # the static lib will be broken LDFLAGS.SO = -shared -soname $(LIB.SONAME) --out-implib lib/$(LIB.DEVLNK) -LIB.SONAME.MX = lib$(NAME)mx.dll -LIB.DEVLNK.MX = lib$(NAME)mx.dll.a # for mingw this is the dll import lib -LIB.SHARED.MX = $(NAME)mx.dll -LIB.STATIC.MX = lib$(NAME)mx.a # the static lib will be broken -LDFLAGS.SO.MX = -shared -soname $(LIB.SONAME.MX) --out-implib lib/$(LIB.DEVLNK.MX) diff --git a/config/Makefile.linux-mingw32 b/config/Makefile.linux-mingw32 index 049ee74..cc389c1 100644 --- a/config/Makefile.linux-mingw32 +++ b/config/Makefile.linux-mingw32 @@ -6,11 +6,11 @@ NAME := glew32 HOST := i586-mingw32msvc -CC := $(HOST)-gcc -LD := $(HOST)-ld +CC := $(HOST)-gcc -fno-builtin -fno-stack-protector +LD := $(HOST)-ld -nostdlib LN := STRIP := -LDFLAGS.GL = -lopengl32 -lgdi32 -lmsvcrt -luser32 -lkernel32 +LDFLAGS.GL = -lopengl32 -lgdi32 -luser32 -lkernel32 WARN = -Wall -W POPT = -O2 BIN.SUFFIX = .exe @@ -19,8 +19,3 @@ LIB.DEVLNK = lib$(NAME).dll.a # for mingw this is the dll import lib LIB.SHARED = $(NAME).dll LIB.STATIC = lib$(NAME).a # the static lib will be broken LDFLAGS.SO = -shared -soname $(LIB.SONAME) --out-implib lib/$(LIB.DEVLNK) -LIB.SONAME.MX = lib$(NAME)mx.dll -LIB.DEVLNK.MX = lib$(NAME)mx.dll.a # for mingw this is the dll import lib -LIB.SHARED.MX = $(NAME)mx.dll -LIB.STATIC.MX = lib$(NAME)mx.a # the static lib will be broken -LDFLAGS.SO.MX = -shared -soname $(LIB.SONAME.MX) --out-implib lib/$(LIB.DEVLNK.MX) diff --git a/config/Makefile.linux-mingw64 b/config/Makefile.linux-mingw64 index c5c386c..439b4e9 100644 --- a/config/Makefile.linux-mingw64 +++ b/config/Makefile.linux-mingw64 @@ -6,11 +6,11 @@ NAME := glew32 HOST := i686-w64-mingw32 -CC := $(HOST)-gcc -LD := $(HOST)-ld +CC := $(HOST)-gcc -fno-builtin -fno-stack-protector +LD := $(HOST)-ld -nostdlib LN := STRIP := -LDFLAGS.GL = -lopengl32 -lgdi32 -lmsvcrt -luser32 -lkernel32 +LDFLAGS.GL = -lopengl32 -lgdi32 -luser32 -lkernel32 WARN = -Wall -W POPT = -O2 BIN.SUFFIX = .exe @@ -19,8 +19,3 @@ LIB.DEVLNK = lib$(NAME).dll.a # for mingw this is the dll import lib LIB.SHARED = $(NAME).dll LIB.STATIC = lib$(NAME).a # the static lib will be broken LDFLAGS.SO = -shared -soname $(LIB.SONAME) --out-implib lib/$(LIB.DEVLNK) -LIB.SONAME.MX = lib$(NAME)mx.dll -LIB.DEVLNK.MX = lib$(NAME)mx.dll.a # for mingw this is the dll import lib -LIB.SHARED.MX = $(NAME)mx.dll -LIB.STATIC.MX = lib$(NAME)mx.a # the static lib will be broken -LDFLAGS.SO.MX = -shared -soname $(LIB.SONAME.MX) --out-implib lib/$(LIB.DEVLNK.MX) diff --git a/config/Makefile.mingw b/config/Makefile.mingw index f1fb194..56b5dcc 100644 --- a/config/Makefile.mingw +++ b/config/Makefile.mingw @@ -1,7 +1,7 @@ NAME = glew32 # use gcc for linking, with ld it does not work -CC := gcc -LD := gcc +CC := gcc -fno-builtin -fno-stack-protector +LD := gcc -nostdlib LN := LDFLAGS.GL = -lopengl32 -lgdi32 -luser32 -lkernel32 LDFLAGS.EXTRA = -L/mingw/lib @@ -13,8 +13,3 @@ LIB.DEVLNK = lib$(NAME).dll.a # for mingw this is the dll import lib LIB.SHARED = $(NAME).dll LIB.STATIC = lib$(NAME).a # the static lib will be broken LDFLAGS.SO = -shared -Wl,-soname,$(LIB.SONAME) -Wl,--out-implib,lib/$(LIB.DEVLNK) -LIB.SONAME.MX = lib$(NAME)mx.dll -LIB.DEVLNK.MX = lib$(NAME)mx.dll.a # for mingw this is the dll import lib -LIB.SHARED.MX = $(NAME)mx.dll -LIB.STATIC.MX = lib$(NAME)mx.a # the static lib will be broken -LDFLAGS.SO.MX = -shared -Wl,-soname,$(LIB.SONAME.MX) -Wl,--out-implib,lib/$(LIB.DEVLNK.MX) diff --git a/config/Makefile.msys b/config/Makefile.msys index dfee9c7..f765b0e 100644 --- a/config/Makefile.msys +++ b/config/Makefile.msys @@ -1,7 +1,7 @@ NAME = glew32 # use gcc for linking, with ld it does not work -CC := gcc -LD := gcc +CC := gcc -fno-builtin -fno-stack-protector +LD := gcc -nostdlib LN := CFLAGS.EXTRA += -D_WIN32 LDFLAGS.GL = -lopengl32 -lgdi32 -luser32 -lkernel32 From 2563b1c36a42127470581a53e59ee09a3d980ce1 Mon Sep 17 00:00:00 2001 From: Wes Tarro Date: Mon, 15 Feb 2016 15:40:53 -0500 Subject: [PATCH 07/11] Finish removing MX support from build system --- build/vc10/glew.sln | 36 ----- build/vc10/glew_shared.vcxproj | 218 ------------------------------- build/vc10/glew_static.vcxproj | 168 ------------------------ build/vc10/glewinfo.vcxproj | 186 -------------------------- build/vc10/visualinfo.vcxproj | 186 -------------------------- build/vc6/Makefile | 7 - build/vc6/glew_shared.dsp | 64 +-------- build/vc6/glew_static.dsp | 52 +------- build/vc6/glewinfo.dsp | 56 -------- build/vc6/visualinfo.dsp | 56 -------- config/Makefile.cygwin | 5 - config/Makefile.darwin | 5 - config/Makefile.darwin-ppc | 5 - config/Makefile.darwin-universal | 5 - config/Makefile.darwin-x86_64 | 5 - config/Makefile.freebsd | 5 - config/Makefile.gnu | 5 - config/Makefile.haiku | 9 -- config/Makefile.irix | 5 - config/Makefile.kfreebsd | 5 - config/Makefile.linux | 5 - config/Makefile.linux-clang | 5 - config/Makefile.nacl-32 | 5 - config/Makefile.nacl-64 | 5 - config/Makefile.netbsd | 5 - config/Makefile.openbsd | 5 - config/Makefile.solaris | 4 - config/Makefile.solaris-gcc | 5 - 28 files changed, 2 insertions(+), 1120 deletions(-) diff --git a/build/vc10/glew.sln b/build/vc10/glew.sln index 9a2d169..a3d671e 100644 --- a/build/vc10/glew.sln +++ b/build/vc10/glew.sln @@ -11,76 +11,40 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "visualinfo", "visualinfo.vc EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution - Debug MX|Win32 = Debug MX|Win32 - Debug MX|x64 = Debug MX|x64 Debug|Win32 = Debug|Win32 Debug|x64 = Debug|x64 - Release MX|Win32 = Release MX|Win32 - Release MX|x64 = Release MX|x64 Release|Win32 = Release|Win32 Release|x64 = Release|x64 EndGlobalSection GlobalSection(ProjectConfigurationPlatforms) = postSolution - {55AE3D72-7DE6-F19F-AEF2-9AE8CA26CF3D}.Debug MX|Win32.ActiveCfg = Debug MX|Win32 - {55AE3D72-7DE6-F19F-AEF2-9AE8CA26CF3D}.Debug MX|Win32.Build.0 = Debug MX|Win32 - {55AE3D72-7DE6-F19F-AEF2-9AE8CA26CF3D}.Debug MX|x64.ActiveCfg = Debug MX|x64 - {55AE3D72-7DE6-F19F-AEF2-9AE8CA26CF3D}.Debug MX|x64.Build.0 = Debug MX|x64 {55AE3D72-7DE6-F19F-AEF2-9AE8CA26CF3D}.Debug|Win32.ActiveCfg = Debug|Win32 {55AE3D72-7DE6-F19F-AEF2-9AE8CA26CF3D}.Debug|Win32.Build.0 = Debug|Win32 {55AE3D72-7DE6-F19F-AEF2-9AE8CA26CF3D}.Debug|x64.ActiveCfg = Debug|x64 {55AE3D72-7DE6-F19F-AEF2-9AE8CA26CF3D}.Debug|x64.Build.0 = Debug|x64 - {55AE3D72-7DE6-F19F-AEF2-9AE8CA26CF3D}.Release MX|Win32.ActiveCfg = Release MX|Win32 - {55AE3D72-7DE6-F19F-AEF2-9AE8CA26CF3D}.Release MX|Win32.Build.0 = Release MX|Win32 - {55AE3D72-7DE6-F19F-AEF2-9AE8CA26CF3D}.Release MX|x64.ActiveCfg = Release MX|x64 - {55AE3D72-7DE6-F19F-AEF2-9AE8CA26CF3D}.Release MX|x64.Build.0 = Release MX|x64 {55AE3D72-7DE6-F19F-AEF2-9AE8CA26CF3D}.Release|Win32.ActiveCfg = Release|Win32 {55AE3D72-7DE6-F19F-AEF2-9AE8CA26CF3D}.Release|Win32.Build.0 = Release|Win32 {55AE3D72-7DE6-F19F-AEF2-9AE8CA26CF3D}.Release|x64.ActiveCfg = Release|x64 {55AE3D72-7DE6-F19F-AEF2-9AE8CA26CF3D}.Release|x64.Build.0 = Release|x64 - {664E6F0D-6784-4760-9565-D54F8EB1EDF4}.Debug MX|Win32.ActiveCfg = Debug MX|Win32 - {664E6F0D-6784-4760-9565-D54F8EB1EDF4}.Debug MX|Win32.Build.0 = Debug MX|Win32 - {664E6F0D-6784-4760-9565-D54F8EB1EDF4}.Debug MX|x64.ActiveCfg = Debug MX|x64 - {664E6F0D-6784-4760-9565-D54F8EB1EDF4}.Debug MX|x64.Build.0 = Debug MX|x64 {664E6F0D-6784-4760-9565-D54F8EB1EDF4}.Debug|Win32.ActiveCfg = Debug|Win32 {664E6F0D-6784-4760-9565-D54F8EB1EDF4}.Debug|Win32.Build.0 = Debug|Win32 {664E6F0D-6784-4760-9565-D54F8EB1EDF4}.Debug|x64.ActiveCfg = Debug|x64 {664E6F0D-6784-4760-9565-D54F8EB1EDF4}.Debug|x64.Build.0 = Debug|x64 - {664E6F0D-6784-4760-9565-D54F8EB1EDF4}.Release MX|Win32.ActiveCfg = Release MX|Win32 - {664E6F0D-6784-4760-9565-D54F8EB1EDF4}.Release MX|Win32.Build.0 = Release MX|Win32 - {664E6F0D-6784-4760-9565-D54F8EB1EDF4}.Release MX|x64.ActiveCfg = Release MX|x64 - {664E6F0D-6784-4760-9565-D54F8EB1EDF4}.Release MX|x64.Build.0 = Release MX|x64 {664E6F0D-6784-4760-9565-D54F8EB1EDF4}.Release|Win32.ActiveCfg = Release|Win32 {664E6F0D-6784-4760-9565-D54F8EB1EDF4}.Release|Win32.Build.0 = Release|Win32 {664E6F0D-6784-4760-9565-D54F8EB1EDF4}.Release|x64.ActiveCfg = Release|x64 {664E6F0D-6784-4760-9565-D54F8EB1EDF4}.Release|x64.Build.0 = Release|x64 - {8EFB5DCB-C0C4-1670-5938-A0E0F1A1C5EA}.Debug MX|Win32.ActiveCfg = Debug MX|Win32 - {8EFB5DCB-C0C4-1670-5938-A0E0F1A1C5EA}.Debug MX|Win32.Build.0 = Debug MX|Win32 - {8EFB5DCB-C0C4-1670-5938-A0E0F1A1C5EA}.Debug MX|x64.ActiveCfg = Debug MX|x64 - {8EFB5DCB-C0C4-1670-5938-A0E0F1A1C5EA}.Debug MX|x64.Build.0 = Debug MX|x64 {8EFB5DCB-C0C4-1670-5938-A0E0F1A1C5EA}.Debug|Win32.ActiveCfg = Debug|Win32 {8EFB5DCB-C0C4-1670-5938-A0E0F1A1C5EA}.Debug|Win32.Build.0 = Debug|Win32 {8EFB5DCB-C0C4-1670-5938-A0E0F1A1C5EA}.Debug|x64.ActiveCfg = Debug|x64 {8EFB5DCB-C0C4-1670-5938-A0E0F1A1C5EA}.Debug|x64.Build.0 = Debug|x64 - {8EFB5DCB-C0C4-1670-5938-A0E0F1A1C5EA}.Release MX|Win32.ActiveCfg = Release MX|Win32 - {8EFB5DCB-C0C4-1670-5938-A0E0F1A1C5EA}.Release MX|Win32.Build.0 = Release MX|Win32 - {8EFB5DCB-C0C4-1670-5938-A0E0F1A1C5EA}.Release MX|x64.ActiveCfg = Release MX|x64 - {8EFB5DCB-C0C4-1670-5938-A0E0F1A1C5EA}.Release MX|x64.Build.0 = Release MX|x64 {8EFB5DCB-C0C4-1670-5938-A0E0F1A1C5EA}.Release|Win32.ActiveCfg = Release|Win32 {8EFB5DCB-C0C4-1670-5938-A0E0F1A1C5EA}.Release|Win32.Build.0 = Release|Win32 {8EFB5DCB-C0C4-1670-5938-A0E0F1A1C5EA}.Release|x64.ActiveCfg = Release|x64 {8EFB5DCB-C0C4-1670-5938-A0E0F1A1C5EA}.Release|x64.Build.0 = Release|x64 - {79AA8443-86F4-649A-0BEB-0CB5E51B7D7E}.Debug MX|Win32.ActiveCfg = Debug MX|Win32 - {79AA8443-86F4-649A-0BEB-0CB5E51B7D7E}.Debug MX|Win32.Build.0 = Debug MX|Win32 - {79AA8443-86F4-649A-0BEB-0CB5E51B7D7E}.Debug MX|x64.ActiveCfg = Debug MX|x64 - {79AA8443-86F4-649A-0BEB-0CB5E51B7D7E}.Debug MX|x64.Build.0 = Debug MX|x64 {79AA8443-86F4-649A-0BEB-0CB5E51B7D7E}.Debug|Win32.ActiveCfg = Debug|Win32 {79AA8443-86F4-649A-0BEB-0CB5E51B7D7E}.Debug|Win32.Build.0 = Debug|Win32 {79AA8443-86F4-649A-0BEB-0CB5E51B7D7E}.Debug|x64.ActiveCfg = Debug|x64 {79AA8443-86F4-649A-0BEB-0CB5E51B7D7E}.Debug|x64.Build.0 = Debug|x64 - {79AA8443-86F4-649A-0BEB-0CB5E51B7D7E}.Release MX|Win32.ActiveCfg = Release MX|Win32 - {79AA8443-86F4-649A-0BEB-0CB5E51B7D7E}.Release MX|Win32.Build.0 = Release MX|Win32 - {79AA8443-86F4-649A-0BEB-0CB5E51B7D7E}.Release MX|x64.ActiveCfg = Release MX|x64 - {79AA8443-86F4-649A-0BEB-0CB5E51B7D7E}.Release MX|x64.Build.0 = Release MX|x64 {79AA8443-86F4-649A-0BEB-0CB5E51B7D7E}.Release|Win32.ActiveCfg = Release|Win32 {79AA8443-86F4-649A-0BEB-0CB5E51B7D7E}.Release|Win32.Build.0 = Release|Win32 {79AA8443-86F4-649A-0BEB-0CB5E51B7D7E}.Release|x64.ActiveCfg = Release|x64 diff --git a/build/vc10/glew_shared.vcxproj b/build/vc10/glew_shared.vcxproj index 41a9a54..1009ae9 100644 --- a/build/vc10/glew_shared.vcxproj +++ b/build/vc10/glew_shared.vcxproj @@ -1,14 +1,6 @@ - - Debug MX - Win32 - - - Debug MX - x64 - Debug Win32 @@ -17,14 +9,6 @@ Debug x64 - - Release MX - Win32 - - - Release MX - x64 - Release Win32 @@ -48,14 +32,6 @@ DynamicLibrary false - - DynamicLibrary - false - - - DynamicLibrary - false - DynamicLibrary false @@ -64,14 +40,6 @@ DynamicLibrary false - - DynamicLibrary - false - - - DynamicLibrary - false - @@ -81,37 +49,13 @@ - - - - - - - - - - - - - - $(BIN_DIR)\$(Configuration)\$(PlatformName)\ - tmp\$(TargetName)\$(Configuration)\$(PlatformName)\ - false - glew32mx - - - $(BIN_DIR)\$(Configuration)\$(PlatformName)\ - tmp\$(TargetName)\$(Configuration)\$(PlatformName)\ - false - glew32mx - $(BIN_DIR)\$(Configuration)\$(PlatformName)\ tmp\$(TargetName)\$(Configuration)\$(PlatformName)\ @@ -124,18 +68,6 @@ false glew32 - - $(BIN_DIR)\$(Configuration)\$(PlatformName)\ - tmp\$(TargetName)\$(Configuration)\$(PlatformName)\ - false - glew32mxd - - - $(BIN_DIR)\$(Configuration)\$(PlatformName)\ - tmp\$(TargetName)\$(Configuration)\$(PlatformName)\ - false - glew32mxd - $(BIN_DIR)\$(Configuration)\$(PlatformName)\ tmp\$(TargetName)\$(Configuration)\$(PlatformName)\ @@ -148,81 +80,6 @@ false glew32d - - - MultiThreaded - OnlyExplicitInline - true - true - MaxSpeed - true - Level3 - $(INCLUDE_DIR) - WIN32;WIN32_LEAN_AND_MEAN;VC_EXTRALEAN;GLEW_MX;GLEW_BUILD;%(PreprocessorDefinitions) - - - true - NDEBUG;%(PreprocessorDefinitions) - true - Win32 - - - 0x0409 - NDEBUG;GLEW_MX;%(PreprocessorDefinitions) - - - true - - - true - true - Console - $(OutDir)$(TargetName)$(TargetExt) - $(LIB_DIR)\$(Configuration)\$(PlatformName)\$(TargetName).lib - 0x62AA0000 - opengl32.lib;%(AdditionalDependencies) - /ignore:4089 - - - - - - - MultiThreaded - OnlyExplicitInline - true - true - MaxSpeed - true - Level3 - $(INCLUDE_DIR) - WIN32;WIN32_LEAN_AND_MEAN;VC_EXTRALEAN;GLEW_MX;GLEW_BUILD;%(PreprocessorDefinitions) - - - true - NDEBUG;%(PreprocessorDefinitions) - true - - - 0x0409 - NDEBUG;GLEW_MX;%(PreprocessorDefinitions) - - - true - - - true - true - Console - $(OutDir)$(TargetName)$(TargetExt) - $(LIB_DIR)\$(Configuration)\$(PlatformName)\$(TargetName).lib - 0x62AA0000 - opengl32.lib;%(AdditionalDependencies) - /ignore:4089 - - - - MultiThreaded @@ -298,81 +155,6 @@ - - - MultiThreadedDebugDLL - Default - false - Disabled - true - Level3 - $(INCLUDE_DIR) - WIN32;WIN32_MEAN_AND_LEAN;VC_EXTRALEAN;GLEW_MX;GLEW_BUILD;%(PreprocessorDefinitions) - EnableFastChecks - - - true - _DEBUG;%(PreprocessorDefinitions) - true - Win32 - - - 0x0409 - _DEBUG;GLEW_MX;%(PreprocessorDefinitions) - - - true - - - true - true - true - Console - $(OutDir)$(TargetName)$(TargetExt) - $(LIB_DIR)\$(Configuration)\$(PlatformName)\$(TargetName).lib - 0x62AA0000 - opengl32.lib;%(AdditionalDependencies) - - - - - - - MultiThreadedDebugDLL - Default - false - Disabled - true - Level3 - $(INCLUDE_DIR) - WIN32;WIN32_MEAN_AND_LEAN;VC_EXTRALEAN;GLEW_MX;GLEW_BUILD;%(PreprocessorDefinitions) - EnableFastChecks - - - true - _DEBUG;%(PreprocessorDefinitions) - true - - - 0x0409 - _DEBUG;GLEW_MX;%(PreprocessorDefinitions) - - - true - - - true - true - true - Console - $(OutDir)$(TargetName)$(TargetExt) - $(LIB_DIR)\$(Configuration)\$(PlatformName)\$(TargetName).lib - 0x62AA0000 - opengl32.lib;%(AdditionalDependencies) - - - - MultiThreadedDebugDLL diff --git a/build/vc10/glew_static.vcxproj b/build/vc10/glew_static.vcxproj index 5dccd6a..3c8c488 100644 --- a/build/vc10/glew_static.vcxproj +++ b/build/vc10/glew_static.vcxproj @@ -1,14 +1,6 @@ - - Debug MX - Win32 - - - Debug MX - x64 - Debug Win32 @@ -17,14 +9,6 @@ Debug x64 - - Release MX - Win32 - - - Release MX - x64 - Release Win32 @@ -56,16 +40,6 @@ false MultiByte - - StaticLibrary - false - MultiByte - - - StaticLibrary - false - MultiByte - StaticLibrary false @@ -76,16 +50,6 @@ false MultiByte - - StaticLibrary - false - MultiByte - - - StaticLibrary - false - MultiByte - @@ -101,35 +65,13 @@ - - - - - - - - - - - - - - $(LIB_DIR)\$(Configuration)\$(PlatformName)\ - tmp\$(TargetName)\$(Configuration)\$(PlatformName)\ - glew32mxsd - - - $(LIB_DIR)\$(Configuration)\$(PlatformName)\ - tmp\$(TargetName)\$(Configuration)\$(PlatformName)\ - glew32mxsd - $(LIB_DIR)\$(Configuration)\$(PlatformName)\ tmp\$(TargetName)\$(Configuration)\$(PlatformName)\ @@ -140,16 +82,6 @@ tmp\$(TargetName)\$(Configuration)\$(PlatformName)\ glew32s - - $(LIB_DIR)\$(Configuration)\$(PlatformName)\ - tmp\$(TargetName)\$(Configuration)\$(PlatformName)\ - glew32mxs - - - $(LIB_DIR)\$(Configuration)\$(PlatformName)\ - tmp\$(TargetName)\$(Configuration)\$(PlatformName)\ - glew32mxs - $(LIB_DIR)\$(Configuration)\$(PlatformName)\ tmp\$(TargetName)\$(Configuration)\$(PlatformName)\ @@ -168,56 +100,6 @@ $(LIB_DIR)\$(Configuration)\$(PlatformName)\ tmp\$(TargetName)\$(Configuration)\$(PlatformName)\ - - - MultiThreadedDebugDLL - Default - false - Disabled - true - Level3 - ../../include;%(AdditionalIncludeDirectories) - WIN32;_DEBUG;_LIB;WIN32_LEAN_AND_MEAN;GLEW_MX;GLEW_STATIC;%(PreprocessorDefinitions) - EnableFastChecks - - - 0x0409 - _DEBUG;GLEW_MX;GLEW_STATIC;%(PreprocessorDefinitions) - - - true - - - true - $(OutDir)$(TargetName)$(TargetExt) - MachineX86 - - - - - MultiThreadedDebugDLL - Default - false - Disabled - true - Level3 - ../../include;%(AdditionalIncludeDirectories) - WIN32;_DEBUG;_LIB;WIN32_LEAN_AND_MEAN;GLEW_MX;GLEW_STATIC;%(PreprocessorDefinitions) - EnableFastChecks - - - 0x0409 - _DEBUG;GLEW_MX;GLEW_STATIC;%(PreprocessorDefinitions) - - - true - - - true - $(OutDir)$(TargetName)$(TargetExt) - MachineX64 - - MultiThreaded @@ -268,56 +150,6 @@ MachineX64 - - - MultiThreaded - OnlyExplicitInline - true - true - MaxSpeed - true - Level3 - ../../include;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;_LIB;WIN32_LEAN_AND_MEAN;GLEW_MX;GLEW_STATIC;%(PreprocessorDefinitions) - - - 0x0409 - NDEBUG;GLEW_MX;GLEW_STATIC;%(PreprocessorDefinitions) - - - true - - - true - $(OutDir)$(TargetName)$(TargetExt) - MachineX86 - - - - - MultiThreaded - OnlyExplicitInline - true - true - MaxSpeed - true - Level3 - ../../include;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;_LIB;WIN32_LEAN_AND_MEAN;GLEW_MX;GLEW_STATIC;%(PreprocessorDefinitions) - - - 0x0409 - NDEBUG;GLEW_MX;GLEW_STATIC;%(PreprocessorDefinitions) - - - true - - - true - $(OutDir)$(TargetName)$(TargetExt) - MachineX64 - - MultiThreadedDebugDLL diff --git a/build/vc10/glewinfo.vcxproj b/build/vc10/glewinfo.vcxproj index 04a0675..5361664 100644 --- a/build/vc10/glewinfo.vcxproj +++ b/build/vc10/glewinfo.vcxproj @@ -1,14 +1,6 @@ - - Debug MX - Win32 - - - Debug MX - x64 - Debug Win32 @@ -17,14 +9,6 @@ Debug x64 - - Release MX - Win32 - - - Release MX - x64 - Release Win32 @@ -62,22 +46,6 @@ Application false - - Application - false - - - Application - false - - - Application - false - - - Application - false - @@ -99,43 +67,7 @@ - - - - - - - - - - - - - - $(BIN_DIR)\$(Configuration)\$(PlatformName)\ - tmp\$(TargetName)\$(Configuration)\$(PlatformName)\ - false - glewinfo-mx - - - $(BIN_DIR)\$(Configuration)\$(PlatformName)\ - tmp\$(TargetName)\$(Configuration)\$(PlatformName)\ - false - glewinfo-mx - - - $(BIN_DIR)\$(Configuration)\$(PlatformName)\ - tmp\$(TargetName)\$(Configuration)\$(PlatformName)\ - false - glewinfo-mxd - - - $(BIN_DIR)\$(Configuration)\$(PlatformName)\ - tmp\$(TargetName)\$(Configuration)\$(PlatformName)\ - false - glewinfo-mxd - $(BIN_DIR)\$(Configuration)\$(PlatformName)\ tmp\$(TargetName)\$(Configuration)\$(PlatformName)\ @@ -170,124 +102,6 @@ glewinfo tmp\$(TargetName)\$(Configuration)\$(PlatformName)\ - - - MultiThreaded - OnlyExplicitInline - true - true - MaxSpeed - true - Level3 - WIN32;WIN32_LEAN_AND_MEAN;GLEW_MX;GLEW_STATIC;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) - - - .\..\..\bin\glewinfo.tlb - - - 0x0409 - NDEBUG;GLEW_MX;%(PreprocessorDefinitions) - - - true - - - true - Console - $(OutDir)$(TargetName)$(TargetExt) - glew32mxs.lib;opengl32.lib;%(AdditionalDependencies) - $(LIB_DIR)\$(Configuration)\$(PlatformName)\ - - - - - MultiThreaded - OnlyExplicitInline - true - true - MaxSpeed - true - Level3 - WIN32;WIN32_LEAN_AND_MEAN;GLEW_MX;GLEW_STATIC;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) - - - .\..\..\bin\glewinfo.tlb - - - 0x0409 - NDEBUG;GLEW_MX;%(PreprocessorDefinitions) - - - true - - - true - Console - $(OutDir)$(TargetName)$(TargetExt) - glew32mxs.lib;opengl32.lib;%(AdditionalDependencies) - $(LIB_DIR)\$(Configuration)\$(PlatformName)\ - - - - - MultiThreadedDebugDLL - Default - false - Disabled - true - Level3 - WIN32;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;GLEW_MX;GLEW_STATIC;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) - EnableFastChecks - - - .\..\..\bin\glewinfo.tlb - - - 0x0409 - _DEBUG;GLEW_MX;%(PreprocessorDefinitions) - - - true - - - true - true - Console - $(OutDir)$(TargetName)$(TargetExt) - glew32mxsd.lib;opengl32.lib;%(AdditionalDependencies) - $(LIB_DIR)\$(Configuration)\$(PlatformName)\ - - - - - MultiThreadedDebugDLL - Default - false - Disabled - true - Level3 - WIN32;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;GLEW_MX;GLEW_STATIC;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) - EnableFastChecks - - - .\..\..\bin\glewinfo.tlb - - - 0x0409 - _DEBUG;GLEW_MX;%(PreprocessorDefinitions) - - - true - - - true - true - Console - $(OutDir)$(TargetName)$(TargetExt) - glew32mxsd.lib;opengl32.lib;%(AdditionalDependencies) - $(LIB_DIR)\$(Configuration)\$(PlatformName)\ - - MultiThreadedDebugDLL diff --git a/build/vc10/visualinfo.vcxproj b/build/vc10/visualinfo.vcxproj index d05ff9d..f684265 100644 --- a/build/vc10/visualinfo.vcxproj +++ b/build/vc10/visualinfo.vcxproj @@ -1,14 +1,6 @@ - - Debug MX - Win32 - - - Debug MX - x64 - Debug Win32 @@ -17,14 +9,6 @@ Debug x64 - - Release MX - Win32 - - - Release MX - x64 - Release Win32 @@ -54,14 +38,6 @@ Application false - - Application - false - - - Application - false - Application false @@ -70,14 +46,6 @@ Application false - - Application - false - - - Application - false - @@ -93,37 +61,13 @@ - - - - - - - - - - - - - - $(BIN_DIR)\$(Configuration)\$(PlatformName)\ - tmp\$(TargetName)\$(Configuration)\$(PlatformName)\ - false - visualinfo-mxd - - - $(BIN_DIR)\$(Configuration)\$(PlatformName)\ - tmp\$(TargetName)\$(Configuration)\$(PlatformName)\ - false - visualinfo-mxd - $(BIN_DIR)\$(Configuration)\$(PlatformName)\ tmp\$(TargetName)\$(Configuration)\$(PlatformName)\ @@ -136,18 +80,6 @@ false visualinfod - - $(BIN_DIR)\$(Configuration)\$(PlatformName)\ - tmp\$(TargetName)\$(Configuration)\$(PlatformName)\ - false - visualinfo-mx - - - $(BIN_DIR)\$(Configuration)\$(PlatformName)\ - tmp\$(TargetName)\$(Configuration)\$(PlatformName)\ - false - visualinfo-mx - $(BIN_DIR)\$(Configuration)\$(PlatformName)\ tmp\$(TargetName)\$(Configuration)\$(PlatformName)\ @@ -169,66 +101,6 @@ ..\..\bin/ visualinfo - - - MultiThreadedDebugDLL - Default - false - Disabled - true - Level3 - WIN32;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;GLEW_MX;GLEW_STATIC;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) - EnableFastChecks - - - .\..\..\bin\visualinfo.tlb - - - 0x0409 - _DEBUG;GLEW_MX;%(PreprocessorDefinitions) - - - true - - - true - true - Console - $(OutDir)$(TargetName)$(TargetExt) - glew32mxsd.lib;glu32.lib;opengl32.lib;%(AdditionalDependencies) - $(LIB_DIR)\$(Configuration)\$(PlatformName)\ - - - - - MultiThreadedDebugDLL - Default - false - Disabled - true - Level3 - WIN32;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;GLEW_MX;GLEW_STATIC;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) - EnableFastChecks - - - .\..\..\bin\visualinfo.tlb - - - 0x0409 - _DEBUG;GLEW_MX;%(PreprocessorDefinitions) - - - true - - - true - true - Console - $(OutDir)$(TargetName)$(TargetExt) - glew32mxsd.lib;glu32.lib;opengl32.lib;%(AdditionalDependencies) - $(LIB_DIR)\$(Configuration)\$(PlatformName)\ - - MultiThreadedDebugDLL @@ -289,64 +161,6 @@ $(LIB_DIR)\$(Configuration)\$(PlatformName)\ - - - MultiThreaded - OnlyExplicitInline - true - true - MaxSpeed - true - Level3 - WIN32;WIN32_LEAN_AND_MEAN;VC_EXTRALEAN;GLEW_MX;GLEW_STATIC;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) - - - .\..\..\bin\visualinfo.tlb - - - 0x0409 - NDEBUG;GLEW_MX;%(PreprocessorDefinitions) - - - true - - - true - Console - $(OutDir)$(TargetName)$(TargetExt) - glew32mxs.lib;glu32.lib;opengl32.lib;%(AdditionalDependencies) - $(LIB_DIR)\$(Configuration)\$(PlatformName)\ - - - - - MultiThreaded - OnlyExplicitInline - true - true - MaxSpeed - true - Level3 - WIN32;WIN32_LEAN_AND_MEAN;GLEW_MX;GLEW_STATIC;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) - - - .\..\..\bin\visualinfo.tlb - - - 0x0409 - NDEBUG;GLEW_MX;%(PreprocessorDefinitions) - - - true - - - true - Console - $(OutDir)$(TargetName)$(TargetExt) - glew32mxs.lib;glu32.lib;opengl32.lib;%(AdditionalDependencies) - $(LIB_DIR)\$(Configuration)\$(PlatformName)\ - - MultiThreaded diff --git a/build/vc6/Makefile b/build/vc6/Makefile index 9f0ab41..5a4f5d6 100644 --- a/build/vc6/Makefile +++ b/build/vc6/Makefile @@ -8,13 +8,6 @@ default: "glewinfo - Win32 Release" \ "visualinfo - Win32 Release" /build -mx: - $(MSDEV) glew.dsw /make \ - "glew_static - Win32 Release MX" \ - "glew_shared - Win32 Release MX" \ - "glewinfo - Win32 Release MX" \ - "visualinfo - Win32 Release MX" /build - debug: $(MSDEV) glew.dsw /make \ "glew_static - Win32 Debug" \ diff --git a/build/vc6/glew_shared.dsp b/build/vc6/glew_shared.dsp index 4ef3c7f..b8d2f1b 100644 --- a/build/vc6/glew_shared.dsp +++ b/build/vc6/glew_shared.dsp @@ -4,7 +4,7 @@ # TARGTYPE "Win32 (x86) Dynamic-Link Library" 0x0102 -CFG=glew_shared - Win32 Debug MX +CFG=glew_shared - Win32 Debug !MESSAGE This is not a valid makefile. To build this project using NMAKE, !MESSAGE use the Export Makefile command and run !MESSAGE @@ -19,8 +19,6 @@ CFG=glew_shared - Win32 Debug MX !MESSAGE !MESSAGE "glew_shared - Win32 Release" (based on "Win32 (x86) Dynamic-Link Library") !MESSAGE "glew_shared - Win32 Debug" (based on "Win32 (x86) Dynamic-Link Library") -!MESSAGE "glew_shared - Win32 Debug MX" (based on "Win32 (x86) Dynamic-Link Library") -!MESSAGE "glew_shared - Win32 Release MX" (based on "Win32 (x86) Dynamic-Link Library") !MESSAGE # Begin Project @@ -86,72 +84,12 @@ LINK32=link.exe # SUBTRACT LINK32 /pdb:none # ADD LINK32 /base:0x62AA0000 -!ELSEIF "$(CFG)" == "glew_shared - Win32 Debug MX" - -# PROP BASE Use_MFC 0 -# PROP BASE Use_Debug_Libraries 1 -# PROP BASE Output_Dir "glew_shared___Win32_Debug_MX" -# PROP BASE Intermediate_Dir "glew_shared___Win32_Debug_MX" -# PROP BASE Ignore_Export_Lib 0 -# PROP BASE Target_Dir "" -# PROP Use_MFC 0 -# PROP Use_Debug_Libraries 1 -# PROP Output_Dir "../../lib" -# PROP Intermediate_Dir "shared/debug-mx" -# PROP Ignore_Export_Lib 0 -# PROP Target_Dir "" -# ADD BASE CPP /nologo /MDd /W3 /Zi /Od /I "../../include" /D "WIN32" /D "WIN32_MEAN_AND_LEAN" /D "VC_EXTRALEAN" /D "GLEW_BUILD" /YX /FD /GZ /c -# ADD CPP /nologo /MDd /W3 /Zi /Od /I "../../include" /D "WIN32" /D "WIN32_MEAN_AND_LEAN" /D "VC_EXTRALEAN" /D "GLEW_MX" /D "GLEW_BUILD" /YX /FD /GZ /c -# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32 -# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32 -# ADD BASE RSC /l 0x409 /d "_DEBUG" -# ADD RSC /l 0x409 /d "_DEBUG" /d "GLEW_MX" -BSC32=bscmake.exe -# ADD BASE BSC32 /nologo -# ADD BSC32 /nologo -LINK32=link.exe -# ADD BASE LINK32 opengl32.lib /nologo /dll /incremental:no /pdb:"../../lib/glew32d.pdb" /debug /machine:I386 /out:"../../lib/glew32d.dll" /implib:"../../lib/glew32d.lib" /pdbtype:sept -# SUBTRACT BASE LINK32 /pdb:none -# ADD LINK32 opengl32.lib /nologo /dll /incremental:no /debug /machine:I386 /out:"../../bin/glew32mxd.dll" /pdbtype:sept -# SUBTRACT LINK32 /pdb:none -# ADD LINK32 /base:0x62AA0000 - -!ELSEIF "$(CFG)" == "glew_shared - Win32 Release MX" - -# PROP BASE Use_MFC 0 -# PROP BASE Use_Debug_Libraries 0 -# PROP BASE Output_Dir "glew_shared___Win32_Release_MX" -# PROP BASE Intermediate_Dir "glew_shared___Win32_Release_MX" -# PROP BASE Ignore_Export_Lib 0 -# PROP BASE Target_Dir "" -# PROP Use_MFC 0 -# PROP Use_Debug_Libraries 0 -# PROP Output_Dir "../../lib" -# PROP Intermediate_Dir "shared/release-mx" -# PROP Ignore_Export_Lib 0 -# PROP Target_Dir "" -# ADD BASE CPP /nologo /W3 /O2 /I "../../include" /D "WIN32" /D "WIN32_LEAN_AND_MEAN" /D "VC_EXTRALEAN" /D "GLEW_BUILD" /YX /FD /c -# ADD CPP /nologo /W3 /O2 /I "../../include" /D "WIN32" /D "WIN32_LEAN_AND_MEAN" /D "VC_EXTRALEAN" /D "GLEW_MX" /D "GLEW_BUILD" /YX /FD /c -# ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32 -# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32 -# ADD BASE RSC /l 0x409 /d "NDEBUG" -# ADD RSC /l 0x409 /d "NDEBUG" /d "GLEW_MX" -BSC32=bscmake.exe -# ADD BASE BSC32 /nologo -# ADD BSC32 /nologo -LINK32=link.exe -# ADD BASE LINK32 opengl32.lib /nologo /dll /pdb:none /machine:I386 /out:"../../lib/glew32.dll" /implib:"../../lib/glew32.lib" /ignore:4089 -# ADD LINK32 opengl32.lib /nologo /dll /pdb:none /machine:I386 /out:"../../bin/glew32mx.dll" /ignore:4089 -# ADD LINK32 /base:0x62AA0000 - !ENDIF # Begin Target # Name "glew_shared - Win32 Release" # Name "glew_shared - Win32 Debug" -# Name "glew_shared - Win32 Debug MX" -# Name "glew_shared - Win32 Release MX" # Begin Group "Source Files" # PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat" diff --git a/build/vc6/glew_static.dsp b/build/vc6/glew_static.dsp index 3f29255..55adb1a 100644 --- a/build/vc6/glew_static.dsp +++ b/build/vc6/glew_static.dsp @@ -4,7 +4,7 @@ # TARGTYPE "Win32 (x86) Static Library" 0x0104 -CFG=glew_static - Win32 Debug MX +CFG=glew_static - Win32 Debug !MESSAGE This is not a valid makefile. To build this project using NMAKE, !MESSAGE use the Export Makefile command and run !MESSAGE @@ -19,8 +19,6 @@ CFG=glew_static - Win32 Debug MX !MESSAGE !MESSAGE "glew_static - Win32 Release" (based on "Win32 (x86) Static Library") !MESSAGE "glew_static - Win32 Debug" (based on "Win32 (x86) Static Library") -!MESSAGE "glew_static - Win32 Debug MX" (based on "Win32 (x86) Static Library") -!MESSAGE "glew_static - Win32 Release MX" (based on "Win32 (x86) Static Library") !MESSAGE # Begin Project @@ -76,60 +74,12 @@ LIB32=link.exe -lib # ADD BASE LIB32 /nologo # ADD LIB32 /nologo /out:"../../lib/glew32sd.lib" -!ELSEIF "$(CFG)" == "glew_static - Win32 Debug MX" - -# PROP BASE Use_MFC 0 -# PROP BASE Use_Debug_Libraries 1 -# PROP BASE Output_Dir "glew_static___Win32_Debug_MX" -# PROP BASE Intermediate_Dir "glew_static___Win32_Debug_MX" -# PROP BASE Target_Dir "" -# PROP Use_MFC 0 -# PROP Use_Debug_Libraries 1 -# PROP Output_Dir "../../lib" -# PROP Intermediate_Dir "static/debug-mx" -# PROP Target_Dir "" -# ADD BASE CPP /nologo /MDd /W3 /GX /Zi /Od /I "../../include" /D "WIN32" /D "_DEBUG" /D "_MBCS" /D "_LIB" /D "WIN32_LEAN_AND_MEAN" /D "VC_EXTRALEAN" /D "GLEW_STATIC" /YX /FD /GZ /c -# ADD CPP /nologo /MDd /W3 /GX /Zi /Od /I "../../include" /D "WIN32" /D "_DEBUG" /D "_MBCS" /D "_LIB" /D "WIN32_LEAN_AND_MEAN" /D "VC_EXTRALEAN" /D "GLEW_MX" /D "GLEW_STATIC" /YX /FD /GZ /c -# ADD BASE RSC /l 0x409 /d "_DEBUG" -# ADD RSC /l 0x409 /d "_DEBUG" /d "GLEW_MX" /d "GLEW_STATIC" -BSC32=bscmake.exe -# ADD BASE BSC32 /nologo -# ADD BSC32 /nologo -LIB32=link.exe -lib -# ADD BASE LIB32 /nologo /out:"../../lib/glew32sd.lib" -# ADD LIB32 /nologo /out:"../../lib/glew32mxsd.lib" - -!ELSEIF "$(CFG)" == "glew_static - Win32 Release MX" - -# PROP BASE Use_MFC 0 -# PROP BASE Use_Debug_Libraries 0 -# PROP BASE Output_Dir "glew_static___Win32_Release_MX" -# PROP BASE Intermediate_Dir "glew_static___Win32_Release_MX" -# PROP BASE Target_Dir "" -# PROP Use_MFC 0 -# PROP Use_Debug_Libraries 0 -# PROP Output_Dir "../../lib" -# PROP Intermediate_Dir "static/release-mx" -# PROP Target_Dir "" -# ADD BASE CPP /nologo /W3 /GX /O2 /I "../../include" /D "WIN32" /D "NDEBUG" /D "_MBCS" /D "_LIB" /D "WIN32_LEAN_AND_MEAN" /D "VC_EXTRALEAN" /D "GLEW_STATIC" /YX /FD /c -# ADD CPP /nologo /W3 /GX /O2 /I "../../include" /D "WIN32" /D "NDEBUG" /D "_MBCS" /D "_LIB" /D "WIN32_LEAN_AND_MEAN" /D "VC_EXTRALEAN" /D "GLEW_MX" /D "GLEW_STATIC" /YX /FD /c -# ADD BASE RSC /l 0x409 /d "NDEBUG" -# ADD RSC /l 0x409 /d "NDEBUG" /d "GLEW_MX" /d "GLEW_STATIC" -BSC32=bscmake.exe -# ADD BASE BSC32 /nologo -# ADD BSC32 /nologo -LIB32=link.exe -lib -# ADD BASE LIB32 /nologo /out:"../../lib/glew32s.lib" -# ADD LIB32 /nologo /out:"../../lib/glew32mxs.lib" - !ENDIF # Begin Target # Name "glew_static - Win32 Release" # Name "glew_static - Win32 Debug" -# Name "glew_static - Win32 Debug MX" -# Name "glew_static - Win32 Release MX" # Begin Group "Source Files" # PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat" diff --git a/build/vc6/glewinfo.dsp b/build/vc6/glewinfo.dsp index 423c1eb..95a599d 100644 --- a/build/vc6/glewinfo.dsp +++ b/build/vc6/glewinfo.dsp @@ -19,8 +19,6 @@ CFG=glewinfo - Win32 Debug MX !MESSAGE !MESSAGE "glewinfo - Win32 Release" (based on "Win32 (x86) Console Application") !MESSAGE "glewinfo - Win32 Debug" (based on "Win32 (x86) Console Application") -!MESSAGE "glewinfo - Win32 Debug MX" (based on "Win32 (x86) Console Application") -!MESSAGE "glewinfo - Win32 Release MX" (based on "Win32 (x86) Console Application") !MESSAGE # Begin Project @@ -79,66 +77,12 @@ LINK32=link.exe # ADD LINK32 ../../lib/glew32sd.lib opengl32.lib gdi32.lib user32.lib /nologo /subsystem:console /incremental:no /pdb:"static/debug/glewinfod.pdb" /debug /machine:I386 /out:"../../bin/glewinfod.exe" /pdbtype:sept # SUBTRACT LINK32 /pdb:none -!ELSEIF "$(CFG)" == "glewinfo - Win32 Debug MX" - -# PROP BASE Use_MFC 0 -# PROP BASE Use_Debug_Libraries 1 -# PROP BASE Output_Dir "glewinfo___Win32_Debug_MX" -# PROP BASE Intermediate_Dir "glewinfo___Win32_Debug_MX" -# PROP BASE Ignore_Export_Lib 0 -# PROP BASE Target_Dir "" -# PROP Use_MFC 0 -# PROP Use_Debug_Libraries 1 -# PROP Output_Dir "../../bin" -# PROP Intermediate_Dir "static/debug-mx" -# PROP Ignore_Export_Lib 0 -# PROP Target_Dir "" -# ADD BASE CPP /nologo /MDd /W3 /GX /Zi /Od /I "../../include" /D "WIN32" /D "WIN32_LEAN_AND_MEAN" /D "VC_EXTRA_LEAN" /D "GLEW_STATIC" /YX /FD /GZ /c -# ADD CPP /nologo /MDd /W3 /GX /Zi /Od /I "../../include" /D "WIN32" /D "WIN32_LEAN_AND_MEAN" /D "VC_EXTRA_LEAN" /D "GLEW_MX" /D "GLEW_STATIC" /D "_CRT_SECURE_NO_WARNINGS" /YX /FD /GZ /c -# ADD BASE RSC /l 0x409 /d "_DEBUG" -# ADD RSC /l 0x409 /d "_DEBUG" /d "GLEW_MX" -BSC32=bscmake.exe -# ADD BASE BSC32 /nologo -# ADD BSC32 /nologo -LINK32=link.exe -# ADD BASE LINK32 ../../lib/glew32sd.lib opengl32.lib gdi32.lib user32.lib /nologo /subsystem:console /incremental:no /pdb:"static/debug/glewinfod.pdb" /debug /machine:I386 /out:"../../bin/glewinfod.exe" /pdbtype:sept -# SUBTRACT BASE LINK32 /pdb:none -# ADD LINK32 ../../lib/glew32mxsd.lib opengl32.lib gdi32.lib user32.lib /nologo /subsystem:console /incremental:no /pdb:"static/debug/glewinfod.pdb" /debug /machine:I386 /out:"../../bin/glewinfo-mxd.exe" /pdbtype:sept -# SUBTRACT LINK32 /pdb:none - -!ELSEIF "$(CFG)" == "glewinfo - Win32 Release MX" - -# PROP BASE Use_MFC 0 -# PROP BASE Use_Debug_Libraries 0 -# PROP BASE Output_Dir "glewinfo___Win32_Release_MX" -# PROP BASE Intermediate_Dir "glewinfo___Win32_Release_MX" -# PROP BASE Ignore_Export_Lib 0 -# PROP BASE Target_Dir "" -# PROP Use_MFC 0 -# PROP Use_Debug_Libraries 0 -# PROP Output_Dir "../../bin" -# PROP Intermediate_Dir "static/release-mx" -# PROP Ignore_Export_Lib 0 -# PROP Target_Dir "" -# ADD BASE CPP /nologo /W3 /GX /O2 /I "../../include" /D "WIN32" /D "WIN32_MEAN_AND_LEAN" /D "VC_EXTRALEAN" /D "GLEW_STATIC" /YX /FD /c -# ADD CPP /nologo /W3 /GX /O2 /I "../../include" /D "WIN32" /D "WIN32_MEAN_AND_LEAN" /D "VC_EXTRALEAN" /D "GLEW_MX" /D "GLEW_STATIC" /D "_CRT_SECURE_NO_WARNINGS" /YX /FD /c -# ADD BASE RSC /l 0x409 /d "NDEBUG" -# ADD RSC /l 0x409 /d "NDEBUG" /d "GLEW_MX" -BSC32=bscmake.exe -# ADD BASE BSC32 /nologo -# ADD BSC32 /nologo -LINK32=link.exe -# ADD BASE LINK32 ../../lib/glew32s.lib opengl32.lib gdi32.lib user32.lib /nologo /subsystem:console /machine:I386 -# ADD LINK32 ../../lib/glew32mxs.lib opengl32.lib gdi32.lib user32.lib /nologo /subsystem:console /machine:I386 /out:"../../bin/glewinfo-mx.exe" - !ENDIF # Begin Target # Name "glewinfo - Win32 Release" # Name "glewinfo - Win32 Debug" -# Name "glewinfo - Win32 Debug MX" -# Name "glewinfo - Win32 Release MX" # Begin Group "Source Files" # PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat" diff --git a/build/vc6/visualinfo.dsp b/build/vc6/visualinfo.dsp index 289f1c6..adcc814 100644 --- a/build/vc6/visualinfo.dsp +++ b/build/vc6/visualinfo.dsp @@ -19,8 +19,6 @@ CFG=visualinfo - Win32 Debug MX !MESSAGE !MESSAGE "visualinfo - Win32 Release" (based on "Win32 (x86) Console Application") !MESSAGE "visualinfo - Win32 Debug" (based on "Win32 (x86) Console Application") -!MESSAGE "visualinfo - Win32 Debug MX" (based on "Win32 (x86) Console Application") -!MESSAGE "visualinfo - Win32 Release MX" (based on "Win32 (x86) Console Application") !MESSAGE # Begin Project @@ -79,66 +77,12 @@ LINK32=link.exe # ADD LINK32 ../../lib/glew32sd.lib glu32.lib opengl32.lib gdi32.lib user32.lib kernel32.lib /nologo /subsystem:console /incremental:no /pdb:"static/debug/visualinfod.pdb" /debug /machine:I386 /out:"../../bin/visualinfod.exe" /pdbtype:sept # SUBTRACT LINK32 /pdb:none -!ELSEIF "$(CFG)" == "visualinfo - Win32 Debug MX" - -# PROP BASE Use_MFC 0 -# PROP BASE Use_Debug_Libraries 1 -# PROP BASE Output_Dir "visualinfo___Win32_Debug_MX" -# PROP BASE Intermediate_Dir "visualinfo___Win32_Debug_MX" -# PROP BASE Ignore_Export_Lib 0 -# PROP BASE Target_Dir "" -# PROP Use_MFC 0 -# PROP Use_Debug_Libraries 1 -# PROP Output_Dir "../../bin" -# PROP Intermediate_Dir "static/debug-mx" -# PROP Ignore_Export_Lib 0 -# PROP Target_Dir "" -# ADD BASE CPP /nologo /MDd /W3 /GX /Zi /Od /I "../../include" /D "WIN32" /D "WIN32_LEAN_AND_MEAN" /D "VC_EXTRA_LEAN" /D "GLEW_STATIC" /YX /FD /GZ /c -# ADD CPP /nologo /MDd /W3 /GX /Zi /Od /I "../../include" /D "WIN32" /D "WIN32_LEAN_AND_MEAN" /D "VC_EXTRA_LEAN" /D "GLEW_MX" /D "GLEW_STATIC" /D "_CRT_SECURE_NO_WARNINGS" /YX /FD /GZ /c -# ADD BASE RSC /l 0x409 /d "_DEBUG" -# ADD RSC /l 0x409 /d "_DEBUG" /d "GLEW_MX" -BSC32=bscmake.exe -# ADD BASE BSC32 /nologo -# ADD BSC32 /nologo -LINK32=link.exe -# ADD BASE LINK32 ../../lib/glew32sd.lib glu32.lib opengl32.lib gdi32.lib user32.lib kernel32.lib /nologo /subsystem:console /incremental:no /pdb:"static/debug/visualinfod.pdb" /debug /machine:I386 /out:"../../bin/visualinfod.exe" /pdbtype:sept -# SUBTRACT BASE LINK32 /pdb:none -# ADD LINK32 ../../lib/glew32mxsd.lib glu32.lib opengl32.lib gdi32.lib user32.lib kernel32.lib /nologo /subsystem:console /incremental:no /pdb:"static/debug/visualinfod.pdb" /debug /machine:I386 /out:"../../bin/visualinfo-mxd.exe" /pdbtype:sept -# SUBTRACT LINK32 /pdb:none - -!ELSEIF "$(CFG)" == "visualinfo - Win32 Release MX" - -# PROP BASE Use_MFC 0 -# PROP BASE Use_Debug_Libraries 0 -# PROP BASE Output_Dir "visualinfo___Win32_Release_MX" -# PROP BASE Intermediate_Dir "visualinfo___Win32_Release_MX" -# PROP BASE Ignore_Export_Lib 0 -# PROP BASE Target_Dir "" -# PROP Use_MFC 0 -# PROP Use_Debug_Libraries 0 -# PROP Output_Dir "../../bin" -# PROP Intermediate_Dir "static/release-mx" -# PROP Ignore_Export_Lib 0 -# PROP Target_Dir "" -# ADD BASE CPP /nologo /W3 /GX /O2 /I "../../include" /D "WIN32" /D "WIN32_MEAN_AND_LEAN" /D "VC_EXTRALEAN" /D "GLEW_STATIC" /YX /FD /c -# ADD CPP /nologo /W3 /GX /O2 /I "../../include" /D "WIN32" /D "WIN32_MEAN_AND_LEAN" /D "VC_EXTRALEAN" /D "GLEW_MX" /D "GLEW_STATIC" /D "_CRT_SECURE_NO_WARNINGS" /YX /FD /c -# ADD BASE RSC /l 0x409 /d "NDEBUG" -# ADD RSC /l 0x409 /d "NDEBUG" /d "GLEW_MX" -BSC32=bscmake.exe -# ADD BASE BSC32 /nologo -# ADD BSC32 /nologo -LINK32=link.exe -# ADD BASE LINK32 ../../lib/glew32s.lib glu32.lib opengl32.lib gdi32.lib user32.lib kernel32.lib /nologo /subsystem:console /machine:I386 -# ADD LINK32 ../../lib/glew32mxs.lib glu32.lib opengl32.lib gdi32.lib user32.lib kernel32.lib /nologo /subsystem:console /machine:I386 /out:"../../bin/visualinfo-mx.exe" - !ENDIF # Begin Target # Name "visualinfo - Win32 Release" # Name "visualinfo - Win32 Debug" -# Name "visualinfo - Win32 Debug MX" -# Name "visualinfo - Win32 Release MX" # Begin Group "Source Files" # PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat" diff --git a/config/Makefile.cygwin b/config/Makefile.cygwin index 8600fd0..bc7e2fd 100644 --- a/config/Makefile.cygwin +++ b/config/Makefile.cygwin @@ -17,8 +17,3 @@ LIB.DEVLNK = lib$(NAME).dll.a LIB.SHARED = cyg$(NAME)-$(GLEW_MAJOR)-$(GLEW_MINOR).dll LIB.STATIC = lib$(NAME).a LDFLAGS.SO = -shared -Wl,--out-implib,lib/$(LIB.DEVLNK) -LIB.SONAME.MX = cyg$(NAME)mx-$(GLEW_MAJOR)-$(GLEW_MINOR).dll -LIB.DEVLNK.MX = lib$(NAME)mx.dll.a -LIB.SHARED.MX = cyg$(NAME)mx-$(GLEW_MAJOR)-$(GLEW_MINOR).dll -LIB.STATIC.MX = lib$(NAME)mx.a -LDFLAGS.SO.MX = -shared -Wl,--out-implib,lib/$(LIB.DEVLNK.MX) diff --git a/config/Makefile.darwin b/config/Makefile.darwin index 93b2052..7a2d01e 100644 --- a/config/Makefile.darwin +++ b/config/Makefile.darwin @@ -23,8 +23,3 @@ LIB.DEVLNK = lib$(NAME).dylib LIB.SHARED = lib$(NAME).$(SO_VERSION).dylib LIB.STATIC = lib$(NAME).a LDFLAGS.SO = -dynamiclib -install_name $(GLEW_DEST)/lib/$(LIB.SHARED) -current_version $(SO_VERSION) -compatibility_version $(SO_MAJOR) -LIB.SONAME.MX = lib$(NAME)mx.$(SO_MAJOR).dylib -LIB.DEVLNK.MX = lib$(NAME)mx.dylib -LIB.SHARED.MX = lib$(NAME)mx.$(SO_VERSION).dylib -LIB.STATIC.MX = lib$(NAME)mx.a -LDFLAGS.SO.MX = -dynamiclib -install_name $(GLEW_DEST)/lib/$(LIB.SHARED.MX) -current_version $(SO_VERSION) -compatibility_version $(SO_MAJOR) diff --git a/config/Makefile.darwin-ppc b/config/Makefile.darwin-ppc index 7dd99ff..6ffbfab 100644 --- a/config/Makefile.darwin-ppc +++ b/config/Makefile.darwin-ppc @@ -22,8 +22,3 @@ LIB.DEVLNK = lib$(NAME).dylib LIB.SHARED = lib$(NAME).$(SO_VERSION).dylib LIB.STATIC = lib$(NAME).a LDFLAGS.SO = -dynamiclib -install_name $(GLEW_DEST)/lib/$(LIB.SHARED) -current_version $(SO_VERSION) -compatibility_version $(SO_MAJOR) -LIB.SONAME.MX = lib$(NAME)mx.$(SO_MAJOR).dylib -LIB.DEVLNK.MX = lib$(NAME)mx.dylib -LIB.SHARED.MX = lib$(NAME)mx.$(SO_VERSION).dylib -LIB.STATIC.MX = lib$(NAME)mx.a -LDFLAGS.SO.MX = -dynamiclib -install_name $(GLEW_DEST)/lib/$(LIB.SHARED.MX) -current_version $(SO_VERSION) -compatibility_version $(SO_MAJOR) diff --git a/config/Makefile.darwin-universal b/config/Makefile.darwin-universal index dfd4eef..120bf92 100644 --- a/config/Makefile.darwin-universal +++ b/config/Makefile.darwin-universal @@ -25,8 +25,3 @@ LIB.DEVLNK = lib$(NAME).dylib LIB.SHARED = lib$(NAME).$(SO_VERSION).dylib LIB.STATIC = lib$(NAME).a LDFLAGS.SO = -dynamiclib -install_name $(GLEW_DEST)/lib/$(LIB.SHARED) -current_version $(SO_VERSION) -compatibility_version $(SO_MAJOR) -LIB.SONAME.MX = lib$(NAME)mx.$(SO_MAJOR).dylib -LIB.DEVLNK.MX = lib$(NAME)mx.dylib -LIB.SHARED.MX = lib$(NAME)mx.$(SO_VERSION).dylib -LIB.STATIC.MX = lib$(NAME)mx.a -LDFLAGS.SO.MX = -dynamiclib -install_name $(GLEW_DEST)/lib/$(LIB.SHARED.MX) -current_version $(SO_VERSION) -compatibility_version $(SO_MAJOR) diff --git a/config/Makefile.darwin-x86_64 b/config/Makefile.darwin-x86_64 index 437bad4..274036a 100644 --- a/config/Makefile.darwin-x86_64 +++ b/config/Makefile.darwin-x86_64 @@ -22,8 +22,3 @@ LIB.DEVLNK = lib$(NAME).dylib LIB.SHARED = lib$(NAME).$(SO_VERSION).dylib LIB.STATIC = lib$(NAME).a LDFLAGS.SO = -dynamiclib -install_name $(GLEW_DEST)/lib/$(LIB.SHARED) -current_version $(SO_VERSION) -compatibility_version $(SO_MAJOR) -LIB.SONAME.MX = lib$(NAME)mx.$(SO_MAJOR).dylib -LIB.DEVLNK.MX = lib$(NAME)mx.dylib -LIB.SHARED.MX = lib$(NAME)mx.$(SO_VERSION).dylib -LIB.STATIC.MX = lib$(NAME)mx.a -LDFLAGS.SO.MX = -dynamiclib -install_name $(GLEW_DEST)/lib/$(LIB.SHARED.MX) -current_version $(SO_VERSION) -compatibility_version $(SO_MAJOR) diff --git a/config/Makefile.freebsd b/config/Makefile.freebsd index ca2771d..4fb9b6a 100644 --- a/config/Makefile.freebsd +++ b/config/Makefile.freebsd @@ -15,8 +15,3 @@ LIB.DEVLNK = lib$(NAME).so LIB.SHARED = lib$(NAME).so.$(SO_VERSION) LIB.STATIC = lib$(NAME).a LDFLAGS.SO = -shared -soname $(LIB.SONAME) -LIB.SONAME.MX = lib$(NAME)mx.so.$(SO_MAJOR) -LIB.DEVLNK.MX = lib$(NAME)mx.so -LIB.SHARED.MX = lib$(NAME)mx.so.$(SO_VERSION) -LIB.STATIC.MX = lib$(NAME)mx.a -LDFLAGS.SO.MX = -shared -soname $(LIB.SONAME.MX) diff --git a/config/Makefile.gnu b/config/Makefile.gnu index b7c58be..8d4f07e 100644 --- a/config/Makefile.gnu +++ b/config/Makefile.gnu @@ -15,8 +15,3 @@ LIB.DEVLNK = lib$(NAME).so LIB.SHARED = lib$(NAME).so.$(SO_VERSION) LIB.STATIC = lib$(NAME).a LDFLAGS.SO = -shared -Wl,-soname=$(LIB.SONAME) -LIB.SONAME.MX = lib$(NAME)mx.so.$(SO_MAJOR) -LIB.DEVLNK.MX = lib$(NAME)mx.so -LIB.SHARED.MX = lib$(NAME)mx.so.$(SO_VERSION) -LIB.STATIC.MX = lib$(NAME)mx.a -LDFLAGS.SO.MX = -shared -Wl,-soname=$(LIB.SONAME.MX) diff --git a/config/Makefile.haiku b/config/Makefile.haiku index ce832f9..b8b7bd1 100644 --- a/config/Makefile.haiku +++ b/config/Makefile.haiku @@ -1,9 +1,6 @@ NAME = $(GLEW_NAME) CC = cc LD = cc -ifneq (undefined, $(origin GLEW_MX)) - CFLAGS.EXTRA = -DGLEW_MX -endif LDFLAGS.GL = -lGL LDFLAGS.STATIC = -Wl,-Bstatic @@ -21,9 +18,3 @@ LIB.SHARED = lib$(NAME).so.$(SO_VERSION) LIB.STATIC = lib$(NAME).a LDFLAGS.SO = -shared -Wl,-soname=$(LIB.SONAME) -LIB.SONAME.MX = lib$(NAME)mx.so.$(SO_MAJOR) -LIB.DEVLNK.MX = lib$(NAME)mx.so -LIB.SHARED.MX = lib$(NAME)mx.so.$(SO_VERSION) -LIB.STATIC.MX = lib$(NAME)mx.a -LDFLAGS.SO.MX = -shared -Wl,-soname=$(LIB.SONAME.MX) - diff --git a/config/Makefile.irix b/config/Makefile.irix index a1be5ee..ef8f830 100644 --- a/config/Makefile.irix +++ b/config/Makefile.irix @@ -15,8 +15,3 @@ LIB.DEVLNK = lib$(NAME).so LIB.SHARED = lib$(NAME).so.$(SO_VERSION) LIB.STATIC = lib$(NAME).a LDFLAGS.SO = -shared -soname $(LIB.SONAME) -LIB.SONAME.MX = lib$(NAME)mx.so.$(SO_MAJOR) -LIB.DEVLNK.MX = lib$(NAME)mx.so -LIB.SHARED.MX = lib$(NAME)mx.so.$(SO_VERSION) -LIB.STATIC.MX = lib$(NAME)mx.a -LDFLAGS.SO.MX = -shared -soname $(LIB.SONAME.MX) diff --git a/config/Makefile.kfreebsd b/config/Makefile.kfreebsd index faf1046..e2ff5c3 100644 --- a/config/Makefile.kfreebsd +++ b/config/Makefile.kfreebsd @@ -15,8 +15,3 @@ LIB.DEVLNK = lib$(NAME).so LIB.SHARED = lib$(NAME).so.$(SO_VERSION) LIB.STATIC = lib$(NAME).a LDFLAGS.SO = -shared -Wl,-soname $(LIB.SONAME) -LIB.SONAME.MX = lib$(NAME)mx.so.$(SO_MAJOR) -LIB.DEVLNK.MX = lib$(NAME)mx.so -LIB.SHARED.MX = lib$(NAME)mx.so.$(SO_VERSION) -LIB.STATIC.MX = lib$(NAME)mx.a -LDFLAGS.SO.MX = -shared -Wl,-soname $(LIB.SONAME.MX) diff --git a/config/Makefile.linux b/config/Makefile.linux index 9a81dac..50b813c 100644 --- a/config/Makefile.linux +++ b/config/Makefile.linux @@ -32,8 +32,3 @@ LIB.DEVLNK = lib$(NAME).so LIB.SHARED = lib$(NAME).so.$(SO_VERSION) LIB.STATIC = lib$(NAME).a LDFLAGS.SO = -shared -Wl,-soname=$(LIB.SONAME) -LIB.SONAME.MX = lib$(NAME)mx.so.$(SO_MAJOR) -LIB.DEVLNK.MX = lib$(NAME)mx.so -LIB.SHARED.MX = lib$(NAME)mx.so.$(SO_VERSION) -LIB.STATIC.MX = lib$(NAME)mx.a -LDFLAGS.SO.MX = -shared -Wl,-soname=$(LIB.SONAME.MX) diff --git a/config/Makefile.linux-clang b/config/Makefile.linux-clang index 4e7039e..2992b89 100644 --- a/config/Makefile.linux-clang +++ b/config/Makefile.linux-clang @@ -32,8 +32,3 @@ LIB.DEVLNK = lib$(NAME).so LIB.SHARED = lib$(NAME).so.$(SO_VERSION) LIB.STATIC = lib$(NAME).a LDFLAGS.SO = -shared -Wl,-soname=$(LIB.SONAME) -LIB.SONAME.MX = lib$(NAME)mx.so.$(SO_MAJOR) -LIB.DEVLNK.MX = lib$(NAME)mx.so -LIB.SHARED.MX = lib$(NAME)mx.so.$(SO_VERSION) -LIB.STATIC.MX = lib$(NAME)mx.a -LDFLAGS.SO.MX = -shared -Wl,-soname=$(LIB.SONAME.MX) diff --git a/config/Makefile.nacl-32 b/config/Makefile.nacl-32 index 2a5cec7..2182cee 100644 --- a/config/Makefile.nacl-32 +++ b/config/Makefile.nacl-32 @@ -29,8 +29,3 @@ LIB.DEVLNK = lib$(NAME).so LIB.SHARED = lib$(NAME).so.$(SO_VERSION) LIB.STATIC = lib$(NAME).a LDFLAGS.SO = $(LDFLAGS.DYNAMIC) -soname=$(LIB.SONAME) -LIB.SONAME.MX = lib$(NAME)mx.so.$(SO_MAJOR) -LIB.DEVLNK.MX = lib$(NAME)mx.so -LIB.SHARED.MX = lib$(NAME)mx.so.$(SO_VERSION) -LIB.STATIC.MX = lib$(NAME)mx.a -LDFLAGS.SO.MX = $(LDFLAGS.DYNAMIC) -soname=$(LIB.SONAME.MX) diff --git a/config/Makefile.nacl-64 b/config/Makefile.nacl-64 index 37cb6e9..d6135ea 100644 --- a/config/Makefile.nacl-64 +++ b/config/Makefile.nacl-64 @@ -29,8 +29,3 @@ LIB.DEVLNK = lib$(NAME).so LIB.SHARED = lib$(NAME).so.$(SO_VERSION) LIB.STATIC = lib$(NAME).a LDFLAGS.SO = $(LDFLAGS.DYNAMIC) -soname=$(LIB.SONAME) -LIB.SONAME.MX = lib$(NAME)mx.so.$(SO_MAJOR) -LIB.DEVLNK.MX = lib$(NAME)mx.so -LIB.SHARED.MX = lib$(NAME)mx.so.$(SO_VERSION) -LIB.STATIC.MX = lib$(NAME)mx.a -LDFLAGS.SO.MX = $(LDFLAGS.DYNAMIC) -soname=$(LIB.SONAME.MX) diff --git a/config/Makefile.netbsd b/config/Makefile.netbsd index 6da47b1..d2db8a9 100644 --- a/config/Makefile.netbsd +++ b/config/Makefile.netbsd @@ -15,8 +15,3 @@ LIB.DEVLNK = lib$(NAME).so LIB.SHARED = lib$(NAME).so.$(SO_VERSION) LIB.STATIC = lib$(NAME).a LDFLAGS.SO = -shared -soname $(LIB.SONAME) -LIB.SONAME.MX = lib$(NAME)mx.so.$(SO_MAJOR) -LIB.DEVLNK.MX = lib$(NAME)mx.so -LIB.SHARED.MX = lib$(NAME)mx.so.$(SO_VERSION) -LIB.STATIC.MX = lib$(NAME)mx.a -LDFLAGS.SO.MX = -shared -soname $(LIB.SONAME.MX) diff --git a/config/Makefile.openbsd b/config/Makefile.openbsd index ade993e..b64910c 100644 --- a/config/Makefile.openbsd +++ b/config/Makefile.openbsd @@ -15,8 +15,3 @@ LIB.DEVLNK = lib$(NAME).so LIB.SHARED = lib$(NAME).so.$(SO_VERSION) LIB.STATIC = lib$(NAME).a LDFLAGS.SO = -shared -soname $(LIB.SONAME) -LIB.SONAME.MX = lib$(NAME)mx.so.$(SO_MAJOR) -LIB.DEVLNK.MX = lib$(NAME)mx.so -LIB.SHARED.MX = lib$(NAME)mx.so.$(SO_VERSION) -LIB.STATIC.MX = lib$(NAME)mx.a -LDFLAGS.SO.MX = -shared -soname $(LIB.SONAME.MX) diff --git a/config/Makefile.solaris b/config/Makefile.solaris index 96e6d1f..bb2455f 100644 --- a/config/Makefile.solaris +++ b/config/Makefile.solaris @@ -12,7 +12,3 @@ LIB.SONAME = lib$(NAME).so.$(SO_MAJOR) LIB.DEVLNK = lib$(NAME).so LIB.SHARED = lib$(NAME).so.$(SO_VERSION) LIB.STATIC = lib$(NAME).a -LIB.SONAME.MX = lib$(NAME)mx.so.$(SO_MAJOR) -LIB.DEVLNK.MX = lib$(NAME)mx.so -LIB.SHARED.MX = lib$(NAME)mx.so.$(SO_VERSION) -LIB.STATIC.MX = lib$(NAME)mx.a diff --git a/config/Makefile.solaris-gcc b/config/Makefile.solaris-gcc index d66395b..24a8531 100644 --- a/config/Makefile.solaris-gcc +++ b/config/Makefile.solaris-gcc @@ -13,8 +13,3 @@ LIB.DEVLNK = lib$(NAME).so LIB.SHARED = lib$(NAME).so.$(SO_VERSION) LIB.STATIC = lib$(NAME).a LDFLAGS.SO = -shared -Wl,-soname=$(LIB.SONAME) -LIB.SONAME.MX = lib$(NAME)mx.so.$(SO_MAJOR) -LIB.DEVLNK.MX = lib$(NAME)mx.so -LIB.SHARED.MX = lib$(NAME)mx.so.$(SO_VERSION) -LIB.STATIC.MX = lib$(NAME)mx.a -LDFLAGS.SO.MX = -shared -Wl,-soname=$(LIB.SONAME.MX) From 6c68ad327fbdc8188575f3fcf5e3987b059aee89 Mon Sep 17 00:00:00 2001 From: Wes Tarro Date: Mon, 15 Feb 2016 16:14:17 -0500 Subject: [PATCH 08/11] Remove standard library dependency from older VS project files as well. --- build/vc10/glew_shared.vcxproj | 8 ++++++++ build/vc10/glew_static.vcxproj | 4 ++++ build/vc12/glew_shared.vcxproj | 6 +++--- build/vc6/glew_shared.dsp | 10 +++++----- build/vc6/glew_static.dsp | 4 ++-- 5 files changed, 22 insertions(+), 10 deletions(-) diff --git a/build/vc10/glew_shared.vcxproj b/build/vc10/glew_shared.vcxproj index 1009ae9..e1149d9 100644 --- a/build/vc10/glew_shared.vcxproj +++ b/build/vc10/glew_shared.vcxproj @@ -91,6 +91,7 @@ Level3 $(INCLUDE_DIR) WIN32;WIN32_LEAN_AND_MEAN;VC_EXTRALEAN;GLEW_BUILD;%(PreprocessorDefinitions) + false true @@ -116,6 +117,8 @@ /ignore:4089 + true + true @@ -129,6 +132,7 @@ Level3 $(INCLUDE_DIR) WIN32;WIN32_LEAN_AND_MEAN;VC_EXTRALEAN;GLEW_BUILD;%(PreprocessorDefinitions) + false true @@ -153,6 +157,8 @@ /ignore:4089 + true + true @@ -166,6 +172,7 @@ EnableFastChecks Level3 $(INCLUDE_DIR) + false true @@ -204,6 +211,7 @@ EnableFastChecks Level3 $(INCLUDE_DIR) + false true diff --git a/build/vc10/glew_static.vcxproj b/build/vc10/glew_static.vcxproj index 3c8c488..949db96 100644 --- a/build/vc10/glew_static.vcxproj +++ b/build/vc10/glew_static.vcxproj @@ -111,6 +111,7 @@ Level3 ../../include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_LIB;WIN32_LEAN_AND_MEAN;GLEW_STATIC;%(PreprocessorDefinitions) + false 0x0409 @@ -136,6 +137,7 @@ Level3 ../../include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_LIB;WIN32_LEAN_AND_MEAN;GLEW_STATIC;%(PreprocessorDefinitions) + false 0x0409 @@ -160,6 +162,7 @@ Level3 WIN32;_DEBUG;_LIB;WIN32_LEAN_AND_MEAN;GLEW_STATIC;%(PreprocessorDefinitions) EnableFastChecks + false 0x0409 @@ -184,6 +187,7 @@ Level3 WIN32;_DEBUG;_LIB;WIN32_LEAN_AND_MEAN;GLEW_STATIC;%(PreprocessorDefinitions) EnableFastChecks + false 0x0409 diff --git a/build/vc12/glew_shared.vcxproj b/build/vc12/glew_shared.vcxproj index 6605a1c..b52bcc4 100644 --- a/build/vc12/glew_shared.vcxproj +++ b/build/vc12/glew_shared.vcxproj @@ -167,7 +167,7 @@ - MultiThreadedDebug + MultiThreadedDebugDLL Default false Disabled @@ -206,7 +206,7 @@ - MultiThreadedDebug + MultiThreadedDebugDLL Default false Disabled @@ -255,4 +255,4 @@ - \ No newline at end of file + diff --git a/build/vc6/glew_shared.dsp b/build/vc6/glew_shared.dsp index b8d2f1b..8b576b8 100644 --- a/build/vc6/glew_shared.dsp +++ b/build/vc6/glew_shared.dsp @@ -42,8 +42,8 @@ RSC=rc.exe # PROP Intermediate_Dir "shared/release" # PROP Ignore_Export_Lib 0 # PROP Target_Dir "" -# ADD BASE CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "GLEW_EXPORTS" /YX /FD /c -# ADD CPP /nologo /W3 /O2 /I "../../include" /D "WIN32" /D "WIN32_LEAN_AND_MEAN" /D "VC_EXTRALEAN" /D "GLEW_BUILD" /YX /FD /c +# ADD BASE CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "GLEW_EXPORTS" /YX /FD /c /GS- +# ADD CPP /nologo /W3 /O2 /I "../../include" /D "WIN32" /D "WIN32_LEAN_AND_MEAN" /D "VC_EXTRALEAN" /D "GLEW_BUILD" /YX /FD /c /GS- # ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32 # ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32 # ADD BASE RSC /l 0x409 /d "NDEBUG" @@ -54,7 +54,7 @@ BSC32=bscmake.exe LINK32=link.exe # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /machine:I386 # ADD LINK32 opengl32.lib /nologo /dll /pdb:none /machine:I386 /out:"../../bin/glew32.dll" /ignore:4089 -# ADD LINK32 /base:0x62AA0000 +# ADD LINK32 /base:0x62AA0000 /nodefaultlib /noentry !ELSEIF "$(CFG)" == "glew_shared - Win32 Debug" @@ -69,8 +69,8 @@ LINK32=link.exe # PROP Intermediate_Dir "shared/debug" # PROP Ignore_Export_Lib 0 # PROP Target_Dir "" -# ADD BASE CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "GLEW_EXPORTS" /YX /FD /GZ /c -# ADD CPP /nologo /MDd /W3 /Zi /Od /I "../../include" /D "WIN32" /D "WIN32_MEAN_AND_LEAN" /D "VC_EXTRALEAN" /D "GLEW_BUILD" /YX /FD /GZ /c +# ADD BASE CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "GLEW_EXPORTS" /YX /FD /GZ /c /GS- +# ADD CPP /nologo /MDd /W3 /Zi /Od /I "../../include" /D "WIN32" /D "WIN32_MEAN_AND_LEAN" /D "VC_EXTRALEAN" /D "GLEW_BUILD" /YX /FD /GZ /c /GS- # ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32 # ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32 # ADD BASE RSC /l 0x409 /d "_DEBUG" diff --git a/build/vc6/glew_static.dsp b/build/vc6/glew_static.dsp index 55adb1a..d6bd3d6 100644 --- a/build/vc6/glew_static.dsp +++ b/build/vc6/glew_static.dsp @@ -40,8 +40,8 @@ RSC=rc.exe # PROP Output_Dir "../../lib" # PROP Intermediate_Dir "static/release" # PROP Target_Dir "" -# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_MBCS" /D "_LIB" /YX /FD /c -# ADD CPP /nologo /W3 /GX /O2 /I "../../include" /D "WIN32" /D "NDEBUG" /D "_MBCS" /D "_LIB" /D "WIN32_LEAN_AND_MEAN" /D "VC_EXTRALEAN" /D "GLEW_STATIC" /YX /FD /c +# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_MBCS" /D "_LIB" /YX /FD /c /GS- +# ADD CPP /nologo /W3 /GX /O2 /I "../../include" /D "WIN32" /D "NDEBUG" /D "_MBCS" /D "_LIB" /D "WIN32_LEAN_AND_MEAN" /D "VC_EXTRALEAN" /D "GLEW_STATIC" /YX /FD /c /GS- # ADD BASE RSC /l 0x409 /d "NDEBUG" # ADD RSC /l 0x409 /d "NDEBUG" /d "GLEW_STATIC" BSC32=bscmake.exe From a9f5ec3e21797f58ca82b95999ef245ff8f986d8 Mon Sep 17 00:00:00 2001 From: Nigel Stewart Date: Fri, 19 Feb 2016 22:09:15 +1000 Subject: [PATCH 09/11] Put CFLAGS -fno-builtin and LDFLAGS -nostdlib seperate to CC and LD variables --- config/Makefile.cygming | 6 ++++-- config/Makefile.fedora-mingw32 | 7 ++++--- config/Makefile.linux-mingw-w64 | 6 ++++-- config/Makefile.linux-mingw32 | 7 ++++--- config/Makefile.linux-mingw64 | 7 ++++--- config/Makefile.mingw | 6 ++++-- config/Makefile.msys | 6 ++++-- 7 files changed, 28 insertions(+), 17 deletions(-) diff --git a/config/Makefile.cygming b/config/Makefile.cygming index 842fba5..dcd7b21 100644 --- a/config/Makefile.cygming +++ b/config/Makefile.cygming @@ -4,11 +4,13 @@ BINDIR = /usr/bin LIBDIR = /usr/lib/mingw INCDIR = /usr/include/mingw/GL # use gcc for linking, with ld it does not work -CC := gcc -mno-cygwin -fno-builtin -fno-stack-protector -LD := gcc -mno-cygwin -nostdlib +CC := gcc -mno-cygwin +LD := gcc -mno-cygwin LN := LDFLAGS.GL = -lopengl32 -lgdi32 -luser32 -lkernel32 LDFLAGS.EXTRA = -L$(LIBDIR) +CFLAGS.EXTRA += -fno-builtin -fno-stack-protector +LDFLAGS.EXTRA += -nostdlib WARN = -Wall -W POPT = -O2 BIN.SUFFIX = .exe diff --git a/config/Makefile.fedora-mingw32 b/config/Makefile.fedora-mingw32 index 4110ce7..9bad92a 100644 --- a/config/Makefile.fedora-mingw32 +++ b/config/Makefile.fedora-mingw32 @@ -2,10 +2,11 @@ # http://www.mingw.org/ # # $ make SYSTEM=fedora-mingw32 -# include config/Makefile.linux-mingw32 -CC := i686-pc-mingw32-gcc -fno-builtin -fno-stack-protector -LD := i686-pc-mingw32-ld -nostdlib +CC := i686-pc-mingw32-gcc +LD := i686-pc-mingw32-ld LDFLAGS.GL += -L/usr/i686-pc-mingw32/sys-root/mingw/lib +CFLAGS.EXTRA += -fno-builtin -fno-stack-protector +LDFLAGS.EXTRA += -nostdlib diff --git a/config/Makefile.linux-mingw-w64 b/config/Makefile.linux-mingw-w64 index 2822a1e..175f5a9 100644 --- a/config/Makefile.linux-mingw-w64 +++ b/config/Makefile.linux-mingw-w64 @@ -5,11 +5,13 @@ # NAME := glew32 -CC := i686-w64-mingw32-gcc -fno-builtin -fno-stack-protector -LD := i686-w64-mingw32-ld -nostdlib +CC := i686-w64-mingw32-gcc +LD := i686-w64-mingw32-ld LN := STRIP := LDFLAGS.GL = -lopengl32 -lgdi32 -luser32 -lkernel32 +CFLAGS.EXTRA += -fno-builtin -fno-stack-protector +LDFLAGS.EXTRA += -nostdlib WARN = -Wall -W POPT = -O2 BIN.SUFFIX = .exe diff --git a/config/Makefile.linux-mingw32 b/config/Makefile.linux-mingw32 index cc389c1..9adb205 100644 --- a/config/Makefile.linux-mingw32 +++ b/config/Makefile.linux-mingw32 @@ -2,15 +2,16 @@ # http://www.mingw.org/ # # $ make SYSTEM=linux-mingw32 -# NAME := glew32 HOST := i586-mingw32msvc -CC := $(HOST)-gcc -fno-builtin -fno-stack-protector -LD := $(HOST)-ld -nostdlib +CC := $(HOST)-gcc +LD := $(HOST)-ld LN := STRIP := LDFLAGS.GL = -lopengl32 -lgdi32 -luser32 -lkernel32 +CFLAGS.EXTRA += -fno-builtin -fno-stack-protector +LDFLAGS.EXTRA += -nostdlib WARN = -Wall -W POPT = -O2 BIN.SUFFIX = .exe diff --git a/config/Makefile.linux-mingw64 b/config/Makefile.linux-mingw64 index 439b4e9..8bc3894 100644 --- a/config/Makefile.linux-mingw64 +++ b/config/Makefile.linux-mingw64 @@ -2,15 +2,16 @@ # http://www.mingw.org/ # # $ make SYSTEM=linux-mingw64 -# NAME := glew32 HOST := i686-w64-mingw32 -CC := $(HOST)-gcc -fno-builtin -fno-stack-protector -LD := $(HOST)-ld -nostdlib +CC := $(HOST)-gcc +LD := $(HOST)-ld LN := STRIP := LDFLAGS.GL = -lopengl32 -lgdi32 -luser32 -lkernel32 +CFLAGS.EXTRA += -fno-builtin -fno-stack-protector +LDFLAGS.EXTRA += -nostdlib WARN = -Wall -W POPT = -O2 BIN.SUFFIX = .exe diff --git a/config/Makefile.mingw b/config/Makefile.mingw index 56b5dcc..3f413ee 100644 --- a/config/Makefile.mingw +++ b/config/Makefile.mingw @@ -1,10 +1,12 @@ NAME = glew32 # use gcc for linking, with ld it does not work -CC := gcc -fno-builtin -fno-stack-protector -LD := gcc -nostdlib +CC := gcc -fno-builtin +LD := gcc LN := LDFLAGS.GL = -lopengl32 -lgdi32 -luser32 -lkernel32 LDFLAGS.EXTRA = -L/mingw/lib +CFLAGS.EXTRA += -fno-builtin -fno-stack-protector +LDFLAGS.EXTRA += -nostdlib WARN = -Wall -W POPT = -O2 BIN.SUFFIX = .exe diff --git a/config/Makefile.msys b/config/Makefile.msys index f765b0e..b5187af 100644 --- a/config/Makefile.msys +++ b/config/Makefile.msys @@ -1,11 +1,13 @@ NAME = glew32 # use gcc for linking, with ld it does not work -CC := gcc -fno-builtin -fno-stack-protector -LD := gcc -nostdlib +CC := gcc +LD := gcc LN := CFLAGS.EXTRA += -D_WIN32 LDFLAGS.GL = -lopengl32 -lgdi32 -luser32 -lkernel32 LDFLAGS.EXTRA = +CFLAGS.EXTRA += -fno-builtin -fno-stack-protector +LDFLAGS.EXTRA += -nostdlib LIBDIR = $(GLEW_DEST)/bin WARN = -Wall -W POPT = -O2 From f4d58a657aaa337d4972431176c2d2a9aba6c876 Mon Sep 17 00:00:00 2001 From: Nigel Stewart Date: Fri, 19 Feb 2016 22:24:12 +1000 Subject: [PATCH 10/11] LDFLAGS.EXTRA += -nostdlib seems problematic for SYSTEM=linux-mingw32, linux-mingw64 --- config/Makefile.linux-mingw32 | 2 +- config/Makefile.linux-mingw64 | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/config/Makefile.linux-mingw32 b/config/Makefile.linux-mingw32 index 9adb205..12dfb99 100644 --- a/config/Makefile.linux-mingw32 +++ b/config/Makefile.linux-mingw32 @@ -11,7 +11,7 @@ LN := STRIP := LDFLAGS.GL = -lopengl32 -lgdi32 -luser32 -lkernel32 CFLAGS.EXTRA += -fno-builtin -fno-stack-protector -LDFLAGS.EXTRA += -nostdlib +#LDFLAGS.EXTRA += -nostdlib WARN = -Wall -W POPT = -O2 BIN.SUFFIX = .exe diff --git a/config/Makefile.linux-mingw64 b/config/Makefile.linux-mingw64 index 8bc3894..f3e47a2 100644 --- a/config/Makefile.linux-mingw64 +++ b/config/Makefile.linux-mingw64 @@ -11,7 +11,7 @@ LN := STRIP := LDFLAGS.GL = -lopengl32 -lgdi32 -luser32 -lkernel32 CFLAGS.EXTRA += -fno-builtin -fno-stack-protector -LDFLAGS.EXTRA += -nostdlib +#LDFLAGS.EXTRA += -nostdlib WARN = -Wall -W POPT = -O2 BIN.SUFFIX = .exe From c4bade8726701ae95d9fe22f1e1aeba462dc9f0b Mon Sep 17 00:00:00 2001 From: Nigel Stewart Date: Fri, 19 Feb 2016 22:30:48 +1000 Subject: [PATCH 11/11] Resolve some gcc compilation warnings --- auto/src/glew_init_tail.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/auto/src/glew_init_tail.c b/auto/src/glew_init_tail.c index c7be402..e21ce96 100644 --- a/auto/src/glew_init_tail.c +++ b/auto/src/glew_init_tail.c @@ -59,6 +59,9 @@ GLenum GLEWAPIENTRY glewInit (void) /* Types extracted from windows.h to avoid polluting the rest of the file. */ int __stdcall DllMainCRTStartup(void* instance, unsigned reason, void* reserved) { + (void) instance; + (void) reason; + (void) reserved; return 1; } #endif