[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [40007] trunk/lib/windows/thumbhandler: Committing [#28499] Windows thumbnail x86 fix by Tom Edwards

Thomas Dinges blender at dingto.org
Wed Sep 7 13:22:57 CEST 2011


Revision: 40007
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=40007
Author:   dingto
Date:     2011-09-07 11:22:57 +0000 (Wed, 07 Sep 2011)
Log Message:
-----------
Committing [#28499] Windows thumbnail x86 fix by Tom Edwards

This fixes Thumbnails on x86, they did not work before to to wrong linking to the zlib.dll.

Modified Paths:
--------------
    trunk/lib/windows/thumbhandler/lib/BlendThumb.dll
    trunk/lib/windows/thumbhandler/lib/BlendThumb64.dll
    trunk/lib/windows/thumbhandler/src/BlendThumb.rc
    trunk/lib/windows/thumbhandler/src/BlendThumb.vcxproj

Modified: trunk/lib/windows/thumbhandler/lib/BlendThumb.dll
===================================================================
(Binary files differ)

Modified: trunk/lib/windows/thumbhandler/lib/BlendThumb64.dll
===================================================================
(Binary files differ)

Modified: trunk/lib/windows/thumbhandler/src/BlendThumb.rc
===================================================================
--- trunk/lib/windows/thumbhandler/src/BlendThumb.rc	2011-09-07 11:22:25 UTC (rev 40006)
+++ trunk/lib/windows/thumbhandler/src/BlendThumb.rc	2011-09-07 11:22:57 UTC (rev 40007)
@@ -1,8 +1,8 @@
 #define IDR_VERSION1 1
 
 IDR_VERSION1 VERSIONINFO
-FILEVERSION 1,1,0,0
-PRODUCTVERSION 2,5,6,0
+FILEVERSION 1,3,0,0
+PRODUCTVERSION 2,60,0,0
 FILEOS 0x00000004
 FILETYPE 0x00000002
 BEGIN
@@ -10,8 +10,8 @@
   BEGIN
     BLOCK "FFFF04B0"
     BEGIN
-      VALUE "FileVersion", "1.1.0.0\0"
-      VALUE "ProductVersion", "2.5.6.0\0"
+      VALUE "FileVersion", "1.3\0"
+      VALUE "ProductVersion", "2.60\0"
       VALUE "FileDescription", "Blender Thumbnail Handler\0"
       VALUE "OriginalFilename", "BlendThumb.dll\0"
       VALUE "ProductName", "Blender\0"

Modified: trunk/lib/windows/thumbhandler/src/BlendThumb.vcxproj
===================================================================
--- trunk/lib/windows/thumbhandler/src/BlendThumb.vcxproj	2011-09-07 11:22:25 UTC (rev 40006)
+++ trunk/lib/windows/thumbhandler/src/BlendThumb.vcxproj	2011-09-07 11:22:57 UTC (rev 40007)
@@ -228,6 +228,7 @@
       </Command>
     </PostBuildEvent>
     <ResourceCompile />
+    <ResourceCompile />
   </ItemDefinitionGroup>
   <ItemGroup>
     <None Include="BlendThumb.def" />
@@ -235,15 +236,33 @@
   <ItemGroup>
     <ClCompile Include="Dll.cpp" />
     <ClCompile Include="BlenderThumb.cpp" />
+    <ClCompile Include="write_bmp.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <ResourceCompile Include="BlendThumb.rc" />
   </ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="..\..\Libraries\zlib-1.2.5\vc\zlib.vcxproj">
-      <Project>{e55efdd9-104e-4e3c-8a0f-a73b5f84fbae}</Project>
-    </ProjectReference>
+    <ClInclude Include="..\..\..\..\..\..\blender-svn\lib\windows\zlib\include\zlib.h">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClInclude>
+    <ClInclude Include="..\..\Libraries\zlib-1.2.5\zlib.h">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+    </ClInclude>
   </ItemGroup>
+  <ItemGroup>
+    <Library Include="..\..\..\..\..\..\blender-svn\lib\windows\zlib\lib\libz.lib">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </Library>
+    <Library Include="..\..\Libraries\zlib-1.2.5\lib64\zlib.lib">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+    </Library>
+  </ItemGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
   </ImportGroup>




More information about the Bf-blender-cvs mailing list