Commit graph

7759 commits

Author SHA1 Message Date
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
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
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
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
Maarten ter Huurne
f50ea590ce Don't use the same name for two different local variables.
This avoids a warning when compiling with GCC.
2011-12-02 00:06:49 +01:00
Maarten ter Huurne
51127c1243 Added newlines at end of file.
This avoids warnings when compiling with GCC.
2011-12-01 23:30:28 +01:00
Maarten ter Huurne
98981cc724 Fixed EFB cache index computations in OpenGL renderer.
The previous computation was very likely to go out of array bounds,
which could result in crashes on EFB access.

Also, the cache size was rounded down instead of up. This is a problem
since EFB_HEIGHT (528) is not a multiple of EFB_CACHE_RECT_SIZE (64).
2011-12-01 02:46:59 +01:00
Jordan Woyak
4fcd6994c6 fix wireframe setting toggling 2011-11-29 22:21:43 -06:00
Jordan Woyak
0dfca1cf2b remove now unnecessary glPolygonMode from ResetAPIState 2011-11-29 22:02:18 -06:00
Jordan Woyak
88700e817a make OpenGL ClearScreen use glClear 2011-11-29 21:50:31 -06:00
Maarten ter Huurne
cda94290f5 Merge branch 'master' of https://code.google.com/p/dolphin-emu 2011-11-30 00:51:36 +01:00
Maarten ter Huurne
29865e6366 Avoid virtual memory range collision between JIT and emulated RAM.
Passing MAP_FIXED to mmap causes already mapped pages in the requested
region to be replaced. On Mac OS X this caused pages for JIT-generatd
code to appear in the memory range previously auto-allocated for the RAM
of the emulated machine. This led to a hang at boot time. The same problem
can probably occur on FreeBSD, but not on Linux since MAP_32BIT is used
there instead of MAP_FIXED.

The solution is to not use MAP_FIXED, but instead rely on the OS honoring
the hinted address which is below 4 GB: we don't need an exact match,
just a low address.
2011-11-30 00:37:57 +01:00
kostamarino@hotmail.com
1bbd63ebc5 Gameini database cleanup. Fixes improper file endings due to copy paste errors (last line didn't work). Addition of SSX On Tour - fixes issue 5032. Also some small additions/updates. 2011-11-29 17:45:39 +02:00
Glenn Rice
933d2dde42 Merge branch 'remove-libav-deprecated' 2011-11-27 22:12:00 -06:00
kostamarino@hotmail.com
04026ae19a Gameini database cleanup of "postprocessingshader" and additions/updates for FlingSmash, Rune Factory Tides of Destiny, The Legend of Zelda Twilight Princess for GC and Wii. 2011-11-28 01:29:18 +02:00
Glenn Rice
ea42e9e04d Update required libav versions in the cmake build. 2011-11-22 19:56:42 -06:00
Glenn Rice
e5d051a4e9 Update linux libav frame dump code for recent api changes. 2011-11-22 19:24:05 -06: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
kostamarino@hotmail.com
507a4aa704 Gameini database update for auto modellista, Happy Feet, Alone In The Dark, DeadSpace, MADWORLD, Scooby-Doo! Mystery Mayhem, FIFA 2003, Mission: Impossible Operation Surma, Def Jam Fight For NY, FIFA Soccer 2004, THE HOUSE OF THE DEAD 2 AND 3 RETURN, LEGO Star Wars The Complete Saga, Rayman Origins, The Legend of Zelda Skyward Sword. Fixes issue 4953. 2011-11-20 19:32:00 +02:00
skidau
cc6f90c7d5 Enabled memory breakpoints under JIT in the debugger. 2011-11-05 19:42:06 +11:00
skidau
9eaf20cc44 Fixed the slowdown that occurred under JIT32. Fixes issue 4969. 2011-11-05 13:04:46 +11:00
skidau
3d2a2abb49 Made the JIT bypass the icache when it is executing the external interrupt
exception handler.

Fixed by comwiz.k
2011-11-03 20:55:47 +11:00
Pierre Bourdon
7f055d6b56 UI: refactor the game list sorting code 2011-11-02 02:45:51 +01:00
Pierre Bourdon
d9b3a69f47 Formatting fixes for el.po and pt_BR.po
On Linux with recent versions of gettext these formatting fixes are done
automatically by gettext when updating the PO files. They create conflicts each
time a rebase / merge is done and need to be reset manually.
2011-11-01 23:20:09 +01:00
kostamarino@hotmail.com
7aed6a6859 Game ini database update for Kirby's Adventure Wii, Monster House, Mario Strikers Charged, Yu-Gi-Oh! 5D's: Duel Transfer, Mario & Sonic at the Olympic Winter Games, Disney Epic Mickey. 2011-11-01 15:09:41 +02:00
skidau
1387da7900 Merge branch 'JitCache' of https://skidau@code.google.com/p/dolphin-emu/ 2011-11-01 20:45:50 +11:00
Pierre Bourdon
8f31968466 Revert "Merge branch 'zcomploc-support'"
This reverts commit 9dad9ebe89, reversing
changes made to e76bc71efe.
2011-11-01 01:37:54 +01:00