Revision: 61589
https://developer.blender.org/rBL61589
Author: juicyfruit
Date: 2016-01-02 10:50:07 +0000 (Sat, 02 Jan 2016)
Log Message:
-----------
MSVC 2015 windows x64 thumbnailer and wintab ( copied from msvc 2013)
Added Paths:
-----------
trunk/lib/win64_vc14/thumbhandler/
trunk/lib/win64_vc14/thumbhandler/lib/
trunk/lib/win64_vc14/thumbhandler/lib/BlendThumb.dll
trunk/lib/win64_vc14/thumbhandler/lib/BlendThumb64.dll
trunk/lib/win64_vc14/thumbhandler/readme.txt
trunk/lib/win64_vc14/thumbhandler/src/
trunk/lib/win64_vc14/thumbhandler/src/BlendThumb.def
trunk/lib/win64_vc14/thumbhandler/src/BlendThumb.rc
trunk/lib/win64_vc14/thumbhandler/src/BlendThumb.vcxproj
trunk/lib/win64_vc14/thumbhandler/src/BlenderThumb.cpp
trunk/lib/win64_vc14/thumbhandler/src/Dll.cpp
trunk/lib/win64_vc14/wintab/
trunk/lib/win64_vc14/wintab/include/
trunk/lib/win64_vc14/wintab/include/pktdef.h
trunk/lib/win64_vc14/wintab/include/wintab.h
Added: trunk/lib/win64_vc14/thumbhandler/lib/BlendThumb.dll
===================================================================
(Binary files differ)
Index: trunk/lib/win64_vc14/thumbhandler/lib/BlendThumb.dll
===================================================================
--- trunk/lib/win64_vc14/thumbhandler/lib/BlendThumb.dll 2016-01-02
10:30:42 UTC (rev 61588)
+++ trunk/lib/win64_vc14/thumbhandler/lib/BlendThumb.dll 2016-01-02
10:50:07 UTC (rev 61589)
Property changes on: trunk/lib/win64_vc14/thumbhandler/lib/BlendThumb.dll
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Added: trunk/lib/win64_vc14/thumbhandler/lib/BlendThumb64.dll
===================================================================
(Binary files differ)
Index: trunk/lib/win64_vc14/thumbhandler/lib/BlendThumb64.dll
===================================================================
--- trunk/lib/win64_vc14/thumbhandler/lib/BlendThumb64.dll 2016-01-02
10:30:42 UTC (rev 61588)
+++ trunk/lib/win64_vc14/thumbhandler/lib/BlendThumb64.dll 2016-01-02
10:50:07 UTC (rev 61589)
Property changes on: trunk/lib/win64_vc14/thumbhandler/lib/BlendThumb64.dll
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Added: trunk/lib/win64_vc14/thumbhandler/readme.txt
===================================================================
--- trunk/lib/win64_vc14/thumbhandler/readme.txt
(rev 0)
+++ trunk/lib/win64_vc14/thumbhandler/readme.txt 2016-01-02 10:50:07 UTC
(rev 61589)
@@ -0,0 +1,7 @@
+This is BF code, but is in the libs folder because:
+
+* It has to be dynamic. The build systems aren't set up to create DLLs from
source.
+* Building requires both the Windows SDK and Visual Studio (for a header file).
+* Since the DLL is loaded by Explorer, architecture is strict: the x86 build
fails on x64
+ Windows. We need to ship both builds in x86 packages, and once again the
build systems
+ can't handle that.
\ No newline at end of file
Added: trunk/lib/win64_vc14/thumbhandler/src/BlendThumb.def
===================================================================
--- trunk/lib/win64_vc14/thumbhandler/src/BlendThumb.def
(rev 0)
+++ trunk/lib/win64_vc14/thumbhandler/src/BlendThumb.def 2016-01-02
10:50:07 UTC (rev 61589)
@@ -0,0 +1,5 @@
+EXPORTS
+ DllGetClassObject PRIVATE
+ DllCanUnloadNow PRIVATE
+ DllRegisterServer PRIVATE
+ DllUnregisterServer PRIVATE
\ No newline at end of file
Added: trunk/lib/win64_vc14/thumbhandler/src/BlendThumb.rc
===================================================================
--- trunk/lib/win64_vc14/thumbhandler/src/BlendThumb.rc
(rev 0)
+++ trunk/lib/win64_vc14/thumbhandler/src/BlendThumb.rc 2016-01-02 10:50:07 UTC
(rev 61589)
@@ -0,0 +1,26 @@
+#define IDR_VERSION1 1
+
+IDR_VERSION1 VERSIONINFO
+FILEVERSION 1,3,0,0
+PRODUCTVERSION 2,60,0,0
+FILEOS 0x00000004
+FILETYPE 0x00000002
+BEGIN
+ BLOCK "StringFileInfo"
+ BEGIN
+ BLOCK "FFFF04B0"
+ BEGIN
+ 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"
+ VALUE "LegalCopyright", "GPL2, 2011\0"
+ END
+ END
+ BLOCK "VarFileInfo"
+ BEGIN
+ VALUE "Translation", 0xFFFF, 0x04B0
+ END
+END
+
Added: trunk/lib/win64_vc14/thumbhandler/src/BlendThumb.vcxproj
===================================================================
--- trunk/lib/win64_vc14/thumbhandler/src/BlendThumb.vcxproj
(rev 0)
+++ trunk/lib/win64_vc14/thumbhandler/src/BlendThumb.vcxproj 2016-01-02
10:50:07 UTC (rev 61589)
@@ -0,0 +1,269 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" ToolsVersion="4.0"
xmlns="http://schemas.microsoft.com/developer/msbuild/2003";>
+ <ItemGroup Label="ProjectConfigurations">
+ <ProjectConfiguration Include="Debug|Win32">
+ <Configuration>Debug</Configuration>
+ <Platform>Win32</Platform>
+ </ProjectConfiguration>
+ <ProjectConfiguration Include="Debug|x64">
+ <Configuration>Debug</Configuration>
+ <Platform>x64</Platform>
+ </ProjectConfiguration>
+ <ProjectConfiguration Include="Release|Win32">
+ <Configuration>Release</Configuration>
+ <Platform>Win32</Platform>
+ </ProjectConfiguration>
+ <ProjectConfiguration Include="Release|x64">
+ <Configuration>Release</Configuration>
+ <Platform>x64</Platform>
+ </ProjectConfiguration>
+ </ItemGroup>
+ <PropertyGroup Label="Globals">
+ <ProjectGuid>{3AF44F8C-A331-4D74-995A-9BDF157E4B8A}</ProjectGuid>
+ <Keyword>Win32Proj</Keyword>
+ <ProjectName>BlendThumb</ProjectName>
+ </PropertyGroup>
+ <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"
Label="Configuration">
+ <ConfigurationType>DynamicLibrary</ConfigurationType>
+ <CharacterSet>Unicode</CharacterSet>
+ <PlatformToolset>Windows7.1SDK</PlatformToolset>
+ </PropertyGroup>
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"
Label="Configuration">
+ <ConfigurationType>DynamicLibrary</ConfigurationType>
+ <CharacterSet>Unicode</CharacterSet>
+ <PlatformToolset>Windows7.1SDK</PlatformToolset>
+ </PropertyGroup>
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'"
Label="Configuration">
+ <ConfigurationType>DynamicLibrary</ConfigurationType>
+ <CharacterSet>Unicode</CharacterSet>
+ <PlatformToolset>Windows7.1SDK</PlatformToolset>
+ </PropertyGroup>
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'"
Label="Configuration">
+ <ConfigurationType>DynamicLibrary</ConfigurationType>
+ <CharacterSet>Unicode</CharacterSet>
+ <PlatformToolset>Windows7.1SDK</PlatformToolset>
+ </PropertyGroup>
+ <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
+ <ImportGroup Label="ExtensionSettings">
+ </ImportGroup>
+ <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"
Label="PropertySheets">
+ <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props"
Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')"
Label="LocalAppDataPlatform" />
+ <Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC71.props" />
+ </ImportGroup>
+ <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"
Label="PropertySheets">
+ <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props"
Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')"
Label="LocalAppDataPlatform" />
+ <Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC71.props" />
+ </ImportGroup>
+ <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'"
Label="PropertySheets">
+ <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props"
Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')"
Label="LocalAppDataPlatform" />
+ <Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC71.props" />
+ </ImportGroup>
+ <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'"
Label="PropertySheets">
+ <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props"
Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')"
Label="LocalAppDataPlatform" />
+ <Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC71.props" />
+ </ImportGroup>
+ <PropertyGroup Label="UserMacros" />
+ <PropertyGroup>
+ <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
+ <OutDir
Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Debug\</OutDir>
+ <IntDir
Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Debug\</IntDir>
+ <LinkIncremental
Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</LinkIncremental>
+ <OutDir
Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">C:\blendthumb\</OutDir>
+ <IntDir
Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(Platform)\$(Configuration)\</IntDir>
+ <LinkIncremental
Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</LinkIncremental>
+ <OutDir
Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Release\</OutDir>
+ <IntDir
Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Release\</IntDir>
+ <LinkIncremental
Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</LinkIncremental>
+ <OutDir
Condition="'$(Configuration)|$(Platform)'=='Release|x64'">C:\blendthumb\</OutDir>
+ <IntDir
Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(Platform)\$(Configuration)\</IntDir>
+ <LinkIncremental
Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</LinkIncremental>
+ <PreBuildEventUseInBuild
Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</PreBuildEventUseInBuild>
+ <TargetExt
Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">.dll</TargetExt>
+ <TargetExt
Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">.dll</TargetExt>
+ </PropertyGroup>
+ <ItemDefinitionGroup
Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+ <ClCompile>
+ <Optimization>Disabled</Optimization>
+ <AdditionalIncludeDirectories>C:\Users\Tom\Documents\Visual Studio
2010\Libraries\zlib-1.2.5;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+
<PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <MinimalRebuild>true</MinimalRebuild>
+ <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
+ <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
+ <PrecompiledHeader>
+ </PrecompiledHeader>
+ <WarningLevel>Level4</WarningLevel>
+ <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
+ </ClCompile>
+ <Link>
+ <OutputFile>$(OutDir)$(ProjectName).dll</OutputFile>
+ <ModuleDefinitionFile>BlendThumb.def</ModuleDefinitionFile>
+ <GenerateDebugInformation>true</GenerateDebugInformation>
@@ Diff output truncated at 10240 characters. @@
_______________________________________________
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
