ShuriZma
/
dolphin
mirror of https://github.com/dolphin-emu/dolphin.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
5,631 Commits 5 Branches 11 Tags 1.3 GiB
Commit Graph

75 Commits

Author SHA1 Message Date
Glenn Rice 1936772725 Linux build fix 
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@5667 8ced0084-cf51-0410-be5f-012b33b47a6e
 2010-06-12 20:33:29 +00:00
Soren Jorvang 404c625622 Simplify the SCons build: 
On OS X, build all code as Objective-C(++).

Centralize framework handling.

Cleanup.


git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@5645 8ced0084-cf51-0410-be5f-012b33b47a6e
 2010-06-10 14:18:21 +00:00
Soren Jorvang c05c9fa1f4 Use 10.5 compatible API's to get list of display resolutions on OS X. 
Patch from user gamepromcompany on the MacOSX_Build wiki page.

Add support for the Mac command key as a hotkey modifier in 
WXKeyToString but present it as Control. WXKeyToString is used for     
both hotkeys and menu accelerators, the latter only supporting
Shift/Alt/Control with wxWidgets.

wxSpinCtrl on wx 2.9 has a very small default size, so give the 
window size ones a reasonable size.

Use wxFULLSCREEN_ALL when switching to fullscreen, which gets rid
of window decorations like the title bar. Note that to actually
be rid of it with wx 2.9 on OS X, you'll need this patch:
http://trac.wxwidgets.org/ticket/11701

Also remove a couple of files I had accidentally duplicated.


git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@5642 8ced0084-cf51-0410-be5f-012b33b47a6e
 2010-06-09 20:03:37 +00:00
Soren Jorvang 3ab27a7d87 Revert parts of r5576 and r5598 for Sonicadvance1's sake. 
This reenables the option for building without wx on OS X,
but still leaves wxgl as the default.


git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@5599 8ced0084-cf51-0410-be5f-012b33b47a6e
 2010-06-04 04:59:07 +00:00
Soren Jorvang 84c55c3e4e Deprecate nowx on OS X (but keep it building for sanity checking). 
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@5598 8ced0084-cf51-0410-be5f-012b33b47a6e
 2010-06-04 02:58:35 +00:00
hrydgard a3c96ac42c Warp back to 5578. Sorry for the lost changes, please re-apply. Reason: 5579 is a complete disaster. 
Not only does it change tons of files to switch to a new and non-working (it doesn't parse my ini files, at least) ini parser, it also reshuffles a lot of code and removes a plugin. The latter part is fine, but doing these two major switches in one revision, one of which is broken, is completely unacceptable. I said to merge tiny changes, not massive reworkings.

git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@5589 8ced0084-cf51-0410-be5f-012b33b47a6e
 2010-06-03 18:05:08 +00:00
nakeee 89aeda83a3 Compile fix 
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@5582 8ced0084-cf51-0410-be5f-012b33b47a6e
 2010-06-03 06:13:09 +00:00
nakeee a34ad40517 An almost linux/osx compile fix beside some undefined references 
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@5581 8ced0084-cf51-0410-be5f-012b33b47a6e
 2010-06-03 05:59:58 +00:00
Soren Jorvang 52c912a59e Make wxgl mandatory on OS X. 
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@5576 8ced0084-cf51-0410-be5f-012b33b47a6e
 2010-06-03 01:24:26 +00:00
Soren Jorvang c9564405d9 Some wxWidgets features, like wxProgressDialog used when updating the 
game list, rely on the main event handler already running, which isn't
the case until after OnInit(). This is a problem when an ISO directory
is already set at startup.

To deal with such actions that can only properly be done after the wx
environment is fully functional, schedule AfterInit() where the initial
game list scan is done.

The underlying icon object for wxIcon on OS X didn't work with our 
(non-square?) 96x32 game list graphics, but we weren't using any wxIcon
properties such as transparency anyhow, so just skip the wxBitmap to 
wxIcon back to wxBitmap conversions.

Use wxID_ABOUT and wxID_PREFERENCES so that those menu items are
automagically teleported to their canonincal locations on each platform.

USE_XPM_BITMAPS has been implicit on all platforms for some time now.
 
AddGrowableCol() causes problems in a couple of inessential places for    
some unknown reason, even though the same pattern works fine elsewhere.
 
These changes make us play a lot nicer with wxWidgets 2.9.


git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@5564 8ced0084-cf51-0410-be5f-012b33b47a6e
 2010-06-01 21:03:02 +00:00
Soren Jorvang 220c3ae829 Identify OS X application bundle with SVN version number. 
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@5557 8ced0084-cf51-0410-be5f-012b33b47a6e
 2010-05-31 16:18:40 +00:00
Jordan Woyak ec11685a66 NetPlay: Allow manual adjustments to the pad buffer size. Hacked in all the functions that will be needed for wiimote support (not functional yet). Rumble is sent to the correct gamepad during netplay. Stop button works better. Games no longer hang on disconnect. 
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@5434 8ced0084-cf51-0410-be5f-012b33b47a6e
 2010-05-05 04:31:21 +00:00
Jordan Woyak a6d6d27328 NetPlay: completely redone - should be somewhat usable when using Single Core and DSP LLE Plugin. 
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@5425 8ced0084-cf51-0410-be5f-012b33b47a6e
 2010-05-01 19:10:35 +00:00
Glenn Rice 140332c02e Move fullscreen display resolution control to the GUI with the rest of the fullscreen toggling code. This removes redundancy of code that was in several places through the various video plugins. Unfortunately it means the fullscreen resolution setting also had to be moved to the main configuration dialog. I am sure that will meet some resistance. 
Also added a window size setting for windowed mode.

Also pulled some X11 specific code out into a separate file.


git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@5395 8ced0084-cf51-0410-be5f-012b33b47a6e
 2010-04-22 04:28:34 +00:00
Glenn Rice 33a64d5db0 Big restructuring of how the video plugin works. In linux and windows you shouldn't see a change in the functionality; however, there are changes in how render to main or not, and fullscreen modes, and such are handled. Input is largely restructured for the video plugin. It is now handled by the host. Keys for pausing and changing fullscreen are configurable. More will probably be later. This is probably classified as highly experimental. 
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@5336 8ced0084-cf51-0410-be5f-012b33b47a6e
 2010-04-12 01:33:10 +00:00
Shawn Hoffman e6efc4a611 remove wiimote led/speaker status from statusbar 
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@5187 8ced0084-cf51-0410-be5f-012b33b47a6e
 2010-03-11 17:20:32 +00:00
Glenn Rice c455673f87 Added scons options "shared_libname=true" to link agains the system shared libraries for lzo, sfml, and soil. For example add the scons option "shared_lzo=true" for lzo. This will check for the system libraries and then fall back to building and linking statically against the Externals if not found. You must have liblzo2-dev, libsoil-dev, and libsfml-dev installed. Note that you need version 1.5 or later for sfml. Currently scons doesn't check the version for you. 
If you are having trouble with segmentation faults in linux try "shared_soil=true".  That seems to fix the problem.  How do we fix this for the static build?


git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@5182 8ced0084-cf51-0410-be5f-012b33b47a6e
 2010-03-09 22:17:33 +00:00
Glenn Rice 303769d31c Revert commit 5105 until we sort out how we want this to work in linux. 
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@5110 8ced0084-cf51-0410-be5f-012b33b47a6e
 2010-02-22 16:10:08 +00:00
Glenn Rice 73d575c5c2 On linux don't compile and link against lzo, soil, and sfml "Externals." 
Instead use system libraries liblzo2-dev, libsoil-dev, and libsfml-dev


git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@5105 8ced0084-cf51-0410-be5f-012b33b47a6e
 2010-02-22 00:39:38 +00:00
nakeee 7de17cb9c2 SFML on linux/osx now compiles from external (static) 
removed HAVE_SFML ifdefs


git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@5101 8ced0084-cf51-0410-be5f-012b33b47a6e
 2010-02-21 20:09:49 +00:00
Glenn Rice feba09f7a3 Linux global build. At least the basic footwork is done here. 
Basic usage:  "sudo scons install=global install"
Hopefully this doesn't break builds on Macs.  I have tested this on linux and windows.


git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@4994 8ced0084-cf51-0410-be5f-012b33b47a6e
 2010-02-02 21:56:29 +00:00
hrydgard 9d14042a0c Move Segher's hashing/crypto code from the Dolphin project to Common. 
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@4857 8ced0084-cf51-0410-be5f-012b33b47a6e
 2010-01-16 19:31:11 +00:00
Shawn Hoffman 61eed07ec4 scons buildfix 
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@4838 8ced0084-cf51-0410-be5f-012b33b47a6e
 2010-01-14 23:26:53 +00:00
LPFaint99 b186f0821e Adds experimental data.bin export of wii saves, 
use at your own risk as it has been tested only to the point that a real wii recognizes the save on an sd card
Please post test results here or on issue 1945
removed the automated backup when importing from a save.bin

fixed display of pokemon titles in memcardmanager

git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@4829 8ced0084-cf51-0410-be5f-012b33b47a6e
 2010-01-14 07:19:10 +00:00
nakeee ea4225f9fd Cleanup of the Device usb code, now we don't compare u32 to NULL. 
Please someone who knows the code take a look to make sure I got it right.


git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@4785 8ced0084-cf51-0410-be5f-012b33b47a6e
 2010-01-05 08:07:06 +00:00
death2droid 6005f4155d Remove info window from Dolphin since most people do not use it or didn't even know it exists. 
Plus many people think its useless :P

git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@4574 8ced0084-cf51-0410-be5f-012b33b47a6e
 2009-11-14 22:24:20 +00:00
nakeee 60f142ce96 Begining of porting the luainteface to linux + some other small fixes. 
(could use some help with lua macros)


git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@4515 8ced0084-cf51-0410-be5f-012b33b47a6e
 2009-11-08 08:54:09 +00:00
tmator f768ae5586 wx 2.9 works in 64bit with snow leopard 
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@4374 8ced0084-cf51-0410-be5f-012b33b47a6e
 2009-10-07 10:13:20 +00:00
Sonicadvance1 ced92d8544 Fix compiling in Snow Leopard, the Update stuff in the Video plugin shouldn't be in the GUI since it breaks nowx builds, wasn't sure where to put it, but Render.cpp seemed like the best place. Fixed wiiuse.c, and the SConscripts needed updating for Snow Leopard. Building 32bit in Snow Leopard is apparently broken. and Running 64bit in Snow Leopard seems to fail. Haven't tracked this down yet 
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@4299 8ced0084-cf51-0410-be5f-012b33b47a6e
 2009-09-18 19:56:49 +00:00
John Peterson 6168ab75c6 GUI: File split 
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@4142 8ced0084-cf51-0410-be5f-012b33b47a6e
 2009-09-01 15:16:44 +00:00
John Peterson 4272d7cd99 GUI: No need to remove the log window 
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@4131 8ced0084-cf51-0410-be5f-012b33b47a6e
 2009-08-31 23:09:50 +00:00
nakeee fdf94d7d2b Killed the log window we should add the log level controls somewhere 
else.


git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@4126 8ced0084-cf51-0410-be5f-012b33b47a6e
 2009-08-31 22:18:44 +00:00
tmator 1e9bb4ed9a fix non gui build 
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@3921 8ced0084-cf51-0410-be5f-012b33b47a6e
 2009-08-01 18:31:25 +00:00
Sonicadvance1 e91ab24bce Linux compile fix 
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@3519 8ced0084-cf51-0410-be5f-012b33b47a6e
 2009-06-21 09:35:31 +00:00
nakeee b9cdcb1819 added HAVE_SFML so the code compiles without it 
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@3221 8ced0084-cf51-0410-be5f-012b33b47a6e
 2009-05-13 22:23:54 +00:00
tmator 63f84a491a fix nowx build for osx 
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@3108 8ced0084-cf51-0410-be5f-012b33b47a6e
 2009-04-30 08:24:48 +00:00
Marcus Wanners f39af5f9a5 The start of the InfoWindow (issue 722). By death2droid. 
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@3066 8ced0084-cf51-0410-be5f-012b33b47a6e
 2009-04-24 18:04:50 +00:00
Shawn Hoffman ed598d3c67 aaaand the always-fun linux build fix 
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@3043 8ced0084-cf51-0410-be5f-012b33b47a6e
 2009-04-22 17:15:51 +00:00
nakeee e65eb58f00 scons: building nogui only without wx (too much horrible dependecies) 
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@2719 8ced0084-cf51-0410-be5f-012b33b47a6e
 2009-03-21 19:55:10 +00:00
Shawn Hoffman 2301d072a6 nakee's new logmanager. added a console window for windows builds (prints to parent console on non-win32). also fix some random wxw bugs: main window's position is saved when using debugger, disabling windows from the tools menu are saved settings, some other small fixes 
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@2675 8ced0084-cf51-0410-be5f-012b33b47a6e
 2009-03-18 17:17:58 +00:00
nakeee ab93b00385 Ported wxutils from soap branch (Should make launch and explore work in Linux and osx as well) please test on windows. 
Fixed a compile bug and a small bug in the cdutils(thanks lp).



git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@2420 8ced0084-cf51-0410-be5f-012b33b47a6e
 2009-02-24 19:31:32 +00:00
omegadox ca741b2526 More SDIO WIP Code: Added ground work for SDCard Mounter wxDialog 
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@2067 8ced0084-cf51-0410-be5f-012b33b47a6e
 2009-02-01 20:20:58 +00:00
nakeee 4433e06447 Move Config.cpp to Core renamed it to ConfigManager 
Todo: Use it from core.cpp instead of the params


git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@1905 8ced0084-cf51-0410-be5f-012b33b47a6e
 2009-01-17 23:41:21 +00:00
Shawn Hoffman ba8c2aa7e4 nakee's work on dolphin events. Also get wxw out of logmanager. This commit wants your comments 
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@1875 8ced0084-cf51-0410-be5f-012b33b47a6e
 2009-01-15 06:48:15 +00:00
tmator a255ea66cf first step to get cocoa events 
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@1857 8ced0084-cf51-0410-be5f-012b33b47a6e
 2009-01-12 20:52:45 +00:00
nakeee 9cae49bb52 moved plugin manager to core. 
Can someone fix it on windows? 


git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@1840 8ced0084-cf51-0410-be5f-012b33b47a6e
 2009-01-09 12:46:04 +00:00
John Peterson eb2ce16a6c Interface and general: Fixed the hangings and crashes that would occur from repeated Start and Stop, added optional toolbar themes, made the fullscreen mode in the OpenGL plugin more user friendly for Windows users 
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@1770 8ced0084-cf51-0410-be5f-012b33b47a6e
 2009-01-04 21:53:41 +00:00
nakeee 90560511c9 moving around some event handler code 
creating inputcommon


git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@1766 8ced0084-cf51-0410-be5f-012b33b47a6e
 2009-01-04 19:54:56 +00:00
Shawn Hoffman 4a5d9ded94 namespace-ified ActionReplay, and made ISOProperties use the existing AR code. bonus: encrypted arcodes are saved as unencrypted codes just by closing the isoproperties dialog. also added ARCodeAddEdit, but once again, it only views entries atm. some misc wxw cleanup 
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@1560 8ced0084-cf51-0410-be5f-012b33b47a6e
 2008-12-17 04:14:24 +00:00
nakeee 736409632e compile fix on linux 
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@1460 8ced0084-cf51-0410-be5f-012b33b47a6e
 2008-12-09 18:10:16 +00:00