summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRobin Watts <robin.watts@artifex.com>2016-07-08 17:18:59 +0100
committerRobin Watts <robin.watts@artifex.com>2016-07-08 17:19:56 +0100
commitd08fbf57aa74e3947f198c03aaefd5356425cda3 (patch)
tree4de8f2f99edeb03df7c6b78c4f70ae572838266e
parente44262b27b5692c226ec3bfa24a3dd66333490c3 (diff)
downloadmupdf-d08fbf57aa74e3947f198c03aaefd5356425cda3.tar.xz
Fix Windows builds.
generated.sh was broken (wrong font path). load_pnm.c had been omitted from VS projects.
-rw-r--r--platform/win32/generate.bat8
-rw-r--r--platform/win32/libmupdf.vcproj4
2 files changed, 8 insertions, 4 deletions
diff --git a/platform/win32/generate.bat b/platform/win32/generate.bat
index 6e073d3c..831889ac 100644
--- a/platform/win32/generate.bat
+++ b/platform/win32/generate.bat
@@ -52,10 +52,10 @@ if not exist generated/CharisSIL-I.c fontdump.exe generated/CharisSIL-I.c resour
if not exist generated/CharisSIL-B.c fontdump.exe generated/CharisSIL-B.c resources/fonts/sil/CharisSIL-B.cff
if not exist generated/CharisSIL-BI.c fontdump.exe generated/CharisSIL-BI.c resources/fonts/sil/CharisSIL-BI.cff
-if not exist generated/SourceHanSansCN-Regular.c fontdump.exe generated/SourceHanSansCN-Regular.c resources/fonts/sil/SourceHanSansCN-Regular.otf
-if not exist generated/SourceHanSansJP-Regular.c fontdump.exe generated/SourceHanSansJP-Regular.c resources/fonts/sil/SourceHanSansJP-Regular.otf
-if not exist generated/SourceHanSansKR-Regular.c fontdump.exe generated/SourceHanSansKR-Regular.c resources/fonts/sil/SourceHanSansKR-Regular.otf
-if not exist generated/SourceHanSansTW-Regular.c fontdump.exe generated/SourceHanSansTW-Regular.c resources/fonts/sil/SourceHanSansTW-Regular.otf
+if not exist generated/SourceHanSansCN-Regular.c fontdump.exe generated/SourceHanSansCN-Regular.c resources/fonts/han/SourceHanSansCN-Regular.otf
+if not exist generated/SourceHanSansJP-Regular.c fontdump.exe generated/SourceHanSansJP-Regular.c resources/fonts/han/SourceHanSansJP-Regular.otf
+if not exist generated/SourceHanSansKR-Regular.c fontdump.exe generated/SourceHanSansKR-Regular.c resources/fonts/han/SourceHanSansKR-Regular.otf
+if not exist generated/SourceHanSansTW-Regular.c fontdump.exe generated/SourceHanSansTW-Regular.c resources/fonts/han/SourceHanSansTW-Regular.otf
if not exist generated/NotoEmoji-Regular.c fontdump.exe generated/NotoEmoji-Regular.c resources/fonts/noto/NotoEmoji-Regular.ttf
if not exist generated/NotoKufiArabic-Regular.c fontdump.exe generated/NotoKufiArabic-Regular.c resources/fonts/noto/NotoKufiArabic-Regular.ttf
diff --git a/platform/win32/libmupdf.vcproj b/platform/win32/libmupdf.vcproj
index 5a5367fd..65b90db8 100644
--- a/platform/win32/libmupdf.vcproj
+++ b/platform/win32/libmupdf.vcproj
@@ -1092,6 +1092,10 @@
>
</File>
<File
+ RelativePath="..\..\source\fitz\load-pnm.c"
+ >
+ </File>
+ <File
RelativePath="..\..\source\fitz\load-tiff.c"
>
</File>