summaryrefslogtreecommitdiff
path: root/platform/win32/mupdf-gl.vcproj
diff options
context:
space:
mode:
authorTor Andersson <tor.andersson@artifex.com>2017-09-26 23:45:31 +0200
committerTor Andersson <tor.andersson@artifex.com>2017-11-08 17:57:09 +0100
commit896830e23e8f94b17bdf386c191a885c972ea8a8 (patch)
tree061feda4707c8cc989df39e2440550a6ca1a2f7d /platform/win32/mupdf-gl.vcproj
parent94a5846502cd1f05ec4127872ef06dcd8606f34b (diff)
downloadmupdf-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/mupdf-gl.vcproj')
-rw-r--r--platform/win32/mupdf-gl.vcproj58
1 files changed, 30 insertions, 28 deletions
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"