piwalker/dolphin
1
0
Fork 0
mirror of https://github.com/dolphin-emu/dolphin.git synced 2025-07-29 00:59:44 -06:00
Code Issues Packages Projects Releases Wiki Activity

build against wxWidgets3 from Externals on Windows.

Browse Source 
use Externals version of libpng on Windows.
This commit is contained in:
Shawn Hoffman
2012-03-18 02:31:19 -07:00
parent 360c8d4cb3
commit c3d13b048c
14 changed files with 502 additions and 213 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
Source/Core/DolphinWX/Src/GameListCtrl.cpp
View File

@ -723,8 +723,8 @@ const GameListItem *CGameListCtrl::GetISO(size_t index) const
CGameListCtrl *caller;
#if wxCHECK_VERSION(2, 9, 0)
int wxCALLBACK wxListCompare(long item1, long item2, wxIntPtr sortData)
#else
int wxCALLBACK wxListCompare(wxIntPtr item1, wxIntPtr item2, wxIntPtr sortData)
#else // 2.8.x
int wxCALLBACK wxListCompare(long item1, long item2, long sortData)
#endif
{

14
Source/Core/DolphinWX/Src/Main.cpp
View File

@ -115,37 +115,37 @@ bool DolphinApp::OnInit()
wxCmdLineEntryDesc cmdLineDesc[] =
{
{
wxCMD_LINE_SWITCH, wxS("h"), wxS("help"),
wxCMD_LINE_SWITCH, "h", "help",
_("Show this help message"),
wxCMD_LINE_VAL_NONE, wxCMD_LINE_OPTION_HELP
},
{
wxCMD_LINE_SWITCH, wxS("d"), wxS("debugger"),
wxCMD_LINE_SWITCH, "d", "debugger",
_("Opens the debugger"),
wxCMD_LINE_VAL_NONE, wxCMD_LINE_PARAM_OPTIONAL
},
{
wxCMD_LINE_SWITCH, wxS("l"), wxS("logger"),
wxCMD_LINE_SWITCH, "l", "logger",
_("Opens the logger"),
wxCMD_LINE_VAL_NONE, wxCMD_LINE_PARAM_OPTIONAL
},
{
wxCMD_LINE_OPTION, wxS("e"), wxS("exec"),
wxCMD_LINE_OPTION, "e", "exec",
_("Loads the specified file (DOL,ELF,GCM,ISO,WAD)"),
wxCMD_LINE_VAL_STRING, wxCMD_LINE_PARAM_OPTIONAL
},
{
wxCMD_LINE_SWITCH, wxS("b"), wxS("batch"),
wxCMD_LINE_SWITCH, "b", "batch",
_("Exit Dolphin with emulator"),
wxCMD_LINE_VAL_NONE, wxCMD_LINE_PARAM_OPTIONAL
},
{
wxCMD_LINE_OPTION, wxS("V"), wxS("video_backend"),
wxCMD_LINE_OPTION, "V", "video_backend",
_("Specify a video backend"),
wxCMD_LINE_VAL_STRING, wxCMD_LINE_PARAM_OPTIONAL
},
{
wxCMD_LINE_OPTION, wxS("A"), wxS("audio_emulation"),
wxCMD_LINE_OPTION, "A", "audio_emulation",
_("Low level (LLE) or high level (HLE) audio"),
wxCMD_LINE_VAL_STRING, wxCMD_LINE_PARAM_OPTIONAL
},

1
Source/Core/DolphinWX/Src/NetWindow.h
View File

@ -24,6 +24,7 @@
#include <string>
#include <wx/wx.h>
#include <wx/event.h>
#include <wx/sizer.h>
#include <wx/dialog.h>
#include <wx/notebook.h>

4
Source/Core/DolphinWX/Src/WXInputBase.cpp
View File

@ -44,6 +44,9 @@ const wxString WXKeyToString(int keycode)
case WXK_SHIFT: return wxT("Shift");
case WXK_ALT: return wxT("Alt");
case WXK_RAW_CONTROL: return _("Control");
#ifdef __WXOSX__
case WXK_COMMAND: return _("Command");
#endif
case WXK_MENU: return _("Menu");
case WXK_PAUSE: return _("Pause");
case WXK_CAPITAL: return _("Caps Lock");
@ -131,7 +134,6 @@ const wxString WXKeyToString(int keycode)
case WXK_WINDOWS_LEFT: return _("Windows Left");
case WXK_WINDOWS_RIGHT: return _("Windows Right");
case WXK_WINDOWS_MENU: return _("Windows Menu");
case WXK_COMMAND: return _("Command");
}
if (keycode > WXK_SPACE && keycode < WXK_DELETE) {