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/app.props | 1 - vsprops/externals.props | 6 +++--- vsprops/qt.props | 2 +- vsprops/qt_libs_debug.props | 2 +- 4 files changed, 5 insertions(+), 6 deletions(-) (limited to 'vsprops') diff --git a/vsprops/app.props b/vsprops/app.props index aa86fd142..8a3227771 100644 --- a/vsprops/app.props +++ b/vsprops/app.props @@ -11,7 +11,6 @@ xcopy "$(SolutionDir)data" "$(EmuBinDir)" /Y /S /D -xcopy "$(ExternalsDir)glew-1.10.0\bin\Release\$(PlatformName)\glew32.dll" "$(EmuBinDir)" /Y /S /D xcopy "$(ExternalsDir)glfw-3.0.2\lib-msvc100\glfw3.dll" "$(EmuBinDir)" /Y /S /D %(Command) 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) diff --git a/vsprops/qt.props b/vsprops/qt.props index f74a7b5ea..ba9455e96 100644 --- a/vsprops/qt.props +++ b/vsprops/qt.props @@ -19,7 +19,7 @@ .h - /I"$(SolutionDir)src" /I"$(ExternalsDir)glew-1.6.0\include" /I"$(ExternalsDir)sdl-1.2.15\include" /I"$(ExternalsDir)qhexedit" + /I"$(SolutionDir)src" /I"$(ExternalsDir)sdl-1.2.15\include" /I"$(ExternalsDir)qhexedit" false diff --git a/vsprops/qt_libs_debug.props b/vsprops/qt_libs_debug.props index 335d0ac47..65261c908 100644 --- a/vsprops/qt_libs_debug.props +++ b/vsprops/qt_libs_debug.props @@ -9,7 +9,7 @@ false - /I"$(SolutionDir)src" /I"$(ExternalsDir)glew-1.6.0\include" /I"$(ExternalsDir)sdl-1.2.15\include" /I"$(ExternalsDir)qhexedit" /D"_DEBUG" + /I"$(SolutionDir)src" /I"$(ExternalsDir)sdl-1.2.15\include" /I"$(ExternalsDir)qhexedit" /D"_DEBUG" xcopy "$(QtBinaryDir)QtCored4.dll" "$(EmuBinDir)" /Y /S /D -- 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/app.props | 2 +- vsprops/externals.props | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) (limited to 'vsprops') diff --git a/vsprops/app.props b/vsprops/app.props index 8a3227771..b9c583e0f 100644 --- a/vsprops/app.props +++ b/vsprops/app.props @@ -11,7 +11,7 @@ xcopy "$(SolutionDir)data" "$(EmuBinDir)" /Y /S /D -xcopy "$(ExternalsDir)glfw-3.0.2\lib-msvc100\glfw3.dll" "$(EmuBinDir)" /Y /S /D +xcopy "$(ExternalsDir)glfw-3.0.4.bin\lib-msvc_$(PlatformToolset)-$(Platform)\glfw3.dll" "$(EmuBinDir)" /Y /S /D %(Command) 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/app.props | 26 ---------------------- vsprops/base.props | 25 --------------------- vsprops/code_generation_debug.props | 19 ---------------- vsprops/code_generation_release.props | 22 ------------------- vsprops/externals.props | 30 ------------------------- vsprops/optimization_debug.props | 12 ---------- vsprops/optimization_release.props | 41 ----------------------------------- vsprops/qt.props | 39 --------------------------------- vsprops/qt_libs_debug.props | 21 ------------------ vsprops/qt_libs_release.props | 17 --------------- 10 files changed, 252 deletions(-) delete mode 100644 vsprops/app.props delete mode 100644 vsprops/base.props delete mode 100644 vsprops/code_generation_debug.props delete mode 100644 vsprops/code_generation_release.props delete mode 100644 vsprops/externals.props delete mode 100644 vsprops/optimization_debug.props delete mode 100644 vsprops/optimization_release.props delete mode 100644 vsprops/qt.props delete mode 100644 vsprops/qt_libs_debug.props delete mode 100644 vsprops/qt_libs_release.props (limited to 'vsprops') diff --git a/vsprops/app.props b/vsprops/app.props deleted file mode 100644 index b9c583e0f..000000000 --- a/vsprops/app.props +++ /dev/null @@ -1,26 +0,0 @@ - - - - - $(SolutionDir)bin\$(PlatformName)\ - - - $(EmuBinDir) - $(ProjectName)$(Configuration) - - - - xcopy "$(SolutionDir)data" "$(EmuBinDir)" /Y /S /D -xcopy "$(ExternalsDir)glfw-3.0.4.bin\lib-msvc_$(PlatformToolset)-$(Platform)\glfw3.dll" "$(EmuBinDir)" /Y /S /D -%(Command) - - - comctl32.lib;winmm.lib;%(AdditionalDependencies) - - - - - $(EmuBinDir) - - - \ No newline at end of file diff --git a/vsprops/base.props b/vsprops/base.props deleted file mode 100644 index 7eedacc74..000000000 --- a/vsprops/base.props +++ /dev/null @@ -1,25 +0,0 @@ - - - - - - $(SolutionDir)build\$(ProjectName)\$(PlatformName)\$(Configuration)\ - $(SolutionDir)build\$(ProjectName)\$(PlatformName)\$(Configuration)\ - - - - Level3 - 16Bytes - true - true - $(SolutionDir)src;%(AdditionalIncludeDirectories) - - - false - - - true - - - - \ No newline at end of file diff --git a/vsprops/code_generation_debug.props b/vsprops/code_generation_debug.props deleted file mode 100644 index abd617d71..000000000 --- a/vsprops/code_generation_debug.props +++ /dev/null @@ -1,19 +0,0 @@ - - - - - - - - _DEBUG;_SECURE_SCL=1;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_NO_DEPRECATE;_UNICODE;UNICODE;%(PreprocessorDefinitions) - MultiThreadedDebug - false - - - - - /NODEFAULTLIB:LIBCMT %(AdditionalOptions) - - - - \ No newline at end of file diff --git a/vsprops/code_generation_release.props b/vsprops/code_generation_release.props deleted file mode 100644 index 732092ad6..000000000 --- a/vsprops/code_generation_release.props +++ /dev/null @@ -1,22 +0,0 @@ - - - - - - <_PropertySheetDisplayName>code_generation_release - - - - false - MultiThreaded - _SECURE_SCL=0;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_NO_DEPRECATE;_UNICODE;UNICODE;%(PreprocessorDefinitions) - true - StreamingSIMDExtensions2 - - - true - true - - - - \ No newline at end of file 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 diff --git a/vsprops/optimization_debug.props b/vsprops/optimization_debug.props deleted file mode 100644 index 3c7081f16..000000000 --- a/vsprops/optimization_debug.props +++ /dev/null @@ -1,12 +0,0 @@ - - - - - - - - false - - - - \ No newline at end of file diff --git a/vsprops/optimization_release.props b/vsprops/optimization_release.props deleted file mode 100644 index ea1573e6c..000000000 --- a/vsprops/optimization_release.props +++ /dev/null @@ -1,41 +0,0 @@ - - - - - - - - AnySuitable - - - - - true - - - - - Speed - - - - - true - - - - - true - - - - - true - MaxSpeed - - - UseLinkTimeCodeGeneration - - - - \ No newline at end of file diff --git a/vsprops/qt.props b/vsprops/qt.props deleted file mode 100644 index ba9455e96..000000000 --- a/vsprops/qt.props +++ /dev/null @@ -1,39 +0,0 @@ - - - - - $(QTDIR)\include\ - $(QTDIR)\lib\ - $(QTDIR)\bin\ - - - $(QtIncludeDir);$(QtIncludeDir)QtGui;$(QtIncludeDir)QtCore;$(QtIncludeDir)Qt;$(QtIncludeDir)QtOpenGL;$(QtIncludeDir)QtANGLE;$(QtIncludeDir)QtWidgets;$(ProjectDir);$(IncludePath) - $(QtLibraryDir);$(LibraryPath) - - - - - - - ui_ - .h - - - /I"$(SolutionDir)src" /I"$(ExternalsDir)sdl-1.2.15\include" /I"$(ExternalsDir)qhexedit" - false - - - - - - - $(QtIncludeDir) - - - $(QtLibraryDir) - - - $(QtBinaryDir) - - - \ No newline at end of file diff --git a/vsprops/qt_libs_debug.props b/vsprops/qt_libs_debug.props deleted file mode 100644 index 65261c908..000000000 --- a/vsprops/qt_libs_debug.props +++ /dev/null @@ -1,21 +0,0 @@ - - - - - - - - QtCored4.lib;QtGuid4.lib;QtOpenGLd4.lib;%(AdditionalDependencies) - - - false - /I"$(SolutionDir)src" /I"$(ExternalsDir)sdl-1.2.15\include" /I"$(ExternalsDir)qhexedit" /D"_DEBUG" - - - xcopy "$(QtBinaryDir)QtCored4.dll" "$(EmuBinDir)" /Y /S /D -xcopy "$(QtBinaryDir)QtGuid4.dll" "$(EmuBinDir)" /Y /S /D -xcopy "$(QtBinaryDir)QtOpenGLd4.dll" "$(EmuBinDir)" /Y /S /D - - - - \ No newline at end of file diff --git a/vsprops/qt_libs_release.props b/vsprops/qt_libs_release.props deleted file mode 100644 index 0f02f30d5..000000000 --- a/vsprops/qt_libs_release.props +++ /dev/null @@ -1,17 +0,0 @@ - - - - - - - - QtCore4.lib;QtGui4.lib;QtOpenGL4.lib;%(AdditionalDependencies) - - - xcopy "$(QtBinaryDir)QtCore4.dll" "$(EmuBinDir)" /Y /S /D -xcopy "$(QtBinaryDir)QtGui4.dll" "$(EmuBinDir)" /Y /S /D -xcopy "$(QtBinaryDir)QtOpenGL4.dll" "$(EmuBinDir)" /Y /S /D - - - - \ No newline at end of file -- cgit v1.2.3