diff options
Diffstat (limited to 'Source/Core')
| -rw-r--r-- | Source/Core/Common/Src/Common.h | 2 | ||||
| -rw-r--r-- | Source/Core/Common/Src/FileUtil.cpp | 2 | ||||
| -rw-r--r-- | Source/Core/DolphinWX/src/BootManager.cpp | 4 | ||||
| -rw-r--r-- | Source/Core/DolphinWX/src/Frame.cpp | 2 | ||||
| -rw-r--r-- | Source/Core/DolphinWX/src/GameListCtrl.cpp | 4 | ||||
| -rw-r--r-- | Source/Core/DolphinWX/src/Main.cpp | 21 | ||||
| -rw-r--r-- | Source/Core/VideoCommon/Src/SConscript | 1 |
7 files changed, 26 insertions, 10 deletions
diff --git a/Source/Core/Common/Src/Common.h b/Source/Core/Common/Src/Common.h index b086269b42..771caec106 100644 --- a/Source/Core/Common/Src/Common.h +++ b/Source/Core/Common/Src/Common.h @@ -105,7 +105,9 @@ typedef union _LARGE_INTEGER #define GC_ALIGNED16_DECL(x) x
#else
#define GC_ALIGNED16(x) x
+#define GC_ALIGNED64(x) x
#define GC_ALIGNED16_DECL(x) x __attribute((aligned(16)))
+#define GC_ALIGNED64_DECL(x) x
#endif
#ifndef __forceinline
diff --git a/Source/Core/Common/Src/FileUtil.cpp b/Source/Core/Common/Src/FileUtil.cpp index 2c14db9ab1..2d3d827477 100644 --- a/Source/Core/Common/Src/FileUtil.cpp +++ b/Source/Core/Common/Src/FileUtil.cpp @@ -1,6 +1,8 @@ #include "Common.h"
#include "FileUtil.h"
+#ifdef _WIN32
#include <shellapi.h>
+#endif
bool File::Exists(const std::string &filename)
{
diff --git a/Source/Core/DolphinWX/src/BootManager.cpp b/Source/Core/DolphinWX/src/BootManager.cpp index 201c52094e..60a4f435a3 100644 --- a/Source/Core/DolphinWX/src/BootManager.cpp +++ b/Source/Core/DolphinWX/src/BootManager.cpp @@ -56,7 +56,9 @@ bool BootCore(const std::string& _rFilename) // StartUp.bUseDualCore = false;
StartUp.bUseDynarec = true;
}
-
+ #ifndef _WIN32
+ StartUp.bUseDynarec = false;//Never use Dynarec in Linux, crashes
+ #endif
StartUp.m_BootType = SCoreStartupParameter::BOOT_ISO;
StartUp.m_strFilename = _rFilename;
StartUp.bHLEBios = true;
diff --git a/Source/Core/DolphinWX/src/Frame.cpp b/Source/Core/DolphinWX/src/Frame.cpp index 230675e15d..b932c8e594 100644 --- a/Source/Core/DolphinWX/src/Frame.cpp +++ b/Source/Core/DolphinWX/src/Frame.cpp @@ -191,7 +191,7 @@ CFrame::CreateMenu() {
wxMenu* pGameMenu = new wxMenu;
{
- wxMenuItem *pItem = new wxMenuItem(pGameMenu, IDM_EDITPATCHFILE, "Edit patch file");
+ wxMenuItem *pItem = new wxMenuItem(pGameMenu, IDM_EDITPATCHFILE, wxString::FromAscii("Edit patch file"));
pGameMenu->Append(pItem);
}
}
diff --git a/Source/Core/DolphinWX/src/GameListCtrl.cpp b/Source/Core/DolphinWX/src/GameListCtrl.cpp index 513e7a95a2..17391926a4 100644 --- a/Source/Core/DolphinWX/src/GameListCtrl.cpp +++ b/Source/Core/DolphinWX/src/GameListCtrl.cpp @@ -338,8 +338,8 @@ CGameListCtrl::OnRightClick(wxMouseEvent& event) std::string unique_id = selected_iso->GetUniqueID();
wxMenu popupMenu;
std::string menu_text = StringFromFormat("Edit &patch file: %s.ini", unique_id.c_str());
- popupMenu.Append(IDM_EDITPATCHFILE, menu_text);
- popupMenu.Append(IDM_OPENCONTAININGFOLDER, "Open &containing folder");
+ popupMenu.Append(IDM_EDITPATCHFILE, wxString::FromAscii(menu_text.c_str())); //Pretty much everything in wxwidgets is a wxString, try to convert to those first!
+ popupMenu.Append(IDM_OPENCONTAININGFOLDER, wxString::FromAscii("Open &containing folder"));
PopupMenu(&popupMenu);
}
}
diff --git a/Source/Core/DolphinWX/src/Main.cpp b/Source/Core/DolphinWX/src/Main.cpp index ed90697efe..612614e72e 100644 --- a/Source/Core/DolphinWX/src/Main.cpp +++ b/Source/Core/DolphinWX/src/Main.cpp @@ -17,8 +17,9 @@ #include <vector>
#include <string>
-
-#include "svnrev.h"
+#ifdef WIN32
+ #include "svnrev.h"
+#endif
#include "CPUDetect.h"
#include "Globals.h"
#include "Common.h"
@@ -94,12 +95,20 @@ bool DolphinApp::OnInit() SConfig::GetInstance().LoadSettings();
wxInitAllImageHandlers();
// Create the main frame window
-#ifdef _DEBUG
- const char *title = "Dolphin Debug SVN R " SVN_REV_STR;
+#ifdef _WIN32
+ #ifdef _DEBUG
+ const char *title = "Dolphin Debug SVN R " SVN_REV_STR;
+ #else
+ const char *title = "Dolphin SVN R " SVN_REV_STR;
+ #endif
#else
- const char *title = "Dolphin SVN R " SVN_REV_STR;
+ #ifdef _DEBUG
+ const char *title = "Dolphin Debug SVN Linux Build"; // Do this for now
+ #else
+ const char *title = "Dolphin SVN Linux Build";
+ #endif
#endif
- main_frame = new CFrame((wxFrame*) NULL, wxID_ANY, title,
+ main_frame = new CFrame((wxFrame*) NULL, wxID_ANY, wxString::FromAscii(title),
wxPoint(100, 100), wxSize(800, 600));
// create debugger
diff --git a/Source/Core/VideoCommon/Src/SConscript b/Source/Core/VideoCommon/Src/SConscript index 1de4410e2e..415e17d5b5 100644 --- a/Source/Core/VideoCommon/Src/SConscript +++ b/Source/Core/VideoCommon/Src/SConscript @@ -3,6 +3,7 @@ Import('env') files = ["BPMemory.cpp", "CPMemory.cpp", "LookUpTables.cpp", + "TextureDecoder.cpp", "XFMemory.cpp", ] |