From 76dc6c7c5dcb170f3e153b95d8d11ab4c7bef221 Mon Sep 17 00:00:00 2001
From: Bruno Barbieri <brunorex@gmail.com>
Date: Sat, 22 Feb 2014 04:44:33 -0300
Subject: [PATCH] Fixes for unrar

* Set /Ob1 and /Os for release configuration
* Move USE_UNRAR_STATIC define to vsfilter_config.h
---
 include/unrar/{UNRAR.H => unrar.h}           | 0
 include/unrar/{UNRARDLL.TXT => unrardll.txt} | 0
 include/vsfilter_config.h                    | 2 ++
 src/subtitles/VobSubFile.cpp                 | 3 ---
 src/thirdparty/unrar/unrar.vcxproj           | 8 +++++++-
 5 files changed, 9 insertions(+), 4 deletions(-)
 rename include/unrar/{UNRAR.H => unrar.h} (100%)
 rename include/unrar/{UNRARDLL.TXT => unrardll.txt} (100%)

diff --git a/include/unrar/UNRAR.H b/include/unrar/unrar.h
similarity index 100%
rename from include/unrar/UNRAR.H
rename to include/unrar/unrar.h
diff --git a/include/unrar/UNRARDLL.TXT b/include/unrar/unrardll.txt
similarity index 100%
rename from include/unrar/UNRARDLL.TXT
rename to include/unrar/unrardll.txt
diff --git a/include/vsfilter_config.h b/include/vsfilter_config.h
index 3a0c18456..584d07963 100644
--- a/include/vsfilter_config.h
+++ b/include/vsfilter_config.h
@@ -40,4 +40,6 @@
 //show the bounding boxes of bitmaps
 //#define XY_DBG_SHOW_BITMAP_BOX_IN_COLOR 0x00ff00
 
+#define USE_UNRAR_STATIC
+
 #endif // __VSFILTER_CONFIG_6A82AF4A_67EC_4840_99D5_2DF001C64FEC_H__
diff --git a/src/subtitles/VobSubFile.cpp b/src/subtitles/VobSubFile.cpp
index 13da1444f..db4bee84a 100644
--- a/src/subtitles/VobSubFile.cpp
+++ b/src/subtitles/VobSubFile.cpp
@@ -24,9 +24,6 @@
 #include "TextFile.h"
 #include "VobSubFile.h"
 #ifndef USE_UNRAR_STATIC
-#define USE_UNRAR_STATIC
-#endif
-#ifndef USE_UNRAR_STATIC
 #include "unrar.h"
 #else
 #include "unrar/dll.hpp"
diff --git a/src/thirdparty/unrar/unrar.vcxproj b/src/thirdparty/unrar/unrar.vcxproj
index 57b125df0..1a08e1bc8 100644
--- a/src/thirdparty/unrar/unrar.vcxproj
+++ b/src/thirdparty/unrar/unrar.vcxproj
@@ -24,7 +24,7 @@
     <Keyword>Win32Proj</Keyword>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <Import Project="..\..\platform.props" />
+  <Import Project="..\..\configuration.props" />
   <PropertyGroup Label="Configuration">
     <ConfigurationType>StaticLibrary</ConfigurationType>
     <CharacterSet>MultiByte</CharacterSet>
@@ -44,6 +44,12 @@
       <EnablePREfast>false</EnablePREfast>
     </ClCompile>
   </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)'=='Release'">
+    <ClCompile>
+      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
+      <FavorSizeOrSpeed>Size</FavorSizeOrSpeed>
+    </ClCompile>
+  </ItemDefinitionGroup>
   <ItemGroup>
     <ClCompile Include="archive.cpp" />
     <ClCompile Include="arcread.cpp" />