Skip to content

Commit

Permalink
Updated Text to have right platform toolset
Browse files Browse the repository at this point in the history
Clean targets
added 7z command line tool
  • Loading branch information
mrvux committed Feb 7, 2014
1 parent 3423428 commit 921b157
Show file tree
Hide file tree
Showing 7 changed files with 6 additions and 61 deletions.
Binary file added Dependencies/x64/libvlc.dll
Binary file not shown.
Binary file added Dependencies/x64/libvlccore.dll
Binary file not shown.
5 changes: 3 additions & 2 deletions Nodes/VVVV.DX11.Nodes.Text/VVVV.DX11.Nodes.Text.vcxproj
Expand Up @@ -38,6 +38,7 @@
<UseDebugLibraries>true</UseDebugLibraries>
<CLRSupport>true</CLRSupport>
<CharacterSet>Unicode</CharacterSet>
<PlatformToolset>v120</PlatformToolset>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
<ConfigurationType>DynamicLibrary</ConfigurationType>
Expand All @@ -51,6 +52,7 @@
<UseDebugLibraries>false</UseDebugLibraries>
<CLRSupport>true</CLRSupport>
<CharacterSet>Unicode</CharacterSet>
<PlatformToolset>v120</PlatformToolset>
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
<ImportGroup Label="ExtensionSettings">
Expand Down Expand Up @@ -107,6 +109,7 @@
<Link>
<GenerateDebugInformation>true</GenerateDebugInformation>
<AdditionalDependencies>FW1FontWrapper.lib</AdditionalDependencies>
<AdditionalLibraryDirectories>$(SolutionDir)\Dependencies\x64</AdditionalLibraryDirectories>
</Link>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
Expand Down Expand Up @@ -244,10 +247,8 @@
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
<ImportGroup Label="ExtensionTargets">
</ImportGroup>

<Target Name="AfterBuild">
<Copy SourceFiles="$(SolutionDir)\Dependencies\x86\FW1FontWrapper.dll" DestinationFolder="$(OutputPath)" Condition="'$(Platform)' == 'Win32'" />
<Copy SourceFiles="$(SolutionDir)\Dependencies\x64\FW1FontWrapper.dll" DestinationFolder="$(OutputPath)" Condition="'$(Platform)' == 'x64'" />
</Target>

</Project>
Binary file added Tools/7za.exe
Binary file not shown.
1 change: 1 addition & 0 deletions deploy.targets
@@ -0,0 +1 @@
<?xml version="1.0" encoding="utf-8"?><Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="4.0" DefaultTargets="Build"> <ItemGroup> <DeployFolder Include="Deploy\**\*.*" /> </ItemGroup> <ItemGroup> <GirlPower Include="girlpower\girlpower\**\*.*" /> </ItemGroup> <ItemGroup> <GirlPowerNodes Include="girlpower\nodes\**\*.*" /> </ItemGroup> <Target Name="Clean-Deploy"> <Delete Files="@(DeployFolder)" /> </Target> <Target Name="Build-x86"> <MSBuild Projects="vvvv-dx11.sln" Properties="Configuration=Release;Platform=x86;DebugSymbols=false;DebugType=None" /> </Target> <Target Name="Build-x64"> <MSBuild Projects="vvvv-dx11.sln" Properties="Configuration=Release;Platform=x64;DebugSymbols=false;DebugType=None" /> </Target> <Target Name="Build"> <CallTarget Targets="Build-x86" /> <Copy SourceFiles="@(GirlPowerNodes)" DestinationFolder="Deploy\Release\x86\packs\dx11\nodes\%(GirlPowerNodes.RecursiveDir)" /> <Copy SourceFiles="@(GirlPower)" DestinationFolder="Deploy\Release\x86\packs\dx11\girlpower\%(GirlPower.RecursiveDir)" /> <CallTarget Targets="Build-x64" /> <Copy SourceFiles="@(GirlPowerNodes)" DestinationFolder="Deploy\Release\x64\packs\dx11\nodes\%(GirlPowerNodes.RecursiveDir)" /> <Copy SourceFiles="@(GirlPower)" DestinationFolder="Deploy\Release\x64\packs\dx11\girlpower\%(GirlPower.RecursiveDir)" /> </Target> </Project>
Expand Down
58 changes: 0 additions & 58 deletions vvvv-dx11.sln
Expand Up @@ -29,158 +29,100 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "VVVV.DX11.Nodes.Text", "Nod
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Any CPU = Debug|Any CPU
Debug|Mixed Platforms = Debug|Mixed Platforms
Debug|Win32 = Debug|Win32
Debug|x64 = Debug|x64
Debug|x86 = Debug|x86
Release|Any CPU = Release|Any CPU
Release|Mixed Platforms = Release|Mixed Platforms
Release|Win32 = Release|Win32
Release|x64 = Release|x64
Release|x86 = Release|x86
EndGlobalSection
GlobalSection(ProjectConfigurationPlatforms) = postSolution
{71C0786D-2640-4E39-AA7B-83602F36F3A3}.Debug|Any CPU.ActiveCfg = Debug|x86
{71C0786D-2640-4E39-AA7B-83602F36F3A3}.Debug|Mixed Platforms.ActiveCfg = Debug|x86
{71C0786D-2640-4E39-AA7B-83602F36F3A3}.Debug|Mixed Platforms.Build.0 = Debug|x86
{71C0786D-2640-4E39-AA7B-83602F36F3A3}.Debug|Win32.ActiveCfg = Debug|x64
{71C0786D-2640-4E39-AA7B-83602F36F3A3}.Debug|x64.ActiveCfg = Debug|x64
{71C0786D-2640-4E39-AA7B-83602F36F3A3}.Debug|x64.Build.0 = Debug|x64
{71C0786D-2640-4E39-AA7B-83602F36F3A3}.Debug|x86.ActiveCfg = Debug|x86
{71C0786D-2640-4E39-AA7B-83602F36F3A3}.Debug|x86.Build.0 = Debug|x86
{71C0786D-2640-4E39-AA7B-83602F36F3A3}.Release|Any CPU.ActiveCfg = Release|x86
{71C0786D-2640-4E39-AA7B-83602F36F3A3}.Release|Mixed Platforms.ActiveCfg = Release|x86
{71C0786D-2640-4E39-AA7B-83602F36F3A3}.Release|Mixed Platforms.Build.0 = Release|x86
{71C0786D-2640-4E39-AA7B-83602F36F3A3}.Release|Win32.ActiveCfg = Release|x64
{71C0786D-2640-4E39-AA7B-83602F36F3A3}.Release|x64.ActiveCfg = Release|x64
{71C0786D-2640-4E39-AA7B-83602F36F3A3}.Release|x64.Build.0 = Release|x64
{71C0786D-2640-4E39-AA7B-83602F36F3A3}.Release|x86.ActiveCfg = Release|x86
{71C0786D-2640-4E39-AA7B-83602F36F3A3}.Release|x86.Build.0 = Release|x86
{C6EE17BB-1F48-44EA-8131-D299BC57748C}.Debug|Any CPU.ActiveCfg = Debug|x86
{C6EE17BB-1F48-44EA-8131-D299BC57748C}.Debug|Mixed Platforms.ActiveCfg = Debug|x86
{C6EE17BB-1F48-44EA-8131-D299BC57748C}.Debug|Mixed Platforms.Build.0 = Debug|x86
{C6EE17BB-1F48-44EA-8131-D299BC57748C}.Debug|Win32.ActiveCfg = Debug|x86
{C6EE17BB-1F48-44EA-8131-D299BC57748C}.Debug|x64.ActiveCfg = Debug|x64
{C6EE17BB-1F48-44EA-8131-D299BC57748C}.Debug|x64.Build.0 = Debug|x64
{C6EE17BB-1F48-44EA-8131-D299BC57748C}.Debug|x86.ActiveCfg = Debug|x86
{C6EE17BB-1F48-44EA-8131-D299BC57748C}.Debug|x86.Build.0 = Debug|x86
{C6EE17BB-1F48-44EA-8131-D299BC57748C}.Release|Any CPU.ActiveCfg = Release|x86
{C6EE17BB-1F48-44EA-8131-D299BC57748C}.Release|Mixed Platforms.ActiveCfg = Release|x86
{C6EE17BB-1F48-44EA-8131-D299BC57748C}.Release|Mixed Platforms.Build.0 = Release|x86
{C6EE17BB-1F48-44EA-8131-D299BC57748C}.Release|Win32.ActiveCfg = Release|x86
{C6EE17BB-1F48-44EA-8131-D299BC57748C}.Release|x64.ActiveCfg = Release|x64
{C6EE17BB-1F48-44EA-8131-D299BC57748C}.Release|x64.Build.0 = Release|x64
{C6EE17BB-1F48-44EA-8131-D299BC57748C}.Release|x86.ActiveCfg = Release|x86
{C6EE17BB-1F48-44EA-8131-D299BC57748C}.Release|x86.Build.0 = Release|x86
{A07A761E-EA4E-4F48-B42E-CD0539364DD0}.Debug|Any CPU.ActiveCfg = Debug|x86
{A07A761E-EA4E-4F48-B42E-CD0539364DD0}.Debug|Mixed Platforms.ActiveCfg = Debug|x86
{A07A761E-EA4E-4F48-B42E-CD0539364DD0}.Debug|Mixed Platforms.Build.0 = Debug|x86
{A07A761E-EA4E-4F48-B42E-CD0539364DD0}.Debug|Win32.ActiveCfg = Debug|x86
{A07A761E-EA4E-4F48-B42E-CD0539364DD0}.Debug|x64.ActiveCfg = Debug|x64
{A07A761E-EA4E-4F48-B42E-CD0539364DD0}.Debug|x64.Build.0 = Debug|x64
{A07A761E-EA4E-4F48-B42E-CD0539364DD0}.Debug|x86.ActiveCfg = Debug|x86
{A07A761E-EA4E-4F48-B42E-CD0539364DD0}.Debug|x86.Build.0 = Debug|x86
{A07A761E-EA4E-4F48-B42E-CD0539364DD0}.Release|Any CPU.ActiveCfg = Release|x86
{A07A761E-EA4E-4F48-B42E-CD0539364DD0}.Release|Mixed Platforms.ActiveCfg = Release|x86
{A07A761E-EA4E-4F48-B42E-CD0539364DD0}.Release|Mixed Platforms.Build.0 = Release|x86
{A07A761E-EA4E-4F48-B42E-CD0539364DD0}.Release|Win32.ActiveCfg = Release|x86
{A07A761E-EA4E-4F48-B42E-CD0539364DD0}.Release|x64.ActiveCfg = Release|x64
{A07A761E-EA4E-4F48-B42E-CD0539364DD0}.Release|x64.Build.0 = Release|x64
{A07A761E-EA4E-4F48-B42E-CD0539364DD0}.Release|x86.ActiveCfg = Release|x86
{A07A761E-EA4E-4F48-B42E-CD0539364DD0}.Release|x86.Build.0 = Release|x86
{08972D1A-D674-4CC1-BF56-FDB04E5FE730}.Debug|Any CPU.ActiveCfg = Debug|x86
{08972D1A-D674-4CC1-BF56-FDB04E5FE730}.Debug|Mixed Platforms.ActiveCfg = Debug|x86
{08972D1A-D674-4CC1-BF56-FDB04E5FE730}.Debug|Mixed Platforms.Build.0 = Debug|x86
{08972D1A-D674-4CC1-BF56-FDB04E5FE730}.Debug|Win32.ActiveCfg = Debug|x86
{08972D1A-D674-4CC1-BF56-FDB04E5FE730}.Debug|x64.ActiveCfg = Debug|x64
{08972D1A-D674-4CC1-BF56-FDB04E5FE730}.Debug|x64.Build.0 = Debug|x64
{08972D1A-D674-4CC1-BF56-FDB04E5FE730}.Debug|x86.ActiveCfg = Debug|x86
{08972D1A-D674-4CC1-BF56-FDB04E5FE730}.Debug|x86.Build.0 = Debug|x86
{08972D1A-D674-4CC1-BF56-FDB04E5FE730}.Release|Any CPU.ActiveCfg = Release|x86
{08972D1A-D674-4CC1-BF56-FDB04E5FE730}.Release|Mixed Platforms.ActiveCfg = Release|x86
{08972D1A-D674-4CC1-BF56-FDB04E5FE730}.Release|Mixed Platforms.Build.0 = Release|x86
{08972D1A-D674-4CC1-BF56-FDB04E5FE730}.Release|Win32.ActiveCfg = Release|x86
{08972D1A-D674-4CC1-BF56-FDB04E5FE730}.Release|x64.ActiveCfg = Release|x64
{08972D1A-D674-4CC1-BF56-FDB04E5FE730}.Release|x64.Build.0 = Release|x64
{08972D1A-D674-4CC1-BF56-FDB04E5FE730}.Release|x86.ActiveCfg = Release|x86
{08972D1A-D674-4CC1-BF56-FDB04E5FE730}.Release|x86.Build.0 = Release|x86
{5EB993E1-CF42-433C-9463-0E46FC8C4FD6}.Debug|Any CPU.ActiveCfg = Debug|x86
{5EB993E1-CF42-433C-9463-0E46FC8C4FD6}.Debug|Mixed Platforms.ActiveCfg = Debug|x86
{5EB993E1-CF42-433C-9463-0E46FC8C4FD6}.Debug|Mixed Platforms.Build.0 = Debug|x86
{5EB993E1-CF42-433C-9463-0E46FC8C4FD6}.Debug|Win32.ActiveCfg = Debug|x86
{5EB993E1-CF42-433C-9463-0E46FC8C4FD6}.Debug|x64.ActiveCfg = Debug|x64
{5EB993E1-CF42-433C-9463-0E46FC8C4FD6}.Debug|x64.Build.0 = Debug|x64
{5EB993E1-CF42-433C-9463-0E46FC8C4FD6}.Debug|x86.ActiveCfg = Debug|x86
{5EB993E1-CF42-433C-9463-0E46FC8C4FD6}.Debug|x86.Build.0 = Debug|x86
{5EB993E1-CF42-433C-9463-0E46FC8C4FD6}.Release|Any CPU.ActiveCfg = Release|x86
{5EB993E1-CF42-433C-9463-0E46FC8C4FD6}.Release|Mixed Platforms.ActiveCfg = Release|x86
{5EB993E1-CF42-433C-9463-0E46FC8C4FD6}.Release|Mixed Platforms.Build.0 = Release|x86
{5EB993E1-CF42-433C-9463-0E46FC8C4FD6}.Release|Win32.ActiveCfg = Release|x86
{5EB993E1-CF42-433C-9463-0E46FC8C4FD6}.Release|x64.ActiveCfg = Release|x64
{5EB993E1-CF42-433C-9463-0E46FC8C4FD6}.Release|x64.Build.0 = Release|x64
{5EB993E1-CF42-433C-9463-0E46FC8C4FD6}.Release|x86.ActiveCfg = Release|x86
{5EB993E1-CF42-433C-9463-0E46FC8C4FD6}.Release|x86.Build.0 = Release|x86
{C6F7D284-30A7-4EF0-9D9C-4B635BDB3F1E}.Debug|Any CPU.ActiveCfg = Debug|x86
{C6F7D284-30A7-4EF0-9D9C-4B635BDB3F1E}.Debug|Mixed Platforms.ActiveCfg = Debug|x86
{C6F7D284-30A7-4EF0-9D9C-4B635BDB3F1E}.Debug|Mixed Platforms.Build.0 = Debug|x86
{C6F7D284-30A7-4EF0-9D9C-4B635BDB3F1E}.Debug|Win32.ActiveCfg = Debug|x86
{C6F7D284-30A7-4EF0-9D9C-4B635BDB3F1E}.Debug|x64.ActiveCfg = Debug|x64
{C6F7D284-30A7-4EF0-9D9C-4B635BDB3F1E}.Debug|x64.Build.0 = Debug|x64
{C6F7D284-30A7-4EF0-9D9C-4B635BDB3F1E}.Debug|x86.ActiveCfg = Debug|x86
{C6F7D284-30A7-4EF0-9D9C-4B635BDB3F1E}.Debug|x86.Build.0 = Debug|x86
{C6F7D284-30A7-4EF0-9D9C-4B635BDB3F1E}.Release|Any CPU.ActiveCfg = Release|x86
{C6F7D284-30A7-4EF0-9D9C-4B635BDB3F1E}.Release|Mixed Platforms.ActiveCfg = Release|x86
{C6F7D284-30A7-4EF0-9D9C-4B635BDB3F1E}.Release|Mixed Platforms.Build.0 = Release|x86
{C6F7D284-30A7-4EF0-9D9C-4B635BDB3F1E}.Release|Win32.ActiveCfg = Release|x86
{C6F7D284-30A7-4EF0-9D9C-4B635BDB3F1E}.Release|x64.ActiveCfg = Release|x64
{C6F7D284-30A7-4EF0-9D9C-4B635BDB3F1E}.Release|x64.Build.0 = Release|x64
{C6F7D284-30A7-4EF0-9D9C-4B635BDB3F1E}.Release|x86.ActiveCfg = Release|x86
{C6F7D284-30A7-4EF0-9D9C-4B635BDB3F1E}.Release|x86.Build.0 = Release|x86
{CAE46B4A-CB79-4E39-B318-BF76A2CB256F}.Debug|Any CPU.ActiveCfg = Debug|x86
{CAE46B4A-CB79-4E39-B318-BF76A2CB256F}.Debug|Mixed Platforms.ActiveCfg = Debug|x86
{CAE46B4A-CB79-4E39-B318-BF76A2CB256F}.Debug|Mixed Platforms.Build.0 = Debug|x86
{CAE46B4A-CB79-4E39-B318-BF76A2CB256F}.Debug|Win32.ActiveCfg = Debug|x86
{CAE46B4A-CB79-4E39-B318-BF76A2CB256F}.Debug|x64.ActiveCfg = Debug|x64
{CAE46B4A-CB79-4E39-B318-BF76A2CB256F}.Debug|x64.Build.0 = Debug|x64
{CAE46B4A-CB79-4E39-B318-BF76A2CB256F}.Debug|x86.ActiveCfg = Debug|x86
{CAE46B4A-CB79-4E39-B318-BF76A2CB256F}.Debug|x86.Build.0 = Debug|x86
{CAE46B4A-CB79-4E39-B318-BF76A2CB256F}.Release|Any CPU.ActiveCfg = Release|x86
{CAE46B4A-CB79-4E39-B318-BF76A2CB256F}.Release|Mixed Platforms.ActiveCfg = Release|x86
{CAE46B4A-CB79-4E39-B318-BF76A2CB256F}.Release|Mixed Platforms.Build.0 = Release|x86
{CAE46B4A-CB79-4E39-B318-BF76A2CB256F}.Release|Win32.ActiveCfg = Release|x86
{CAE46B4A-CB79-4E39-B318-BF76A2CB256F}.Release|x64.ActiveCfg = Release|x64
{CAE46B4A-CB79-4E39-B318-BF76A2CB256F}.Release|x64.Build.0 = Release|x64
{CAE46B4A-CB79-4E39-B318-BF76A2CB256F}.Release|x86.ActiveCfg = Release|x86
{CAE46B4A-CB79-4E39-B318-BF76A2CB256F}.Release|x86.Build.0 = Release|x86
{9EAD0F44-E6AA-4363-BE4D-D944C1D35044}.Debug|Any CPU.ActiveCfg = Debug|x86
{9EAD0F44-E6AA-4363-BE4D-D944C1D35044}.Debug|Mixed Platforms.ActiveCfg = Debug|x86
{9EAD0F44-E6AA-4363-BE4D-D944C1D35044}.Debug|Mixed Platforms.Build.0 = Debug|x86
{9EAD0F44-E6AA-4363-BE4D-D944C1D35044}.Debug|Win32.ActiveCfg = Debug|x64
{9EAD0F44-E6AA-4363-BE4D-D944C1D35044}.Debug|x64.ActiveCfg = Debug|x64
{9EAD0F44-E6AA-4363-BE4D-D944C1D35044}.Debug|x64.Build.0 = Debug|x64
{9EAD0F44-E6AA-4363-BE4D-D944C1D35044}.Debug|x86.ActiveCfg = Debug|x86
{9EAD0F44-E6AA-4363-BE4D-D944C1D35044}.Debug|x86.Build.0 = Debug|x86
{9EAD0F44-E6AA-4363-BE4D-D944C1D35044}.Release|Any CPU.ActiveCfg = Release|x86
{9EAD0F44-E6AA-4363-BE4D-D944C1D35044}.Release|Mixed Platforms.ActiveCfg = Release|x86
{9EAD0F44-E6AA-4363-BE4D-D944C1D35044}.Release|Mixed Platforms.Build.0 = Release|x86
{9EAD0F44-E6AA-4363-BE4D-D944C1D35044}.Release|Win32.ActiveCfg = Release|x64
{9EAD0F44-E6AA-4363-BE4D-D944C1D35044}.Release|x64.ActiveCfg = Release|x64
{9EAD0F44-E6AA-4363-BE4D-D944C1D35044}.Release|x64.Build.0 = Release|x64
{9EAD0F44-E6AA-4363-BE4D-D944C1D35044}.Release|x86.ActiveCfg = Release|x86
{9EAD0F44-E6AA-4363-BE4D-D944C1D35044}.Release|x86.Build.0 = Release|x86
{51469F38-9510-4A16-8998-67A55C386059}.Debug|Any CPU.ActiveCfg = Debug|Win32
{51469F38-9510-4A16-8998-67A55C386059}.Debug|Mixed Platforms.ActiveCfg = Debug|Win32
{51469F38-9510-4A16-8998-67A55C386059}.Debug|Mixed Platforms.Build.0 = Debug|Win32
{51469F38-9510-4A16-8998-67A55C386059}.Debug|Win32.ActiveCfg = Debug|Win32
{51469F38-9510-4A16-8998-67A55C386059}.Debug|Win32.Build.0 = Debug|Win32
{51469F38-9510-4A16-8998-67A55C386059}.Debug|x64.ActiveCfg = Debug|x64
{51469F38-9510-4A16-8998-67A55C386059}.Debug|x64.Build.0 = Debug|x64
{51469F38-9510-4A16-8998-67A55C386059}.Debug|x86.ActiveCfg = Debug|Win32
{51469F38-9510-4A16-8998-67A55C386059}.Debug|x86.Build.0 = Debug|Win32
{51469F38-9510-4A16-8998-67A55C386059}.Release|Any CPU.ActiveCfg = Release|Win32
{51469F38-9510-4A16-8998-67A55C386059}.Release|Mixed Platforms.ActiveCfg = Release|Win32
{51469F38-9510-4A16-8998-67A55C386059}.Release|Mixed Platforms.Build.0 = Release|Win32
{51469F38-9510-4A16-8998-67A55C386059}.Release|Win32.ActiveCfg = Release|Win32
{51469F38-9510-4A16-8998-67A55C386059}.Release|Win32.Build.0 = Release|Win32
{51469F38-9510-4A16-8998-67A55C386059}.Release|x64.ActiveCfg = Release|x64
Expand Down
3 changes: 2 additions & 1 deletion vvvv.DX11.Build.targets
Expand Up @@ -3,7 +3,8 @@
<Import Project="vvvv.DX11.References.targets" />
<PropertyGroup>
<TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
<AllowUnsafeBlocks>true</AllowUnsafeBlocks><OutputPath>$(SolutionDir)\Deploy\$(Configuration)\$(Platform)\packs\dx11\</OutputPath>
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
<OutputPath>$(SolutionDir)\Deploy\$(Configuration)\$(Platform)\packs\dx11\</OutputPath>
</PropertyGroup>

<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x86'">
Expand Down

0 comments on commit 921b157

Please sign in to comment.