summaryrefslogtreecommitdiff
path: root/Source
diff options
context:
space:
mode:
Diffstat (limited to 'Source')
-rw-r--r--Source/Core/Common/Src/Common.h2
-rw-r--r--Source/Core/Common/Src/FileUtil.cpp2
-rw-r--r--Source/Core/DolphinWX/src/BootManager.cpp4
-rw-r--r--Source/Core/DolphinWX/src/Frame.cpp2
-rw-r--r--Source/Core/DolphinWX/src/GameListCtrl.cpp4
-rw-r--r--Source/Core/DolphinWX/src/Main.cpp21
-rw-r--r--Source/Core/VideoCommon/Src/SConscript1
-rw-r--r--Source/Plugins/Plugin_PadSimple/Src/main.cpp1
-rw-r--r--Source/Plugins/Plugin_VideoOGL/Src/GLInit.cpp6
-rw-r--r--Source/Plugins/Plugin_VideoOGL/Src/SConscript2
-rw-r--r--Source/Plugins/Plugin_VideoOGL/Src/VertexLoader.cpp5
11 files changed, 36 insertions, 14 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",
]
diff --git a/Source/Plugins/Plugin_PadSimple/Src/main.cpp b/Source/Plugins/Plugin_PadSimple/Src/main.cpp
index eb08c9cfce..88fcdfd1cb 100644
--- a/Source/Plugins/Plugin_PadSimple/Src/main.cpp
+++ b/Source/Plugins/Plugin_PadSimple/Src/main.cpp
@@ -367,7 +367,6 @@ void DInput_Read(int _numPad, SPADStatus* _pPADStatus)
if (dinput.diks[keyForControl[CTL_START]] & 0xFF){_pPADStatus->button |= PAD_BUTTON_START;}
}
-
void XInput_Read(int _numPAD, SPADStatus* _pPADStatus)
{
#ifdef XINPUT_ENABLE
diff --git a/Source/Plugins/Plugin_VideoOGL/Src/GLInit.cpp b/Source/Plugins/Plugin_VideoOGL/Src/GLInit.cpp
index 9001af9632..2da93652e9 100644
--- a/Source/Plugins/Plugin_VideoOGL/Src/GLInit.cpp
+++ b/Source/Plugins/Plugin_VideoOGL/Src/GLInit.cpp
@@ -16,8 +16,8 @@
// http://code.google.com/p/dolphin-emu/
#include "Globals.h"
-#include "svnrev.h"
#ifdef _WIN32
+#include "svnrev.h"
#include "EmuWindow.h"
#endif
#include "GLInit.h"
@@ -82,10 +82,14 @@ BOOL Callback_PeekMessages()
void UpdateFPSDisplay(const char *text)
{
+#ifdef _WIN32
char temp[512];
sprintf(temp, "SVN R%i: %s", SVN_REV, text);
SetWindowText(EmuWindow::GetWnd(), temp);
OpenGL_SetWindowText(temp);
+#else
+ //TODO
+#endif
}
diff --git a/Source/Plugins/Plugin_VideoOGL/Src/SConscript b/Source/Plugins/Plugin_VideoOGL/Src/SConscript
index 279c0e66e6..61d0f790bd 100644
--- a/Source/Plugins/Plugin_VideoOGL/Src/SConscript
+++ b/Source/Plugins/Plugin_VideoOGL/Src/SConscript
@@ -13,7 +13,7 @@ files = ["BPStructs.cpp",
"PixelShaderManager.cpp",
"rasterfont.cpp",
"Render.cpp",
- "TextureDecoder.cpp",
+# "TextureDecoder.cpp",
"TextureMngr.cpp",
"VertexLoader.cpp",
"VertexLoader_Normal.cpp",
diff --git a/Source/Plugins/Plugin_VideoOGL/Src/VertexLoader.cpp b/Source/Plugins/Plugin_VideoOGL/Src/VertexLoader.cpp
index eadb267a86..8b870afe46 100644
--- a/Source/Plugins/Plugin_VideoOGL/Src/VertexLoader.cpp
+++ b/Source/Plugins/Plugin_VideoOGL/Src/VertexLoader.cpp
@@ -54,7 +54,10 @@ float tcScaleU[8];
float tcScaleV[8];
int tcIndex;
int colIndex;
-
+#ifndef _WIN32
+ #undef inline
+ #define inline
+#endif
inline u8 ReadBuffer8()
{
return g_pDataReader->Read8();
generated by cgit v1.2.3 (git 2.25.1) at 2026-09-07 05:12:35 +0000