libretro/ppsspp
1
0
Fork 0
mirror of https://github.com/libretro/ppsspp.git synced 2024-11-27 18:30:56 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix multiple compilation issues for all platforms.

Browse Source
This commit is contained in:
The Dax 2013-07-03 14:37:31 -04:00
parent c8431493be
commit ab8c1f5b5f
7 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Common/Common.vcxproj
View File

@ -186,6 +186,7 @@
<ClInclude Include="FixedSizeQueue.h" /> <ClInclude Include="FixedSizeQueue.h" />
<ClInclude Include="FixedSizeUnorderedSet.h" /> <ClInclude Include="FixedSizeUnorderedSet.h" />
<ClInclude Include="Hash.h" /> <ClInclude Include="Hash.h" />
<ClInclude Include="KeyMap.h" />
<ClInclude Include="LinearDiskCache.h" /> <ClInclude Include="LinearDiskCache.h" />
<ClInclude Include="Log.h" /> <ClInclude Include="Log.h" />
<ClInclude Include="LogManager.h" /> <ClInclude Include="LogManager.h" />
@ -225,6 +226,7 @@
<ClCompile Include="FileSearch.cpp" /> <ClCompile Include="FileSearch.cpp" />
<ClCompile Include="FileUtil.cpp" /> <ClCompile Include="FileUtil.cpp" />
<ClCompile Include="Hash.cpp" /> <ClCompile Include="Hash.cpp" />
<ClCompile Include="KeyMap.cpp" />
<ClCompile Include="LogManager.cpp" /> <ClCompile Include="LogManager.cpp" />
<ClCompile Include="MathUtil.cpp" /> <ClCompile Include="MathUtil.cpp" />
<ClCompile Include="MemArena.cpp" /> <ClCompile Include="MemArena.cpp" />

2
Common/Common.vcxproj.filters
View File

@ -46,6 +46,7 @@
<ClInclude Include="Crypto\md5.h"> <ClInclude Include="Crypto\md5.h">
<Filter>Crypto</Filter> <Filter>Crypto</Filter>
</ClInclude> </ClInclude>
<ClInclude Include="KeyMap.h" />
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<ClCompile Include="stdafx.cpp" /> <ClCompile Include="stdafx.cpp" />
@ -76,6 +77,7 @@
<ClCompile Include="Crypto\md5.cpp"> <ClCompile Include="Crypto\md5.cpp">
<Filter>Crypto</Filter> <Filter>Crypto</Filter>
</ClCompile> </ClCompile>
<ClCompile Include="KeyMap.cpp" />
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<None Include="CMakeLists.txt" /> <None Include="CMakeLists.txt" />

2
Common/KeyMap.cpp
View File

@ -16,7 +16,7 @@
// https://github.com/hrydgard/ppsspp and http://www.ppsspp.org/. // https://github.com/hrydgard/ppsspp and http://www.ppsspp.org/.
#include "input/input_state.h" #include "input/input_state.h"
#include "Core/Config.h" #include "../Core/Config.h"
#include "KeyMap.h" #include "KeyMap.h"
using namespace KeyMap; using namespace KeyMap;

2
Common/KeyMap.h
View File

@ -20,7 +20,7 @@
#include <string> #include <string>
#include <map> #include <map>
#include "input/keycodes.h" // keyboard keys #include "input/keycodes.h" // keyboard keys
#include "Core/HLE/sceCtrl.h" // psp keys #include "../Core/HLE/sceCtrl.h" // psp keys
#define KEYMAP_ERROR_KEY_ALREADY_USED -1 #define KEYMAP_ERROR_KEY_ALREADY_USED -1
#define KEYMAP_ERROR_UNKNOWN_KEY 0 #define KEYMAP_ERROR_UNKNOWN_KEY 0

2
Core/HLE/sceCtrl.h
View File

@ -17,7 +17,7 @@
#pragma once #pragma once
#include "Common/CommonTypes.h" #include "../Common/CommonTypes.h"
class PointerWrap; class PointerWrap;

2
Qt/Common.pro
View File

@ -37,6 +37,7 @@ SOURCES += ../Common/ColorUtil.cpp \
../Common/FileUtil.cpp \ ../Common/FileUtil.cpp \
../Common/Hash.cpp \ ../Common/Hash.cpp \
../Common/LogManager.cpp \ ../Common/LogManager.cpp \
../Common/KeyMap.cpp \
../Common/MathUtil.cpp \ ../Common/MathUtil.cpp \
../Common/MemArena.cpp \ ../Common/MemArena.cpp \
../Common/MemoryUtil.cpp \ ../Common/MemoryUtil.cpp \
@ -56,6 +57,7 @@ HEADERS += ../Common/ChunkFile.h \
../Common/FileUtil.h \ ../Common/FileUtil.h \
../Common/Hash.h \ ../Common/Hash.h \
../Common/LogManager.h \ ../Common/LogManager.h \
../Common/KeyMap.cpp \
../Common/MathUtil.h \ ../Common/MathUtil.h \
../Common/MemArena.h \ ../Common/MemArena.h \
../Common/MemoryUtil.h \ ../Common/MemoryUtil.h \

1
android/jni/Android.mk
View File

@ -152,6 +152,7 @@ LOCAL_SRC_FILES := \
$(SRC)/ext/snappy/snappy.cpp \ $(SRC)/ext/snappy/snappy.cpp \
$(SRC)/ext/xbrz/xbrz.cpp \ $(SRC)/ext/xbrz/xbrz.cpp \
$(SRC)/Common/Crypto/md5.cpp \ $(SRC)/Common/Crypto/md5.cpp \
$(SRC)/Common/KeyMap.cpp \
$(SRC)/Common/LogManager.cpp \ $(SRC)/Common/LogManager.cpp \
$(SRC)/Common/MemArena.cpp \ $(SRC)/Common/MemArena.cpp \
$(SRC)/Common/MemoryUtil.cpp \ $(SRC)/Common/MemoryUtil.cpp \