Skip to content

Commit

Permalink
Visual Studio project updates for OF 0.10+
Browse files Browse the repository at this point in the history
  • Loading branch information
@bangnoise
bangnoise committed Nov 27, 2018
1 parent 25acc39 commit 615bb6e
Show file tree
Hide file tree
Showing 2 changed files with 19 additions and 10 deletions.
2 changes: 1 addition & 1 deletion example/example.sln
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio 14
# Visual Studio 15
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "example", "example.vcxproj", "{7FD42DF7-442E-479A-BA76-D0022F99702A}"
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "openframeworksLib", "..\..\..\libs\openFrameworksCompiled\project\vs\openframeworksLib.vcxproj", "{5837595D-ACA9-485C-8E76-729040CE4B0B}"
Expand Down
27 changes: 18 additions & 9 deletions example/example.vcxproj
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<?xml version="1.0"?>
<Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<ItemGroup Label="ProjectConfigurations">
<ProjectConfiguration Include="Debug|Win32">
<Configuration>Debug</Configuration>
Expand All @@ -18,6 +18,11 @@
<Platform>x64</Platform>
</ProjectConfiguration>
</ItemGroup>
<PropertyGroup Condition="'$(WindowsTargetPlatformVersion)'==''">
<LatestTargetPlatformVersion>$([Microsoft.Build.Utilities.ToolLocationHelper]::GetLatestSDKTargetPlatformVersion('Windows', '10.0'))</LatestTargetPlatformVersion>
<WindowsTargetPlatformVersion Condition="'$(WindowsTargetPlatformVersion)' == ''">$(LatestTargetPlatformVersion)</WindowsTargetPlatformVersion>
<TargetPlatformVersion>$(WindowsTargetPlatformVersion)</TargetPlatformVersion>
</PropertyGroup>
<PropertyGroup Label="Globals">
<ProjectGuid>{7FD42DF7-442E-479A-BA76-D0022F99702A}</ProjectGuid>
<Keyword>Win32Proj</Keyword>
Expand All @@ -27,24 +32,24 @@
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
<ConfigurationType>Application</ConfigurationType>
<CharacterSet>Unicode</CharacterSet>
<PlatformToolset>v140</PlatformToolset>
<PlatformToolset>v141</PlatformToolset>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
<ConfigurationType>Application</ConfigurationType>
<CharacterSet>Unicode</CharacterSet>
<PlatformToolset>v140</PlatformToolset>
<PlatformToolset>v141</PlatformToolset>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
<ConfigurationType>Application</ConfigurationType>
<CharacterSet>Unicode</CharacterSet>
<WholeProgramOptimization>true</WholeProgramOptimization>
<PlatformToolset>v140</PlatformToolset>
<PlatformToolset>v141</PlatformToolset>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
<ConfigurationType>Application</ConfigurationType>
<CharacterSet>Unicode</CharacterSet>
<WholeProgramOptimization>true</WholeProgramOptimization>
<PlatformToolset>v140</PlatformToolset>
<PlatformToolset>v141</PlatformToolset>
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
Expand All @@ -66,26 +71,26 @@
<PropertyGroup Label="UserMacros" />
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
<OutDir>bin\</OutDir>
<IntDir>obj\$(Configuration)\</IntDir>
<IntDir>obj\$(Platform)\$(Configuration)\</IntDir>
<TargetName>$(ProjectName)_debug</TargetName>
<LinkIncremental>true</LinkIncremental>
<GenerateManifest>true</GenerateManifest>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
<OutDir>bin\</OutDir>
<IntDir>obj\$(Configuration)\</IntDir>
<IntDir>obj\$(Platform)\$(Configuration)\</IntDir>
<TargetName>$(ProjectName)_debug</TargetName>
<LinkIncremental>true</LinkIncremental>
<GenerateManifest>true</GenerateManifest>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
<OutDir>bin\</OutDir>
<IntDir>obj\$(Configuration)\</IntDir>
<IntDir>obj\$(Platform)\$(Configuration)\</IntDir>
<LinkIncremental>false</LinkIncremental>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
<OutDir>bin\</OutDir>
<IntDir>obj\$(Configuration)\</IntDir>
<IntDir>obj\$(Platform)\$(Configuration)\</IntDir>
<LinkIncremental>false</LinkIncremental>
</PropertyGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
Expand All @@ -97,6 +102,7 @@
<WarningLevel>Level3</WarningLevel>
<AdditionalIncludeDirectories>%(AdditionalIncludeDirectories);src;..\..\..\addons\ofxHapPlayer\libs;..\..\..\addons\ofxHapPlayer\libs\ffmpeg;..\..\..\addons\ofxHapPlayer\libs\ffmpeg\include;..\..\..\addons\ofxHapPlayer\libs\ffmpeg\lib;..\..\..\addons\ofxHapPlayer\libs\ffmpeg\lib\vs;..\..\..\addons\ofxHapPlayer\libs\ffmpeg\lib\vs\Win32;..\..\..\addons\ofxHapPlayer\libs\ffmpeg\lib\vs\x64;..\..\..\addons\ofxHapPlayer\libs\hap;..\..\..\addons\ofxHapPlayer\libs\hap\src;..\..\..\addons\ofxHapPlayer\libs\ofxHap;..\..\..\addons\ofxHapPlayer\libs\ofxHap\include;..\..\..\addons\ofxHapPlayer\libs\ofxHap\include\ofxHap;..\..\..\addons\ofxHapPlayer\libs\ofxHap\src;..\..\..\addons\ofxHapPlayer\libs\snappy;..\..\..\addons\ofxHapPlayer\libs\snappy\include;..\..\..\addons\ofxHapPlayer\libs\snappy\lib;..\..\..\addons\ofxHapPlayer\libs\snappy\lib\vs;..\..\..\addons\ofxHapPlayer\libs\snappy\lib\vs\Win32;..\..\..\addons\ofxHapPlayer\libs\snappy\lib\vs\Win32\Debug;..\..\..\addons\ofxHapPlayer\libs\snappy\lib\vs\Win32\Release;..\..\..\addons\ofxHapPlayer\libs\snappy\lib\vs\x64;..\..\..\addons\ofxHapPlayer\libs\snappy\lib\vs\x64\Debug;..\..\..\addons\ofxHapPlayer\libs\snappy\lib\vs\x64\Release;..\..\..\addons\ofxHapPlayer\libs\snappy\license;..\..\..\addons\ofxHapPlayer\src</AdditionalIncludeDirectories>
<CompileAs>CompileAsCpp</CompileAs>
<ObjectFileName>$(IntDir)</ObjectFileName>
</ClCompile>
<Link>
<GenerateDebugInformation>true</GenerateDebugInformation>
Expand All @@ -117,6 +123,7 @@
<AdditionalIncludeDirectories>%(AdditionalIncludeDirectories);src;..\..\..\addons\ofxHapPlayer\libs;..\..\..\addons\ofxHapPlayer\libs\ffmpeg;..\..\..\addons\ofxHapPlayer\libs\ffmpeg\include;..\..\..\addons\ofxHapPlayer\libs\ffmpeg\lib;..\..\..\addons\ofxHapPlayer\libs\ffmpeg\lib\vs;..\..\..\addons\ofxHapPlayer\libs\ffmpeg\lib\vs\Win32;..\..\..\addons\ofxHapPlayer\libs\ffmpeg\lib\vs\x64;..\..\..\addons\ofxHapPlayer\libs\hap;..\..\..\addons\ofxHapPlayer\libs\hap\src;..\..\..\addons\ofxHapPlayer\libs\ofxHap;..\..\..\addons\ofxHapPlayer\libs\ofxHap\include;..\..\..\addons\ofxHapPlayer\libs\ofxHap\include\ofxHap;..\..\..\addons\ofxHapPlayer\libs\ofxHap\src;..\..\..\addons\ofxHapPlayer\libs\snappy;..\..\..\addons\ofxHapPlayer\libs\snappy\include;..\..\..\addons\ofxHapPlayer\libs\snappy\lib;..\..\..\addons\ofxHapPlayer\libs\snappy\lib\vs;..\..\..\addons\ofxHapPlayer\libs\snappy\lib\vs\Win32;..\..\..\addons\ofxHapPlayer\libs\snappy\lib\vs\Win32\Debug;..\..\..\addons\ofxHapPlayer\libs\snappy\lib\vs\Win32\Release;..\..\..\addons\ofxHapPlayer\libs\snappy\lib\vs\x64;..\..\..\addons\ofxHapPlayer\libs\snappy\lib\vs\x64\Debug;..\..\..\addons\ofxHapPlayer\libs\snappy\lib\vs\x64\Release;..\..\..\addons\ofxHapPlayer\libs\snappy\license;..\..\..\addons\ofxHapPlayer\src</AdditionalIncludeDirectories>
<CompileAs>CompileAsCpp</CompileAs>
<MultiProcessorCompilation>true</MultiProcessorCompilation>
<ObjectFileName>$(IntDir)</ObjectFileName>
</ClCompile>
<Link>
<GenerateDebugInformation>true</GenerateDebugInformation>
Expand All @@ -136,6 +143,7 @@
<AdditionalIncludeDirectories>%(AdditionalIncludeDirectories);src;..\..\..\addons\ofxHapPlayer\libs;..\..\..\addons\ofxHapPlayer\libs\ffmpeg;..\..\..\addons\ofxHapPlayer\libs\ffmpeg\include;..\..\..\addons\ofxHapPlayer\libs\ffmpeg\lib;..\..\..\addons\ofxHapPlayer\libs\ffmpeg\lib\vs;..\..\..\addons\ofxHapPlayer\libs\ffmpeg\lib\vs\Win32;..\..\..\addons\ofxHapPlayer\libs\ffmpeg\lib\vs\x64;..\..\..\addons\ofxHapPlayer\libs\hap;..\..\..\addons\ofxHapPlayer\libs\hap\src;..\..\..\addons\ofxHapPlayer\libs\ofxHap;..\..\..\addons\ofxHapPlayer\libs\ofxHap\include;..\..\..\addons\ofxHapPlayer\libs\ofxHap\include\ofxHap;..\..\..\addons\ofxHapPlayer\libs\ofxHap\src;..\..\..\addons\ofxHapPlayer\libs\snappy;..\..\..\addons\ofxHapPlayer\libs\snappy\include;..\..\..\addons\ofxHapPlayer\libs\snappy\lib;..\..\..\addons\ofxHapPlayer\libs\snappy\lib\vs;..\..\..\addons\ofxHapPlayer\libs\snappy\lib\vs\Win32;..\..\..\addons\ofxHapPlayer\libs\snappy\lib\vs\Win32\Debug;..\..\..\addons\ofxHapPlayer\libs\snappy\lib\vs\Win32\Release;..\..\..\addons\ofxHapPlayer\libs\snappy\lib\vs\x64;..\..\..\addons\ofxHapPlayer\libs\snappy\lib\vs\x64\Debug;..\..\..\addons\ofxHapPlayer\libs\snappy\lib\vs\x64\Release;..\..\..\addons\ofxHapPlayer\libs\snappy\license;..\..\..\addons\ofxHapPlayer\src</AdditionalIncludeDirectories>
<CompileAs>CompileAsCpp</CompileAs>
<MultiProcessorCompilation>true</MultiProcessorCompilation>
<ObjectFileName>$(IntDir)</ObjectFileName>
</ClCompile>
<Link>
<IgnoreAllDefaultLibraries>false</IgnoreAllDefaultLibraries>
Expand All @@ -157,6 +165,7 @@
<WarningLevel>Level3</WarningLevel>
<AdditionalIncludeDirectories>%(AdditionalIncludeDirectories);src;..\..\..\addons\ofxHapPlayer\libs;..\..\..\addons\ofxHapPlayer\libs\ffmpeg;..\..\..\addons\ofxHapPlayer\libs\ffmpeg\include;..\..\..\addons\ofxHapPlayer\libs\ffmpeg\lib;..\..\..\addons\ofxHapPlayer\libs\ffmpeg\lib\vs;..\..\..\addons\ofxHapPlayer\libs\ffmpeg\lib\vs\Win32;..\..\..\addons\ofxHapPlayer\libs\ffmpeg\lib\vs\x64;..\..\..\addons\ofxHapPlayer\libs\hap;..\..\..\addons\ofxHapPlayer\libs\hap\src;..\..\..\addons\ofxHapPlayer\libs\ofxHap;..\..\..\addons\ofxHapPlayer\libs\ofxHap\include;..\..\..\addons\ofxHapPlayer\libs\ofxHap\include\ofxHap;..\..\..\addons\ofxHapPlayer\libs\ofxHap\src;..\..\..\addons\ofxHapPlayer\libs\snappy;..\..\..\addons\ofxHapPlayer\libs\snappy\include;..\..\..\addons\ofxHapPlayer\libs\snappy\lib;..\..\..\addons\ofxHapPlayer\libs\snappy\lib\vs;..\..\..\addons\ofxHapPlayer\libs\snappy\lib\vs\Win32;..\..\..\addons\ofxHapPlayer\libs\snappy\lib\vs\Win32\Debug;..\..\..\addons\ofxHapPlayer\libs\snappy\lib\vs\Win32\Release;..\..\..\addons\ofxHapPlayer\libs\snappy\lib\vs\x64;..\..\..\addons\ofxHapPlayer\libs\snappy\lib\vs\x64\Debug;..\..\..\addons\ofxHapPlayer\libs\snappy\lib\vs\x64\Release;..\..\..\addons\ofxHapPlayer\libs\snappy\license;..\..\..\addons\ofxHapPlayer\src</AdditionalIncludeDirectories>
<CompileAs>CompileAsCpp</CompileAs>
<ObjectFileName>$(IntDir)</ObjectFileName>
</ClCompile>
<Link>
<IgnoreAllDefaultLibraries>false</IgnoreAllDefaultLibraries>
Expand Down

0 comments on commit 615bb6e

Please sign in to comment.