ShuriZma
/
dolphin
mirror of https://github.com/dolphin-emu/dolphin.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

This change might work better if I git add the files

This commit is contained in:
Pierre Bourdon 2013-03-29 07:31:15 -07:00
parent b73941c0ea
commit 4895e38bd5
11 changed files with 43 additions and 46 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
CMakeLists.txt
View File

@ -168,8 +168,8 @@ if(APPLE)
set(ENV{PATH} /usr/bin:/bin:/usr/sbin:/sbin) set(ENV{PATH} /usr/bin:/bin:/usr/sbin:/sbin)
# Some of our code contains Objective C constructs. # Some of our code contains Objective C constructs.
set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -x objective-c") set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -x objective-c -stdlib=libc++")
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -x objective-c++") set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -x objective-c++ -stdlib=libc++")
# Avoid mistaking an object file for a source file on the link command line. # Avoid mistaking an object file for a source file on the link command line.
set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -x none") set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -x none")
@ -180,10 +180,10 @@ if(APPLE)
# This is inserted into the Info.plist as well. # This is inserted into the Info.plist as well.
# Note that the SDK determines the maximum version of which optional # Note that the SDK determines the maximum version of which optional
# features can be used, not the minimum required version to run. # features can be used, not the minimum required version to run.
set(OSX_MIN_VERSION "10.5.4") set(OSX_MIN_VERSION "10.7")
set(TARGET_FLAGS "${TARGET_FLAGS} -mmacosx-version-min=${OSX_MIN_VERSION}") set(TARGET_FLAGS "${TARGET_FLAGS} -mmacosx-version-min=${OSX_MIN_VERSION}")
set(SYSROOT_LEGACY_PATH "/Developer/SDKs/MacOSX10.6.sdk") set(SYSROOT_LEGACY_PATH "/Developer/SDKs/MacOSX10.7.sdk")
set(SYSROOT_PATH "/Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.6.sdk") set(SYSROOT_PATH "/Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.7.sdk")
if(EXISTS "${SYSROOT_PATH}/") if(EXISTS "${SYSROOT_PATH}/")
set(TARGET_SYSROOT ${SYSROOT_PATH}) set(TARGET_SYSROOT ${SYSROOT_PATH})
elseif(EXISTS "${SYSROOT_LEGACY_PATH}/") elseif(EXISTS "${SYSROOT_LEGACY_PATH}/")
@ -197,8 +197,8 @@ if(APPLE)
# This avoids a warning when linking with QuickTime. # This avoids a warning when linking with QuickTime.
set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -Wl,-no_arch_warnings") set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -Wl,-no_arch_warnings")
# Specify target CPUs. # Specify target CPUs.
set(TARGET_FLAGS "${TARGET_FLAGS} -Xarch_x86_64 -mssse3") set(TARGET_FLAGS "${TARGET_FLAGS} -mssse3")
set(TARGET_FLAGS "${TARGET_FLAGS} -Xarch_x86_64 -march=core2") set(TARGET_FLAGS "${TARGET_FLAGS} -march=core2")
# Target flags apply to both C and C++ compilation. # Target flags apply to both C and C++ compilation.
# CMake passes these to the compiler on the link command line as well. # CMake passes these to the compiler on the link command line as well.
set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${TARGET_FLAGS}") set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${TARGET_FLAGS}")

4
Externals/wxWidgets3/build_wx.sh vendored
View File

@ -5,7 +5,9 @@ cd wxWidgets
case $OSTYPE in case $OSTYPE in
darwin*) darwin*)
export CC=clang CXX=clang++ CFLAGS="-stdlib=libc++" CXXFLAGS="-stdlib=libc++" CPPFLAGS="-stdlib=libc++"
BACKEND="osx_cocoa" BACKEND="osx_cocoa"
ADD_OPTS=--with-macosx-version-min=10.7 --enable-stl
;; ;;
linux*) linux*)
BACKEND="gtk" BACKEND="gtk"
@ -15,5 +17,5 @@ esac
mkdir build-local mkdir build-local
cd build-local cd build-local
../configure --with-$BACKEND --disable-shared --enable-unicode --disable-compat28 --disable-exceptions --disable-fswatcher --without-regex --without-expat --disable-xml --disable-ribbon --disable-propgrid --disable-stc --disable-html --disable-richtext --without-libjpeg --without-libtiff --disable-webview --disable-markup ../configure --with-$BACKEND --disable-shared --enable-unicode --disable-compat28 --disable-exceptions --disable-fswatcher --without-regex --without-expat --disable-xml --disable-ribbon --disable-propgrid --disable-stc --disable-html --disable-richtext --without-libjpeg --without-libtiff --disable-webview --disable-markup $ADD_OPTS
make make

28
Externals/wxWidgets3/wx/wxcocoa.h vendored
View File

@ -16,7 +16,7 @@
#endif /* __cplusplus */ #endif /* __cplusplus */
/* fill in with the string wxGetOsDescription() will return */ /* fill in with the string wxGetOsDescription() will return */
#define WXWIN_OS_DESCRIPTION "Darwin 11.3.0 i386" #define WXWIN_OS_DESCRIPTION "Darwin 11.4.2 x86_64"
/* the installation location prefix from configure */ /* the installation location prefix from configure */
#define wxINSTALL_PREFIX "/usr/local" #define wxINSTALL_PREFIX "/usr/local"
@ -205,7 +205,7 @@
#define wxUSE_STL 0 #define wxUSE_STL 1
#if defined(__DMC__) || defined(__WATCOMC__) \ #if defined(__DMC__) || defined(__WATCOMC__) \
|| (defined(_MSC_VER) && _MSC_VER < 1200) || (defined(_MSC_VER) && _MSC_VER < 1200)
@ -214,7 +214,7 @@
#define wxUSE_STD_DEFAULT 0 #define wxUSE_STD_DEFAULT 0
#endif #endif
#define wxUSE_STD_CONTAINERS 0 #define wxUSE_STD_CONTAINERS 1
#define wxUSE_STD_IOSTREAM 1 #define wxUSE_STD_IOSTREAM 1
@ -715,7 +715,7 @@
/* /*
* Define if your compiler has compliant std::string::compare * Define if your compiler has compliant std::string::compare
*/ */
/* #undef HAVE_STD_STRING_COMPARE */ #define HAVE_STD_STRING_COMPARE 1
/* /*
* Define if your compiler has <hash_map> * Define if your compiler has <hash_map>
*/ */
@ -736,12 +736,12 @@
/* /*
* Define if your compiler has std::unordered_map * Define if your compiler has std::unordered_map
*/ */
/* #undef HAVE_STD_UNORDERED_MAP */ #define HAVE_STD_UNORDERED_MAP 1
/* /*
* Define if your compiler has std::unordered_set * Define if your compiler has std::unordered_set
*/ */
/* #undef HAVE_STD_UNORDERED_SET */ #define HAVE_STD_UNORDERED_SET 1
/* /*
* Define if your compiler has std::tr1::unordered_map * Define if your compiler has std::tr1::unordered_map
@ -756,12 +756,12 @@
/* /*
* Define if your compiler has <tr1/type_traits> * Define if your compiler has <tr1/type_traits>
*/ */
#define HAVE_TR1_TYPE_TRAITS 1 /* #undef HAVE_TR1_TYPE_TRAITS */
/* /*
* Define if your compiler has <type_traits> * Define if your compiler has <type_traits>
*/ */
/* #undef HAVE_TYPE_TRAITS */ #define HAVE_TYPE_TRAITS 1
/* /*
* Define if the compiler supports simple visibility declarations. * Define if the compiler supports simple visibility declarations.
@ -830,7 +830,7 @@
/* /*
* Define if compiler has __thread keyword. * Define if compiler has __thread keyword.
*/ */
/* #undef HAVE___THREAD_KEYWORD */ #define HAVE___THREAD_KEYWORD 1
/* /*
* Define if large (64 bit file offsets) files are supported. * Define if large (64 bit file offsets) files are supported.
*/ */
@ -996,25 +996,25 @@
#define HAVE_USLEEP 1 #define HAVE_USLEEP 1
/* Define if you have wcscasecmp() function */ /* Define if you have wcscasecmp() function */
/* #undef HAVE_WCSCASECMP 1 */ #define HAVE_WCSCASECMP 1
/* Define if you have wcsncasecmp() function */ /* Define if you have wcsncasecmp() function */
/* #undef HAVE_WCSNCASECMP 1 */ #define HAVE_WCSNCASECMP 1
/* Define if you have wcslen function */ /* Define if you have wcslen function */
#define HAVE_WCSLEN 1 #define HAVE_WCSLEN 1
/* Define if you have wcsdup function */ /* Define if you have wcsdup function */
/* #undef HAVE_WCSDUP 1 */ #define HAVE_WCSDUP 1
/* Define if you have wcsftime() function */ /* Define if you have wcsftime() function */
#define HAVE_WCSFTIME 1 #define HAVE_WCSFTIME 1
/* Define if you have strnlen() function */ /* Define if you have strnlen() function */
/* #undef HAVE_STRNLEN 1 */ #define HAVE_STRNLEN 1
/* Define if you have wcsnlen() function */ /* Define if you have wcsnlen() function */
/* #undef HAVE_WCSNLEN 1 */ #define HAVE_WCSNLEN 1
/* Define if you have wcstoull() and wcstoll() */ /* Define if you have wcstoull() and wcstoll() */
/* #undef HAVE_WCSTOULL */ /* #undef HAVE_WCSTOULL */

3
Source/Core/AudioCommon/Src/Mixer.h
View File

@ -18,8 +18,9 @@
#ifndef _MIXER_H_ #ifndef _MIXER_H_
#define _MIXER_H_ #define _MIXER_H_
#include <mutex>
#include "WaveFile.h" #include "WaveFile.h"
#include "StdMutex.h"
// 16 bit Stereo // 16 bit Stereo
#define MAX_SAMPLES (1024 * 8) #define MAX_SAMPLES (1024 * 8)

5
Source/Core/Common/Common.vcxproj
View File

@ -241,9 +241,6 @@
<ClInclude Include="Src\SDCardUtil.h" /> <ClInclude Include="Src\SDCardUtil.h" />
<ClInclude Include="Src\Setup.h" /> <ClInclude Include="Src\Setup.h" />
<ClInclude Include="Src\stdafx.h" /> <ClInclude Include="Src\stdafx.h" />
<ClInclude Include="Src\StdConditionVariable.h" />
<ClInclude Include="Src\StdMutex.h" />
<ClInclude Include="Src\StdThread.h" />
<ClInclude Include="Src\StringUtil.h" /> <ClInclude Include="Src\StringUtil.h" />
<ClInclude Include="Src\SymbolDB.h" /> <ClInclude Include="Src\SymbolDB.h" />
<ClInclude Include="Src\SysConf.h" /> <ClInclude Include="Src\SysConf.h" />
@ -261,4 +258,4 @@
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" /> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
<ImportGroup Label="ExtensionTargets"> <ImportGroup Label="ExtensionTargets">
</ImportGroup> </ImportGroup>
</Project> </Project>

5
Source/Core/Common/Common.vcxproj.filters
View File

@ -85,7 +85,6 @@
<ClInclude Include="Src\SDCardUtil.h" /> <ClInclude Include="Src\SDCardUtil.h" />
<ClInclude Include="Src\Setup.h" /> <ClInclude Include="Src\Setup.h" />
<ClInclude Include="Src\stdafx.h" /> <ClInclude Include="Src\stdafx.h" />
<ClInclude Include="Src\StdThread.h" />
<ClInclude Include="Src\StringUtil.h" /> <ClInclude Include="Src\StringUtil.h" />
<ClInclude Include="Src\SymbolDB.h" /> <ClInclude Include="Src\SymbolDB.h" />
<ClInclude Include="Src\SysConf.h" /> <ClInclude Include="Src\SysConf.h" />
@ -119,8 +118,6 @@
<ClInclude Include="Src\Crypto\tools.h"> <ClInclude Include="Src\Crypto\tools.h">
<Filter>Crypto</Filter> <Filter>Crypto</Filter>
</ClInclude> </ClInclude>
<ClInclude Include="Src\StdMutex.h" />
<ClInclude Include="Src\StdConditionVariable.h" />
<ClInclude Include="Src\x64ABI.h" /> <ClInclude Include="Src\x64ABI.h" />
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
@ -134,4 +131,4 @@
<UniqueIdentifier>{f078f36e-a0ff-4cd0-95f8-476100d68e68}</UniqueIdentifier> <UniqueIdentifier>{f078f36e-a0ff-4cd0-95f8-476100d68e68}</UniqueIdentifier>
</Filter> </Filter>
</ItemGroup> </ItemGroup>
</Project> </Project>

2
Source/Core/Common/Src/LogManager.h
View File

@ -46,7 +46,7 @@ public:
void Log(LogTypes::LOG_LEVELS, const char *msg); void Log(LogTypes::LOG_LEVELS, const char *msg);
bool IsValid() { return (m_logfile != NULL); } bool IsValid() { return (bool)m_logfile; }
bool IsEnabled() const { return m_enable; } bool IsEnabled() const { return m_enable; }
void SetEnable(bool enable) { m_enable = enable; } void SetEnable(bool enable) { m_enable = enable; }

13
Source/Core/Common/Src/Thread.h
View File

@ -18,9 +18,16 @@
#ifndef _THREAD_H_ #ifndef _THREAD_H_
#define _THREAD_H_ #define _THREAD_H_
#include "StdThread.h" // <condition_variable> has a bug in some versions of libc++: it uses _ as a variable.
#include "StdMutex.h" // This conflicts with gettext's use of _ as a macro.
#include "StdConditionVariable.h" #undef _
#include <condition_variable>
#include <mutex>
#include <thread>
// Restore _
#define _(s) wxGetTranslation((s))
// Don't include common.h here as it will break LogManager // Don't include common.h here as it will break LogManager
#include "CommonTypes.h" #include "CommonTypes.h"

2
Source/Core/Core/Src/HW/DSPHLE/UCodes/UCode_AX.h
View File

@ -75,7 +75,7 @@ public:
virtual void DoState(PointerWrap& p); virtual void DoState(PointerWrap& p);
// Needed because StdThread.h std::thread implem does not support member // Needed because StdThread.h std::thread implem does not support member
// pointers. // pointers. TODO(delroth): obsolete.
static void SpawnAXThread(CUCode_AX* self); static void SpawnAXThread(CUCode_AX* self);
protected: protected:

2
Source/Core/Core/Src/HW/EXI_DeviceMic.h
View File

@ -20,7 +20,7 @@
#if HAVE_PORTAUDIO #if HAVE_PORTAUDIO
#include "StdMutex.h" #include <mutex>
class CEXIMic : public IEXIDevice class CEXIMic : public IEXIDevice
{ {

11
Source/Core/DolphinWX/Src/ConfigMain.cpp
View File

@ -18,6 +18,7 @@
#include <string> // System #include <string> // System
#include <vector> #include <vector>
#include <algorithm> #include <algorithm>
#include <functional>
#include <wx/spinbutt.h> #include <wx/spinbutt.h>
#include "Common.h" #include "Common.h"
@ -43,14 +44,6 @@
#include "Main.h" #include "Main.h"
#include "VideoBackendBase.h" #include "VideoBackendBase.h"
#if defined(__APPLE__)
#include <tr1/functional>
using std::tr1::function;
#else
#include <functional>
using std::function;
#endif
#define TEXT_BOX(page, text) new wxStaticText(page, wxID_ANY, text, wxDefaultPosition, wxDefaultSize) #define TEXT_BOX(page, text) new wxStaticText(page, wxID_ANY, text, wxDefaultPosition, wxDefaultSize)
struct CPUCore struct CPUCore
@ -631,7 +624,7 @@ void CConfigMain::CreateGUIControls()
theme_selection->SetStringSelection(SConfig::GetInstance().m_LocalCoreStartupParameter.theme_name); theme_selection->SetStringSelection(SConfig::GetInstance().m_LocalCoreStartupParameter.theme_name);
// std::function = avoid error on msvc // std::function = avoid error on msvc
theme_selection->Bind(wxEVT_COMMAND_CHOICE_SELECTED, function<void(wxEvent&)>([theme_selection](wxEvent&) theme_selection->Bind(wxEVT_COMMAND_CHOICE_SELECTED, std::function<void(wxEvent&)>([theme_selection](wxEvent&)
{ {
SConfig::GetInstance().m_LocalCoreStartupParameter.theme_name = theme_selection->GetStringSelection(); SConfig::GetInstance().m_LocalCoreStartupParameter.theme_name = theme_selection->GetStringSelection();
main_frame->InitBitmaps(); main_frame->InitBitmaps();