libretro/ppsspp
1
0
Fork 0
mirror of https://github.com/libretro/ppsspp.git synced 2024-11-23 16:19:44 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Avoid name collision with StringUtil on Windows hosts. Fixes all Linux/Unix cross-compiles from Windows, including Harmattan and Blackberry.

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

4
CMakeLists.txt
View File

@ -257,8 +257,8 @@ add_library(Common STATIC
Common/Misc.cpp
Common/MsgHandler.cpp
Common/MsgHandler.h
Common/StringUtil.cpp
Common/StringUtil.h
Common/StringUtils.cpp
Common/StringUtils.h
Common/Thread.cpp
Common/Thread.h
Common/ThreadPool.cpp

2
Common/ArmCPUDetect.cpp
View File

@ -17,7 +17,7 @@
#include "Common.h"
#include "CPUDetect.h"
#include "StringUtil.h"
#include "StringUtils.h"
// Only Linux platforms have /proc/cpuinfo
#if !defined(BLACKBERRY) && !defined(IOS) && !defined(__SYMBIAN32__)

2
Common/CMakeLists.txt
View File

@ -12,7 +12,7 @@ set(SRCS
MemoryUtil.cpp
Misc.cpp
MsgHandler.cpp
StringUtil.cpp
StringUtils.cpp
Thread.cpp
ThreadPool.cpp
Timer.cpp

2
Common/CPUDetect.cpp
View File

@ -72,7 +72,7 @@ void __cpuid(int regs[4], int cpuid_leaf)
#include "Common.h"
#include "CPUDetect.h"
#include "StringUtil.h"
#include "StringUtils.h"
CPUInfo cpu_info;

4
Common/Common.vcxproj
View File

@ -188,7 +188,7 @@
<ClInclude Include="StdConditionVariable.h" />
<ClInclude Include="StdMutex.h" />
<ClInclude Include="StdThread.h" />
<ClInclude Include="StringUtil.h" />
<ClInclude Include="StringUtils.h" />
<ClInclude Include="targetver.h" />
<ClInclude Include="Thread.h" />
<ClInclude Include="ThreadPool.h" />
@ -225,7 +225,7 @@
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Create</PrecompiledHeader>
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|x64'">Create</PrecompiledHeader>
</ClCompile>
<ClCompile Include="StringUtil.cpp" />
<ClCompile Include="StringUtils.cpp" />
<ClCompile Include="Thread.cpp" />
<ClCompile Include="ThreadPool.cpp" />
<ClCompile Include="Thunk.cpp" />

4
Common/Common.vcxproj.filters
View File

@ -34,7 +34,7 @@
<ClInclude Include="StdConditionVariable.h" />
<ClInclude Include="StdMutex.h" />
<ClInclude Include="StdThread.h" />
<ClInclude Include="StringUtil.h" />
<ClInclude Include="StringUtils.h" />
<ClInclude Include="Thread.h" />
<ClInclude Include="Thunk.h" />
<ClInclude Include="Timer.h" />
@ -60,7 +60,7 @@
<ClCompile Include="MemoryUtil.cpp" />
<ClCompile Include="Misc.cpp" />
<ClCompile Include="MsgHandler.cpp" />
<ClCompile Include="StringUtil.cpp" />
<ClCompile Include="StringUtils.cpp" />
<ClCompile Include="Thread.cpp" />
<ClCompile Include="Thunk.cpp" />
<ClCompile Include="Timer.cpp" />

2
Common/FileSearch.cpp
View File

@ -32,7 +32,7 @@
#include "FileSearch.h"
#include "StringUtil.h"
#include "StringUtils.h"
CFileSearch::CFileSearch(const CFileSearch::XStringVector& _rSearchStrings, const CFileSearch::XStringVector& _rDirectories)

2
Common/FileUtil.cpp
View File

@ -18,7 +18,7 @@
#include "Common.h"
#include "CommonPaths.h"
#include "FileUtil.h"
#include "StringUtil.h"
#include "StringUtils.h"
#ifdef _WIN32
#include <windows.h>

2
Common/LogManager.h
View File

@ -18,7 +18,7 @@
#pragma once
#include "Log.h"
#include "StringUtil.h"
#include "StringUtils.h"
#include "Thread.h"
#include "FileUtil.h"
#include "file/ini_file.h"

2
Common/MemoryUtil.cpp
View File

@ -17,7 +17,7 @@
#include "Common.h"
#include "MemoryUtil.h"
#include "StringUtil.h"
#include "StringUtils.h"
#ifdef _WIN32
#include <windows.h>

2
Common/MsgHandler.cpp
View File

@ -19,7 +19,7 @@
#include <stdio.h> // System
#include "Common.h" // Local
#include "StringUtil.h"
#include "StringUtils.h"
bool DefaultMsgHandler(const char* caption, const char* text, bool yes_no, int Style);
static MsgAlertHandler msg_handler = DefaultMsgHandler;

2
Common/StringUtil.cpp → Common/StringUtils.cpp
View File

@ -20,7 +20,7 @@
#include "Common.h"
#include "CommonPaths.h"
#include "StringUtil.h"
#include "StringUtils.h"
// faster than sscanf
bool AsciiToHex(const char* _szValue, u32& result)

0
Common/StringUtil.h → Common/StringUtils.h
View File

2
Common/Timer.cpp
View File

@ -27,7 +27,7 @@
#include "Common.h"
#include "Timer.h"
#include "StringUtil.h"
#include "StringUtils.h"
namespace Common
{

2
Core/FileSystems/MetaFileSystem.cpp
View File

@ -16,7 +16,7 @@
// https://github.com/hrydgard/ppsspp and http://www.ppsspp.org/.
#include <set>
#include "Common/StringUtil.h"
#include "Common/StringUtils.h"
#include "../HLE/sceKernelThread.h"
#include "MetaFileSystem.h"

2
Core/PSPLoaders.cpp
View File

@ -27,7 +27,7 @@
#include "MIPS/MIPSAnalyst.h"
#include "MIPS/MIPSCodeUtils.h"
#include "StringUtil.h"
#include "StringUtils.h"
#include "Host.h"

4
Qt/Common.pro
View File

@ -42,7 +42,7 @@ SOURCES += ../Common/ColorUtil.cpp \
../Common/MemoryUtil.cpp \
../Common/Misc.cpp \
../Common/MsgHandler.cpp \
../Common/StringUtil.cpp \
../Common/StringUtils.cpp \
../Common/Thread.cpp \
../Common/ThreadPool.cpp \
../Common/Timer.cpp \
@ -60,7 +60,7 @@ HEADERS += ../Common/ChunkFile.h \
../Common/MemArena.h \
../Common/MemoryUtil.h \
../Common/MsgHandler.h \
../Common/StringUtil.h \
../Common/StringUtils.h \
../Common/Thread.h \
../Common/ThreadPool.h \
../Common/Timer.h \

6
UI/MenuScreens.cpp
View File

@ -18,10 +18,6 @@
#include <cmath>
#include <string>
#include <cstdio>
// Hack: Harmattan will not compile without this!
#ifdef MEEGO_EDITION_HARMATTAN
#include "StringUtil.cpp"
#endif
#ifdef _WIN32
namespace MainWindow {
@ -52,7 +48,7 @@ namespace MainWindow {
#include "util/text/utf8.h"
#include "UIShader.h"
#include "Common/StringUtil.h"
#include "Common/StringUtils.h"
#include "Core/System.h"
#include "Core/CoreParameter.h"
#include "GPU/ge_constants.h"

2
Windows/EmuThread.cpp
View File

@ -4,7 +4,7 @@
#include "base/timeutil.h"
#include "base/NativeApp.h"
#include "Log.h"
#include "StringUtil.h"
#include "StringUtils.h"
#include "../Globals.h"
#include "EmuThread.h"
#include "../Core/Reporting.h"

2
android/jni/Android.mk
View File

@ -134,7 +134,7 @@ LOCAL_SRC_FILES := \
$(SRC)/Common/MemoryUtil.cpp \
$(SRC)/Common/MsgHandler.cpp \
$(SRC)/Common/FileUtil.cpp \
$(SRC)/Common/StringUtil.cpp \
$(SRC)/Common/StringUtils.cpp \
$(SRC)/Common/Thread.cpp \
$(SRC)/Common/ThreadPool.cpp \
$(SRC)/Common/Timer.cpp \