Fixes for unrar

* Set /Ob1 and /Os for release configuration * Move USE_UNRAR_STATIC define to vsfilter_config.h
Cyberbeing · Mar 4, 2014 · 76dc6c7 · 76dc6c7
1 parent b0e3f6f
commit 76dc6c7
Show file tree

Hide file tree

Showing 5 changed files with 9 additions and 4 deletions.
diff --git a/include/unrar/UNRAR.H → include/unrar/unrar.h b/include/unrar/UNRAR.H → include/unrar/unrar.h
diff --git a/include/unrar/UNRARDLL.TXT → include/unrar/unrardll.txt b/include/unrar/UNRARDLL.TXT → include/unrar/unrardll.txt
diff --git 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
@@ -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
@@ -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" />