summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTor Andersson <tor.andersson@artifex.com>2018-09-20 13:17:08 +0200
committerTor Andersson <tor.andersson@artifex.com>2018-09-21 14:20:08 +0200
commit60103f2af83eb04c1e74b32fa9d29c74bf01c118 (patch)
tree92770b673bd82c35018cd31cb1db155c0d7c52c6
parent14f0dd1c64500c1cf12dcb47d14620afa3416d9f (diff)
downloadmupdf-60103f2af83eb04c1e74b32fa9d29c74bf01c118.tar.xz
Don't build freetype source files twice.
Don't bother compiling the freetype C files that are #included by ftbase.c This fixes a harmless "repeated symbol" warning in the windows build.
-rw-r--r--Makethird2
-rw-r--r--platform/win32/libthirdparty.vcproj4
2 files changed, 0 insertions, 6 deletions
diff --git a/Makethird b/Makethird
index 76151f71..bf570880 100644
--- a/Makethird
+++ b/Makethird
@@ -32,11 +32,9 @@ THIRD_SRC += thirdparty/freetype/src/base/ftbase.c
THIRD_SRC += thirdparty/freetype/src/base/ftbbox.c
THIRD_SRC += thirdparty/freetype/src/base/ftbitmap.c
THIRD_SRC += thirdparty/freetype/src/base/ftdebug.c
-THIRD_SRC += thirdparty/freetype/src/base/ftfntfmt.c
THIRD_SRC += thirdparty/freetype/src/base/ftgasp.c
THIRD_SRC += thirdparty/freetype/src/base/ftglyph.c
THIRD_SRC += thirdparty/freetype/src/base/ftinit.c
-THIRD_SRC += thirdparty/freetype/src/base/ftlcdfil.c
THIRD_SRC += thirdparty/freetype/src/base/ftstroke.c
THIRD_SRC += thirdparty/freetype/src/base/ftsynth.c
THIRD_SRC += thirdparty/freetype/src/base/ftsystem.c
diff --git a/platform/win32/libthirdparty.vcproj b/platform/win32/libthirdparty.vcproj
index fb3468ac..d7737624 100644
--- a/platform/win32/libthirdparty.vcproj
+++ b/platform/win32/libthirdparty.vcproj
@@ -1131,10 +1131,6 @@
>
</File>
<File
- RelativePath="..\..\thirdparty\freetype\src\base\ftfntfmt.c"
- >
- </File>
- <File
RelativePath="..\..\thirdparty\freetype\src\base\ftgasp.c"
>
</File>