Commit Graph
100 Commits
Author SHA1 Message Date
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
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
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
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
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
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
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
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
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
Maarten ter Huurne b6c0530e15 Let SVN ignore files created by SCons.
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@1047 8ced0084-cf51-0410-be5f-012b33b47a6e
2008-11-01 18:36:26 +00:00
Maarten ter Huurne 24866abaf5 Let SVN ignore memcard images.
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@1046 8ced0084-cf51-0410-be5f-012b33b47a6e
2008-11-01 18:34:29 +00:00
Maarten ter Huurne b88098cc17 Let SVN ignore generated object files.
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@1044 8ced0084-cf51-0410-be5f-012b33b47a6e
2008-11-01 18:33:29 +00:00
Maarten ter Huurne 6938deaf1e Let SVN ignore generated object files.
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@1043 8ced0084-cf51-0410-be5f-012b33b47a6e
2008-11-01 18:32:32 +00:00
Maarten ter Huurne 744b82ab2b Let SVN ignore generated object files.
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@1042 8ced0084-cf51-0410-be5f-012b33b47a6e
2008-11-01 18:32:13 +00:00
Maarten ter Huurne 0ca3eb591c Let SVN ignore generated object files.
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@1041 8ced0084-cf51-0410-be5f-012b33b47a6e
2008-11-01 18:31:40 +00:00
Maarten ter Huurne 458211384f Let SVN ignore generated object files.
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@1040 8ced0084-cf51-0410-be5f-012b33b47a6e
2008-11-01 18:31:20 +00:00
Maarten ter Huurne b2161882c5 Let SVN ignore generated object files.
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@1039 8ced0084-cf51-0410-be5f-012b33b47a6e
2008-11-01 18:30:47 +00:00
Maarten ter Huurne 277670a5a5 Removed unused Windows-specific #include.
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@1038 8ced0084-cf51-0410-be5f-012b33b47a6e
2008-11-01 18:27:50 +00:00
Maarten ter Huurne c4923df779 Added new source "IPC_HLE/WII_IPC_HLE_Device_fs.cpp".
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@1036 8ced0084-cf51-0410-be5f-012b33b47a6e
2008-11-01 17:48:38 +00:00
Maarten ter Huurne 619f144455 "FileSearch.cpp" was moved.
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@1035 8ced0084-cf51-0410-be5f-012b33b47a6e
2008-11-01 17:44:27 +00:00
Maarten ter Huurne f27c6f514c Indent consistently. Please, no more mixing of tabs and spaces!
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@1034 8ced0084-cf51-0410-be5f-012b33b47a6e
2008-11-01 17:07:35 +00:00
Maarten ter Huurne 7be6725459 Include PluginSpecs.h so __cdecl is defined on non-Windows.
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@954 8ced0084-cf51-0410-be5f-012b33b47a6e
2008-10-25 11:12:03 +00:00
Maarten ter Huurne 98277aeda0 Fixed build ("file" -> "files"). Made indenting consistent again (tabs or spaces does not matter, but mixing them is evil).
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@953 8ced0084-cf51-0410-be5f-012b33b47a6e
2008-10-25 11:11:20 +00:00
Maarten ter Huurne 9c5438cb0b Whatever you do, do not mix tabs and spaces!
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@897 8ced0084-cf51-0410-be5f-012b33b47a6e
2008-10-17 09:44:44 +00:00
Maarten ter Huurne abe24d1c36 Fixed compilation on Linux, as instructed by shuffle2.
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@736 8ced0084-cf51-0410-be5f-012b33b47a6e
2008-09-30 22:11:20 +00:00
Maarten ter Huurne 3aadef14eb Fixed case in header name (thread.h -> Thread.h).
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@659 8ced0084-cf51-0410-be5f-012b33b47a6e
2008-09-24 11:55:23 +00:00
Maarten ter Huurne 180070d1af Let SVN ignore object files written here.
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@653 8ced0084-cf51-0410-be5f-012b33b47a6e
2008-09-23 23:45:33 +00:00
Maarten ter Huurne 5282ba6e29 Append instead of override LIBS.
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@652 8ced0084-cf51-0410-be5f-012b33b47a6e
2008-09-23 23:44:26 +00:00
Maarten ter Huurne bcba16bb20 Do not use 32-bit masks on 64-bit offsets.
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@651 8ced0084-cf51-0410-be5f-012b33b47a6e
2008-09-23 23:29:54 +00:00
Maarten ter Huurne 35d830924d Moved ScanDirectoryTree() to FileUtil: this is a generic directory scanning function which might be useful in other places as well.
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@650 8ced0084-cf51-0410-be5f-012b33b47a6e
2008-09-23 23:27:38 +00:00
Maarten ter Huurne c688f95374 Fixed another error in pre-previous commit: ScanDirectoryTree should call itself recursively, not AddDirectoryEntries.
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@649 8ced0084-cf51-0410-be5f-012b33b47a6e
2008-09-23 22:31:39 +00:00
Maarten ter Huurne b79bd60b7c Fixed error in previous commit: FSTEntry is no longer an inner class..
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@648 8ced0084-cf51-0410-be5f-012b33b47a6e
2008-09-23 22:28:33 +00:00
Maarten ter Huurne 851dbcd7d6 Changed File from a class into a namespace, since all its methods were static.
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@647 8ced0084-cf51-0410-be5f-012b33b47a6e
2008-09-23 22:23:38 +00:00
Maarten ter Huurne 5a3aee5118 Split functionality from AddDirectoryEntries into ScanDirectoryTree (generic directory scanning; OS depedent) and ComputeNameSize (specific for CVolumeDirectory; OS independent).
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@646 8ced0084-cf51-0410-be5f-012b33b47a6e
2008-09-23 22:13:53 +00:00
Maarten ter Huurne 6bffd4d4bb Use existing File::IsDirectory() function. Thanks to nakee for pointing this out.
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@639 8ced0084-cf51-0410-be5f-012b33b47a6e
2008-09-23 10:05:46 +00:00
Maarten ter Huurne 65d59e8d6a Gave file scope to functions and consts that are not declared in the header.
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@637 8ced0084-cf51-0410-be5f-012b33b47a6e
2008-09-23 08:07:53 +00:00
Maarten ter Huurne fa83ed62a0 Implemented POSIX version of IsValidDirectory().
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@636 8ced0084-cf51-0410-be5f-012b33b47a6e
2008-09-23 08:04:48 +00:00
Maarten ter Huurne 5254528eb9 Various small cleanups. Slightly less broken on Linux.
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@635 8ced0084-cf51-0410-be5f-012b33b47a6e
2008-09-23 07:49:32 +00:00
Maarten ter Huurne e8a3840461 Updated file list.
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@634 8ced0084-cf51-0410-be5f-012b33b47a6e
2008-09-23 07:00:18 +00:00
Maarten ter Huurne f3cf5abe25 Fixed build on Unicode-enabled wx.
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@633 8ced0084-cf51-0410-be5f-012b33b47a6e
2008-09-23 06:59:35 +00:00
Maarten ter Huurne 18dbfbd462 Fixed function signature on Linux. The implementation is still missing, so it will not work, but at least it compiles now.
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@631 8ced0084-cf51-0410-be5f-012b33b47a6e
2008-09-23 00:37:52 +00:00
Maarten ter Huurne 4439c1e092 Added new source file "VolumeDirectory.cpp". And reformatted.
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@630 8ced0084-cf51-0410-be5f-012b33b47a6e
2008-09-23 00:35:07 +00:00
Maarten ter Huurne 93afa3c5bb Use single quotes instead of double quotes.
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@629 8ced0084-cf51-0410-be5f-012b33b47a6e
2008-09-23 00:26:21 +00:00
Maarten ter Huurne 6e424f152a Made layout more consistent.
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@628 8ced0084-cf51-0410-be5f-012b33b47a6e
2008-09-23 00:24:28 +00:00
Maarten ter Huurne 26b6e7df49 The workaround for Mac OS X broke the build; without the workaround it builds fine. Maybe the workaround was designed for an older SCons version?
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@627 8ced0084-cf51-0410-be5f-012b33b47a6e
2008-09-23 00:16:57 +00:00
Maarten ter Huurne 148fd7b96e Do not forget to append the LINKFLAGS. Replaced "-framework name" with "-Wl,-framework,name" because the space inside the option seems to confuse SCons.
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@626 8ced0084-cf51-0410-be5f-012b33b47a6e
2008-09-23 00:11:33 +00:00
Maarten ter Huurne 866d15d3d8 Moved closing of the Configure environment before the env.ParseConfig() calls, since those use the normal environment (env), not the Configure environment (conf).
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@625 8ced0084-cf51-0410-be5f-012b33b47a6e
2008-09-23 00:07:51 +00:00
Maarten ter Huurne ef1aba784e Use Append() to append to LIBS, like in the other SConscripts.
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@623 8ced0084-cf51-0410-be5f-012b33b47a6e
2008-09-22 23:53:15 +00:00
Maarten ter Huurne 31f1fabbac Append to LIBS instead of overriding. Fixes build problems on Mac OS X.
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@622 8ced0084-cf51-0410-be5f-012b33b47a6e
2008-09-22 23:36:16 +00:00
Maarten ter Huurne 7199c04c0c Fixed warning about mixing signed and unsigned.
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@621 8ced0084-cf51-0410-be5f-012b33b47a6e
2008-09-22 23:31:52 +00:00
Maarten ter Huurne 4797d01920 Fixed warning about mixing signed and unsigned.
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@620 8ced0084-cf51-0410-be5f-012b33b47a6e
2008-09-22 23:31:12 +00:00
Maarten ter Huurne 6c68afb171 Fixed warning about too large signed number.
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@619 8ced0084-cf51-0410-be5f-012b33b47a6e
2008-09-22 23:30:19 +00:00
Maarten ter Huurne e8a14fc949 Fixed compile warning when compiling with SDL support.
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@618 8ced0084-cf51-0410-be5f-012b33b47a6e
2008-09-22 23:27:42 +00:00
Maarten ter Huurne bbf7377544 Removed unused field "m_szName". Added virtual destructor.
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@617 8ced0084-cf51-0410-be5f-012b33b47a6e
2008-09-22 23:25:29 +00:00
Maarten ter Huurne b269e0779a Ignore Python byte-compiled files.
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@615 8ced0084-cf51-0410-be5f-012b33b47a6e
2008-09-22 21:59:16 +00:00
Maarten ter Huurne a2c8bc6e3c Fix build with Unicode-enabled wx.
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@614 8ced0084-cf51-0410-be5f-012b33b47a6e
2008-09-22 21:57:42 +00:00
Maarten ter Huurne 2b4037df8e Added newline at end of file.
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@606 8ced0084-cf51-0410-be5f-012b33b47a6e
2008-09-22 08:14:15 +00:00
Maarten ter Huurne 78bb1cf82d Made layout (indent and quotes) more consistent.
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@580 8ced0084-cf51-0410-be5f-012b33b47a6e
2008-09-18 22:19:01 +00:00
Maarten ter Huurne dae082e59e Added "-fno-exceptions" to compile flags, so GCC knows we do not use exceptions and can generate more efficient code.
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@579 8ced0084-cf51-0410-be5f-012b33b47a6e
2008-09-18 10:06:55 +00:00
Maarten ter Huurne 0bf262cc16 Fixed build for Unicode version of wx.
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@576 8ced0084-cf51-0410-be5f-012b33b47a6e
2008-09-18 09:36:02 +00:00
Maarten ter Huurne cbd945b137 Fixed error handling in GetUniqueID(): returning "false" is not an option if your return type is std::string...
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@575 8ced0084-cf51-0410-be5f-012b33b47a6e
2008-09-18 09:30:23 +00:00
Maarten ter Huurne 8ce6b5aceb Reinstated the changes from rev 568. Also fixed the actual bug: fread() was told to read 1 n-byte record, while it should be told to read n 1-byte records, so we know exactly how much it actually read.
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@573 8ced0084-cf51-0410-be5f-012b33b47a6e
2008-09-18 08:29:10 +00:00
Maarten ter Huurne a112da66ea Fixed compilation of the Linux version. Also some small cleanups.
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@568 8ced0084-cf51-0410-be5f-012b33b47a6e
2008-09-18 00:22:28 +00:00
Maarten ter Huurne 89fa3804f1 Added newline at end of file.
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@567 8ced0084-cf51-0410-be5f-012b33b47a6e
2008-09-18 00:20:51 +00:00
Maarten ter Huurne 50e327024e Corrected name of Wiimote plugin.
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@561 8ced0084-cf51-0410-be5f-012b33b47a6e
2008-09-17 08:29:30 +00:00
Maarten ter Huurne 8821eeae68 Let SVN ignore non-GUI executable.
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@560 8ced0084-cf51-0410-be5f-012b33b47a6e
2008-09-17 08:25:11 +00:00
Maarten ter Huurne e9f0d0cae3 Added missing include.
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@559 8ced0084-cf51-0410-be5f-012b33b47a6e
2008-09-17 08:23:41 +00:00
Maarten ter Huurne c778e0b83d Let SVN ignore generated static lib.
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@558 8ced0084-cf51-0410-be5f-012b33b47a6e
2008-09-17 08:13:55 +00:00
Maarten ter Huurne e099980b75 Let SVN ignore generated object files.
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@557 8ced0084-cf51-0410-be5f-012b33b47a6e
2008-09-17 08:10:56 +00:00