From 478289140daae28cf7eabf54af3addf476aaad9c Mon Sep 17 00:00:00 2001 From: Yuri Kunde Schlesner Date: Sat, 23 Aug 2014 21:00:08 -0300 Subject: Replace GLEW with a glLoadGen loader. This should fix the GL loading errors that occur in some drivers due to the use of deprecated functions by GLEW. Side benefits are more accurate auto-completion (deprecated function and symbols don't exist) and faster pointer loading (less entrypoints to load). In addition it removes an external library depency, simplifying the build system a bit and eliminating one set of binary libraries for Windows. --- vsprops/externals.props | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'vsprops/externals.props') diff --git a/vsprops/externals.props b/vsprops/externals.props index c49a095ec..d401fee5c 100644 --- a/vsprops/externals.props +++ b/vsprops/externals.props @@ -9,14 +9,14 @@ - $(ExternalsDir)glew-1.10.0\include;$(ExternalsDir)glfw-3.0.2\include;$(ExternalsDir)qhexedit;%(AdditionalIncludeDirectories) + $(ExternalsDir)glfw-3.0.2\include;$(ExternalsDir)qhexedit;%(AdditionalIncludeDirectories) - $(ExternalsDir)glew-1.10.0\lib\Release\$(PlatformName);$(ExternalsDir)glfw-3.0.2\lib-msvc100;$(ExternalsDir)libjpeg;$(ExternalsDir)sdl-2.0.0\lib\$(PlatformName);%(AdditionalLibraryDirectories) - glfw3dll.lib;opengl32.lib;glew32.lib;glu32.lib;%(AdditionalDependencies) + $(ExternalsDir)glfw-3.0.2\lib-msvc100;$(ExternalsDir)libjpeg;$(ExternalsDir)sdl-2.0.0\lib\$(PlatformName);%(AdditionalLibraryDirectories) + glfw3dll.lib;opengl32.lib;glu32.lib;%(AdditionalDependencies) -- cgit v1.2.3 From 523385955c3c0af2dc2133546490f8ede0dd824f Mon Sep 17 00:00:00 2001 From: Yuri Kunde Schlesner Date: Sat, 23 Aug 2014 21:24:08 -0300 Subject: Update GLFW to 3.0.4 and include x64 lib for MSVC --- vsprops/externals.props | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'vsprops/externals.props') diff --git a/vsprops/externals.props b/vsprops/externals.props index d401fee5c..2d320c794 100644 --- a/vsprops/externals.props +++ b/vsprops/externals.props @@ -9,13 +9,13 @@ - $(ExternalsDir)glfw-3.0.2\include;$(ExternalsDir)qhexedit;%(AdditionalIncludeDirectories) + $(ExternalsDir)glfw-3.0.4.bin\include;$(ExternalsDir)qhexedit;%(AdditionalIncludeDirectories) - $(ExternalsDir)glfw-3.0.2\lib-msvc100;$(ExternalsDir)libjpeg;$(ExternalsDir)sdl-2.0.0\lib\$(PlatformName);%(AdditionalLibraryDirectories) + $(ExternalsDir)glfw-3.0.4.bin\lib-msvc_$(PlatformToolset)-$(Platform);$(ExternalsDir)libjpeg;$(ExternalsDir)sdl-2.0.0\lib\$(PlatformName);%(AdditionalLibraryDirectories) glfw3dll.lib;opengl32.lib;glu32.lib;%(AdditionalDependencies) -- cgit v1.2.3 From c57de3e4046c662c5179d3b55340361a046a57ff Mon Sep 17 00:00:00 2001 From: Yuri Kunde Schlesner Date: Mon, 1 Sep 2014 18:04:07 -0300 Subject: Remove hand-crafted Visual Studio solution. --- vsprops/externals.props | 30 ------------------------------ 1 file changed, 30 deletions(-) delete mode 100644 vsprops/externals.props (limited to 'vsprops/externals.props') diff --git a/vsprops/externals.props b/vsprops/externals.props deleted file mode 100644 index 2d320c794..000000000 --- a/vsprops/externals.props +++ /dev/null @@ -1,30 +0,0 @@ - - - - - $(SolutionDir)externals\ - - - <_PropertySheetDisplayName>externals - - - - $(ExternalsDir)glfw-3.0.4.bin\include;$(ExternalsDir)qhexedit;%(AdditionalIncludeDirectories) - - - - - - $(ExternalsDir)glfw-3.0.4.bin\lib-msvc_$(PlatformToolset)-$(Platform);$(ExternalsDir)libjpeg;$(ExternalsDir)sdl-2.0.0\lib\$(PlatformName);%(AdditionalLibraryDirectories) - glfw3dll.lib;opengl32.lib;glu32.lib;%(AdditionalDependencies) - - - - - - - - $(ExternalsDir) - - - \ No newline at end of file -- cgit v1.2.3