Yaya48/dolphin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
11,031 Commits 1 Branch 0 Tags
3b0c0e2500c5ed45ee95d58d0f3e9e7322d08213
Commit Graph
100 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Shawn Hoffman 484130049d On windows, ignore WM_QUERYENDSESSION and close upon WM_ENDSESSION. 
The messages can come through CFrame::MSWWindowProc and the wxApp implementation, so make sure to catch both.
Fixes issue 6546.
 2013-09-10 03:14:21 -07:00
Shawn Hoffman 2d492bdc4f Revert "Leak an object when quitting Dolphin to try and fix issue 6546" 
This reverts commit 380b780dd1.

Revert "Move the CFrame::ClosePages call from ~CFrame to CFrame::OnClose"
This reverts commit e29de302a6.
 2013-09-10 01:04:29 -07:00
Shawn Hoffman b2e2e49fe4 fix Snow Leopard compatibility 
Checking for clang in Xcode bundle seems pointless, command line tools should be installed.
Setting the path explicity to avoid fink/macports/homebrew prevents use of locally installed packages like clang and wxwidgets.
Realistically using opencl means the minimum OSX version targetable is 10.6.
Correct TARGET_SYSROOT check, add required -mmacosx-version-min to linker flags.
also using wxwidgets gl component.
 2012-10-22 16:45:37 -07:00
Shawn Hoffman 1a8005d948 set ProgramShaderCache program format correctly. 2012-10-09 23:56:00 -05:00
Shawn Hoffman 210ecad15f let us try normal c++ static init instead... 2012-10-09 23:56:00 -05:00
Shawn Hoffman 108722bed0 oops, forgot to make sure the gl program is actually free'd. 2012-10-09 23:54:18 -05:00
Shawn Hoffman 4c1fef8f98 refactor ProgramShaderCache::PCacheEntry 2012-10-09 23:54:18 -05:00
Shawn Hoffman aaa405c973 Checking GLEW_VERSION_4_0 is superfluous since we check GL_ARB_get_program_binary, and it's a runtime variable anyways. 2012-10-09 23:54:18 -05:00
Shawn Hoffman 31a8424bcc fix formatting uglies introduced in glsl-master branch 2012-10-09 23:54:17 -05:00
Shawn Hoffman 4a4833e617 default to GLSL instead of Cg 2012-10-09 23:43:22 -05:00
Shawn Hoffman 26521aa66a force VolumeDirectory to align files to 32KB (only streaming audio files really need to be aligned...) 2012-04-23 00:50:44 -07:00
Shawn Hoffman 702905131b follow-up for last commit: don't warn about the EUART init commands. 2012-04-03 03:54:17 -07:00
Shawn Hoffman 423cdb6398 fixes issue 5335 2012-04-03 03:26:06 -07:00
Shawn Hoffman 2ee5e5cebc Merge branch 'scons-removal' 2012-03-28 00:02:04 -07:00
godisgovernment d5ae3e90a8 cmake elif() -> elseif() 2012-03-26 03:27:18 +00:00
Shawn Hoffman 48eb791a4e Merge remote-tracking branch 'timowiren/master' 2012-03-25 13:21:25 -07:00
Shawn Hoffman 48bfca3c86 Merge remote-tracking branch 'adlr/macwiimote' 2012-03-25 13:15:38 -07:00
Shawn Hoffman e25d29bf67 Remove old version of wxWidgets from Externals 2012-03-25 12:45:34 -07:00
Shawn Hoffman d15740daf1 Merge branch 'wxw3-update' 2012-03-25 12:27:38 -07:00
Shawn Hoffman fab037446c Forward "raw" reads of GC discs to the normal read function, since they are not encrypted in the first place. 2012-03-22 23:04:45 -07:00
Shawn Hoffman 36f3962551 small fix for last commit - didn't notice that was an #elif instead of #if 2012-03-22 18:57:30 -07:00
Shawn Hoffman 56b1373baf Remove scons-related files 2012-03-25 12:55:02 -07:00
Shawn Hoffman 5bf99f461b Add some padding to the GameList column sizes on non-MSW. 
These underlying controls seem to insert 8px of divider between each column.
 2012-03-22 18:45:11 -07:00
Shawn Hoffman 7d57b925e6 Disable wxHAS_MSW_TASKDIALOG because as of wxW svn r70933, 
there is a bug with the wxPD_AUTO_HIDE style which can cause a non-dolphin
window to come to the foreground after auto-closing of the TaskDialog.
 2012-03-24 20:59:20 -07:00
Shawn Hoffman e0941828f5 Fix uglies on gcpad/wiimote config pages. 
Use wxPanel in place of wxNotebookPage (which is really just a typedef for wxWindow). This applies the correct background color for the page.
 2012-03-23 00:27:54 -07:00
Shawn Hoffman 4130116a85 fix building on OS X when no OSX SDK is installed. (i.e. just commandline tools) 2012-03-22 18:11:45 -07:00
Shawn Hoffman f7423a0a4f Merge branch 'master' into wxw3-update 
Conflicts:
	Source/Core/DolphinWX/Src/LogWindow.cpp
 2012-03-22 17:57:38 -07:00
Shawn Hoffman 15db05d7ab I am very picky about my VS files... :D 2012-03-21 14:53:50 -07:00
Shawn Hoffman c0992cc73e Build fix: 
Don't use isascii() - just do it ourselves
Bump required wxw version (for shared libs)
There still seems to be linking issues on some linux distros, I can't reproduce it though...
 2012-03-19 23:16:01 -07:00
Shawn Hoffman dd5df17688 forgot to save my buffer :( 2012-03-19 12:07:47 -07:00
Shawn Hoffman cf52029b51 Check if the game's ID is valid before accessing it to set the ntsc u/j register. Prevents discs without a real ID from crashing dolphin. 2012-03-19 11:12:40 -07:00
Shawn Hoffman ff6023df27 Change wxString(<string>, wxConvUTF8) method of creating unicode from filenames to wxSafeConvertMB2WX() 
(Just applied to FrameTools.cpp for now)
Allows one to properly restart Pokémon by hitting play :P

Ignore non-ASCII strings passed to DisplayMessage(). These strings would end up going to renderer display and statusbar/titlebar, which can't handle them properly.
 2012-03-19 10:37:15 -07:00
Shawn Hoffman 4a1e8ba30a sigh...fix #ifdefs in last commit... 2012-03-19 07:46:23 -07:00
Shawn Hoffman 05c964e6d6 wxw3: OSX can use the same method of hiding cursors as MSW 2012-03-19 07:40:27 -07:00
Shawn Hoffman 35a5a3b9d4 Fix "Hid cursor" causing a wxWidgets warning 2012-03-19 06:54:02 -07:00
Shawn Hoffman c3a537728f Don't allow wiimote config while in Gamecube mode 
Fixes crash when attempting to open emulated wiimote config in Gamecube mode
 2012-03-19 06:03:23 -07:00
Shawn Hoffman 6091774ade get wxw3 building on linux 
kind of hacky because currently, shared libpng is always expected to be used
on darwin, libpng in externals is always used
 2012-03-19 04:59:49 -07:00
Shawn Hoffman 20bb7a28b5 wxw3: update wx/setup.h for wxgtk to be compatible with current version 2012-03-19 04:59:48 -07:00
Shawn Hoffman 00fed2e70e wxw3: revert wx/setup.h for wxgtk to the previous version 2012-03-19 04:59:48 -07:00
Shawn Hoffman ec6d2572c1 oops, forgot to disable WDMKS on portaudio 32bit build 2012-03-19 03:40:21 -07:00
Shawn Hoffman bfcc720a47 Make sure updating scmrev.h causes a rebuild of dependant projects. 2012-03-19 03:40:14 -07:00
Shawn Hoffman 2ab2afaa1f update portaudio to stable_v19_20111121 and fix linker warnings 2012-03-18 07:50:37 -07:00
Shawn Hoffman c5d746f3d8 remove scons files from VS projects 2012-03-18 06:41:12 -07:00
Shawn Hoffman 483d15a9c3 fix Common lib re-linking all the time 
rename wxBase28 project to wxWidgets
 2012-03-18 05:47:55 -07:00
Shawn Hoffman d9a7510937 forgot to add wxwidgets3 vcxproj to git, since it was masked by gitignore... 
fix up misc warnings and build errors
 2012-03-18 03:30:03 -07:00
Shawn Hoffman ff63c689d6 wxMSW no longer allows overriding OnPaintDrawImages, so remove the msw-specific drawing code from the GameListCtrl (it's rendered correctly by default) 2012-03-18 02:33:03 -07:00
Shawn Hoffman c3d13b048c build against wxWidgets3 from Externals on Windows. 
use Externals version of libpng on Windows.
 2012-03-18 02:31:19 -07:00
Shawn Hoffman 360c8d4cb3 make same changes to CMake as scons for wxw3 update 2012-03-17 22:16:54 -07:00
Shawn Hoffman 8bdf93a15c fix logwindow crash 2012-03-17 21:51:24 -07:00
Shawn Hoffman 1fbf2e38c4 wxw implements wxEVT_THREAD itself now 2012-03-17 21:50:40 -07:00
Shawn Hoffman a648aca65c wxWidgets3: update to svn r70933 2012-03-17 21:47:47 -07:00
Shawn Hoffman 6eb2cb2666 Merge branch 'master' into wii-network 2012-02-27 22:36:41 -08:00
Shawn Hoffman 5b01af5a37 openssl: fix linker warning by adding those pesky pdb files. 2012-02-27 00:54:11 -08:00
Shawn Hoffman e5b7e81f44 openssl: enable ec/dsa and rearrange files in Externals a bit. 2012-02-27 00:51:50 -08:00
Shawn Hoffman 9866cae4ff net: create directory for config file if it doesn't exist. 2012-02-23 12:48:54 -08:00
Shawn Hoffman f73c82c232 net: add inet_ntop 2012-02-23 12:38:11 -08:00
Shawn Hoffman 570a12dcd1 Fix ICMP ping. Obey timeout. 2012-02-17 00:51:33 -08:00
Shawn Hoffman f81524e827 shorten ssl logs too 2012-02-12 23:23:00 -08:00
Shawn Hoffman 4e62015e9a implement ICMP stuff (on windows). should be very similar on *nix...might just be able to compile the current code :) 2012-02-12 23:22:51 -08:00
Shawn Hoffman 2046fb0457 remove an extraneous variable 2012-02-12 15:13:54 -08:00
Shawn Hoffman 831b6b947b net: change some logging to not be so incredibly log that it doesn't fit on a 30" screen. 2012-02-12 14:53:14 -08:00
Shawn Hoffman 5a61a499a2 fixup IOCTL_SO_GETHOSTBYNAME. Fixes SSBB crash. 2012-02-12 14:49:40 -08:00
Shawn Hoffman 6b583ab00e add IOCTLV_WD_GET_INFO 
-forgot to add changes to header
 2012-02-10 14:58:09 -08:00
Shawn Hoffman 68e7f0d170 add IOCTLV_WD_GET_INFO 2012-02-10 14:28:33 -08:00
Shawn Hoffman 35d573fd79 fix regression 2012-02-10 12:01:47 -08:00
Shawn Hoffman f412227cd5 show a wifi AP :) 
the connection test fails (freezes), though. strange, since it will work with net config settings from a real nand...
 2012-02-10 03:28:26 -08:00
Shawn Hoffman 8ddfff6425 log params to /net/wd/command 2012-02-10 01:59:18 -08:00
Shawn Hoffman bad1c7e67a fixup net/ncd/manage 2012-02-09 23:37:50 -08:00
Shawn Hoffman ac0883044e move SettingsHandler to Common lib 2012-02-09 21:04:07 -08:00
Shawn Hoffman c8129bc802 fixup net/kd/time 2012-02-09 10:21:26 -08:00
Shawn Hoffman f57f654b59 set ProgramShaderCache program format correctly. 2012-01-18 10:22:03 -08:00
Shawn Hoffman bef3d7229e Ensure comment strings in CBannerLoaderWii::SWiiBanner are null-terminated. Fixes issue 5012. 
Signed-off-by: Shawn Hoffman <[email protected]>
 2012-01-17 23:59:48 -08:00
Shawn Hoffman 1df04e11a4 matt p's current wii-network changes 2012-01-12 02:16:44 -08:00
Shawn Hoffman cb03841b7f Add forgotten openssl libs and fix problems from merging Core VS project files. 2012-01-11 21:53:48 -08:00
Shawn Hoffman aff6a7ac6f WIP patch for networking 2012-01-05 02:59:47 -08:00
Shawn Hoffman 8a1ca0f1b8 add openssl to externals 2012-01-05 02:59:46 -08:00
Shawn Hoffman bd5cf88686 let us try normal c++ static init instead... 2011-12-29 16:25:03 +01:00
Shawn Hoffman c8d0c8e217 oops, forgot to make sure the gl program is actually free'd. 2011-12-26 10:27:18 -05:00
Shawn Hoffman 5f296d0be7 refactor ProgramShaderCache::PCacheEntry 2011-12-26 02:58:52 -05:00
Shawn Hoffman 16f9d8e06d Checking GLEW_VERSION_4_0 is superfluous since we check GL_ARB_get_program_binary, and it's a runtime variable anyways. 2011-12-26 00:43:47 -05:00
Shawn Hoffman 4bc14c3473 fix formatting uglies introduced in glsl-master branch 2011-12-26 00:15:54 -05:00
Shawn Hoffman f59063c8e7 default to GLSL instead of Cg 2011-12-25 22:00:24 -05:00
Shawn Hoffman b0ffa72e37 Merge branch 'large-mram' 2011-12-10 18:48:35 -08:00
Shawn Hoffman 62858c8c14 Small logging changes. Pause core if Jit64 tries to compile at 0. 2011-12-10 18:42:49 -08:00
Shawn Hoffman b62cac2ca9 Allow modifying main ram size at compile time by changing Memory::REALRAM_SIZE. 2011-11-27 19:52:05 -08:00
Shawn Hoffman 29f52ce6dd gcc sux 2011-11-20 16:25:23 -08:00
Shawn Hoffman 73beeaf45a Change the mask shown for rlw* to be shifted. ie the result of the instruction is source & mask, right-aligned. 2011-11-20 15:35:43 -08:00
Shawn Hoffman 78832cb4ea Update to portaudio SVN rev 1762 
Disable portaudio backend for wdmks (fixes debug build on windows)
 2011-10-23 18:17:50 -07:00
Shawn Hoffman 7bac36d455 Merge branch 'TaruKonga' 
The DK Bongos are just a standard controller in disguise (ie, it uses your GCPad input mapping):
Clap Sensor = Analog R Trigger
start = start
Top of Left Bongo = Y Button
Bottom of Left Bongo = B Button
Top of Right Bongo = X Button
Bottom of Right Bongo = A Button
 2011-10-23 13:37:10 -07:00
Shawn Hoffman 105e7e4eb4 Added TaruKonga (DK Bongos) support. 
Separated SI Device IDs from the enums used for config/gui since quite a few device types all have the gc controller SI ID.
 2011-10-23 07:01:17 -07:00
Shawn Hoffman ba119e8c05 Set the correct bit for "trap" program exception. Fixes http://wiibrew.org/wiki/Descent 2011-10-23 02:53:31 -07:00
Shawn Hoffman 3fc5d8d7cf Merge branch 'gc-mic' 
Added GameCube Microphone support.  Uses your default audio recording device.  The Microphone is selectable from the Slot A/Slot B pulldowns under the GameCube tab.  The Microphone button can be set under GCPad configuration for pad 1 and 2. Thanks to MooglyGuy and skidau.
 2011-10-17 03:21:11 -07:00
Shawn Hoffman 45eb9f0e7a fix some logic errors in the mic code and decrease latency a bit. emulate the buffer_overflow bit. 2011-10-17 03:14:20 -07:00
Shawn Hoffman c528978608 use callback model instead of blocking read/write. 
fixes delay on linux.
currently not implementing the overflow bit, not sure it's needed since we manage our own buffer now.
 2011-10-16 23:20:37 -07:00
Shawn Hoffman 1d6bd3248c It is safe to call Pa_Initialize and Pa_Terminate more than once. 2011-10-16 13:29:10 -07:00
Shawn Hoffman 46afefb14f Merge branch 'master' into gc-mic 2011-10-16 02:22:21 -07:00
Shawn Hoffman 676822891d ups, exi slots are on whole different channels... 2011-10-16 02:08:51 -07:00
Shawn Hoffman 3556069f9f Also allow JitIL to update EXI exceptions much more frequently. 
At this point, the mic branch is ready for testing by windows people at least. cmake/scons may work already, not sure.
 2011-10-09 03:41:31 -07:00
Shawn Hoffman 41424d98e8 Make the mic button respect which slot it's plugged into. 
*You need to open the Gamecube config page and reselect the devices in slot A and B after this commit*

Just jitil left...
 2011-10-09 03:18:15 -07:00
Shawn Hoffman 3790a16ece billliarrddd...here is how to set the button bit 2011-10-09 01:11:49 -07:00