Commit Graph

7785 Commits

Author SHA1 Message Date
nitsuja
c68c8c388c made savestate loads less fragile by adding some markers and rolling back on a mismatch.
This should make it so if you try to load an incompatible save, it simply doesn't load, instead of crashing dolphin. (I can't guarantee no crash but it's much less likely now)
2011-12-18 00:22:06 -08:00
Jordan Woyak
98d22d0e03 Revert the latest GUI change (Emulation Notes column). We don't care for it. 2011-12-17 23:44:09 -06:00
Maarten ter Huurne
ed1bfdf293 Merge branch 'cmake-osx2' 2011-12-17 16:30:02 +01:00
Maarten ter Huurne
83bf5790a6 Copy translation files into OS X bundle. 2011-12-17 16:26:52 +01:00
Maarten ter Huurne
74d552f3ca Removed debug prints. 2011-12-17 15:32:41 +01:00
kostamarino@hotmail.com
a58c46be81 Gui change and an update to the gameini database.
The "Notes" column is gone and in it's place an "Emulation Notes" column is placed (it contains the emulationissues lines from the game inis). Notes that contain useful info about the game can be seen with just a glance this way.

Fixes issue 5043.
2011-12-16 21:01:10 +02:00
Maarten ter Huurne
5cbc31b052 Lowered wxWidgets version number requirement to 2.8.9.
I incorrectly assumed that since wx 2.8.8 lacked wxAuiToolBar, the entire 2.8.x
series lacked it. In fact in wx 2.8.9 this feature was added.

Thanks to Glenn Rice for spotting this issue.
2011-12-16 02:46:55 +01:00
nitsuja
d2f61fa155 some movie playback fixes 2011-12-15 09:22:16 -08:00
Maarten ter Huurne
e13f4644bb Link weakly to OpenCL on OS X.
This makes sure Dolphin still loads when OpenCL is not available.
OpenCL was added in OS X 10.6, while we also support 10.5.
2011-12-15 06:54:42 +01:00
Maarten ter Huurne
27590c3a8f Suppress link warning about QuickTime being 32-bit only.
If we are actually missing symbols because a required architecture is missing
from a library, we'll get a link error as usual, so suppressing this warning
is pretty safe.
2011-12-15 06:41:39 +01:00
nitsuja
1ad05f7440 Merge branch 'master' of https://code.google.com/p/dolphin-emu 2011-12-14 21:34:55 -08:00
nitsuja
9470f9545f many movie fixes (mainly for readonly mode), and some wii input display support 2011-12-14 21:26:42 -08:00
Maarten ter Huurne
4c7c29b8b6 Let "make install" on OS X copy the bundle to /Applications.
The "dsptool" executable is not included in the bundle.
The "tester" executable is not included in the bundle and it no longer
installed on other platforms, since it is neither expected nor useful
to install unit tests.
2011-12-14 02:50:36 +01:00
Jordan Woyak
b44918d1ed Merge branch 'fix-real-gcpad-sticks' 2011-12-12 23:25:32 -06:00
Jordan Woyak
09d2301fed detect input at 55% to catch silly c-stick range 2011-12-12 23:24:10 -06:00
Maarten ter Huurne
27bda2c054 Fixed range check on TryParse() for u32, again.
The code from 748be364e5 incorrectly accepted -0x100000000 on x86_64.

Also if ERANGE is returned by strtoul(), reject the parsed value regardless
of what that value is. This fixes invalid values being returned when compiling
with Visual C++. Thanks to "cotton" for testing this.
2011-12-13 02:08:34 +01:00
nitsuja
f3325036be fixed hotkeys getting ignored after tab is pressed 2011-12-11 21:54:50 -08:00
nitsuja
2c2ef9a961 made frame advance act normal (so it advances 1 frame each time instead of waiting for further unpause commands), and did some minor improvements to the read-only command (making the UI behavior a little nicer, no actual changes to what read-only does at this point) 2011-12-11 21:08:26 -08:00
Maarten ter Huurne
ee5a29e6f2 For CPUID, save EBX on the stack instead of in a register.
This fixes GCC running out of registers when compiling for x86
in release mode.

Thanks to kiesel.
2011-12-12 02:14:56 +01:00
Maarten ter Huurne
d75f45979b Copy data files into OS X application bundle. 2011-12-12 01:30:42 +01:00
Maarten ter Huurne
7423c74deb Force the "ebx" argument to be mapped to a register (not necessarily EBX).
Fixes crash on x86 under OS X.
Thanks to kiesel for the fix and to shuffle2 for remembering the problem.
2011-12-12 00:43:23 +01:00
Maarten ter Huurne
344ca5d360 Applied compile and link flags from SCons build for OS X to CMake build.
The following changes were made:
Restricted the "-march=core2" option to i386 because the first Intel Macs
had Intel Core CPUs, not Core2.
Removed the "-mdynamic-no-pic" flag as GCC lists it as a PPC specific flag.
Removed "-Wl,-read_only_relocs,suppress" because it seems to be related
to "-mdynamic-no-pic" and I see no need for it.
Removed "-Wextra-tokens -Wnewline-eof" because they are GCC specific and
not OS X specific.
2011-12-11 21:27:06 +01:00
Maarten ter Huurne
9ede977a56 Added QuickTime framework as dependency for wxWidgets on OS X.
It seems that the required functions are in an already included framework
on x86_64, but on i386 we depend on QuickTime.
2011-12-11 21:24:40 +01:00
Maarten ter Huurne
780e5e7244 Use a custom template to generate the Info.plist for the OS X bundle.
This allows us to add keys that don't exist in the CMake template.
I added the keys from the Info.plist that was generated by our SCons build
to the new template.
2011-12-11 16:54:37 +01:00
Maarten ter Huurne
c1cf4f80cf Added bundle version and copyright string to OS X bundle info. 2011-12-11 16:21:17 +01:00
Maarten ter Huurne
9d2f589f01 Create application bundle on OS X. 2011-12-11 16:07:59 +01: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
NeoBrainX
3d9c35f58e VideoCommon: Fix upper and lower depth bytes being switched when performing Z16L EFB copies (EFB to texture only).
Fixes issue 4989.
Fixes issue 5056.
2011-12-10 16:08:26 +01:00
Maarten ter Huurne
f9133a7376 Link to the required OS X frameworks.
Previously, there was just one list of frameworks regardless of which part
of the code depended on which frameworks. Now we keep separate lists for
the Dolphin core, the Dolphin GUI and internal use by wxWidgets.
2011-12-07 08:26:44 +01:00
Maarten ter Huurne
c04c3bd9d3 Use "unsigned int" instead of "unsigned".
By request of hrydgard.
See commit 045eb924d9.
2011-12-07 07:10:31 +01:00
Maarten ter Huurne
8a75351674 Link against OpenGL using the info gathered by the FindOpenGL module. 2011-12-05 06:18:04 +01:00
Maarten ter Huurne
2621d89a41 Link OS X version of wxWidgets against libpng and libiconv. 2011-12-05 06:07:10 +01:00
Maarten ter Huurne
958891b4eb Compile with OpenAL support on OS X. 2011-12-05 05:49:08 +01:00
Maarten ter Huurne
24dcb7922c On OS X, compile only against standard system libs and Externals.
Libraries from MacPorts, Fink or manually installed stuff in /usr/local
will be ignored. This ensures the binary will work on other machines as well.
2011-12-05 05:44:35 +01:00
Maarten ter Huurne
54ea98b0a9 Refer to the wxWidgets libary as "wx" instead of its full path name.
This ensures that additional library dependencies declared for "wx"
using target_link_libraries() are applied.
2011-12-05 05:39:41 +01:00
Maarten ter Huurne
d440dfe9b2 Link against systemwide LZO using the info gathered by check_lib(). 2011-12-05 05:33:35 +01:00
Maarten ter Huurne
bb182d88b7 Link against systemwide OpenCL on OS X. 2011-12-05 05:26:28 +01:00
Maarten ter Huurne
7ebb0e526f Added CMakeLists.txt for libpng.
The vast majority of the changes in this commit were originally done
by Shawn Hoffman in commit c86846cf9c995d8e0463419bd9477b0dae884929.
2011-12-05 05:10:21 +01:00
Maarten ter Huurne
8c3775ee6f Under OS X, link GL plugin against Cg framework instead of Cg library. 2011-12-05 01:12:09 +01:00
Maarten ter Huurne
20fa8bb9f2 Fixed linking to wxWidgets built from Externals under OS X. 2011-12-05 01:10:45 +01:00
Maarten ter Huurne
7417ecf67f Tell the linker to not treat its input as Objective C/C++ source.
Flags in CMAKE_CXX_FLAGS are passed to both compile and link commands.

A cleaner solution would be to use set_source_files_properties().
However, currently there are headers (StdThread.h, maybe more) that contain
Objective syntax. So it is not easy to determine exactly which source files
should be compiled as Objective C/C++ and that set can quickly change when
certain #include directives are modified. The solution for that would be to
move all uses of Objective syntax to implementation (.cpp) files and then
apply set_source_files_properties() to those.
2011-12-05 00:57:51 +01:00
Maarten ter Huurne
d249ee599a Added CMakeLists.txt for wxWidgets under OS X.
The vast majority of the changes in this commit were originally done
by Shawn Hoffman in commit c86846cf9c995d8e0463419bd9477b0dae884929.
2011-12-04 15:43:52 +01:00
Maarten ter Huurne
7f578ce1ae Use Externals/wxWidgets3 instead of Externals/wxWidgets under OS X.
The "3" variant has some extra stuff merged that helps under OS X.
This split should not last longer than until the wxWidgets 3.0 release.
2011-12-04 15:34:23 +01:00
Maarten ter Huurne
ffb06c23ac Added version check for wxWidgets.
If the systemwide wxWidgets is too old, we can fall back to the version
from Externals instead of letting the build fail.

Note that while the version in Externals appears to be wxWidgets 2.8,
it has post-2.8 features manually added to it (wxAuiToolBar), so the
version check only accepts 2.9 or higher.
2011-12-04 03:37:02 +01:00
Maarten ter Huurne
7c92b94bc1 Use Cg from Externals if it is not found systemwide. 2011-12-04 02:48:01 +01:00
Pierre Bourdon
252093295b Do not fail with strict drivers when compiling a not SM2.0 shader
To enforce SM2.0 compatibility, the OpenGL plugin was made to crash when
compiling a shader which does not fit in the SM2.0a limits. However, on some
combinations of OS/drivers/GPU, our shaders already do not fit in these limits,
causing artificial failures only to try to keep a non existant SM2.0a compat.
Basically, this sucks.

This commit increases the artificial limit to SM3.0. If you're using a GPU
which does not support SM3.0 and Dolphin works properly, this should not cause
any problem at all.
2011-12-03 23:24:10 +01:00
Jordan Woyak
575814895c Merge branch 'clearscreen-kill-immediate-mode' 2011-12-01 20:16:23 -06:00
Maarten ter Huurne
748be364e5 Fixed range check on TryParse() for u32.
On x86-64, "unsigned long" is 64 bits wide, so it is possible for a number
to not trigger a range error on strtoul() but still not fit inside an u32.
An extra check is added to ensure that 32-bit and 64-bit builds will accept
the same numbers.
2011-12-02 02:24:43 +01:00
Maarten ter Huurne
045eb924d9 Changed type of GetTicksPer(Line|Frame) to unsigned.
Avoids a GCC warning about comparing signed and unsigned values
in Source/Core/Core/Src/State.cpp.
2011-12-02 00:33:45 +01:00