summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTor Andersson <tor.andersson@artifex.com>2017-11-13 17:18:52 +0100
committerTor Andersson <tor.andersson@artifex.com>2017-11-17 13:11:42 +0100
commita3979090efc4463e033b701089afa42312df7f6e (patch)
tree22fd78736ad9a68b86827ef19f9a9d740c36d8d9
parentfc452c7a082905f3c45b22b2455b4322d26bbaec (diff)
downloadmupdf-a3979090efc4463e033b701089afa42312df7f6e.tar.xz
Purge remnants of GLFW.
-rw-r--r--docs/building.html8
-rw-r--r--docs/thirdparty.html2
-rw-r--r--platform/gl/gl-winres.rc2
-rw-r--r--platform/win32/libfreeglut.vcproj2
4 files changed, 7 insertions, 7 deletions
diff --git a/docs/building.html b/docs/building.html
index 8970e542..3d0edeba 100644
--- a/docs/building.html
+++ b/docs/building.html
@@ -83,10 +83,10 @@ only want the command line tools, you can build with HAVE_X11=no.
<p>
The new OpenGL-based viewer also needs OpenGL headers and libraries. If you're
-building on Linux, install the mesa-common-dev and libgl1-mesa-dev packages.
-You'll also need several X11 development packages: xorg-dev, libxcursor-dev,
-libxrandr-dev, and libxinerama-dev. To skip building the OpenGL viewer, build
-with HAVE_GLUT=no.
+building on Linux, install the mesa-common-dev, libgl1-mesa-dev packages, and
+libglu1-mesa-dev packages. You'll also need several X11 development packages:
+xorg-dev, libxcursor-dev, libxrandr-dev, and libxinerama-dev. To skip building
+the OpenGL viewer, build with HAVE_GLUT=no.
<p>
To install the viewer, command line tools, libraries, and header files on your system:
diff --git a/docs/thirdparty.html b/docs/thirdparty.html
index 2e6d8c70..a7f55376 100644
--- a/docs/thirdparty.html
+++ b/docs/thirdparty.html
@@ -37,7 +37,7 @@ These are the third party libraries used by MuPDF.
<tr><td><a href="http://www.zlib.net/">zlib</a><td>1.2.7<td>Deflate compression <td>zlib License
<tr><td><i>Optional:</i>
-<tr><td><a href="http://www.glfw.org/">glfw</a><td>3.2.1 with patches <td>OpenGL API for UI<td>BSD-style
+<tr><td><a href="http://freeglut.sourceforge.net/">FreeGLUT</a><td>3.0.0 with patches <td>OpenGL API for UI<td>MIT-style
<tr><td><a href="http://curl.haxx.se/">curl</a><td>7.51.0 with patches <td>HTTP data transfer <td>MIT-style
<tr><td><a href="http://www.luratech.com/">Luratech JP2</a><td>N/A<td>JPEG 2000 decoding <td>commercial
<tr><td><a href="http://www.luratech.com/">Luratech JBIG2</a><td>N/A<td>JBIG2 decoding <td>commercial
diff --git a/platform/gl/gl-winres.rc b/platform/gl/gl-winres.rc
index 081cff94..eccf1215 100644
--- a/platform/gl/gl-winres.rc
+++ b/platform/gl/gl-winres.rc
@@ -1,2 +1,2 @@
IDI_ICONAPP ICON "mupdf.ico"
-GLFW_ICON ICON "mupdf.ico"
+GLUT_ICON ICON "mupdf.ico"
diff --git a/platform/win32/libfreeglut.vcproj b/platform/win32/libfreeglut.vcproj
index dceea565..2f45dc29 100644
--- a/platform/win32/libfreeglut.vcproj
+++ b/platform/win32/libfreeglut.vcproj
@@ -4,7 +4,7 @@
Version="8.00"
Name="libfreeglut"
ProjectGUID="{A1B75D29-9F5C-4A0F-B368-322A10477D0C}"
- RootNamespace="libglfw"
+ RootNamespace="libfreeglut"
Keyword="Win32Proj"
>
<Platforms>