Tweak optimization flags in MSVC projects.

5 files changed, 61 insertions, 59 deletions

diff --git a/win32/jbig2dec/jbig2dec.vcproj b/win32/jbig2dec/jbig2dec.vcproj
index a5cdac0e..cbc2fbbc 100644
--- a/win32/jbig2dec/jbig2dec.vcproj
+++ b/win32/jbig2dec/jbig2dec.vcproj
@@ -101,6 +101,11 @@
 			/>

 			<Tool

 				Name="VCCLCompilerTool"

+				Optimization="2"

+				InlineFunctionExpansion="2"

+				EnableIntrinsicFunctions="true"

+				FavorSizeOrSpeed="1"

+				OmitFramePointers="true"

 				PreprocessorDefinitions="WIN32;NDEBUG;_LIB;_CRT_SECURE_NO_WARNINGS"

 				RuntimeLibrary="2"

 				UsePrecompiledHeader="0"

@@ -143,14 +148,6 @@
 			Name="jbig2dec"

 			>

 			<File

-				RelativePath="..\..\thirdparty\jbig2dec\config.h"

-				>

-			</File>

-			<File

-				RelativePath="..\..\thirdparty\jbig2dec\config_types.h"

-				>

-			</File>

-			<File

 				RelativePath="..\..\thirdparty\jbig2dec\config_win32.h"

 				>

 			</File>

@@ -271,21 +268,9 @@
 				>

 			</File>

 			<File

-				RelativePath="..\..\thirdparty\jbig2dec\memcmp.c"

-				>

-			</File>

-			<File

 				RelativePath="..\..\thirdparty\jbig2dec\os_types.h"

 				>

 			</File>

-			<File

-				RelativePath="..\..\thirdparty\jbig2dec\sha1.c"

-				>

-			</File>

-			<File

-				RelativePath="..\..\thirdparty\jbig2dec\sha1.h"

-				>

-			</File>

 		</Filter>

 	</Files>

 	<Globals>

diff --git a/win32/jpeg/jpeg.vcproj b/win32/jpeg/jpeg.vcproj
index c070fec5..633e81ee 100644
--- a/win32/jpeg/jpeg.vcproj
+++ b/win32/jpeg/jpeg.vcproj
@@ -105,6 +105,11 @@
 			/>

 			<Tool

 				Name="VCCLCompilerTool"

+				Optimization="2"

+				InlineFunctionExpansion="2"

+				EnableIntrinsicFunctions="true"

+				FavorSizeOrSpeed="1"

+				OmitFramePointers="true"

 				PreprocessorDefinitions="WIN32;NDEBUG;_LIB;_CRT_SECURE_NO_WARNINGS"

 				RuntimeLibrary="2"

 				UsePrecompiledHeader="0"

diff --git a/win32/libopenjpeg/libopenjpeg.vcproj b/win32/libopenjpeg/libopenjpeg.vcproj
index a3db8c21..f9f46e69 100644
--- a/win32/libopenjpeg/libopenjpeg.vcproj
+++ b/win32/libopenjpeg/libopenjpeg.vcproj
@@ -42,6 +42,9 @@
 				Optimization="2"

 				InlineFunctionExpansion="2"

 				EnableIntrinsicFunctions="true"

+				FavorSizeOrSpeed="1"

+				OmitFramePointers="true"

+				WholeProgramOptimization="true"

 				PreprocessorDefinitions="WIN32;NDEBUG;_LIB;OPJ_STATIC;_CRT_SECURE_NO_DEPRECATE"

 				StringPooling="true"

 				RuntimeLibrary="2"

@@ -153,159 +156,159 @@
 				>

 			</File>

 			<File

-				RelativePath="../../thirdparty/openjpeg/libopenjpeg\cio.c"

+				RelativePath="../../thirdparty/openjpeg/libopenjpeg\bio.h"

 				>

 			</File>

 			<File

-				RelativePath="../../thirdparty/openjpeg/libopenjpeg\dwt.c"

+				RelativePath="../../thirdparty/openjpeg/libopenjpeg\cio.c"

 				>

 			</File>

 			<File

-				RelativePath="../../thirdparty/openjpeg/libopenjpeg\event.c"

+				RelativePath="../../thirdparty/openjpeg/libopenjpeg\cio.h"

 				>

 			</File>

 			<File

-				RelativePath="../../thirdparty/openjpeg/libopenjpeg\image.c"

+				RelativePath="../../thirdparty/openjpeg/libopenjpeg\dwt.c"

 				>

 			</File>

 			<File

-				RelativePath="../../thirdparty/openjpeg/libopenjpeg\j2k.c"

+				RelativePath="../../thirdparty/openjpeg/libopenjpeg\dwt.h"

 				>

 			</File>

 			<File

-				RelativePath="../../thirdparty/openjpeg/libopenjpeg\j2k_lib.c"

+				RelativePath="../../thirdparty/openjpeg/libopenjpeg\event.c"

 				>

 			</File>

 			<File

-				RelativePath="../../thirdparty/openjpeg/libopenjpeg\jp2.c"

+				RelativePath="../../thirdparty/openjpeg/libopenjpeg\event.h"

 				>

 			</File>

 			<File

-				RelativePath="../../thirdparty/openjpeg/libopenjpeg\jpt.c"

+				RelativePath="../../thirdparty/openjpeg/libopenjpeg\fix.h"

 				>

 			</File>

 			<File

-				RelativePath="../../thirdparty/openjpeg/libopenjpeg\mct.c"

+				RelativePath="../../thirdparty/openjpeg/libopenjpeg\image.c"

 				>

 			</File>

 			<File

-				RelativePath="../../thirdparty/openjpeg/libopenjpeg\mqc.c"

+				RelativePath="../../thirdparty/openjpeg/libopenjpeg\image.h"

 				>

 			</File>

 			<File

-				RelativePath="../../thirdparty/openjpeg/libopenjpeg\openjpeg.c"

+				RelativePath="../../thirdparty/openjpeg/libopenjpeg\int.h"

 				>

 			</File>

 			<File

-				RelativePath="../../thirdparty/openjpeg/libopenjpeg\pi.c"

+				RelativePath="../../thirdparty/openjpeg/libopenjpeg\j2k.c"

 				>

 			</File>

 			<File

-				RelativePath="../../thirdparty/openjpeg/libopenjpeg\raw.c"

+				RelativePath="../../thirdparty/openjpeg/libopenjpeg\j2k.h"

 				>

 			</File>

 			<File

-				RelativePath="../../thirdparty/openjpeg/libopenjpeg\t1.c"

+				RelativePath="../../thirdparty/openjpeg/libopenjpeg\j2k_lib.c"

 				>

 			</File>

 			<File

-				RelativePath="../../thirdparty/openjpeg/libopenjpeg\t2.c"

+				RelativePath="../../thirdparty/openjpeg/libopenjpeg\j2k_lib.h"

 				>

 			</File>

 			<File

-				RelativePath="../../thirdparty/openjpeg/libopenjpeg\tcd.c"

+				RelativePath="../../thirdparty/openjpeg/libopenjpeg\jp2.c"

 				>

 			</File>

 			<File

-				RelativePath="../../thirdparty/openjpeg/libopenjpeg\tgt.c"

+				RelativePath="../../thirdparty/openjpeg/libopenjpeg\jp2.h"

 				>

 			</File>

 			<File

-				RelativePath="../../thirdparty/openjpeg/libopenjpeg\bio.h"

+				RelativePath="../../thirdparty/openjpeg/libopenjpeg\jpt.c"

 				>

 			</File>

 			<File

-				RelativePath="../../thirdparty/openjpeg/libopenjpeg\cio.h"

+				RelativePath="../../thirdparty/openjpeg/libopenjpeg\jpt.h"

 				>

 			</File>

 			<File

-				RelativePath="../../thirdparty/openjpeg/libopenjpeg\dwt.h"

+				RelativePath="../../thirdparty/openjpeg/libopenjpeg\mct.c"

 				>

 			</File>

 			<File

-				RelativePath="../../thirdparty/openjpeg/libopenjpeg\event.h"

+				RelativePath="../../thirdparty/openjpeg/libopenjpeg\mct.h"

 				>

 			</File>

 			<File

-				RelativePath="../../thirdparty/openjpeg/libopenjpeg\fix.h"

+				RelativePath="../../thirdparty/openjpeg/libopenjpeg\mqc.c"

 				>

 			</File>

 			<File

-				RelativePath="../../thirdparty/openjpeg/libopenjpeg\image.h"

+				RelativePath="../../thirdparty/openjpeg/libopenjpeg\mqc.h"

 				>

 			</File>

 			<File

-				RelativePath="../../thirdparty/openjpeg/libopenjpeg\int.h"

+				RelativePath="../../thirdparty/openjpeg/libopenjpeg\openjpeg.c"

 				>

 			</File>

 			<File

-				RelativePath="../../thirdparty/openjpeg/libopenjpeg\j2k.h"

+				RelativePath="../../thirdparty/openjpeg/libopenjpeg\openjpeg.h"

 				>

 			</File>

 			<File

-				RelativePath="../../thirdparty/openjpeg/libopenjpeg\j2k_lib.h"

+				RelativePath="../../thirdparty/openjpeg/libopenjpeg\opj_includes.h"

 				>

 			</File>

 			<File

-				RelativePath="../../thirdparty/openjpeg/libopenjpeg\jp2.h"

+				RelativePath="../../thirdparty/openjpeg/libopenjpeg\opj_malloc.h"

 				>

 			</File>

 			<File

-				RelativePath="../../thirdparty/openjpeg/libopenjpeg\jpt.h"

+				RelativePath="../../thirdparty/openjpeg/libopenjpeg\pi.c"

 				>

 			</File>

 			<File

-				RelativePath="../../thirdparty/openjpeg/libopenjpeg\mct.h"

+				RelativePath="../../thirdparty/openjpeg/libopenjpeg\pi.h"

 				>

 			</File>

 			<File

-				RelativePath="../../thirdparty/openjpeg/libopenjpeg\mqc.h"

+				RelativePath="../../thirdparty/openjpeg/libopenjpeg\raw.c"

 				>

 			</File>

 			<File

-				RelativePath="../../thirdparty/openjpeg/libopenjpeg\openjpeg.h"

+				RelativePath="../../thirdparty/openjpeg/libopenjpeg\raw.h"

 				>

 			</File>

 			<File

-				RelativePath="../../thirdparty/openjpeg/libopenjpeg\opj_includes.h"

+				RelativePath="../../thirdparty/openjpeg/libopenjpeg\t1.c"

 				>

 			</File>

 			<File

-				RelativePath="../../thirdparty/openjpeg/libopenjpeg\opj_malloc.h"

+				RelativePath="../../thirdparty/openjpeg/libopenjpeg\t1.h"

 				>

 			</File>

 			<File

-				RelativePath="../../thirdparty/openjpeg/libopenjpeg\pi.h"

+				RelativePath="../../thirdparty/openjpeg/libopenjpeg\t1_luts.h"

 				>

 			</File>

 			<File

-				RelativePath="../../thirdparty/openjpeg/libopenjpeg\raw.h"

+				RelativePath="../../thirdparty/openjpeg/libopenjpeg\t2.c"

 				>

 			</File>

 			<File

-				RelativePath="../../thirdparty/openjpeg/libopenjpeg\t1.h"

+				RelativePath="../../thirdparty/openjpeg/libopenjpeg\t2.h"

 				>

 			</File>

 			<File

-				RelativePath="../../thirdparty/openjpeg/libopenjpeg\t1_luts.h"

+				RelativePath="../../thirdparty/openjpeg/libopenjpeg\tcd.c"

 				>

 			</File>

 			<File

-				RelativePath="../../thirdparty/openjpeg/libopenjpeg\t2.h"

+				RelativePath="../../thirdparty/openjpeg/libopenjpeg\tcd.h"

 				>

 			</File>

 			<File

-				RelativePath="../../thirdparty/openjpeg/libopenjpeg\tcd.h"

+				RelativePath="../../thirdparty/openjpeg/libopenjpeg\tgt.c"

 				>

 			</File>

 			<File

diff --git a/win32/mupdf/mupdf.vcproj b/win32/mupdf/mupdf.vcproj
index 488f913c..2816ca8b 100644
--- a/win32/mupdf/mupdf.vcproj
+++ b/win32/mupdf/mupdf.vcproj
@@ -102,6 +102,10 @@
 			/>

 			<Tool

 				Name="VCCLCompilerTool"

+				InlineFunctionExpansion="2"

+				EnableIntrinsicFunctions="true"

+				FavorSizeOrSpeed="1"

+				OmitFramePointers="true"

 				AdditionalIncludeDirectories="..\..\thirdparty\freetype\include;..\..\thirdparty\jpeg;..\..\thirdparty\jbig2dec;..\..\thirdparty\openjpeg\libopenjpeg;..\..\thirdparty\zlib;..\..\mupdf;..\..\fitz"

 				PreprocessorDefinitions="WIN32;NDEBUG;_LIB"

 				RuntimeLibrary="2"

diff --git a/win32/zlib/zlib.vcproj b/win32/zlib/zlib.vcproj
index 10d94f37..ab5d242b 100644
--- a/win32/zlib/zlib.vcproj
+++ b/win32/zlib/zlib.vcproj
@@ -101,6 +101,11 @@
 			/>

 			<Tool

 				Name="VCCLCompilerTool"

+				Optimization="2"

+				InlineFunctionExpansion="2"

+				EnableIntrinsicFunctions="true"

+				FavorSizeOrSpeed="1"

+				OmitFramePointers="true"

 				PreprocessorDefinitions="WIN32;NDEBUG;_LIB;_CRT_SECURE_NO_WARNINGS"

 				RuntimeLibrary="2"

 				UsePrecompiledHeader="0"