Use the BOOST_INCLUDE_DIR variable in Windows build

Change-Id: I2f86aea9177f2f3d24aea40c47d530fd7d96d21c

libmspub/ExternalProject_libmspub.mk

@@ -71,7 +71,7 @@ $(call gb_ExternalProject_get_state_target,libmspub,build) :
 		--without-docs \
 		--disable-debug \
 		--disable-werror \
-        $(if $(filter NO,$(SYSTEM_BOOST)),CXXFLAGS=-I$(call gb_UnpackedTarball_get_dir,boost)) \
+		$(if $(filter NO,$(SYSTEM_BOOST)),CXXFLAGS=-I$(call gb_UnpackedTarball_get_dir,boost)) \
 		$(if $(filter YES,$(CROSS_COMPILING)),--build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM)) \
 	&& (cd $(EXTERNAL_WORKDIR)/src/lib && $(MAKE)) \
 	&& touch $@

libmspub/UnpackedTarball_mspub.mk

@@ -11,4 +11,10 @@ $(eval $(call gb_UnpackedTarball_UnpackedTarball,mspub))
 
 $(eval $(call gb_UnpackedTarball_set_tarball,mspub,$(MSPUB_TARBALL)))
 
+$(eval $(call gb_UnpackedTarball_set_patchlevel,mspub,1))
+
+$(eval $(call gb_UnpackedTarball_add_patches,mspub,\
+	libmspub/libmspub-0.0.4-boost.patch \
+))
+
 # vim: set noet sw=4 ts=4:

libmspub/libmspub-0.0.4-boost.patch

+--- a/build/win32/libmspub.vcproj
++++ b/build/win32/libmspub.vcproj
+@@ -42,7 +42,7 @@
+ 				Name="VCCLCompilerTool"
+ 				Optimization="2"
+ 				InlineFunctionExpansion="1"
+-				AdditionalIncludeDirectories="$(LIBWPD_INCLUDE_DIR),$(LIBWPG_INCLUDE_DIR),$(ZLIB_INCLUDE_DIR),$(ICU_INCLUDE_DIR)"
++				AdditionalIncludeDirectories="$(LIBWPD_INCLUDE_DIR),$(LIBWPG_INCLUDE_DIR),$(ZLIB_INCLUDE_DIR),$(BOOST_INCLUDE_DIR),$(ICU_INCLUDE_DIR)"
+ 				PreprocessorDefinitions="NDEBUG;WIN32;_LIB;_CRT_SECURE_NO_WARNINGS"
+ 				StringPooling="true"
+ 				RuntimeLibrary="2"
+@@ -116,7 +116,7 @@
+ 			<Tool
+ 				Name="VCCLCompilerTool"
+ 				Optimization="0"
+-				AdditionalIncludeDirectories="$(LIBWPD_INCLUDE_DIR),$(LIBWPG_INCLUDE_DIR),$(ZLIB_INCLUDE_DIR),$(ICU_INCLUDE_DIR)"
++				AdditionalIncludeDirectories="$(LIBWPD_INCLUDE_DIR),$(LIBWPG_INCLUDE_DIR),$(ZLIB_INCLUDE_DIR),$(BOOST_INCLUDE_DIR),$(ICU_INCLUDE_DIR)"
+ 				PreprocessorDefinitions="_DEBUG;DEBUG;WIN32;_LIB;_CRT_SECURE_NO_WARNINGS"
+ 				BasicRuntimeChecks="3"
+ 				RuntimeLibrary="3"
+diff --git a/build/win32/libmspub.vcxproj b/build/win32/libmspub.vcxproj
+index 1a3bae4..c233331 100644
+--- a/build/win32/libmspub.vcxproj
++++ b/build/win32/libmspub.vcxproj
+@@ -102,7 +102,7 @@
+     <ClCompile>
+       <Optimization>MaxSpeed</Optimization>
+       <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
+-      <AdditionalIncludeDirectories>$(LIBWPD_INCLUDE_DIR);$(LIBWPG_INCLUDE_DIR);$(ZLIB_INCLUDE_DIR);$(ICU_INCLUDE_DIR);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
++      <AdditionalIncludeDirectories>$(LIBWPD_INCLUDE_DIR);$(LIBWPG_INCLUDE_DIR);$(ZLIB_INCLUDE_DIR);$(BOOST_INCLUDE_DIR);$(ICU_INCLUDE_DIR);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+       <PreprocessorDefinitions>NDEBUG;WIN32;_LIB;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+       <StringPooling>true</StringPooling>
+       <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
+@@ -132,7 +132,7 @@
+   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+     <ClCompile>
+       <Optimization>Disabled</Optimization>
+-      <AdditionalIncludeDirectories>$(LIBWPD_INCLUDE_DIR);$(LIBWPG_INCLUDE_DIR);$(ZLIB_INCLUDE_DIR);$(ICU_INCLUDE_DIR);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
++      <AdditionalIncludeDirectories>$(LIBWPD_INCLUDE_DIR);$(LIBWPG_INCLUDE_DIR);$(ZLIB_INCLUDE_DIR);$(BOOST_INCLUDE_DIR);$(ICU_INCLUDE_DIR);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+       <PreprocessorDefinitions>_DEBUG;DEBUG;WIN32;_LIB;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
+       <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>