Yaya48/dolphin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
13,197 Commits 1 Branch 0 Tags
0b8a6f852bbd1cd96301a025bc92562eeffdd4f9
Commit Graph
100 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Shawn Hoffman c3eb45f7bc Revert "Merge pull request #473 from Tilka/frsp" 
This reverts commit d369627d70, reversing
changes made to 67ff926f1e.
 2014-07-21 20:40:21 -07:00
Shawn Hoffman cfc7bb35c2 Windows: Also look for git.exe in the registry (for Git Extensions installs). 2014-07-20 12:33:56 -07:00
shuffle2 3ac4e9f171 Merge pull request #608 from lioncash/compat 
DolphinWX: Remove the use of some wx 1.0 compatibility function calls.
 2014-07-14 01:56:09 -07:00
shuffle2 0c6eeaff05 Merge pull request #617 from Tilka/clang_bug 
VideoCommon: fix clang version check
 2014-07-14 01:55:31 -07:00
shuffle2 3f67ec0d50 Merge pull request #611 from Tilka/clang_bug 
VideoCommon: version-check clang for workaround
 2014-07-13 17:52:54 -07:00
shuffle2 3cabacde9d Merge pull request #613 from lioncash/uninitialized 
Core: Fix potential uninitialized var usage in WII_IPC_HLE_Device_usb
 2014-07-13 14:03:02 -07:00
shuffle2 5e8ff31eac Merge pull request #612 from lioncash/typedef 
Core: Get rid of an unnecessary struct typedef in Boot.h.
 2014-07-13 14:02:29 -07:00
shuffle2 15c1250d9d Merge pull request #596 from delroth/master 
AVIDump: fix FFV1 encoding
 2014-07-09 18:02:40 -07:00
shuffle2 d0201335c6 Merge pull request #300 from Sonicadvance1/Fix-AndroidInput 
[Android] Fixes a bunch of input bugs.
 2014-05-30 15:32:08 -07:00
shuffle2 8fc83d8ffc Merge pull request #334 from lioncash/use-std-minmax 
Remove the min/max functions in CommonFuncs.
 2014-05-29 20:10:01 -07:00
shuffle2 7c09f07f36 Merge pull request #399 from magumagu/bsemu-bat 
BS2 emulation: set up a reasonable BAT during startup.
 2014-05-29 15:36:28 -07:00
shuffle2 e9975cdd63 Merge pull request #419 from magumagu/jit-load-store-cleanup 
Jit load store cleanup
 2014-05-29 15:25:00 -07:00
shuffle2 fd6fd8fcf1 Merge pull request #433 from lioncash/ini 
Get rid of the temporary buffer in IniFile's Load function.
 2014-05-29 14:53:16 -07:00
shuffle2 3b23f4bbd6 Merge pull request #420 from magumagu/backpatch-s8 
JIT: make backpatch handle sign-extend from 8 bits correctly.
 2014-05-29 14:09:59 -07:00
shuffle2 329fcad04f Merge pull request #421 from CarlKenner/MissingSpace 
Fix error message when D3D11 HResults fail.
 2014-05-29 14:06:18 -07:00
shuffle2 d18bc31e74 Merge pull request #429 from RachelBryk/netplay-pid 
Make sure netplay player IDs are actually unique.
 2014-05-29 14:02:24 -07:00
shuffle2 fee69236d5 Merge pull request #403 from RachelBryk/netplay-player-selection 
When updating netplay player list, reselect by string instead of index.
 2014-05-29 13:52:44 -07:00
Shawn Hoffman 47a2eb47a0 msvc C initializers return int...fix EnableXSaveWorkaround when rax doesn't implicitly equal zero. 2014-05-28 00:16:33 -07:00
shuffle2 3d21c6777e Merge pull request #426 from shuffle2/xsave-workaround-fix 
Redo commit 932945d480
Fixes crashes from running on hardware with FMA3 support and software which doesn't support it.
 2014-05-27 13:59:50 -07:00
Shawn Hoffman 58bcc3d12a Redo commit 932945d480 
This time, make sure the object for disabling XSave support in msvcr can't be dropped by the linker.
 2014-05-27 13:41:19 -07:00
shuffle2 e25c9fef46 Merge pull request #418 from Sonicadvance1/x86_32-cmake-removal 
Add a Cmake generic build option and remove x86_32 build capabilities.
 2014-05-26 13:36:05 -07:00
shuffle2 4758b362c3 Merge pull request #415 from magumagu/memory-cleanup 
Memory code cleanup
 2014-05-26 13:35:54 -07:00
shuffle2 18bdf0706d Merge pull request #416 from lioncash/video-stats 
Clean up string managing in regards to video statistics.
 2014-05-26 13:20:01 -07:00
shuffle2 ca3002977b Merge pull request #256 from magumagu/dsound-notify 
DSound: use DSound notifications to produce sound.
 2014-05-23 17:02:55 -07:00
shuffle2 b58753bd69 Merge pull request #370 from Sonicadvance1/remove_specialized_memcmp 
Removes ZeroFrog's "optimized" memcpy and memcmp functions.
 2014-05-22 13:02:11 -07:00
shuffle2 fc41a53b46 Merge pull request #309 from magumagu/jit-unify-asm 
JIT: unify JitAsm for JIT64 and JIT64IL.
 2014-05-21 23:10:08 -07:00
shuffle2 c308657779 Merge pull request #376 from lioncash/wx 
Wx cleanup
 2014-05-21 21:54:00 -07:00
shuffle2 7a7aa8c5a3 Merge pull request #386 from myownfriend/master 
Fixed formatting of post-processing shaders so they better match Dolphin's coding style
 2014-05-21 21:42:57 -07:00
shuffle2 c4e60d5353 Merge pull request #356 from Sonicadvance1/Fix-MMUAnalyst 
Fixes games that use the MMU to page in code(Rogue Leader).
 2014-05-21 20:59:25 -07:00
shuffle2 6544d53c16 Merge pull request #361 from LPFaint99/wiisave 
Export wii saves to the "User" directory
 2014-05-21 20:17:18 -07:00
shuffle2 9ce269c7dc Merge pull request #382 from magumagu/faster-fast-disc-speed 
DVDInterface: make fast disc speed faster.
 2014-05-21 20:12:38 -07:00
shuffle2 4fb10a11b9 Merge pull request #379 from jordan-woyak/gamelist-size-fix 
Fix game list size display.
 2014-05-21 19:52:10 -07:00
shuffle2 dd413269e3 Merge pull request #343 from jordan-woyak/disable-sdl-windows 
Disable SDL input on Windows.
 2014-05-21 19:47:44 -07:00
shuffle2 d0de0c1222 Merge pull request #374 from ToadKing/master 
make IOCTL_SO_GETHOSTID more accurate on Windows
 2014-05-16 18:12:35 -07:00
shuffle2 36720e6822 Merge pull request #351 from Tilka/make_unique 
Add a std::make_unique implementation (Common/StdMakeUnique.h)
 2014-05-11 01:46:09 -07:00
Shawn Hoffman 17577affba D3D: Don't pass D3D10_SHADER_WARNINGS_ARE_ERRORS to the compiler in debug builds. 
For quite a while this has been causing integer division to generate a warning as error, blocking shader compiling. This means probably no one has even been running D3D in debug builds...
I tried disabling the warning with a #pragma, but it doesn't seem to apply when this flag is used.
 2014-05-10 22:12:54 -07:00
shuffle2 2983ae2823 Merge pull request #357 from shuffle2/master 
Revert "x64FPURoundMode: always set x87 precision"
 2014-05-10 20:26:56 -07:00
Shawn Hoffman 700c135386 Revert "x64FPURoundMode: always set x87 precision" 
This reverts commit 9de77b7c23.
Setting x87 precision control is only supported on x86 platforms (not ARM or x64).
 2014-05-10 20:21:07 -07:00
shuffle2 adbb4c4a0c Merge pull request #352 from shuffle2/master 
[windows] Fix debug build memory leaks.
 2014-05-10 20:18:03 -07:00
Shawn Hoffman fa65eeb492 Apparently the debug build has not been freeing memory since 2008. Undo that. 2014-05-08 00:58:55 -07:00
Shawn Hoffman 0c145dd1aa Assign "user_defined" value properly for downloaded Gecko codes. 
Fixes Issue 7156.
 2014-04-08 14:52:17 -07:00
Shawn Hoffman 932945d480 Implement workaround for Windows versions which do not support XSAVE. 
Fixes CRT math routines using FMA instructions from causing illegal instructions.
 2014-03-06 14:38:10 -08:00
Shawn Hoffman 8995d299f2 windows: move arch defines to base.props 2014-03-06 14:37:40 -08:00
Shawn Hoffman 3647dfa711 Allow VS builds to be speedy again. 2014-03-05 11:17:14 -08:00
Shawn Hoffman 7733463e65 commit 1a428de189 introduced a bug by using a signed enum in a bitfield, the value of which is then used in a ldmxcsr instruction. The sign-extension corrupts the value, causing an exception by attempting to load mxcsr with an invalid value. 2014-03-05 10:19:29 -08:00
Shawn Hoffman 33d56f50a4 Re-plumb window handle to the dsound backend. 
Reverts parts of commit 71c01d83ab614b9e0c421d03ca694713dbabff48.
Fixes issue 6800
 2013-11-07 09:24:56 -08:00
Shawn Hoffman f4056978c8 [windows] update SDL-2.0.0 to 2.0.1. Fixes issue 6793. 2013-11-04 23:50:52 -08:00
Shawn Hoffman 26059f1109 rename the dolphinwx project to dolphin, and thus change the executable name back to dolphin{d}.exe 2013-11-02 16:22:15 -07:00
Shawn Hoffman bc45a38122 do not copy pdbs to binary dir (you can use the symbol server for $(random_build), or it will be found locally if you built it yourself) 2013-11-02 16:19:17 -07:00
Shawn Hoffman 0791a9ef80 Add dxsdk_dir to vc++ paths via base.props. This means you no longer need the paths in a global property sheet. In fact if you have them in such a file, you should remove them as it will cause conflicts with the vs2013 build. 2013-10-27 00:48:53 -07:00
Shawn Hoffman 8dcd13cca7 [vc12] std::min/max requires <algorithm> header. It should be in pch, but just add it for the single file that needs it, for now. 2013-10-26 18:04:00 -07:00
Shawn Hoffman ccd30024b3 Update to VS2013 and a slew of build-related updates. Notes: 
* Currently there is no DEBUGFAST configuration. Defining DEBUGFAST as a preprocessor definition in Base.props (or a global header) enables it for now, pending a better method. This was done to make managing the build harder to screw up. However it may not even be an issue anymore with the new .props usage.
* D3DX11SaveTextureToFile usage is dropped and not replaced.
* If you have $(DXSDK_DIR) in your global property sheets (Microsoft.Cpp.$(PlatformName).user), you need to remove it. The build will error out with a message if it's configured incorrectly.
* If you are on Windows 8 or above, you no longer need the June 2010 DirectX SDK installed to build dolphin. If you are in this situation, it is still required if you want your built binaries to be able to use XAudio2 and XInput on previous Windows versions.
* GLew updated to 1.10.0
* compiler switches added: /volatile:iso, /d2Zi+
* LTCG available via msbuild property: DolphinRelease
* SDL updated to 2.0.0
* All Externals (excl. OpenAL and SDL) are built from source.
* Now uses STL version of std::{mutex,condition_variable,thread}
* Now uses Build as root directory for *all* intermediate files
* Binary directory is populated as post-build msbuild action
* .gitignore is simplified
* UnitTests project is no longer compiled
 2013-10-26 17:55:38 -07:00
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