Emulator-Archive/ppsspp
1
0
Fork 0
mirror of https://github.com/hrydgard/ppsspp.git synced 2024-11-23 05:19:56 +00:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

Fix name collision when building on Windows. Was preventing Blackberry from building.

Browse Source
This commit is contained in:
Sacha 2013-05-03 16:10:23 +10:00
parent 4665226064
commit 8dd683f63f
8 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

0
Common/Atomic.h → Common/Atomics.h
View File

4
Common/Common.vcxproj
View File

@ -156,7 +156,7 @@
<ItemGroup>
<ClInclude Include="ABI.h" />
<ClInclude Include="ArmEmitter.h" />
<ClInclude Include="Atomic.h" />
<ClInclude Include="Atomics.h" />
<ClInclude Include="Atomic_GCC.h" />
<ClInclude Include="Atomic_Win32.h" />
<ClInclude Include="ChunkFile.h" />
@ -245,4 +245,4 @@
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
<ImportGroup Label="ExtensionTargets">
</ImportGroup>
</Project>
</Project>

4
Common/Common.vcxproj.filters
View File

@ -4,7 +4,7 @@
<ClInclude Include="targetver.h" />
<ClInclude Include="stdafx.h" />
<ClInclude Include="ABI.h" />
<ClInclude Include="Atomic.h" />
<ClInclude Include="Atomics.h" />
<ClInclude Include="Atomic_GCC.h" />
<ClInclude Include="Atomic_Win32.h" />
<ClInclude Include="ChunkFile.h" />
@ -74,4 +74,4 @@
<ItemGroup>
<None Include="CMakeLists.txt" />
</ItemGroup>
</Project>
</Project>

2
Common/ConsoleListener.cpp
View File

@ -30,7 +30,7 @@
#include "Common.h"
#include "LogManager.h" // Common
#include "ConsoleListener.h" // Common
#include "Atomic.h"
#include "Atomics.h"
#ifdef _WIN32
const int LOG_PENDING_MAX = 120 * 10000;

2
Common/FifoQueue.h
View File

@ -5,7 +5,7 @@
// a simple lockless thread-safe,
// single reader, single writer queue
#include "Atomic.h"
#include "Atomics.h"
namespace Common
{

2
Core/CoreTiming.cpp
View File

@ -21,7 +21,7 @@
#include "MsgHandler.h"
#include "StdMutex.h"
#include "Atomic.h"
#include "Atomics.h"
#include "CoreTiming.h"
#include "Core.h"
#include "HLE/sceKernelThread.h"

2
Core/MemMapFunctions.cpp
View File

@ -16,7 +16,7 @@
// https://github.com/hrydgard/ppsspp and http://www.ppsspp.org/.
#include "Common.h"
#include "Atomic.h"
#include "Atomics.h"
#include "MemMap.h"
#include "Config.h"

2
native

@ -1 +1 @@
Subproject commit f9c50c822a9a12bcd3952dda58876d1fc2afa2a9
Subproject commit 3edfc6ac1c8c9fa9481ad2a45a7ae0dc849dd9d9