Skip to content

Commit ca4e483

Browse files
danoli3danoli3
authored
Visual Studio 2022 Support (ARM64EC, ARM64, x64) [master] (#474)
* VS Fixes for addon paths and linking to targets (ARM64, ARM64EC, x64) * VS2022 Copy Addon DLLS correctly / Create Folders * Update CommandLine Project to support targets * VS 2022 - multitarget fixes for projectGenerator * Fix default being macOS * npm update * Latest VS 2022 * VS2022
1 parent 44fc978 commit ca4e483

15 files changed

Lines changed: 609 additions & 59 deletions

‎.github/workflows/build-vs.yml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,8 @@ concurrency:
1818
cancel-in-progress: true
1919

2020
jobs:
21-
build-vs2019:
22-
runs-on: windows-2019
21+
build-vs2022:
22+
runs-on: windows-2022
2323
strategy:
2424
matrix:
2525
include:
@@ -63,7 +63,7 @@ jobs:
6363
- name: Build projectGenerator CMDLine with oF
6464
working-directory: ${{env.GITHUB_WORKSPACE}}
6565
run:
66-
msbuild ../openFrameworks/apps/projectGenerator/commandLine/commandLine.vcxproj /p:configuration=release /p:platform=${{ matrix.platform }} /p:PlatformToolset=v142
66+
msbuild ../openFrameworks/apps/projectGenerator/commandLine/commandLine.vcxproj /p:configuration=release /p:platform=${{ matrix.platform }} /p:PlatformToolset=v143
6767

6868
- name: Create projectGenerator cmd zip
6969
shell: msys2 {0}

‎.gitignore‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -97,3 +97,4 @@ commandLine/bin/projectGenerator*
9797
frontend/app/projectGenerator*
9898

9999
commandLine/.vs/commandLine/xs
100+
commandLine/.vs/

‎commandLine/commandLine.sln‎

Lines changed: 26 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,25 +1,50 @@
11
Microsoft Visual Studio Solution File, Format Version 12.00
2-
# Visual Studio 14
2+
# Visual Studio Version 17
3+
VisualStudioVersion = 17.8.34330.188
4+
MinimumVisualStudioVersion = 10.0.40219.1
35
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "commandLine", "commandLine.vcxproj", "{7FD42DF7-442E-479A-BA76-D0022F99702A}"
46
EndProject
57
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "openframeworksLib", "..\..\..\libs\openFrameworksCompiled\project\vs\openframeworksLib.vcxproj", "{5837595D-ACA9-485C-8E76-729040CE4B0B}"
68
EndProject
79
Global
810
GlobalSection(SolutionConfigurationPlatforms) = preSolution
11+
Debug|ARM64 = Debug|ARM64
12+
Debug|ARM64EC = Debug|ARM64EC
913
Debug|x64 = Debug|x64
14+
Release|ARM64 = Release|ARM64
15+
Release|ARM64EC = Release|ARM64EC
1016
Release|x64 = Release|x64
1117
EndGlobalSection
1218
GlobalSection(ProjectConfigurationPlatforms) = postSolution
19+
{7FD42DF7-442E-479A-BA76-D0022F99702A}.Debug|ARM64.ActiveCfg = Debug|ARM64
20+
{7FD42DF7-442E-479A-BA76-D0022F99702A}.Debug|ARM64.Build.0 = Debug|ARM64
21+
{7FD42DF7-442E-479A-BA76-D0022F99702A}.Debug|ARM64EC.ActiveCfg = Debug|ARM64EC
22+
{7FD42DF7-442E-479A-BA76-D0022F99702A}.Debug|ARM64EC.Build.0 = Debug|ARM64EC
1323
{7FD42DF7-442E-479A-BA76-D0022F99702A}.Debug|x64.ActiveCfg = Debug|x64
1424
{7FD42DF7-442E-479A-BA76-D0022F99702A}.Debug|x64.Build.0 = Debug|x64
25+
{7FD42DF7-442E-479A-BA76-D0022F99702A}.Release|ARM64.ActiveCfg = Release|ARM64
26+
{7FD42DF7-442E-479A-BA76-D0022F99702A}.Release|ARM64.Build.0 = Release|ARM64
27+
{7FD42DF7-442E-479A-BA76-D0022F99702A}.Release|ARM64EC.ActiveCfg = Release|ARM64EC
28+
{7FD42DF7-442E-479A-BA76-D0022F99702A}.Release|ARM64EC.Build.0 = Release|ARM64EC
1529
{7FD42DF7-442E-479A-BA76-D0022F99702A}.Release|x64.ActiveCfg = Release|x64
1630
{7FD42DF7-442E-479A-BA76-D0022F99702A}.Release|x64.Build.0 = Release|x64
31+
{5837595D-ACA9-485C-8E76-729040CE4B0B}.Debug|ARM64.ActiveCfg = Debug|ARM64
32+
{5837595D-ACA9-485C-8E76-729040CE4B0B}.Debug|ARM64.Build.0 = Debug|ARM64
33+
{5837595D-ACA9-485C-8E76-729040CE4B0B}.Debug|ARM64EC.ActiveCfg = Debug|ARM64EC
34+
{5837595D-ACA9-485C-8E76-729040CE4B0B}.Debug|ARM64EC.Build.0 = Debug|ARM64EC
1735
{5837595D-ACA9-485C-8E76-729040CE4B0B}.Debug|x64.ActiveCfg = Debug|x64
1836
{5837595D-ACA9-485C-8E76-729040CE4B0B}.Debug|x64.Build.0 = Debug|x64
37+
{5837595D-ACA9-485C-8E76-729040CE4B0B}.Release|ARM64.ActiveCfg = Release|ARM64
38+
{5837595D-ACA9-485C-8E76-729040CE4B0B}.Release|ARM64.Build.0 = Release|ARM64
39+
{5837595D-ACA9-485C-8E76-729040CE4B0B}.Release|ARM64EC.ActiveCfg = Release|ARM64EC
40+
{5837595D-ACA9-485C-8E76-729040CE4B0B}.Release|ARM64EC.Build.0 = Release|ARM64EC
1941
{5837595D-ACA9-485C-8E76-729040CE4B0B}.Release|x64.ActiveCfg = Release|x64
2042
{5837595D-ACA9-485C-8E76-729040CE4B0B}.Release|x64.Build.0 = Release|x64
2143
EndGlobalSection
2244
GlobalSection(SolutionProperties) = preSolution
2345
HideSolutionNode = FALSE
2446
EndGlobalSection
47+
GlobalSection(ExtensibilityGlobals) = postSolution
48+
SolutionGuid = {CA51939E-8EDE-42C4-9126-41B0925A7B1C}
49+
EndGlobalSection
2550
EndGlobal

‎commandLine/commandLine.vcxproj‎

Lines changed: 173 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,26 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
33
<ItemGroup Label="ProjectConfigurations">
4+
<ProjectConfiguration Include="Debug|ARM64">
5+
<Configuration>Debug</Configuration>
6+
<Platform>ARM64</Platform>
7+
</ProjectConfiguration>
8+
<ProjectConfiguration Include="Debug|ARM64EC">
9+
<Configuration>Debug</Configuration>
10+
<Platform>ARM64EC</Platform>
11+
</ProjectConfiguration>
412
<ProjectConfiguration Include="Debug|x64">
513
<Configuration>Debug</Configuration>
614
<Platform>x64</Platform>
715
</ProjectConfiguration>
16+
<ProjectConfiguration Include="Release|ARM64">
17+
<Configuration>Release</Configuration>
18+
<Platform>ARM64</Platform>
19+
</ProjectConfiguration>
20+
<ProjectConfiguration Include="Release|ARM64EC">
21+
<Configuration>Release</Configuration>
22+
<Platform>ARM64EC</Platform>
23+
</ProjectConfiguration>
824
<ProjectConfiguration Include="Release|x64">
925
<Configuration>Release</Configuration>
1026
<Platform>x64</Platform>
@@ -14,28 +30,67 @@
1430
<ProjectGuid>{7FD42DF7-442E-479A-BA76-D0022F99702A}</ProjectGuid>
1531
<Keyword>Win32Proj</Keyword>
1632
<RootNamespace>commandLine</RootNamespace>
33+
<WindowsTargetPlatformVersion>10.0</WindowsTargetPlatformVersion>
1734
</PropertyGroup>
1835
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
1936
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
2037
<ConfigurationType>Application</ConfigurationType>
2138
<CharacterSet>Unicode</CharacterSet>
22-
<PlatformToolset>v142</PlatformToolset>
39+
<PlatformToolset>v143</PlatformToolset>
40+
</PropertyGroup>
41+
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'" Label="Configuration">
42+
<ConfigurationType>Application</ConfigurationType>
43+
<CharacterSet>Unicode</CharacterSet>
44+
<PlatformToolset>v143</PlatformToolset>
45+
</PropertyGroup>
46+
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64EC'" Label="Configuration">
47+
<ConfigurationType>Application</ConfigurationType>
48+
<CharacterSet>Unicode</CharacterSet>
49+
<PlatformToolset>v143</PlatformToolset>
2350
</PropertyGroup>
2451
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
2552
<ConfigurationType>Application</ConfigurationType>
2653
<CharacterSet>Unicode</CharacterSet>
2754
<WholeProgramOptimization>true</WholeProgramOptimization>
28-
<PlatformToolset>v142</PlatformToolset>
55+
<PlatformToolset>v143</PlatformToolset>
56+
</PropertyGroup>
57+
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'" Label="Configuration">
58+
<ConfigurationType>Application</ConfigurationType>
59+
<CharacterSet>Unicode</CharacterSet>
60+
<WholeProgramOptimization>true</WholeProgramOptimization>
61+
<PlatformToolset>v143</PlatformToolset>
62+
</PropertyGroup>
63+
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM64EC'" Label="Configuration">
64+
<ConfigurationType>Application</ConfigurationType>
65+
<CharacterSet>Unicode</CharacterSet>
66+
<WholeProgramOptimization>true</WholeProgramOptimization>
67+
<PlatformToolset>v143</PlatformToolset>
2968
</PropertyGroup>
3069
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
3170
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
3271
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
3372
<Import Project="..\..\..\libs\openFrameworksCompiled\project\vs\openFrameworksRelease.props" />
3473
</ImportGroup>
74+
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'" Label="PropertySheets">
75+
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
76+
<Import Project="..\..\..\libs\openFrameworksCompiled\project\vs\openFrameworksRelease.props" />
77+
</ImportGroup>
78+
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM64EC'" Label="PropertySheets">
79+
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
80+
<Import Project="..\..\..\libs\openFrameworksCompiled\project\vs\openFrameworksRelease.props" />
81+
</ImportGroup>
3582
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
3683
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
3784
<Import Project="..\..\..\libs\openFrameworksCompiled\project\vs\openFrameworksDebug.props" />
3885
</ImportGroup>
86+
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'" Label="PropertySheets">
87+
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
88+
<Import Project="..\..\..\libs\openFrameworksCompiled\project\vs\openFrameworksDebug.props" />
89+
</ImportGroup>
90+
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64EC'" Label="PropertySheets">
91+
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
92+
<Import Project="..\..\..\libs\openFrameworksCompiled\project\vs\openFrameworksDebug.props" />
93+
</ImportGroup>
3994
<PropertyGroup Label="UserMacros" />
4095
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
4196
<OutDir>bin\</OutDir>
@@ -44,11 +99,31 @@
4499
<LinkIncremental>true</LinkIncremental>
45100
<GenerateManifest>true</GenerateManifest>
46101
</PropertyGroup>
102+
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'">
103+
<TargetName>$(ProjectName)_debug</TargetName>
104+
<LinkIncremental>true</LinkIncremental>
105+
<GenerateManifest>true</GenerateManifest>
106+
<IntDir>obj\$(Configuration)\</IntDir>
107+
</PropertyGroup>
108+
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64EC'">
109+
<TargetName>$(ProjectName)_debug</TargetName>
110+
<LinkIncremental>true</LinkIncremental>
111+
<GenerateManifest>true</GenerateManifest>
112+
<IntDir>obj\$(Configuration)\</IntDir>
113+
</PropertyGroup>
47114
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
48115
<OutDir>bin\</OutDir>
49116
<IntDir>obj\$(Configuration)\</IntDir>
50117
<LinkIncremental>false</LinkIncremental>
51118
</PropertyGroup>
119+
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'">
120+
<LinkIncremental>false</LinkIncremental>
121+
<IntDir>obj\$(Configuration)\</IntDir>
122+
</PropertyGroup>
123+
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM64EC'">
124+
<LinkIncremental>false</LinkIncremental>
125+
<IntDir>obj\$(Configuration)\</IntDir>
126+
</PropertyGroup>
52127
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
53128
<ClCompile>
54129
<Optimization>Disabled</Optimization>
@@ -65,7 +140,52 @@
65140
<Link>
66141
<GenerateDebugInformation>true</GenerateDebugInformation>
67142
<SubSystem>Console</SubSystem>
68-
<RandomizedBaseAddress>false</RandomizedBaseAddress>
143+
<RandomizedBaseAddress>true</RandomizedBaseAddress>
144+
<AdditionalDependencies>%(AdditionalDependencies);</AdditionalDependencies>
145+
<AdditionalLibraryDirectories>%(AdditionalLibraryDirectories);</AdditionalLibraryDirectories>
146+
<AdditionalOptions>/FORCE:MULTIPLE %(AdditionalOptions)</AdditionalOptions>
147+
</Link>
148+
<PostBuildEvent />
149+
</ItemDefinitionGroup>
150+
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'">
151+
<ClCompile>
152+
<Optimization>Disabled</Optimization>
153+
<BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
154+
<PreprocessorDefinitions>%(PreprocessorDefinitions)</PreprocessorDefinitions>
155+
<RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
156+
<WarningLevel>Level3</WarningLevel>
157+
<AdditionalIncludeDirectories>%(AdditionalIncludeDirectories);src;src\addons;src\projects;src\utils;src\uuidxx;src\uuidxx\src</AdditionalIncludeDirectories>
158+
<CompileAs>CompileAsCpp</CompileAs>
159+
<ObjectFileName>$(IntDir)/%(RelativeDir)/</ObjectFileName>
160+
<MultiProcessorCompilation>true</MultiProcessorCompilation>
161+
<AdditionalOptions>/Zc:__cplusplus</AdditionalOptions>
162+
</ClCompile>
163+
<Link>
164+
<GenerateDebugInformation>true</GenerateDebugInformation>
165+
<SubSystem>Console</SubSystem>
166+
<RandomizedBaseAddress>true</RandomizedBaseAddress>
167+
<AdditionalDependencies>%(AdditionalDependencies);</AdditionalDependencies>
168+
<AdditionalLibraryDirectories>%(AdditionalLibraryDirectories);</AdditionalLibraryDirectories>
169+
</Link>
170+
<PostBuildEvent />
171+
</ItemDefinitionGroup>
172+
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64EC'">
173+
<ClCompile>
174+
<Optimization>Disabled</Optimization>
175+
<BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
176+
<PreprocessorDefinitions>%(PreprocessorDefinitions)</PreprocessorDefinitions>
177+
<RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
178+
<WarningLevel>Level3</WarningLevel>
179+
<AdditionalIncludeDirectories>%(AdditionalIncludeDirectories);src;src\addons;src\projects;src\utils;src\uuidxx;src\uuidxx\src</AdditionalIncludeDirectories>
180+
<CompileAs>CompileAsCpp</CompileAs>
181+
<ObjectFileName>$(IntDir)/%(RelativeDir)/</ObjectFileName>
182+
<MultiProcessorCompilation>true</MultiProcessorCompilation>
183+
<AdditionalOptions>/Zc:__cplusplus</AdditionalOptions>
184+
</ClCompile>
185+
<Link>
186+
<GenerateDebugInformation>true</GenerateDebugInformation>
187+
<SubSystem>Console</SubSystem>
188+
<RandomizedBaseAddress>true</RandomizedBaseAddress>
69189
<AdditionalDependencies>%(AdditionalDependencies);</AdditionalDependencies>
70190
<AdditionalLibraryDirectories>%(AdditionalLibraryDirectories);</AdditionalLibraryDirectories>
71191
</Link>
@@ -88,7 +208,54 @@
88208
<SubSystem>Console</SubSystem>
89209
<OptimizeReferences>true</OptimizeReferences>
90210
<EnableCOMDATFolding>true</EnableCOMDATFolding>
91-
<RandomizedBaseAddress>false</RandomizedBaseAddress>
211+
<RandomizedBaseAddress>true</RandomizedBaseAddress>
212+
<AdditionalDependencies>%(AdditionalDependencies);</AdditionalDependencies>
213+
<AdditionalLibraryDirectories>%(AdditionalLibraryDirectories);</AdditionalLibraryDirectories>
214+
<AdditionalOptions>/FORCE:MULTIPLE %(AdditionalOptions)</AdditionalOptions>
215+
</Link>
216+
<PostBuildEvent />
217+
</ItemDefinitionGroup>
218+
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'">
219+
<ClCompile>
220+
<WholeProgramOptimization>false</WholeProgramOptimization>
221+
<PreprocessorDefinitions>%(PreprocessorDefinitions)</PreprocessorDefinitions>
222+
<RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
223+
<WarningLevel>Level3</WarningLevel>
224+
<AdditionalIncludeDirectories>%(AdditionalIncludeDirectories);src;src\addons;src\projects;src\utils;src\uuidxx;src\uuidxx\src</AdditionalIncludeDirectories>
225+
<CompileAs>CompileAsCpp</CompileAs>
226+
<ObjectFileName>$(IntDir)/%(RelativeDir)/</ObjectFileName>
227+
<AdditionalOptions>/Zc:__cplusplus</AdditionalOptions>
228+
</ClCompile>
229+
<Link>
230+
<IgnoreAllDefaultLibraries>false</IgnoreAllDefaultLibraries>
231+
<GenerateDebugInformation>false</GenerateDebugInformation>
232+
<SubSystem>Console</SubSystem>
233+
<OptimizeReferences>true</OptimizeReferences>
234+
<EnableCOMDATFolding>true</EnableCOMDATFolding>
235+
<RandomizedBaseAddress>true</RandomizedBaseAddress>
236+
<AdditionalDependencies>%(AdditionalDependencies);</AdditionalDependencies>
237+
<AdditionalLibraryDirectories>%(AdditionalLibraryDirectories);</AdditionalLibraryDirectories>
238+
</Link>
239+
<PostBuildEvent />
240+
</ItemDefinitionGroup>
241+
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM64EC'">
242+
<ClCompile>
243+
<WholeProgramOptimization>false</WholeProgramOptimization>
244+
<PreprocessorDefinitions>%(PreprocessorDefinitions)</PreprocessorDefinitions>
245+
<RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
246+
<WarningLevel>Level3</WarningLevel>
247+
<AdditionalIncludeDirectories>%(AdditionalIncludeDirectories);src;src\addons;src\projects;src\utils;src\uuidxx;src\uuidxx\src</AdditionalIncludeDirectories>
248+
<CompileAs>CompileAsCpp</CompileAs>
249+
<ObjectFileName>$(IntDir)/%(RelativeDir)/</ObjectFileName>
250+
<AdditionalOptions>/Zc:__cplusplus</AdditionalOptions>
251+
</ClCompile>
252+
<Link>
253+
<IgnoreAllDefaultLibraries>false</IgnoreAllDefaultLibraries>
254+
<GenerateDebugInformation>false</GenerateDebugInformation>
255+
<SubSystem>Console</SubSystem>
256+
<OptimizeReferences>true</OptimizeReferences>
257+
<EnableCOMDATFolding>true</EnableCOMDATFolding>
258+
<RandomizedBaseAddress>true</RandomizedBaseAddress>
92259
<AdditionalDependencies>%(AdditionalDependencies);</AdditionalDependencies>
93260
<AdditionalLibraryDirectories>%(AdditionalLibraryDirectories);</AdditionalLibraryDirectories>
94261
</Link>
@@ -132,6 +299,8 @@
132299
<ItemGroup>
133300
<ResourceCompile Include="icon.rc">
134301
<AdditionalOptions Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">/D_DEBUG %(AdditionalOptions)</AdditionalOptions>
302+
<AdditionalOptions Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'">/D_DEBUG %(AdditionalOptions)</AdditionalOptions>
303+
<AdditionalOptions Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64EC'">/D_DEBUG %(AdditionalOptions)</AdditionalOptions>
135304
<AdditionalIncludeDirectories>$(OF_ROOT)\libs\openFrameworksCompiled\project\vs</AdditionalIncludeDirectories>
136305
</ResourceCompile>
137306
</ItemGroup>

‎commandLine/commandLine.vcxproj.filters‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -14,11 +14,7 @@
1414
<ClCompile Include="src\utils\LibraryBinary.cpp" />
1515
<ClCompile Include="src\utils\Utils.cpp" />
1616
<ClCompile Include="src\uuidxx\src\uuidxx.cpp" />
17-
<Filter>src\uuidxx\src</Filter>
18-
</ClCompile>
1917
<ClCompile Include="src\uuidxx\src\uuidxx.h" />
20-
<Filter>src\uuidxx\src</Filter>
21-
</ClCompile>
2218
</ItemGroup>
2319
<ItemGroup>
2420
<ClInclude Include="src\optionparser.h" />

‎commandLine/commandLine.vcxproj.user‎

Lines changed: 17 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,24 @@
44
<LocalDebuggerWorkingDirectory>$(ProjectDir)/bin</LocalDebuggerWorkingDirectory>
55
<DebuggerFlavor>WindowsLocalDebugger</DebuggerFlavor>
66
</PropertyGroup>
7+
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'">
8+
<LocalDebuggerWorkingDirectory>$(ProjectDir)/bin</LocalDebuggerWorkingDirectory>
9+
<DebuggerFlavor>WindowsLocalDebugger</DebuggerFlavor>
10+
</PropertyGroup>
11+
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64EC'">
12+
<LocalDebuggerWorkingDirectory>$(ProjectDir)/bin</LocalDebuggerWorkingDirectory>
13+
<DebuggerFlavor>WindowsLocalDebugger</DebuggerFlavor>
14+
</PropertyGroup>
715
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
816
<LocalDebuggerWorkingDirectory>$(ProjectDir)/bin</LocalDebuggerWorkingDirectory>
917
<DebuggerFlavor>WindowsLocalDebugger</DebuggerFlavor>
1018
</PropertyGroup>
11-
</Project>
19+
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'">
20+
<LocalDebuggerWorkingDirectory>$(ProjectDir)/bin</LocalDebuggerWorkingDirectory>
21+
<DebuggerFlavor>WindowsLocalDebugger</DebuggerFlavor>
22+
</PropertyGroup>
23+
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM64EC'">
24+
<LocalDebuggerWorkingDirectory>$(ProjectDir)/bin</LocalDebuggerWorkingDirectory>
25+
<DebuggerFlavor>WindowsLocalDebugger</DebuggerFlavor>
26+
</PropertyGroup>
27+
</Project>

0 commit comments

Comments
 (0)