Skip to content

Commit 1b22ca3

Browse files
robotconsciencerobotconscience
committed
Auto-updated projects. All good on OS X
1 parent 53922da commit 1b22ca3

File tree

96 files changed

+15284
-9084
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

96 files changed

+15284
-9084
lines changed

‎example_client_blob/Project.xcconfig‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,5 +13,5 @@ ICON_FILE_PATH = $(OF_PATH)/libs/openFrameworksCompiled/project/osx/
1313
//IF YOU WANT AN APP TO HAVE A CUSTOM ICON - PUT THEM IN YOUR DATA FOLDER AND CHANGE ICON_FILE_PATH to:
1414
//ICON_FILE_PATH = bin/data/
1515

16-
OTHER_LDFLAGS = $(OF_CORE_LIBS)
16+
OTHER_LDFLAGS = $(OF_CORE_LIBS) $(OF_CORE_FRAMEWORKS)
1717
HEADER_SEARCH_PATHS = $(OF_CORE_HEADERS)

‎example_client_blob/example_client_blob.sln‎

Lines changed: 35 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -1,25 +1,35 @@
1-
Microsoft Visual Studio Solution File, Format Version 12.00
2-
# Visual Studio 2012
3-
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "example_client_blob", "example_client_blob.vcxproj", "{7FD42DF7-442E-479A-BA76-D0022F99702A}"
4-
EndProject
5-
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "openframeworksLib", "..\..\..\libs\openFrameworksCompiled\project\vs\openframeworksLib.vcxproj", "{5837595D-ACA9-485C-8E76-729040CE4B0B}"
6-
EndProject
7-
Global
8-
GlobalSection(SolutionConfigurationPlatforms) = preSolution
9-
Debug|Win32 = Debug|Win32
10-
Release|Win32 = Release|Win32
11-
EndGlobalSection
12-
GlobalSection(ProjectConfigurationPlatforms) = postSolution
13-
{7FD42DF7-442E-479A-BA76-D0022F99702A}.Debug|Win32.ActiveCfg = Debug|Win32
14-
{7FD42DF7-442E-479A-BA76-D0022F99702A}.Debug|Win32.Build.0 = Debug|Win32
15-
{7FD42DF7-442E-479A-BA76-D0022F99702A}.Release|Win32.ActiveCfg = Release|Win32
16-
{7FD42DF7-442E-479A-BA76-D0022F99702A}.Release|Win32.Build.0 = Release|Win32
17-
{5837595D-ACA9-485C-8E76-729040CE4B0B}.Debug|Win32.ActiveCfg = Debug|Win32
18-
{5837595D-ACA9-485C-8E76-729040CE4B0B}.Debug|Win32.Build.0 = Debug|Win32
19-
{5837595D-ACA9-485C-8E76-729040CE4B0B}.Release|Win32.ActiveCfg = Release|Win32
20-
{5837595D-ACA9-485C-8E76-729040CE4B0B}.Release|Win32.Build.0 = Release|Win32
21-
EndGlobalSection
22-
GlobalSection(SolutionProperties) = preSolution
23-
HideSolutionNode = FALSE
24-
EndGlobalSection
25-
EndGlobal
1+
Microsoft Visual Studio Solution File, Format Version 12.00
2+
# Visual Studio 14
3+
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "example_client_blob", "example_client_blob.vcxproj", "{7FD42DF7-442E-479A-BA76-D0022F99702A}"
4+
EndProject
5+
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "openframeworksLib", "..\..\..\libs\openFrameworksCompiled\project\vs\openframeworksLib.vcxproj", "{5837595D-ACA9-485C-8E76-729040CE4B0B}"
6+
EndProject
7+
Global
8+
GlobalSection(SolutionConfigurationPlatforms) = preSolution
9+
Debug|Win32 = Debug|Win32
10+
Debug|x64 = Debug|x64
11+
Release|Win32 = Release|Win32
12+
Release|x64 = Release|x64
13+
EndGlobalSection
14+
GlobalSection(ProjectConfigurationPlatforms) = postSolution
15+
{7FD42DF7-442E-479A-BA76-D0022F99702A}.Debug|Win32.ActiveCfg = Debug|Win32
16+
{7FD42DF7-442E-479A-BA76-D0022F99702A}.Debug|Win32.Build.0 = Debug|Win32
17+
{7FD42DF7-442E-479A-BA76-D0022F99702A}.Debug|x64.ActiveCfg = Debug|x64
18+
{7FD42DF7-442E-479A-BA76-D0022F99702A}.Debug|x64.Build.0 = Debug|x64
19+
{7FD42DF7-442E-479A-BA76-D0022F99702A}.Release|Win32.ActiveCfg = Release|Win32
20+
{7FD42DF7-442E-479A-BA76-D0022F99702A}.Release|Win32.Build.0 = Release|Win32
21+
{7FD42DF7-442E-479A-BA76-D0022F99702A}.Release|x64.ActiveCfg = Release|x64
22+
{7FD42DF7-442E-479A-BA76-D0022F99702A}.Release|x64.Build.0 = Release|x64
23+
{5837595D-ACA9-485C-8E76-729040CE4B0B}.Debug|Win32.ActiveCfg = Debug|Win32
24+
{5837595D-ACA9-485C-8E76-729040CE4B0B}.Debug|Win32.Build.0 = Debug|Win32
25+
{5837595D-ACA9-485C-8E76-729040CE4B0B}.Debug|x64.ActiveCfg = Debug|x64
26+
{5837595D-ACA9-485C-8E76-729040CE4B0B}.Debug|x64.Build.0 = Debug|x64
27+
{5837595D-ACA9-485C-8E76-729040CE4B0B}.Release|Win32.ActiveCfg = Release|Win32
28+
{5837595D-ACA9-485C-8E76-729040CE4B0B}.Release|Win32.Build.0 = Release|Win32
29+
{5837595D-ACA9-485C-8E76-729040CE4B0B}.Release|x64.ActiveCfg = Release|x64
30+
{5837595D-ACA9-485C-8E76-729040CE4B0B}.Release|x64.Build.0 = Release|x64
31+
EndGlobalSection
32+
GlobalSection(SolutionProperties) = preSolution
33+
HideSolutionNode = FALSE
34+
EndGlobalSection
35+
EndGlobal

‎example_client_blob/example_client_blob.vcxproj‎

Lines changed: 103 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,22 @@
11
<?xml version="1.0"?>
2-
<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
2+
<Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
33
<ItemGroup Label="ProjectConfigurations">
44
<ProjectConfiguration Include="Debug|Win32">
55
<Configuration>Debug</Configuration>
66
<Platform>Win32</Platform>
77
</ProjectConfiguration>
8+
<ProjectConfiguration Include="Debug|x64">
9+
<Configuration>Debug</Configuration>
10+
<Platform>x64</Platform>
11+
</ProjectConfiguration>
812
<ProjectConfiguration Include="Release|Win32">
913
<Configuration>Release</Configuration>
1014
<Platform>Win32</Platform>
1115
</ProjectConfiguration>
16+
<ProjectConfiguration Include="Release|x64">
17+
<Configuration>Release</Configuration>
18+
<Platform>x64</Platform>
19+
</ProjectConfiguration>
1220
</ItemGroup>
1321
<PropertyGroup Label="Globals">
1422
<ProjectGuid>{7FD42DF7-442E-479A-BA76-D0022F99702A}</ProjectGuid>
@@ -19,23 +27,42 @@
1927
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
2028
<ConfigurationType>Application</ConfigurationType>
2129
<CharacterSet>Unicode</CharacterSet>
22-
<PlatformToolset>v110</PlatformToolset>
30+
<PlatformToolset>v140</PlatformToolset>
31+
</PropertyGroup>
32+
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
33+
<ConfigurationType>Application</ConfigurationType>
34+
<CharacterSet>Unicode</CharacterSet>
35+
<PlatformToolset>v140</PlatformToolset>
2336
</PropertyGroup>
2437
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
2538
<ConfigurationType>Application</ConfigurationType>
2639
<CharacterSet>Unicode</CharacterSet>
2740
<WholeProgramOptimization>true</WholeProgramOptimization>
28-
<PlatformToolset>v110</PlatformToolset>
41+
<PlatformToolset>v140</PlatformToolset>
42+
</PropertyGroup>
43+
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
44+
<ConfigurationType>Application</ConfigurationType>
45+
<CharacterSet>Unicode</CharacterSet>
46+
<WholeProgramOptimization>true</WholeProgramOptimization>
47+
<PlatformToolset>v140</PlatformToolset>
2948
</PropertyGroup>
3049
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
3150
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
3251
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
3352
<Import Project="..\..\..\libs\openFrameworksCompiled\project\vs\openFrameworksRelease.props" />
3453
</ImportGroup>
54+
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
55+
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
56+
<Import Project="..\..\..\libs\openFrameworksCompiled\project\vs\openFrameworksRelease.props" />
57+
</ImportGroup>
3558
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
3659
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
3760
<Import Project="..\..\..\libs\openFrameworksCompiled\project\vs\openFrameworksDebug.props" />
3861
</ImportGroup>
62+
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
63+
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
64+
<Import Project="..\..\..\libs\openFrameworksCompiled\project\vs\openFrameworksDebug.props" />
65+
</ImportGroup>
3966
<PropertyGroup Label="UserMacros" />
4067
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
4168
<OutDir>bin\</OutDir>
@@ -44,38 +71,91 @@
4471
<LinkIncremental>true</LinkIncremental>
4572
<GenerateManifest>true</GenerateManifest>
4673
</PropertyGroup>
74+
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
75+
<OutDir>bin\</OutDir>
76+
<IntDir>obj\$(Configuration)\</IntDir>
77+
<TargetName>$(ProjectName)_debug</TargetName>
78+
<LinkIncremental>true</LinkIncremental>
79+
<GenerateManifest>true</GenerateManifest>
80+
</PropertyGroup>
4781
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
4882
<OutDir>bin\</OutDir>
4983
<IntDir>obj\$(Configuration)\</IntDir>
5084
<LinkIncremental>false</LinkIncremental>
5185
</PropertyGroup>
86+
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
87+
<OutDir>bin\</OutDir>
88+
<IntDir>obj\$(Configuration)\</IntDir>
89+
<LinkIncremental>false</LinkIncremental>
90+
</PropertyGroup>
5291
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
5392
<ClCompile>
5493
<Optimization>Disabled</Optimization>
55-
<MinimalRebuild>true</MinimalRebuild>
5694
<BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
57-
<PreprocessorDefinitions>_WIN32_WINNT=0x501;%(PreprocessorDefinitions)</PreprocessorDefinitions>
95+
<PreprocessorDefinitions>%(PreprocessorDefinitions)</PreprocessorDefinitions>
5896
<RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
5997
<WarningLevel>Level3</WarningLevel>
60-
<DebugInformationFormat>EditAndContinue</DebugInformationFormat>
61-
<AdditionalIncludeDirectories>%(AdditionalIncludeDirectories);src;..\..\..\addons\ofxLibwebsockets\libs\jsoncpp;..\..\..\addons\ofxLibwebsockets\libs\jsoncpp\json;..\..\..\addons\ofxLibwebsockets\libs\libwebsockets\include\;..\..\..\addons\ofxLibwebsockets\libs\ofxLibwebsockets\include;..\..\..\addons\ofxLibwebsockets\libs\ofxLibwebsockets\include\ofxLibwebsockets;..\..\..\addons\ofxLibwebsockets\libs\ofxLibwebsockets\src;..\..\..\addons\ofxLibwebsockets\src;..\..\..\addons\ofxLibwebsockets\libs\libwebsockets\include\win32port;..\..\..\addons\ofxLibwebsockets\libs\libwebsockets\include\win32port\win32helpers;..\..\..\addons\ofxTurboJpeg\src\;..\..\..\addons\ofxTurboJpeg\libs\turbo-jpeg\include</AdditionalIncludeDirectories>
98+
<AdditionalIncludeDirectories>%(AdditionalIncludeDirectories);src;..\..\..\addons\ofxLibwebsockets\libs\jsoncpp;..\..\..\addons\ofxLibwebsockets\libs\jsoncpp\json;..\..\..\addons\ofxLibwebsockets\libs\libwebsockets\include\;..\..\..\addons\ofxLibwebsockets\libs\ofxLibwebsockets\include;..\..\..\addons\ofxLibwebsockets\libs\ofxLibwebsockets\include\ofxLibwebsockets;..\..\..\addons\ofxLibwebsockets\libs\ofxLibwebsockets\src;..\..\..\addons\ofxLibwebsockets\src;..\..\..\addons\ofxTurboJpeg\src\;..\..\..\addons\ofxTurboJpeg\libs\turbo-jpeg\include</AdditionalIncludeDirectories>
6299
<CompileAs>CompileAsCpp</CompileAs>
63100
</ClCompile>
64101
<Link>
65102
<GenerateDebugInformation>true</GenerateDebugInformation>
66103
<SubSystem>Console</SubSystem>
67104
<RandomizedBaseAddress>false</RandomizedBaseAddress>
68-
<AdditionalDependencies>%(AdditionalDependencies);websockets.lib;zlib_internal.lib;turbojpeg-static.lib</AdditionalDependencies>
69-
<AdditionalLibraryDirectories>%(AdditionalLibraryDirectories);..\..\..\addons\ofxLibwebsockets\libs\libwebsockets\lib\win32\Release;..\..\..\addons\ofxTurboJpeg\libs\turbo-jpeg\lib\win32</AdditionalLibraryDirectories>
105+
<AdditionalDependencies>%(AdditionalDependencies);websockets_static.lib;ZLIB.lib;turbojpeg-static.lib</AdditionalDependencies>
106+
<AdditionalLibraryDirectories>%(AdditionalLibraryDirectories);..\..\..\addons\ofxLibwebsockets\libs\libwebsockets\lib\vs\Win32\Debug;..\..\..\addons\ofxTurboJpeg\libs\turbo-jpeg\lib\vs\Win32\Debug</AdditionalLibraryDirectories>
70107
</Link>
108+
<PostBuildEvent />
109+
</ItemDefinitionGroup>
110+
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
111+
<ClCompile>
112+
<Optimization>Disabled</Optimization>
113+
<BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
114+
<PreprocessorDefinitions>%(PreprocessorDefinitions)</PreprocessorDefinitions>
115+
<RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
116+
<WarningLevel>Level3</WarningLevel>
117+
<AdditionalIncludeDirectories>%(AdditionalIncludeDirectories);src;..\..\..\addons\ofxLibwebsockets\libs\jsoncpp;..\..\..\addons\ofxLibwebsockets\libs\jsoncpp\json;..\..\..\addons\ofxLibwebsockets\libs\libwebsockets\include\;..\..\..\addons\ofxLibwebsockets\libs\ofxLibwebsockets\include;..\..\..\addons\ofxLibwebsockets\libs\ofxLibwebsockets\include\ofxLibwebsockets;..\..\..\addons\ofxLibwebsockets\libs\ofxLibwebsockets\src;..\..\..\addons\ofxLibwebsockets\src;..\..\..\addons\ofxTurboJpeg\src\;..\..\..\addons\ofxTurboJpeg\libs\turbo-jpeg\include</AdditionalIncludeDirectories>
118+
<CompileAs>CompileAsCpp</CompileAs>
119+
<MultiProcessorCompilation>true</MultiProcessorCompilation>
120+
</ClCompile>
121+
<Link>
122+
<GenerateDebugInformation>true</GenerateDebugInformation>
123+
<SubSystem>Console</SubSystem>
124+
<RandomizedBaseAddress>false</RandomizedBaseAddress>
125+
<AdditionalDependencies>%(AdditionalDependencies);websockets_static.lib;ZLIB.lib;turbojpeg-static.lib</AdditionalDependencies>
126+
<AdditionalLibraryDirectories>%(AdditionalLibraryDirectories);..\..\..\addons\ofxLibwebsockets\libs\libwebsockets\lib\vs\x64\Debug;..\..\..\addons\ofxTurboJpeg\libs\turbo-jpeg\lib\vs\x64\Debug</AdditionalLibraryDirectories>
127+
</Link>
128+
<PostBuildEvent />
71129
</ItemDefinitionGroup>
72130
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
73131
<ClCompile>
74132
<WholeProgramOptimization>false</WholeProgramOptimization>
75-
<PreprocessorDefinitions>_WIN32_WINNT=0x501;%(PreprocessorDefinitions)</PreprocessorDefinitions>
133+
<PreprocessorDefinitions>%(PreprocessorDefinitions)</PreprocessorDefinitions>
134+
<RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
135+
<WarningLevel>Level3</WarningLevel>
136+
<AdditionalIncludeDirectories>%(AdditionalIncludeDirectories);src;..\..\..\addons\ofxLibwebsockets\libs\jsoncpp;..\..\..\addons\ofxLibwebsockets\libs\jsoncpp\json;..\..\..\addons\ofxLibwebsockets\libs\libwebsockets\include\;..\..\..\addons\ofxLibwebsockets\libs\ofxLibwebsockets\include;..\..\..\addons\ofxLibwebsockets\libs\ofxLibwebsockets\include\ofxLibwebsockets;..\..\..\addons\ofxLibwebsockets\libs\ofxLibwebsockets\src;..\..\..\addons\ofxLibwebsockets\src;..\..\..\addons\ofxTurboJpeg\src\;..\..\..\addons\ofxTurboJpeg\libs\turbo-jpeg\include</AdditionalIncludeDirectories>
137+
<CompileAs>CompileAsCpp</CompileAs>
138+
<MultiProcessorCompilation>true</MultiProcessorCompilation>
139+
</ClCompile>
140+
<Link>
141+
<IgnoreAllDefaultLibraries>false</IgnoreAllDefaultLibraries>
142+
<GenerateDebugInformation>false</GenerateDebugInformation>
143+
<SubSystem>Console</SubSystem>
144+
<OptimizeReferences>true</OptimizeReferences>
145+
<EnableCOMDATFolding>true</EnableCOMDATFolding>
146+
<RandomizedBaseAddress>false</RandomizedBaseAddress>
147+
<AdditionalDependencies>%(AdditionalDependencies);websockets_static.lib;ZLIB.lib;turbojpeg-static.lib</AdditionalDependencies>
148+
<AdditionalLibraryDirectories>%(AdditionalLibraryDirectories);..\..\..\addons\ofxLibwebsockets\libs\libwebsockets\lib\vs\Win32\Release;..\..\..\addons\ofxTurboJpeg\libs\turbo-jpeg\lib\vs\Win32\Release</AdditionalLibraryDirectories>
149+
</Link>
150+
<PostBuildEvent />
151+
</ItemDefinitionGroup>
152+
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
153+
<ClCompile>
154+
<WholeProgramOptimization>false</WholeProgramOptimization>
155+
<PreprocessorDefinitions>%(PreprocessorDefinitions)</PreprocessorDefinitions>
76156
<RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
77157
<WarningLevel>Level3</WarningLevel>
78-
<AdditionalIncludeDirectories>%(AdditionalIncludeDirectories);src;..\..\..\addons\ofxLibwebsockets\libs\jsoncpp;..\..\..\addons\ofxLibwebsockets\libs\jsoncpp\json;..\..\..\addons\ofxLibwebsockets\libs\libwebsockets\include\;..\..\..\addons\ofxLibwebsockets\libs\ofxLibwebsockets\include;..\..\..\addons\ofxLibwebsockets\libs\ofxLibwebsockets\include\ofxLibwebsockets;..\..\..\addons\ofxLibwebsockets\libs\ofxLibwebsockets\src;..\..\..\addons\ofxLibwebsockets\src;..\..\..\addons\ofxLibwebsockets\libs\libwebsockets\include\win32port;..\..\..\addons\ofxLibwebsockets\libs\libwebsockets\include\win32port\win32helpers;..\..\..\addons\ofxTurboJpeg\src\;..\..\..\addons\ofxTurboJpeg\libs\turbo-jpeg\include</AdditionalIncludeDirectories>
158+
<AdditionalIncludeDirectories>%(AdditionalIncludeDirectories);src;..\..\..\addons\ofxLibwebsockets\libs\jsoncpp;..\..\..\addons\ofxLibwebsockets\libs\jsoncpp\json;..\..\..\addons\ofxLibwebsockets\libs\libwebsockets\include\;..\..\..\addons\ofxLibwebsockets\libs\ofxLibwebsockets\include;..\..\..\addons\ofxLibwebsockets\libs\ofxLibwebsockets\include\ofxLibwebsockets;..\..\..\addons\ofxLibwebsockets\libs\ofxLibwebsockets\src;..\..\..\addons\ofxLibwebsockets\src;..\..\..\addons\ofxTurboJpeg\src\;..\..\..\addons\ofxTurboJpeg\libs\turbo-jpeg\include</AdditionalIncludeDirectories>
79159
<CompileAs>CompileAsCpp</CompileAs>
80160
</ClCompile>
81161
<Link>
@@ -85,9 +165,10 @@
85165
<OptimizeReferences>true</OptimizeReferences>
86166
<EnableCOMDATFolding>true</EnableCOMDATFolding>
87167
<RandomizedBaseAddress>false</RandomizedBaseAddress>
88-
<AdditionalDependencies>%(AdditionalDependencies);websockets.lib;zlib_internal.lib;turbojpeg-static.lib</AdditionalDependencies>
89-
<AdditionalLibraryDirectories>%(AdditionalLibraryDirectories);..\..\..\addons\ofxLibwebsockets\libs\libwebsockets\lib\win32\Release;..\..\..\addons\ofxTurboJpeg\libs\turbo-jpeg\lib\win32</AdditionalLibraryDirectories>
168+
<AdditionalDependencies>%(AdditionalDependencies);websockets_static.lib;ZLIB.lib;turbojpeg-static.lib</AdditionalDependencies>
169+
<AdditionalLibraryDirectories>%(AdditionalLibraryDirectories);..\..\..\addons\ofxLibwebsockets\libs\libwebsockets\lib\vs\x64\Release;..\..\..\addons\ofxTurboJpeg\libs\turbo-jpeg\lib\vs\x64\Release</AdditionalLibraryDirectories>
90170
</Link>
171+
<PostBuildEvent />
91172
</ItemDefinitionGroup>
92173
<ItemGroup>
93174
<ClCompile Include="src\main.cpp" />
@@ -107,6 +188,7 @@
107188
<ClInclude Include="..\..\..\addons\ofxLibwebsockets\libs\jsoncpp\json\json-forwards.h" />
108189
<ClInclude Include="..\..\..\addons\ofxLibwebsockets\libs\jsoncpp\json\json.h" />
109190
<ClInclude Include="..\..\..\addons\ofxLibwebsockets\libs\libwebsockets\include\libwebsockets.h" />
191+
<ClInclude Include="..\..\..\addons\ofxLibwebsockets\libs\libwebsockets\include\lws_config.h" />
110192
<ClInclude Include="..\..\..\addons\ofxLibwebsockets\libs\ofxLibwebsockets\include\ofxLibwebsockets\Client.h" />
111193
<ClInclude Include="..\..\..\addons\ofxLibwebsockets\libs\ofxLibwebsockets\include\ofxLibwebsockets\Connection.h" />
112194
<ClInclude Include="..\..\..\addons\ofxLibwebsockets\libs\ofxLibwebsockets\include\ofxLibwebsockets\Events.h" />
@@ -117,14 +199,21 @@
117199
<ClInclude Include="..\..\..\addons\ofxTurboJpeg\src\ofxTurboJpeg.h" />
118200
</ItemGroup>
119201
<ItemGroup>
120-
<ProjectReference Include="..\..\..\libs\openFrameworksCompiled\project\vs\openframeworksLib.vcxproj">
202+
<ProjectReference Include="$(OF_ROOT)\libs\openFrameworksCompiled\project\vs\openframeworksLib.vcxproj">
121203
<Project>{5837595d-aca9-485c-8e76-729040ce4b0b}</Project>
122204
</ProjectReference>
123205
</ItemGroup>
124206
<ItemGroup>
125207
<ResourceCompile Include="icon.rc">
126208
<AdditionalOptions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">/D_DEBUG %(AdditionalOptions)</AdditionalOptions>
209+
<AdditionalOptions Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">/D_DEBUG %(AdditionalOptions)</AdditionalOptions>
210+
<AdditionalIncludeDirectories>$(OF_ROOT)\libs\openFrameworksCompiled\project\vs</AdditionalIncludeDirectories>
127211
</ResourceCompile>
128212
</ItemGroup>
129213
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
214+
<ProjectExtensions>
215+
<VisualStudio>
216+
<UserProperties RESOURCE_FILE="icon.rc" />
217+
</VisualStudio>
218+
</ProjectExtensions>
130219
</Project>

0 commit comments

Comments
 (0)