summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPaul Gardiner <paulg.artifex@glidos.net>2013-06-19 11:25:48 +0100
committerRobin Watts <robin.watts@artifex.com>2013-06-19 11:45:39 +0100
commitfe0be86de83b44ace49ceb540fc7f9e4db8253fb (patch)
tree4b27aba68ce4ad245486e5e5f2197cc4cab90c62
parented1e4ec424ccc18670960c85224ec485e85ce7e0 (diff)
downloadmupdf-fe0be86de83b44ace49ceb540fc7f9e4db8253fb.tar.xz
Fix win32, with-openssl build
Also correct a comment
-rw-r--r--pdf/pdf_annot.c2
-rw-r--r--win32/mujstest-v8.vcproj2
-rw-r--r--win32/mupdf-v8.vcproj2
-rw-r--r--win32/mupdf.vcproj2
4 files changed, 4 insertions, 4 deletions
diff --git a/pdf/pdf_annot.c b/pdf/pdf_annot.c
index 4ed14abf..208d93e7 100644
--- a/pdf/pdf_annot.c
+++ b/pdf/pdf_annot.c
@@ -701,7 +701,7 @@ pdf_create_annot(pdf_document *doc, pdf_page *page, fz_annot_type type)
pdf_array_push(annot_arr, ind_obj);
/*
- Linking must be done before any call that might throw because
+ Linking must be done after any call that might throw because
pdf_free_annot below actually frees a list
*/
annot->next = page->annots;
diff --git a/win32/mujstest-v8.vcproj b/win32/mujstest-v8.vcproj
index db8b5ec3..1b37bb12 100644
--- a/win32/mujstest-v8.vcproj
+++ b/win32/mujstest-v8.vcproj
@@ -403,7 +403,7 @@
>
<Tool
Name="VCCLCompilerTool"
- AdditionalIncludeDirectories="..\thirdparty\openssl\include"
+ AdditionalIncludeDirectories="..\thirdparty\openssl\include;..\generated"
/>
</FileConfiguration>
<FileConfiguration
diff --git a/win32/mupdf-v8.vcproj b/win32/mupdf-v8.vcproj
index 37ec5ccf..c66c2d99 100644
--- a/win32/mupdf-v8.vcproj
+++ b/win32/mupdf-v8.vcproj
@@ -403,7 +403,7 @@
>
<Tool
Name="VCCLCompilerTool"
- AdditionalIncludeDirectories="..\thirdparty\openssl\include"
+ AdditionalIncludeDirectories="..\thirdparty\openssl\include;..\generated"
/>
</FileConfiguration>
<FileConfiguration
diff --git a/win32/mupdf.vcproj b/win32/mupdf.vcproj
index 8350e7eb..eca2df73 100644
--- a/win32/mupdf.vcproj
+++ b/win32/mupdf.vcproj
@@ -395,7 +395,7 @@
>
<Tool
Name="VCCLCompilerTool"
- AdditionalIncludeDirectories="..\thirdparty\openssl\include"
+ AdditionalIncludeDirectories="..\thirdparty\openssl\include;..\generated"
/>
</FileConfiguration>
<FileConfiguration