diff options
author | Tor Andersson <tor.andersson@artifex.com> | 2017-09-26 23:45:31 +0200 |
---|---|---|
committer | Tor Andersson <tor.andersson@artifex.com> | 2017-11-08 17:57:09 +0100 |
commit | 896830e23e8f94b17bdf386c191a885c972ea8a8 (patch) | |
tree | 061feda4707c8cc989df39e2440550a6ca1a2f7d /platform/win32 | |
parent | 94a5846502cd1f05ec4127872ef06dcd8606f34b (diff) | |
download | mupdf-896830e23e8f94b17bdf386c191a885c972ea8a8.tar.xz |
gl: Remove GLFW and reinstate FreeGLUT.
GLFW doesn't build on Visual Studio 2005 anymore, and I don't have time to keep
up with the changes.
So, we're switching back to FreeGLUT, which is more stable.
I've added the two missing features that made us switch to GLFW in the first
place: input methods and system clipboard support.
If MuPDF is compiled with our version of FreeGLUT, we now use these functions:
* glutKeyboardExtFunc
* glutSetClipboard
* glutGetClipboard
Diffstat (limited to 'platform/win32')
-rw-r--r-- | platform/win32/libfreeglut.vcproj (renamed from platform/win32/libglfw.vcproj) | 180 | ||||
-rw-r--r-- | platform/win32/mupdf-gl.vcproj | 58 | ||||
-rw-r--r-- | platform/win32/mupdf.sln | 2 |
3 files changed, 169 insertions, 71 deletions
diff --git a/platform/win32/libglfw.vcproj b/platform/win32/libfreeglut.vcproj index e63f99c3..9fb0c2b5 100644 --- a/platform/win32/libglfw.vcproj +++ b/platform/win32/libfreeglut.vcproj @@ -2,7 +2,7 @@ <VisualStudioProject ProjectType="Visual C++" Version="8.00" - Name="libglfw" + Name="libfreeglut" ProjectGUID="{A1B75D29-9F5C-4A0F-B368-322A10477D0C}" RootNamespace="libglfw" Keyword="Win32Proj" @@ -23,7 +23,7 @@ OutputDirectory="$(ConfigurationName)" IntermediateDirectory="$(ConfigurationName)\$(ProjectName)" ConfigurationType="4" - CharacterSet="1" + CharacterSet="0" > <Tool Name="VCPreBuildEventTool" @@ -43,8 +43,8 @@ <Tool Name="VCCLCompilerTool" Optimization="0" - AdditionalIncludeDirectories="..\..\thirdparty\glfw\deps\mingw" - PreprocessorDefinitions="WIN32;_DEBUG;_CRT_SECURE_NO_WARNINGS;_GLFW_WIN32;_GLFW_WGL;_GLFW_USE_OPENGL" + AdditionalIncludeDirectories=""C:\Documents and Settings\admin\src\mupdf\thirdparty\freeglut\include"" + PreprocessorDefinitions="FREEGLUT_LIB_PRAGMAS=0;FREEGLUT_STATIC;HAVE_U__INT64;NEED_XPARSEGEOMETRY_IMPL;_CRT_SECURE_NO_WARNINGS" MinimalRebuild="true" BasicRuntimeChecks="3" RuntimeLibrary="1" @@ -86,7 +86,7 @@ OutputDirectory="$(PlatformName)\$(ConfigurationName)" IntermediateDirectory="$(PlatformName)\$(ConfigurationName)\$(ProjectName)" ConfigurationType="4" - CharacterSet="1" + CharacterSet="0" > <Tool Name="VCPreBuildEventTool" @@ -107,8 +107,8 @@ <Tool Name="VCCLCompilerTool" Optimization="0" - AdditionalIncludeDirectories="..\..\thirdparty\glfw\deps\mingw" - PreprocessorDefinitions="WIN64;_DEBUG;_CRT_SECURE_NO_WARNINGS;_GLFW_WIN32;_GLFW_WGL;_GLFW_USE_OPENGL" + AdditionalIncludeDirectories=""C:\Documents and Settings\admin\src\mupdf\thirdparty\freeglut\include"" + PreprocessorDefinitions="FREEGLUT_LIB_PRAGMAS=0;FREEGLUT_STATIC;HAVE_U__INT64;NEED_XPARSEGEOMETRY_IMPL;_CRT_SECURE_NO_WARNINGS" MinimalRebuild="true" BasicRuntimeChecks="3" RuntimeLibrary="1" @@ -150,7 +150,7 @@ OutputDirectory="$(ConfigurationName)" IntermediateDirectory="$(ConfigurationName)\$(ProjectName)" ConfigurationType="4" - CharacterSet="1" + CharacterSet="0" > <Tool Name="VCPreBuildEventTool" @@ -170,8 +170,8 @@ <Tool Name="VCCLCompilerTool" Optimization="0" - AdditionalIncludeDirectories="..\..\thirdparty\glfw\deps\mingw" - PreprocessorDefinitions="WIN32;_DEBUG;_CRT_SECURE_NO_WARNINGS;_GLFW_WIN32;_GLFW_WGL;_GLFW_USE_OPENGL;MEMENTO" + AdditionalIncludeDirectories=""C:\Documents and Settings\admin\src\mupdf\thirdparty\freeglut\include"" + PreprocessorDefinitions="FREEGLUT_LIB_PRAGMAS=0;FREEGLUT_STATIC;HAVE_U__INT64;NEED_XPARSEGEOMETRY_IMPL;_CRT_SECURE_NO_WARNINGS" MinimalRebuild="true" BasicRuntimeChecks="3" RuntimeLibrary="1" @@ -213,7 +213,7 @@ OutputDirectory="$(PlatformName)\$(ConfigurationName)" IntermediateDirectory="$(PlatformName)\$(ConfigurationName)\$(ProjectName)" ConfigurationType="4" - CharacterSet="1" + CharacterSet="0" > <Tool Name="VCPreBuildEventTool" @@ -234,8 +234,8 @@ <Tool Name="VCCLCompilerTool" Optimization="0" - AdditionalIncludeDirectories="..\..\thirdparty\glfw\deps\mingw" - PreprocessorDefinitions="WIN64;_DEBUG;_CRT_SECURE_NO_WARNINGS;_GLFW_WIN32;_GLFW_WGL;_GLFW_USE_OPENGL;MEMENTO" + AdditionalIncludeDirectories=""C:\Documents and Settings\admin\src\mupdf\thirdparty\freeglut\include"" + PreprocessorDefinitions="FREEGLUT_LIB_PRAGMAS=0;FREEGLUT_STATIC;HAVE_U__INT64;NEED_XPARSEGEOMETRY_IMPL;_CRT_SECURE_NO_WARNINGS" MinimalRebuild="true" BasicRuntimeChecks="3" RuntimeLibrary="1" @@ -277,7 +277,7 @@ OutputDirectory="$(ConfigurationName)" IntermediateDirectory="$(ConfigurationName)\$(ProjectName)" ConfigurationType="4" - CharacterSet="1" + CharacterSet="0" WholeProgramOptimization="1" > <Tool @@ -297,8 +297,8 @@ /> <Tool Name="VCCLCompilerTool" - AdditionalIncludeDirectories="..\..\thirdparty\glfw\deps\mingw" - PreprocessorDefinitions="WIN32;NDEBUG;_CRT_SECURE_NO_WARNINGS;_GLFW_WIN32;_GLFW_WGL;_GLFW_USE_OPENGL" + AdditionalIncludeDirectories=""C:\Documents and Settings\admin\src\mupdf\thirdparty\freeglut\include"" + PreprocessorDefinitions="FREEGLUT_LIB_PRAGMAS=0;FREEGLUT_STATIC;HAVE_U__INT64;NEED_XPARSEGEOMETRY_IMPL;_CRT_SECURE_NO_WARNINGS" RuntimeLibrary="0" EnableFunctionLevelLinking="true" UsePrecompiledHeader="0" @@ -339,7 +339,7 @@ OutputDirectory="$(PlatformName)\$(ConfigurationName)" IntermediateDirectory="$(PlatformName)\$(ConfigurationName)\$(ProjectName)" ConfigurationType="4" - CharacterSet="1" + CharacterSet="0" WholeProgramOptimization="1" > <Tool @@ -360,8 +360,8 @@ /> <Tool Name="VCCLCompilerTool" - AdditionalIncludeDirectories="..\..\thirdparty\glfw\deps\mingw" - PreprocessorDefinitions="WIN64;NDEBUG;_CRT_SECURE_NO_WARNINGS;_GLFW_WIN32;_GLFW_WGL;_GLFW_USE_OPENGL" + AdditionalIncludeDirectories=""C:\Documents and Settings\admin\src\mupdf\thirdparty\freeglut\include"" + PreprocessorDefinitions="FREEGLUT_LIB_PRAGMAS=0;FREEGLUT_STATIC;HAVE_U__INT64;NEED_XPARSEGEOMETRY_IMPL;_CRT_SECURE_NO_WARNINGS" RuntimeLibrary="0" UsePrecompiledHeader="0" WarningLevel="3" @@ -401,14 +401,62 @@ </References> <Files> <Filter - Name="include" + Name="mswin" > <File - RelativePath="..\..\thirdparty\glfw\include\GLFW\glfw3.h" + RelativePath="..\..\thirdparty\freeglut\src\mswin\fg_cursor_mswin.c" > </File> <File - RelativePath="..\..\thirdparty\glfw\include\GLFW\glfw3native.h" + RelativePath="..\..\thirdparty\freeglut\src\mswin\fg_display_mswin.c" + > + </File> + <File + RelativePath="..\..\thirdparty\freeglut\src\mswin\fg_ext_mswin.c" + > + </File> + <File + RelativePath="..\..\thirdparty\freeglut\src\mswin\fg_gamemode_mswin.c" + > + </File> + <File + RelativePath="..\..\thirdparty\freeglut\src\mswin\fg_init_mswin.c" + > + </File> + <File + RelativePath="..\..\thirdparty\freeglut\src\mswin\fg_input_devices_mswin.c" + > + </File> + <File + RelativePath="..\..\thirdparty\freeglut\src\mswin\fg_internal_mswin.h" + > + </File> + <File + RelativePath="..\..\thirdparty\freeglut\src\mswin\fg_joystick_mswin.c" + > + </File> + <File + RelativePath="..\..\thirdparty\freeglut\src\mswin\fg_main_mswin.c" + > + </File> + <File + RelativePath="..\..\thirdparty\freeglut\src\mswin\fg_menu_mswin.c" + > + </File> + <File + RelativePath="..\..\thirdparty\freeglut\src\mswin\fg_spaceball_mswin.c" + > + </File> + <File + RelativePath="..\..\thirdparty\freeglut\src\mswin\fg_state_mswin.c" + > + </File> + <File + RelativePath="..\..\thirdparty\freeglut\src\mswin\fg_structure_mswin.c" + > + </File> + <File + RelativePath="..\..\thirdparty\freeglut\src\mswin\fg_window_mswin.c" > </File> </Filter> @@ -416,83 +464,131 @@ Name="src" > <File - RelativePath="..\..\thirdparty\glfw\src\context.c" + RelativePath="..\..\thirdparty\freeglut\src\fg_callbacks.c" > </File> <File - RelativePath="..\..\thirdparty\glfw\src\egl_context.c" + RelativePath="..\..\thirdparty\freeglut\src\fg_cursor.c" > </File> <File - RelativePath="..\..\thirdparty\glfw\src\egl_context.h" + RelativePath="..\..\thirdparty\freeglut\src\fg_display.c" > </File> <File - RelativePath="..\..\thirdparty\glfw\src\init.c" + RelativePath="..\..\thirdparty\freeglut\src\fg_ext.c" > </File> <File - RelativePath="..\..\thirdparty\glfw\src\input.c" + RelativePath="..\..\thirdparty\freeglut\src\fg_font.c" > </File> <File - RelativePath="..\..\thirdparty\glfw\src\internal.h" + RelativePath="..\..\thirdparty\freeglut\src\fg_font_data.c" > </File> <File - RelativePath="..\..\thirdparty\glfw\src\monitor.c" + RelativePath="..\..\thirdparty\freeglut\src\fg_gamemode.c" > </File> <File - RelativePath="..\..\thirdparty\glfw\src\vulkan.c" + RelativePath="..\..\thirdparty\freeglut\src\fg_geometry.c" > </File> <File - RelativePath="..\..\thirdparty\glfw\src\wgl_context.c" + RelativePath="..\..\thirdparty\freeglut\src\fg_gl2.c" > </File> <File - RelativePath="..\..\thirdparty\glfw\src\wgl_context.h" + RelativePath="..\..\thirdparty\freeglut\src\fg_gl2.h" > </File> <File - RelativePath="..\..\thirdparty\glfw\src\win32_init.c" + RelativePath="..\..\thirdparty\freeglut\src\fg_init.c" > </File> <File - RelativePath="..\..\thirdparty\glfw\src\win32_joystick.c" + RelativePath="..\..\thirdparty\freeglut\src\fg_init.h" > </File> <File - RelativePath="..\..\thirdparty\glfw\src\win32_joystick.h" + RelativePath="..\..\thirdparty\freeglut\src\fg_input_devices.c" > </File> <File - RelativePath="..\..\thirdparty\glfw\src\win32_monitor.c" + RelativePath="..\..\thirdparty\freeglut\src\fg_internal.h" > </File> <File - RelativePath="..\..\thirdparty\glfw\src\win32_platform.h" + RelativePath="..\..\thirdparty\freeglut\src\fg_joystick.c" > </File> <File - RelativePath="..\..\thirdparty\glfw\src\win32_time.c" + RelativePath="..\..\thirdparty\freeglut\src\fg_main.c" > </File> <File - RelativePath="..\..\thirdparty\glfw\src\win32_tls.c" + RelativePath="..\..\thirdparty\freeglut\src\fg_menu.c" > </File> <File - RelativePath="..\..\thirdparty\glfw\src\win32_tls.h" + RelativePath="..\..\thirdparty\freeglut\src\fg_misc.c" > </File> <File - RelativePath="..\..\thirdparty\glfw\src\win32_window.c" + RelativePath="..\..\thirdparty\freeglut\src\fg_overlay.c" + > + </File> + <File + RelativePath="..\..\thirdparty\freeglut\src\fg_spaceball.c" + > + </File> + <File + RelativePath="..\..\thirdparty\freeglut\src\fg_state.c" + > + </File> + <File + RelativePath="..\..\thirdparty\freeglut\src\fg_stroke_mono_roman.c" + > + </File> + <File + RelativePath="..\..\thirdparty\freeglut\src\fg_stroke_roman.c" + > + </File> + <File + RelativePath="..\..\thirdparty\freeglut\src\fg_structure.c" + > + </File> + <File + RelativePath="..\..\thirdparty\freeglut\src\fg_teapot.c" + > + </File> + <File + RelativePath="..\..\thirdparty\freeglut\src\fg_teapot_data.h" + > + </File> + <File + RelativePath="..\..\thirdparty\freeglut\src\fg_version.h" + > + </File> + <File + RelativePath="..\..\thirdparty\freeglut\src\fg_videoresize.c" + > + </File> + <File + RelativePath="..\..\thirdparty\freeglut\src\fg_window.c" + > + </File> + </Filter> + <Filter + Name="util" + > + <File + RelativePath="..\..\thirdparty\freeglut\src\util\xparsegeometry_repl.c" > </File> <File - RelativePath="..\..\thirdparty\glfw\src\window.c" + RelativePath="..\..\thirdparty\freeglut\src\util\xparsegeometry_repl.h" > </File> </Filter> diff --git a/platform/win32/mupdf-gl.vcproj b/platform/win32/mupdf-gl.vcproj index 8d25a8e8..f374aa4a 100644 --- a/platform/win32/mupdf-gl.vcproj +++ b/platform/win32/mupdf-gl.vcproj @@ -43,8 +43,8 @@ <Tool Name="VCCLCompilerTool" Optimization="0" - AdditionalIncludeDirectories="..\..\include;..\..\thirdparty\glfw\include;..\..\scripts\freetype;..\..\thirdparty\freetype\include" - PreprocessorDefinitions="WIN32;_DEBUG" + AdditionalIncludeDirectories="..\..\include;..\..\thirdparty\freeglut\include;..\..\scripts\freetype;..\..\thirdparty\freetype\include" + PreprocessorDefinitions="FREEGLUT_LIB_PRAGMAS=0;FREEGLUT_STATIC;WIN32;_DEBUG" MinimalRebuild="true" BasicRuntimeChecks="3" RuntimeLibrary="1" @@ -64,7 +64,7 @@ /> <Tool Name="VCLinkerTool" - AdditionalOptions="opengl32.lib" + AdditionalOptions="opengl32.lib winmm.lib" LinkIncremental="0" GenerateDebugInformation="true" SubSystem="2" @@ -121,7 +121,7 @@ <Tool Name="VCCLCompilerTool" Optimization="0" - AdditionalIncludeDirectories="..\..\include;..\..\thirdparty\glfw\include;..\..\scripts\freetype;..\..\thirdparty\freetype\include" + AdditionalIncludeDirectories="..\..\include;..\..\thirdparty\freeglut\include;..\..\scripts\freetype;..\..\thirdparty\freetype\include" PreprocessorDefinitions="WIN64;_DEBUG" MinimalRebuild="true" BasicRuntimeChecks="3" @@ -142,7 +142,7 @@ /> <Tool Name="VCLinkerTool" - AdditionalOptions="opengl32.lib" + AdditionalOptions="opengl32.lib winmm.lib" LinkIncremental="0" GenerateDebugInformation="true" SubSystem="2" @@ -198,8 +198,8 @@ <Tool Name="VCCLCompilerTool" Optimization="0" - AdditionalIncludeDirectories="..\..\include;..\..\thirdparty\glfw\include;..\..\scripts\freetype;..\..\thirdparty\freetype\include" - PreprocessorDefinitions="WIN32;_DEBUG;MEMENTO" + AdditionalIncludeDirectories="..\..\include;..\..\thirdparty\freeglut\include;..\..\scripts\freetype;..\..\thirdparty\freetype\include" + PreprocessorDefinitions="FREEGLUT_LIB_PRAGMAS=0;FREEGLUT_STATIC;WIN32;_DEBUG;MEMENTO" MinimalRebuild="true" BasicRuntimeChecks="3" RuntimeLibrary="1" @@ -219,7 +219,7 @@ /> <Tool Name="VCLinkerTool" - AdditionalOptions="opengl32.lib" + AdditionalOptions="opengl32.lib winmm.lib" LinkIncremental="0" GenerateDebugInformation="true" SubSystem="2" @@ -273,7 +273,7 @@ /> <Tool Name="VCCLCompilerTool" - AdditionalIncludeDirectories="..\..\include;..\..\thirdparty\glfw\include;..\..\scripts\freetype;..\..\thirdparty\freetype\include" + AdditionalIncludeDirectories="..\..\include;..\..\thirdparty\freeglut\include;..\..\scripts\freetype;..\..\thirdparty\freetype\include" PreprocessorDefinitions="WIN64;_DEBUG;MEMENTO=1" RuntimeLibrary="1" /> @@ -288,6 +288,7 @@ /> <Tool Name="VCLinkerTool" + AdditionalOptions="opengl32.lib winmm.lib" /> <Tool Name="VCALinkTool" @@ -339,8 +340,8 @@ /> <Tool Name="VCCLCompilerTool" - AdditionalIncludeDirectories="..\..\include;..\..\thirdparty\glfw\include;..\..\scripts\freetype;..\..\thirdparty\freetype\include" - PreprocessorDefinitions="WIN32;NDEBUG" + AdditionalIncludeDirectories="..\..\include;..\..\thirdparty\freeglut\include;..\..\scripts\freetype;..\..\thirdparty\freetype\include" + PreprocessorDefinitions="FREEGLUT_LIB_PRAGMAS=0;FREEGLUT_STATIC;WIN32;NDEBUG" RuntimeLibrary="0" EnableFunctionLevelLinking="true" UsePrecompiledHeader="0" @@ -359,7 +360,7 @@ /> <Tool Name="VCLinkerTool" - AdditionalOptions="opengl32.lib" + AdditionalOptions="opengl32.lib winmm.lib" LinkIncremental="0" GenerateDebugInformation="true" SubSystem="2" @@ -418,7 +419,7 @@ /> <Tool Name="VCCLCompilerTool" - AdditionalIncludeDirectories="..\..\include;..\..\thirdparty\glfw\include;..\..\scripts\freetype;..\..\thirdparty\freetype\include" + AdditionalIncludeDirectories="..\..\include;..\..\thirdparty\freeglut\include;..\..\scripts\freetype;..\..\thirdparty\freetype\include" PreprocessorDefinitions="WIN64;NDEBUG" RuntimeLibrary="0" UsePrecompiledHeader="0" @@ -437,7 +438,7 @@ /> <Tool Name="VCLinkerTool" - AdditionalOptions="opengl32.lib" + AdditionalOptions="opengl32.lib winmm.lib" LinkIncremental="0" GenerateDebugInformation="true" SubSystem="2" @@ -495,8 +496,8 @@ <Tool Name="VCCLCompilerTool" Optimization="0" - AdditionalIncludeDirectories="..\..\include;..\..\thirdparty\glfw\include;..\..\scripts\freetype;..\..\thirdparty\freetype\include" - PreprocessorDefinitions="WIN32;_DEBUG;MEMENTO" + AdditionalIncludeDirectories="..\..\include;..\..\thirdparty\freeglut\include;..\..\scripts\freetype;..\..\thirdparty\freetype\include" + PreprocessorDefinitions="FREEGLUT_LIB_PRAGMAS=0;FREEGLUT_STATIC;WIN32;_DEBUG;MEMENTO" MinimalRebuild="true" BasicRuntimeChecks="3" RuntimeLibrary="1" @@ -516,7 +517,7 @@ /> <Tool Name="VCLinkerTool" - AdditionalOptions="opengl32.lib" + AdditionalOptions="opengl32.lib winmm.lib" LinkIncremental="0" GenerateDebugInformation="true" SubSystem="2" @@ -571,7 +572,7 @@ /> <Tool Name="VCCLCompilerTool" - AdditionalIncludeDirectories="..\..\include;..\..\thirdparty\glfw\include;..\..\scripts\freetype;..\..\thirdparty\freetype\include" + AdditionalIncludeDirectories="..\..\include;..\..\thirdparty\freeglut\include;..\..\scripts\freetype;..\..\thirdparty\freetype\include" PreprocessorDefinitions="WIN64;_DEBUG;MEMENTO" RuntimeLibrary="1" /> @@ -586,6 +587,7 @@ /> <Tool Name="VCLinkerTool" + AdditionalOptions="opengl32.lib winmm.lib" TargetMachine="17" /> <Tool @@ -638,8 +640,8 @@ <Tool Name="VCCLCompilerTool" Optimization="0" - AdditionalIncludeDirectories="..\..\include;..\..\thirdparty\glfw\include;..\..\scripts\freetype;..\..\thirdparty\freetype\include" - PreprocessorDefinitions="WIN32;_DEBUG" + AdditionalIncludeDirectories="..\..\include;..\..\thirdparty\freeglut\include;..\..\scripts\freetype;..\..\thirdparty\freetype\include" + PreprocessorDefinitions="FREEGLUT_LIB_PRAGMAS=0;FREEGLUT_STATIC;WIN32;_DEBUG" MinimalRebuild="true" BasicRuntimeChecks="3" RuntimeLibrary="1" @@ -659,7 +661,7 @@ /> <Tool Name="VCLinkerTool" - AdditionalOptions="opengl32.lib" + AdditionalOptions="opengl32.lib winmm.lib" LinkIncremental="0" GenerateDebugInformation="true" SubSystem="2" @@ -716,7 +718,7 @@ <Tool Name="VCCLCompilerTool" Optimization="0" - AdditionalIncludeDirectories="..\..\include;..\..\thirdparty\glfw\include;..\..\scripts\freetype;..\..\thirdparty\freetype\include" + AdditionalIncludeDirectories="..\..\include;..\..\thirdparty\freeglut\include;..\..\scripts\freetype;..\..\thirdparty\freetype\include" PreprocessorDefinitions="WIN64;_DEBUG" MinimalRebuild="true" BasicRuntimeChecks="3" @@ -737,7 +739,7 @@ /> <Tool Name="VCLinkerTool" - AdditionalOptions="opengl32.lib" + AdditionalOptions="opengl32.lib winmm.lib" LinkIncremental="0" GenerateDebugInformation="true" SubSystem="2" @@ -793,8 +795,8 @@ /> <Tool Name="VCCLCompilerTool" - AdditionalIncludeDirectories="..\..\include;..\..\thirdparty\glfw\include;..\..\scripts\freetype;..\..\thirdparty\freetype\include" - PreprocessorDefinitions="WIN32;NDEBUG" + AdditionalIncludeDirectories="..\..\include;..\..\thirdparty\freeglut\include;..\..\scripts\freetype;..\..\thirdparty\freetype\include" + PreprocessorDefinitions="FREEGLUT_LIB_PRAGMAS=0;FREEGLUT_STATIC;WIN32;NDEBUG" RuntimeLibrary="0" EnableFunctionLevelLinking="true" UsePrecompiledHeader="0" @@ -813,7 +815,7 @@ /> <Tool Name="VCLinkerTool" - AdditionalOptions="opengl32.lib" + AdditionalOptions="opengl32.lib winmm.lib" LinkIncremental="0" GenerateDebugInformation="true" SubSystem="2" @@ -872,7 +874,7 @@ /> <Tool Name="VCCLCompilerTool" - AdditionalIncludeDirectories="..\..\include;..\..\thirdparty\glfw\include;..\..\scripts\freetype;..\..\thirdparty\freetype\include" + AdditionalIncludeDirectories="..\..\include;..\..\thirdparty\freeglut\include;..\..\scripts\freetype;..\..\thirdparty\freetype\include" PreprocessorDefinitions="WIN64;NDEBUG" RuntimeLibrary="0" UsePrecompiledHeader="0" @@ -891,7 +893,7 @@ /> <Tool Name="VCLinkerTool" - AdditionalOptions="opengl32.lib" + AdditionalOptions="opengl32.lib winmm.lib" LinkIncremental="0" GenerateDebugInformation="true" SubSystem="2" diff --git a/platform/win32/mupdf.sln b/platform/win32/mupdf.sln index 91bc3705..95ba2c1b 100644 --- a/platform/win32/mupdf.sln +++ b/platform/win32/mupdf.sln @@ -41,7 +41,7 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mujstest", "mujstest.vcproj {5F615F91-DFF8-4F05-BF48-6222B7D86519} = {5F615F91-DFF8-4F05-BF48-6222B7D86519} EndProjectSection EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libglfw", "libglfw.vcproj", "{A1B75D29-9F5C-4A0F-B368-322A10477D0C}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libfreeglut", "libfreeglut.vcproj", "{A1B75D29-9F5C-4A0F-B368-322A10477D0C}" EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mupdf-gl", "mupdf-gl.vcproj", "{CE3A76A8-A28F-4991-8FB9-C9453D922037}" ProjectSection(ProjectDependencies) = postProject |