|
26 | 26 | <Platform>ARM64EC</Platform>
|
27 | 27 | </ProjectConfiguration>
|
28 | 28 | </ItemGroup>
|
29 |
| - |
30 | 29 | <PropertyGroup Condition="'$(Platform)'=='x64' or '$(Platform)'=='ARM64'">
|
31 | 30 | <LatestTargetPlatformVersion>$([Microsoft.Build.Utilities.ToolLocationHelper]::GetLatestSDKTargetPlatformVersion('Windows', '10.0'))</LatestTargetPlatformVersion>
|
32 | 31 | <WindowsTargetPlatformVersion Condition="'$(WindowsTargetPlatformVersion)' == ''">$(LatestTargetPlatformVersion)</WindowsTargetPlatformVersion>
|
|
47 | 46 | <ConfigurationType>StaticLibrary</ConfigurationType>
|
48 | 47 | <CharacterSet>Unicode</CharacterSet>
|
49 | 48 | <WholeProgramOptimization>true</WholeProgramOptimization>
|
50 |
| - <PlatformToolset>v143</PlatformToolset> |
| 49 | + <PlatformToolset>v142</PlatformToolset> |
51 | 50 | </PropertyGroup>
|
52 | 51 | <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64' or '$(Configuration)|$(Platform)'=='Debug|ARM64' or '$(Configuration)|$(Platform)'=='Debug|ARM64EC'" Label="Configuration">
|
53 | 52 | <ConfigurationType>StaticLibrary</ConfigurationType>
|
54 | 53 | <CharacterSet>Unicode</CharacterSet>
|
55 |
| - <PlatformToolset>v143</PlatformToolset> |
| 54 | + <PlatformToolset>v142</PlatformToolset> |
56 | 55 | </PropertyGroup>
|
57 | 56 | <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
|
58 | 57 | <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64' or '$(Configuration)|$(Platform)'=='Release|ARM64' or '$(Configuration)|$(Platform)'=='Release|ARM64EC'" Label="PropertySheets">
|
|
76 | 75 | <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64' or '$(Configuration)|$(Platform)'=='Debug|ARM64' or '$(Configuration)|$(Platform)'=='Debug|ARM64EC'">
|
77 | 76 | <ClCompile>
|
78 | 77 | <Optimization>Disabled</Optimization>
|
79 |
| - <AdditionalIncludeDirectories>$(OF_ROOT)\libs\openFrameworks;$(OF_ROOT)\libs\openFrameworks\graphics;$(OF_ROOT)\libs\openFrameworks\app;$(OF_ROOT)\libs\openFrameworks\sound;$(OF_ROOT)\libs\openFrameworks\utils;$(OF_ROOT)\libs\openFrameworks\communication;$(OF_ROOT)\libs\openFrameworks\video;$(OF_ROOT)\libs\openFrameworks\types;$(OF_ROOT)\libs\openFrameworks\math;$(OF_ROOT)\libs\openFrameworks\3d;$(OF_ROOT)\libs\openFrameworks\gl;$(OF_ROOT)\libs\openFrameworks\events;$(OF_ROOT)\libs\glut\include;$(OF_ROOT)\libs\glm\include;$(OF_ROOT)\libs\rtAudio\include;$(OF_ROOT)\libs\quicktime\include;$(OF_ROOT)\libs\freetype\include;$(OF_ROOT)\libs\freetype\include\freetype2;$(OF_ROOT)\libs\freeImage\include;$(OF_ROOT)\libs\fmod\include;$(OF_ROOT)\libs\videoInput\include;$(OF_ROOT)\libs\glew\include\;$(OF_ROOT)\libs\glu\include;$(OF_ROOT)\libs\tess2\include;$(OF_ROOT)\libs\cairo\include\cairo;$(OF_ROOT)\libs\poco\include;$(OF_ROOT)\libs\glfw\include;$(OF_ROOT)\libs\openssl\include;$(OF_ROOT)\libs\utf8\include;$(OF_ROOT)\libs\boost\include;$(OF_ROOT)\libs\json\include;$(OF_ROOT)\libs\curl\include;$(OF_ROOT)\libs\uriparser\include;$(OF_ROOT)\libs\pugixml\include;$(OF_ROOT)\addons;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> |
80 |
| - <PreprocessorDefinitions>WIN32;CURL_STATICLIB;FREEIMAGE_LIB;URI_STATIC_BUILD;_DEBUG;_CONSOLE;POCO_STATIC;CAIRO_WIN32_STATIC_BUILD;DISABLE_SOME_FLOATING_POINT;%(PreprocessorDefinitions)</PreprocessorDefinitions> |
| 78 | + <AdditionalIncludeDirectories>$(OF_ROOT)\libs\openFrameworks;$(OF_ROOT)\libs\openFrameworks\graphics;$(OF_ROOT)\libs\openFrameworks\app;$(OF_ROOT)\libs\openFrameworks\sound;$(OF_ROOT)\libs\openFrameworks\utils;$(OF_ROOT)\libs\openFrameworks\communication;$(OF_ROOT)\libs\openFrameworks\video;$(OF_ROOT)\libs\openFrameworks\types;$(OF_ROOT)\libs\openFrameworks\math;$(OF_ROOT)\libs\openFrameworks\3d;$(OF_ROOT)\libs\openFrameworks\gl;$(OF_ROOT)\libs\openFrameworks\events;$(OF_ROOT)\libs\glut\include;$(OF_ROOT)\libs\glm\include;$(OF_ROOT)\libs\rtAudio\include;$(OF_ROOT)\libs\quicktime\include;$(OF_ROOT)\libs\freetype\include;$(OF_ROOT)\libs\freetype\include\freetype2;$(OF_ROOT)\libs\FreeImage\include;$(OF_ROOT)\libs\videoInput\include;$(OF_ROOT)\libs\glew\include\;$(OF_ROOT)\libs\glu\include;$(OF_ROOT)\libs\tess2\include;$(OF_ROOT)\libs\cairo\include;$(OF_ROOT)\libs\poco\include;$(OF_ROOT)\libs\glfw\include;$(OF_ROOT)\libs\openssl\include;$(OF_ROOT)\libs\utf8\include;$(OF_ROOT)\libs\boost\include;$(OF_ROOT)\libs\json\include;$(OF_ROOT)\libs\curl\include;$(OF_ROOT)\libs\uriparser\include;$(OF_ROOT)\libs\pugixml\include;$(OF_ROOT)\addons;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> |
| 79 | + <PreprocessorDefinitions>WIN32;CURL_STATICLIB;FREEIMAGE_LIB;URI_STATIC_BUILD;_HAS_STREAM_INSERTION_OPERATORS_DELETED_IN_CXX20;_DEBUG;_CONSOLE;POCO_STATIC;CAIRO_WIN32_STATIC_BUILD;DISABLE_SOME_FLOATING_POINT;OF_NO_FMOD;%(PreprocessorDefinitions)</PreprocessorDefinitions> |
81 | 80 | <MultiProcessorCompilation>true</MultiProcessorCompilation>
|
82 | 81 | <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
|
83 | 82 | <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
|
84 | 83 | <WarningLevel>Level3</WarningLevel>
|
85 | 84 | <BrowseInformation>false</BrowseInformation>
|
86 | 85 | <CompileAs>CompileAsCpp</CompileAs>
|
87 |
| - <LanguageStandard>stdcpp17</LanguageStandard> |
| 86 | + <LanguageStandard>stdcpplatest</LanguageStandard> |
88 | 87 | <AdditionalOptions>/Zc:__cplusplus %(AdditionalOptions)</AdditionalOptions>
|
89 | 88 | <BufferSecurityCheck Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64EC'">false</BufferSecurityCheck>
|
| 89 | + <LanguageStandard_C Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">stdc17</LanguageStandard_C> |
| 90 | + <LanguageStandard_C Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'">stdc17</LanguageStandard_C> |
| 91 | + <LanguageStandard_C Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64EC'">stdc17</LanguageStandard_C> |
| 92 | + <EnableModules Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'">true</EnableModules> |
| 93 | + <BuildStlModules Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'">true</BuildStlModules> |
| 94 | + <EnableModules Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64EC'">true</EnableModules> |
| 95 | + <BuildStlModules Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64EC'">true</BuildStlModules> |
| 96 | + <EnableModules Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</EnableModules> |
| 97 | + <BuildStlModules Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</BuildStlModules> |
| 98 | + <DebugInformationFormat Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">OldStyle</DebugInformationFormat> |
| 99 | + <DebugInformationFormat Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'">OldStyle</DebugInformationFormat> |
| 100 | + <DebugInformationFormat Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64EC'">OldStyle</DebugInformationFormat> |
90 | 101 | </ClCompile>
|
91 | 102 | <Lib>
|
92 | 103 | <AdditionalLibraryDirectories>
|
93 | 104 | </AdditionalLibraryDirectories>
|
| 105 | + <UseUnicodeResponseFiles Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'">true</UseUnicodeResponseFiles> |
| 106 | + <UseUnicodeResponseFiles Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64EC'">true</UseUnicodeResponseFiles> |
| 107 | + <UseUnicodeResponseFiles Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</UseUnicodeResponseFiles> |
94 | 108 | </Lib>
|
95 | 109 | <PreLinkEvent>
|
96 | 110 | <Command Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">for /d %%f in ("$(OF_ROOT)\libs\*") do (if exist "%%f\lib\vs\x64\*.dll" (xcopy /Y /E "%%f\lib\vs\x64\*.dll" "$(SolutionDir)dll\x64\"))</Command>
|
|
105 | 119 | <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64' or '$(Configuration)|$(Platform)'=='Release|ARM64' or '$(Configuration)|$(Platform)'=='Release|ARM64EC'">
|
106 | 120 | <ClCompile>
|
107 | 121 | <WholeProgramOptimization>false</WholeProgramOptimization>
|
108 |
| - <AdditionalIncludeDirectories>$(OF_ROOT)\libs\openFrameworks;$(OF_ROOT)\libs\openFrameworks\graphics;$(OF_ROOT)\libs\openFrameworks\app;$(OF_ROOT)\libs\openFrameworks\sound;$(OF_ROOT)\libs\openFrameworks\utils;$(OF_ROOT)\libs\openFrameworks\communication;$(OF_ROOT)\libs\openFrameworks\video;$(OF_ROOT)\libs\openFrameworks\types;$(OF_ROOT)\libs\openFrameworks\math;$(OF_ROOT)\libs\openFrameworks\3d;$(OF_ROOT)\libs\openFrameworks\gl;$(OF_ROOT)\libs\openFrameworks\events;$(OF_ROOT)\libs\glut\include;$(OF_ROOT)\libs\glm\include;$(OF_ROOT)\libs\rtAudio\include;$(OF_ROOT)\libs\quicktime\include;$(OF_ROOT)\libs\freetype\include;$(OF_ROOT)\libs\freetype\include\freetype2;$(OF_ROOT)\libs\freeImage\include;$(OF_ROOT)\libs\fmod\include;$(OF_ROOT)\libs\videoInput\include;$(OF_ROOT)\libs\glew\include\;$(OF_ROOT)\libs\glu\include;$(OF_ROOT)\libs\tess2\include;$(OF_ROOT)\libs\cairo\include\cairo;$(OF_ROOT)\libs\poco\include;$(OF_ROOT)\libs\glfw\include;$(OF_ROOT)\libs\openssl\include;$(OF_ROOT)\libs\utf8\include;$(OF_ROOT)\libs\boost\include;$(OF_ROOT)\libs\json\include;$(OF_ROOT)\libs\curl\include;$(OF_ROOT)\libs\uriparser\include;$(OF_ROOT)\libs\pugixml\include;$(OF_ROOT)\addons;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> |
109 |
| - <PreprocessorDefinitions>WIN32;CURL_STATICLIB;FREEIMAGE_LIB;URI_STATIC_BUILD;NDEBUG;_CONSOLE;POCO_STATIC;CAIRO_WIN32_STATIC_BUILD;DISABLE_SOME_FLOATING_POINT;%(PreprocessorDefinitions)</PreprocessorDefinitions> |
| 122 | + <AdditionalIncludeDirectories>$(OF_ROOT)\libs\openFrameworks;$(OF_ROOT)\libs\openFrameworks\graphics;$(OF_ROOT)\libs\openFrameworks\app;$(OF_ROOT)\libs\openFrameworks\sound;$(OF_ROOT)\libs\openFrameworks\utils;$(OF_ROOT)\libs\openFrameworks\communication;$(OF_ROOT)\libs\openFrameworks\video;$(OF_ROOT)\libs\openFrameworks\types;$(OF_ROOT)\libs\openFrameworks\math;$(OF_ROOT)\libs\openFrameworks\3d;$(OF_ROOT)\libs\openFrameworks\gl;$(OF_ROOT)\libs\openFrameworks\events;$(OF_ROOT)\libs\glut\include;$(OF_ROOT)\libs\glm\include;$(OF_ROOT)\libs\rtAudio\include;$(OF_ROOT)\libs\quicktime\include;$(OF_ROOT)\libs\freetype\include;$(OF_ROOT)\libs\freetype\include\freetype2;$(OF_ROOT)\libs\FreeImage\include;$(OF_ROOT)\libs\videoInput\include;$(OF_ROOT)\libs\glew\include\;$(OF_ROOT)\libs\glu\include;$(OF_ROOT)\libs\tess2\include;$(OF_ROOT)\libs\cairo\include;$(OF_ROOT)\libs\poco\include;$(OF_ROOT)\libs\glfw\include;$(OF_ROOT)\libs\openssl\include;$(OF_ROOT)\libs\utf8\include;$(OF_ROOT)\libs\boost\include;$(OF_ROOT)\libs\json\include;$(OF_ROOT)\libs\curl\include;$(OF_ROOT)\libs\uriparser\include;$(OF_ROOT)\libs\pugixml\include;$(OF_ROOT)\addons;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> |
| 123 | + <PreprocessorDefinitions>WIN32;CURL_STATICLIB;FREEIMAGE_LIB;URI_STATIC_BUILD;_HAS_STREAM_INSERTION_OPERATORS_DELETED_IN_CXX20;NDEBUG;_CONSOLE;POCO_STATIC;CAIRO_WIN32_STATIC_BUILD;DISABLE_SOME_FLOATING_POINT;OF_NO_FMOD;%(PreprocessorDefinitions)</PreprocessorDefinitions> |
110 | 124 | <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
|
111 | 125 | <WarningLevel>Level1</WarningLevel>
|
112 | 126 | <MultiProcessorCompilation>true</MultiProcessorCompilation>
|
113 |
| - <LanguageStandard>stdcpp17</LanguageStandard> |
| 127 | + <LanguageStandard>stdcpplatest</LanguageStandard> |
114 | 128 | <AdditionalOptions>/Zc:__cplusplus %(AdditionalOptions)</AdditionalOptions>
|
115 | 129 | <LanguageStandard_C>stdc17</LanguageStandard_C>
|
116 | 130 | <BufferSecurityCheck Condition="'$(Configuration)|$(Platform)'=='Release|ARM64EC'">false</BufferSecurityCheck>
|
| 131 | + <EnableModules Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'">true</EnableModules> |
| 132 | + <BuildStlModules Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'">true</BuildStlModules> |
| 133 | + <EnableModules Condition="'$(Configuration)|$(Platform)'=='Release|ARM64EC'">true</EnableModules> |
| 134 | + <BuildStlModules Condition="'$(Configuration)|$(Platform)'=='Release|ARM64EC'">true</BuildStlModules> |
| 135 | + <EnableModules Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</EnableModules> |
| 136 | + <BuildStlModules Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</BuildStlModules> |
| 137 | + <DebugInformationFormat Condition="'$(Configuration)|$(Platform)'=='Release|x64'">OldStyle</DebugInformationFormat> |
| 138 | + <DebugInformationFormat Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'">OldStyle</DebugInformationFormat> |
| 139 | + <DebugInformationFormat Condition="'$(Configuration)|$(Platform)'=='Release|ARM64EC'">OldStyle</DebugInformationFormat> |
117 | 140 | </ClCompile>
|
118 | 141 | <Lib>
|
119 | 142 | <AdditionalLibraryDirectories>
|
120 | 143 | </AdditionalLibraryDirectories>
|
| 144 | + <UseUnicodeResponseFiles Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'">true</UseUnicodeResponseFiles> |
| 145 | + <UseUnicodeResponseFiles Condition="'$(Configuration)|$(Platform)'=='Release|ARM64EC'">true</UseUnicodeResponseFiles> |
| 146 | + <UseUnicodeResponseFiles Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</UseUnicodeResponseFiles> |
121 | 147 | </Lib>
|
122 | 148 | <PreLinkEvent>
|
123 | 149 | <Command Condition="'$(Configuration)|$(Platform)'=='Release|x64'">for /d %%f in ("$(OF_ROOT)\libs\*") do (if exist "%%f\lib\vs\x64\*.dll" (xcopy /Y /E "%%f\lib\vs\x64\*.dll" "$(SolutionDir)dll\x64\"))</Command>
|
|
211 | 237 | <ClInclude Include="..\..\..\openFrameworks\utils\ofThread.h" />
|
212 | 238 | <ClInclude Include="..\..\..\openFrameworks\utils\ofThreadChannel.h" />
|
213 | 239 | <ClInclude Include="..\..\..\openFrameworks\utils\ofTimer.h" />
|
| 240 | + <ClInclude Include="..\..\..\openFrameworks\utils\ofTimerFps.h" /> |
214 | 241 | <ClInclude Include="..\..\..\openFrameworks\utils\ofURLFileLoader.h" />
|
215 | 242 | <ClInclude Include="..\..\..\openFrameworks\utils\ofUtils.h" />
|
216 | 243 | <ClInclude Include="..\..\..\openFrameworks\utils\ofXml.h" />
|
|
289 | 316 | <ClCompile Include="..\..\..\openFrameworks\utils\ofSystemUtils.cpp" />
|
290 | 317 | <ClCompile Include="..\..\..\openFrameworks\utils\ofThread.cpp" />
|
291 | 318 | <ClCompile Include="..\..\..\openFrameworks\utils\ofTimer.cpp" />
|
| 319 | + <ClCompile Include="..\..\..\openFrameworks\utils\ofTimerFps.cpp" /> |
292 | 320 | <ClCompile Include="..\..\..\openFrameworks\utils\ofURLFileLoader.cpp" />
|
293 | 321 | <ClCompile Include="..\..\..\openFrameworks\utils\ofUtils.cpp" />
|
294 | 322 | <ClCompile Include="..\..\..\openFrameworks\utils\ofXml.cpp" />
|
|
0 commit comments