mirror/tracy
1
0
Fork 0
mirror of https://github.com/wolfpld/tracy.git synced 2024-11-25 23:44:35 +00:00
Code Issues Packages Projects Releases Wiki Activity

Workaround in nfd_win.cpp for MSVC problem in combaseapi.h.

Browse Source
This commit is contained in:
Till Rathmann 2018-08-01 14:44:39 +02:00
parent 659c8e25eb
commit df09fe48cf
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
nfd/nfd_win.cpp
View File

@ -19,7 +19,10 @@
#include <stdio.h> #include <stdio.h>
#include <assert.h> #include <assert.h>
#include <windows.h> #include <windows.h>
struct IUnknown; // Workaround for "combaseapi.h(229): error C2187: syntax error: 'identifier' was unexpected here" when using /permissive-
#include <ShObjIdl.h> #include <ShObjIdl.h>
#include "nfd_common.h" #include "nfd_common.h"

5
standalone/build/win32/Tracy.vcxproj
View File

@ -100,10 +100,7 @@
<ClCompile Include="..\..\..\imgui\imgui_demo.cpp" /> <ClCompile Include="..\..\..\imgui\imgui_demo.cpp" />
<ClCompile Include="..\..\..\imgui\imgui_draw.cpp" /> <ClCompile Include="..\..\..\imgui\imgui_draw.cpp" />
<ClCompile Include="..\..\..\nfd\nfd_common.c" /> <ClCompile Include="..\..\..\nfd\nfd_common.c" />
<ClCompile Include="..\..\..\nfd\nfd_win.cpp"> <ClCompile Include="..\..\..\nfd\nfd_win.cpp" />
<ConformanceMode Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</ConformanceMode>
<ConformanceMode Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">false</ConformanceMode>
</ClCompile>
<ClCompile Include="..\..\..\server\TracyBadVersion.cpp" /> <ClCompile Include="..\..\..\server\TracyBadVersion.cpp" />
<ClCompile Include="..\..\..\server\TracyMemory.cpp" /> <ClCompile Include="..\..\..\server\TracyMemory.cpp" />
<ClCompile Include="..\..\..\server\TracyView.cpp" /> <ClCompile Include="..\..\..\server\TracyView.cpp" />