Glenn Rice
4425140424
Oops, forgot to remove that line.
...
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@6750 8ced0084-cf51-0410-be5f-012b33b47a6e
2011-01-05 16:37:42 +00:00
Glenn Rice
9c2c083f30
Install .mo files on osx as well.
...
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@6749 8ced0084-cf51-0410-be5f-012b33b47a6e
2011-01-05 16:33:44 +00:00
Glenn Rice
8e3af9c2a6
Disable the Languages target on windows 32 bit builds.
...
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@6748 8ced0084-cf51-0410-be5f-012b33b47a6e
2011-01-05 14:31:50 +00:00
Glenn Rice
4f6d4f5ddd
Add internationalization support. There aren't really any translations yet other than a little French thanks to DavidVag. So now the translators need to go to work. See http://wiki.wxwidgets.org/Internationalization for directions. The binary .mo files are generated at build time on linux. They are provided in Data/Languages for windows. I don't know where they need to go on OSX, but they should be able to be generated there at least. I added a target to generate them on windows, but does not build by default as it requires that msgfmt.exe from the gnu gettext tools be installed and in the path.
...
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@6747 8ced0084-cf51-0410-be5f-012b33b47a6e
2011-01-05 04:35:46 +00:00
Glenn Rice
4e97f83578
Fix a mistake... :P
...
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@6733 8ced0084-cf51-0410-be5f-012b33b47a6e
2011-01-03 22:08:03 +00:00
Glenn Rice
75a8fa7340
Fix an issue on windows where found wiimotes were not being reported as found. This fixes issue 3832.
...
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@6722 8ced0084-cf51-0410-be5f-012b33b47a6e
2011-01-02 03:43:44 +00:00
Glenn Rice
71209d99c8
This may fix the extension issue on windows. Please test. Thanks BhaaL.
...
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@6703 8ced0084-cf51-0410-be5f-012b33b47a6e
2010-12-31 15:53:38 +00:00
Glenn Rice
4b3a6a6d47
This should fix wiimote extensions on linux. Now to figure out the windows issue, and then OSX ... Sigh!
...
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@6702 8ced0084-cf51-0410-be5f-012b33b47a6e
2010-12-31 15:47:42 +00:00
Glenn Rice
bc3b43d1bd
Fix core dependencies for all windows builds.
...
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@6695 8ced0084-cf51-0410-be5f-012b33b47a6e
2010-12-31 04:52:20 +00:00
Glenn Rice
0249d5fbaa
A few details missed in the last commit.
...
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@6694 8ced0084-cf51-0410-be5f-012b33b47a6e
2010-12-31 03:08:22 +00:00
Glenn Rice
8e184171e7
Remove wiiuse, and use our own code. Works on linux and windows. On OSX it should compile, but I don't know about functionality. Even on linux and windows I can't promise this is bug free (wiiuse certainly wasn't). Please report issues as you find them for all platforms.
...
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@6693 8ced0084-cf51-0410-be5f-012b33b47a6e
2010-12-31 02:10:07 +00:00
Glenn Rice
765fb4bbe3
Linux build fix.
...
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@6686 8ced0084-cf51-0410-be5f-012b33b47a6e
2010-12-29 15:23:02 +00:00
Glenn Rice
c1c1f54c59
Implement free look on linux. Patch due to artart78.
...
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@6638 8ced0084-cf51-0410-be5f-012b33b47a6e
2010-12-21 23:58:25 +00:00
Glenn Rice
47454a4ed9
Fix the unresolved symbol OSDChoice in the OpenGL plugin on linux.
...
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@6617 8ced0084-cf51-0410-be5f-012b33b47a6e
2010-12-19 20:30:23 +00:00
Glenn Rice
05ad8d01d3
Fix TextureDecoder.cl to work on both NVidia and ATI video cards.
...
To do so I had to re-add the casting bloat removed in revision 6102. Also, for some odd reason the NVidia OpenCL drivers don't like 8 bit rotations, but are okay with 2, 4 bit rotations. These are apparently bugs in the NVidia drivers that are hopefully fixed in future versions.
Also, on linux make sure the TextureDecoder.cl file is copied from the shared data directory to the users directory.
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@6611 8ced0084-cf51-0410-be5f-012b33b47a6e
2010-12-19 14:59:57 +00:00
Glenn Rice
d1631bec3f
Build fix for linux. svnrev.h was not found when compiling OCLTextureDecoder.cpp as that include directory was only used in Core/Common.
...
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@6610 8ced0084-cf51-0410-be5f-012b33b47a6e
2010-12-19 14:02:43 +00:00
Glenn Rice
ef0762c6a5
Apparently I missinterpreted that thing in tortoise svn.
...
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@6607 8ced0084-cf51-0410-be5f-012b33b47a6e
2010-12-19 04:00:07 +00:00
Glenn Rice
a91c86c4d9
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@6606 8ced0084-cf51-0410-be5f-012b33b47a6e
2010-12-19 03:46:20 +00:00
Glenn Rice
7236f114ff
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@6605 8ced0084-cf51-0410-be5f-012b33b47a6e
2010-12-19 03:46:01 +00:00
Glenn Rice
d01542ee0a
Fix another part of issue 3716 missed in the last revision.
...
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@6602 8ced0084-cf51-0410-be5f-012b33b47a6e
2010-12-17 22:13:58 +00:00
Glenn Rice
22f19f6fdb
Fix a segmentation fault that occurs when "Confirm on Stop" is enabled, the close button of the window is clicked, and the user answers No to the resulting confirmation. Fixes issue 3716.
...
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@6601 8ced0084-cf51-0410-be5f-012b33b47a6e
2010-12-17 15:23:33 +00:00
Glenn Rice
4295f2f008
Fix an omission from the last commit.
...
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@6594 8ced0084-cf51-0410-be5f-012b33b47a6e
2010-12-16 18:39:57 +00:00
Glenn Rice
77837b8034
Make sure a few more directories exist when needed. Most package builders (including cmake/cpack) do not install the empty directories in the shared data, and so the paths need to be created at runtime.
...
Also set up cmake/cpack to create prebuilt binary packages and source packages.
Also change the vertex shader dump file name in the gfx debugger to something that makes more sense.
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@6587 8ced0084-cf51-0410-be5f-012b33b47a6e
2010-12-15 14:47:13 +00:00
Glenn Rice
85ec8d268d
Linux build fix.
...
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@6583 8ced0084-cf51-0410-be5f-012b33b47a6e
2010-12-15 02:17:19 +00:00
Glenn Rice
76d9209ad4
When the gfx debugger is saving shaders make sure the directory exists.
...
Make sure the gfx debugger unpauses when the emulator is stopped.
When a wad is installed make sure directories exist.
For the cmake build if a header is not provided in the check_lib macro don't check for it, and assume pkg-config was supposed to work.
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@6581 8ced0084-cf51-0410-be5f-012b33b47a6e
2010-12-14 23:19:34 +00:00
Glenn Rice
35fef1f173
Revert back to LogTypes. Fixes issue 3668.
...
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@6580 8ced0084-cf51-0410-be5f-012b33b47a6e
2010-12-14 17:52:01 +00:00
Glenn Rice
e4ed7dab22
Build fix for case sensitive platforms.
...
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@6578 8ced0084-cf51-0410-be5f-012b33b47a6e
2010-12-14 02:44:27 +00:00
Glenn Rice
3d3411f3a0
Added a FASTLOG option for the cmake build to enable all logs.
...
Also make sure all necessary include directories are added in the check_lib macro.
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@6571 8ced0084-cf51-0410-be5f-012b33b47a6e
2010-12-13 05:29:13 +00:00
Glenn Rice
73da637a42
Rename wii wc24 system files to lower case as on the wii itself. These files are not detected on linux unless the case matches. This fixes an issue when Mario Kart Wii (and possible other games) is run with a clean user directory that renders the game unplayable.
...
Also fix some compiler warnings.
On linux don't install the license.txt file. Most distributions handle license files via a package. For example on debian based systems this gives a lintian warning.
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@6568 8ced0084-cf51-0410-be5f-012b33b47a6e
2010-12-12 15:25:03 +00:00
Glenn Rice
24569aca3d
Fix a linkage issue on newer linux distributions created in revision 6544.
...
Also update the menu link to dolphin-emulator.com
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@6553 8ced0084-cf51-0410-be5f-012b33b47a6e
2010-12-11 01:09:28 +00:00
Glenn Rice
06013d5eec
Make the cmake check_lib macro more versatile. It first tries pkg-config, and if that fails it then check for libraries and required headers. Also cleaned up the output a little bit.
...
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@6544 8ced0084-cf51-0410-be5f-012b33b47a6e
2010-12-10 02:00:05 +00:00
Glenn Rice
2caa685c7f
Fix a few more linkage issues in the cmake build.
...
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@6537 8ced0084-cf51-0410-be5f-012b33b47a6e
2010-12-06 13:06:54 +00:00
Glenn Rice
d171f7277b
Fix the nogui build on linux. The software plugin config dialog should not be built.
...
Fix the default wiimote emulation mouse button settings on linux.
Fix a little c++ operator precedence issue.
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@6534 8ced0084-cf51-0410-be5f-012b33b47a6e
2010-12-05 18:10:13 +00:00
Glenn Rice
63ec59f6c2
Fix a typo in the last revision.
...
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@6500 8ced0084-cf51-0410-be5f-012b33b47a6e
2010-11-30 14:25:15 +00:00
Glenn Rice
2ac9accc85
More linkage fixing. Fixes issue 3596.
...
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@6499 8ced0084-cf51-0410-be5f-012b33b47a6e
2010-11-30 05:20:36 +00:00
Glenn Rice
b5863da915
Possible fix for the rdtsc call in JitIL.cpp on macosx (issue 3531). This also fixes issue 3595 (although that issue was invalid -- we don't suport scons on linux anymore).
...
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@6498 8ced0084-cf51-0410-be5f-012b33b47a6e
2010-11-30 02:56:44 +00:00
Glenn Rice
eda716b164
Fix some linkage issues with the cmake build. This should fix issue 3596.
...
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@6497 8ced0084-cf51-0410-be5f-012b33b47a6e
2010-11-30 01:20:05 +00:00
Glenn Rice
fb9387a38e
Fix for linux screensaver inhibit caused by a misinterpretation of the window id.
...
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@6493 8ced0084-cf51-0410-be5f-012b33b47a6e
2010-11-28 17:23:13 +00:00
Glenn Rice
fae12f43c2
Inhibit the screensaver while the emulator is running on linux. Fixes issue 3279. Uses the xdg-screensaver method suggested in that issue.
...
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@6477 8ced0084-cf51-0410-be5f-012b33b47a6e
2010-11-25 02:26:46 +00:00
Glenn Rice
84a72e90b0
Migrate the opencl setting completely to the gfx config dialog.
...
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@6472 8ced0084-cf51-0410-be5f-012b33b47a6e
2010-11-24 17:30:04 +00:00
Glenn Rice
6d93a6b698
Linux build fix for the windows build fix in r6465. I tested this on both windows and linux.
...
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@6467 8ced0084-cf51-0410-be5f-012b33b47a6e
2010-11-23 15:52:42 +00:00
Glenn Rice
f915509fff
Linux build fix.
...
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@6464 8ced0084-cf51-0410-be5f-012b33b47a6e
2010-11-23 14:00:40 +00:00
Glenn Rice
cefaa393e6
Layout should not be called until after a sizer is inserted into its parent. This fixes the "gtk_widget_size_allocate(): attempt to allocate widget with width -5 and height 17" type console warnings that are annoying on linux. If there are issues with this on other platforms let me know, but there shouldn't be.
...
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@6459 8ced0084-cf51-0410-be5f-012b33b47a6e
2010-11-22 15:25:59 +00:00
Glenn Rice
a3c46990f6
Revert to gettimeofday on posix systems. I give up.
...
Temporary fix for OSX in JitIL.cpp
This revision should build on OSX again.
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@6457 8ced0084-cf51-0410-be5f-012b33b47a6e
2010-11-22 02:42:53 +00:00
Glenn Rice
222c2d1297
Revert revision 6464. _POSIX_MONOTONIC_CLOCK is not used in that way.
...
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@6455 8ced0084-cf51-0410-be5f-012b33b47a6e
2010-11-21 21:31:37 +00:00
Glenn Rice
39a4781a5f
Check if CLOCK_MONOTONIC is supported before using clock_gettime.
...
Fix the cmake check to see if -Wno-unused-result is supported by the compiler.
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@6453 8ced0084-cf51-0410-be5f-012b33b47a6e
2010-11-21 19:13:55 +00:00
Glenn Rice
86dc8d09fe
For the cmake write generate the svnrev.h file in the build directory instead of in the source so that a proper out-of-source build can be done. Fixes issue 3528.
...
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@6449 8ced0084-cf51-0410-be5f-012b33b47a6e
2010-11-20 20:20:12 +00:00
Glenn Rice
7788bac40c
Fix ogl screenshots for windows.
...
Fix the macosx build (perhaps).
This changes the JitIL timed profiling to using assembly language to obtain the time. It does seem to be faster. Not sure if it will work on macosx, but if it does it has the necessary precision that gettimeofday does not have.
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@6448 8ced0084-cf51-0410-be5f-012b33b47a6e
2010-11-20 03:24:51 +00:00
Glenn Rice
ef55177ed6
Implement JitIL profiling on linux. I also tried implementing __rdtsc using assembly and didn't really see a speed improvement so went with clock_gettime.
...
Also changed other gettimeofday calls to clock_gettime, which is supposedly more accurate.
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@6447 8ced0084-cf51-0410-be5f-012b33b47a6e
2010-11-20 00:22:56 +00:00
Glenn Rice
c93aaae1d8
Linux build fix. When I have time later I will implement nodchip's JitIL profiling on linux.
...
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@6445 8ced0084-cf51-0410-be5f-012b33b47a6e
2010-11-19 17:35:01 +00:00
Glenn Rice
f8fbcecad6
Encode framedumps in AVI format on linux as on windows. This adds the additional dependency of libavformat-dev. Remember if you want raw framedumps as before add -DENCODE_FRAMEDUMPS=OFF to the cmake command line.
...
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@6438 8ced0084-cf51-0410-be5f-012b33b47a6e
2010-11-18 16:46:17 +00:00
Glenn Rice
e1e43fa2a6
Fix some opengl errors. Thanks to rodolfo for telling me how to fix it. He is at work or he would do it.
...
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@6437 8ced0084-cf51-0410-be5f-012b33b47a6e
2010-11-18 15:12:12 +00:00
Glenn Rice
08124713bd
The usual linux build fix. I am starting to sound like a broken record.
...
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@6436 8ced0084-cf51-0410-be5f-012b33b47a6e
2010-11-18 04:01:16 +00:00
Glenn Rice
bcad22f266
cmake build fix. Don't blame Billiard for this one. He asked me to test his patch and I missed this.
...
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@6434 8ced0084-cf51-0410-be5f-012b33b47a6e
2010-11-18 03:05:52 +00:00
Glenn Rice
054358380e
Oops. Forgot the primary file.
...
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@6432 8ced0084-cf51-0410-be5f-012b33b47a6e
2010-11-18 02:14:12 +00:00
Glenn Rice
c56b1bffcf
Add the video software plugin to the cmake build system.
...
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@6431 8ced0084-cf51-0410-be5f-012b33b47a6e
2010-11-18 02:13:05 +00:00
Glenn Rice
993b40dfa4
Make it possible to build even if the source no longer contains svn versioning information. To use it add "-DDOLPHIN_WC_REVISION=exported" to the cmake command line. Of course you can replace "exported" with whatever you like. Fixes issue 3517.
...
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@6430 8ced0084-cf51-0410-be5f-012b33b47a6e
2010-11-17 05:34:55 +00:00
Glenn Rice
a279b391cc
Make Linux/MacOSX system checks correct in the cmake build. UNIX is true on both linux and osx. The cmake build probably still doesn't work on MacOSX though.
...
Also added an option to explicitly disable building with MPG framedumps. To use it add -DENCODE_FRAMEDUMPS=OFF to cmake on the command line.
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@6429 8ced0084-cf51-0410-be5f-012b33b47a6e
2010-11-17 01:03:39 +00:00
Glenn Rice
0644295f3d
Build fix. Remove some obsolete code. Fix some compiler warnings.
...
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@6428 8ced0084-cf51-0410-be5f-012b33b47a6e
2010-11-16 21:14:19 +00:00
Glenn Rice
4f81997c14
Fix the no gui cmake build.
...
Add a version check for avcodec and swscale libraries.
Fix a bug in the xlib wiimote emulation button configuration. If you are using a mouse button for wiimote emulation you may need to adjust your settings.
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@6426 8ced0084-cf51-0410-be5f-012b33b47a6e
2010-11-16 04:34:52 +00:00
Glenn Rice
d0e8d8a509
Linux cmake build fix. I fixed the scons build as well, so this might fix the macosx build also.
...
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@6424 8ced0084-cf51-0410-be5f-012b33b47a6e
2010-11-16 00:13:33 +00:00
Glenn Rice
2378b443c1
Build fix for windows.
...
Also a correction to the frame rate for the mpg encoding.
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@6416 8ced0084-cf51-0410-be5f-012b33b47a6e
2010-11-14 22:07:52 +00:00
Glenn Rice
50882c8d30
On linux encode frame dumps in MPG format instead of writing raw frames. To enable this portion of the code you must have libavcodec-dev and libswscale-dev installed (package names for Ubuntu).
...
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@6414 8ced0084-cf51-0410-be5f-012b33b47a6e
2010-11-14 21:14:26 +00:00
Glenn Rice
c1cc742c6b
Damn scons. Fix a indentation issue.
...
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@6412 8ced0084-cf51-0410-be5f-012b33b47a6e
2010-11-14 15:31:10 +00:00
Glenn Rice
d6d907f49c
Linux needs the -fvisibility=hidden flags. The font selection of the debugger segmentation faults without it. Since the font is selected when the application begins the debugger is rendered inoperable.
...
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@6411 8ced0084-cf51-0410-be5f-012b33b47a6e
2010-11-14 15:13:04 +00:00
Glenn Rice
17662d4ac6
Change the cmake check_lib routine to use REQUIRED/OPTIONAL instead of TRUE/FALSE.
...
Add a check to see if -Wno-unused-result is supported by the compiler.
Fix some compiler warnings in the wiiuse code.
Fix a bug in the wxGTK panic alert code.
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@6399 8ced0084-cf51-0410-be5f-012b33b47a6e
2010-11-13 22:07:27 +00:00
Glenn Rice
c0bdf4de81
Several little things.
...
The C version of the GenericLog was being used in both C and C++ branches of the code.
Parent panic alerts by the main_frame so that those windows get the icon too.
Fix a couple of compiler warnings.
Added some checks for libraries in the cmake build.
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@6385 8ced0084-cf51-0410-be5f-012b33b47a6e
2010-11-12 05:05:27 +00:00
Glenn Rice
c6d95c9087
Remove my DESTDIR hack from the cmake build. It turns out this is built into cmake and works in the same way it does with the gnu autotools. Use it in the standard way with "make DESTDIR=/desired/location install".
...
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@6382 8ced0084-cf51-0410-be5f-012b33b47a6e
2010-11-11 15:50:52 +00:00
Glenn Rice
adbd7fbd4a
Fix StringFromFormat hopefully for the last time. This should be more efficient than before. Thanks to shuffle2 for the windows code.
...
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@6379 8ced0084-cf51-0410-be5f-012b33b47a6e
2010-11-11 04:59:50 +00:00
Glenn Rice
5078f430c3
Make gui panic alerts thread safe in linux.
...
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@6375 8ced0084-cf51-0410-be5f-012b33b47a6e
2010-11-11 00:55:06 +00:00
Glenn Rice
072a698856
The change to StringFromFormat was overwriting the last character with the NULL terminating character.
...
Also update a deprecated function call.
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@6374 8ced0084-cf51-0410-be5f-012b33b47a6e
2010-11-10 23:23:12 +00:00
Glenn Rice
895f1500a5
Fix for my tweak in the last commit. I knew I had that working at one point.
...
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@6369 8ced0084-cf51-0410-be5f-012b33b47a6e
2010-11-10 05:18:20 +00:00
Glenn Rice
92a5b72b42
Linux build fix. stricmp does not exist on linux. Also a small tweak to the StringFromFormat routine.
...
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@6368 8ced0084-cf51-0410-be5f-012b33b47a6e
2010-11-10 04:44:25 +00:00
Glenn Rice
7b34def0fc
A couple of changes to the cmake build system.
...
First: Added a DESTDIR option for package building.
Second: Change the OpenCL setup. On both linux and windows use CLRun. I completely removed the option here. If CLRun works on MacOSX this should be done there as well, and this change implemented in the scons build also. Then we could remove the HAVE_OPENCL and the new USE_CLRUN definitions. Then we will finally have the dynamic detection of opencl set up cross platform.
On a side note, it doesn't seem that the program loaded from TextureDecoder.cl compiles or runs.
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@6366 8ced0084-cf51-0410-be5f-012b33b47a6e
2010-11-10 01:59:53 +00:00
Glenn Rice
bee873a30c
Fix the annoying gap in the OpenGL configuration dialog in the "General" tab between "Use Real XFB" and "Wide screen hack".
...
Also link the dolphin-emu executable against GL in the cmake build. Why? This seems to fix the segmentation fault on stop issue. Although curiously enough, linking the dolhpin executable against the system shared library SOIL fixes the problem too. It doesn't work with the static version of SOIL build in the externals. The reason the problem disappeared with the scons build is that the executable is implicitly linked against GL since the linker flags are set up to be thrown in everywhere.
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@6364 8ced0084-cf51-0410-be5f-012b33b47a6e
2010-11-09 03:08:20 +00:00
Glenn Rice
e72ae04e5c
Setup opencl to work like most of the other externals. Autodetect native shared libraries and if not found fall back to the static libs built from the externals.
...
Also some general clean up of the main CMakeLists.txt file. I think it is nice to keep the checks and analysis of the results together.
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@6363 8ced0084-cf51-0410-be5f-012b33b47a6e
2010-11-09 00:29:07 +00:00
Glenn Rice
57f01776ef
Fix cmake so it is possible to build without bluetooth support, and the typo that tells you bluetooth is enabled when it is not.
...
Fixes issue 3464.
Also make the check for portaudio really check the version of portaudio.
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@6359 8ced0084-cf51-0410-be5f-012b33b47a6e
2010-11-08 02:51:31 +00:00
Glenn Rice
e96943c121
Added an option in the cmake build to disable wxWidgets. To use add "-DDISABLE_WX=1" to the cmake configuration command. Also fixed the nowx build.
...
Set scons build to autodetect OpenCL by checking for both the library and header instead of having an option. Unfortunately there probably needs to be a path variable that can be set to the location to look for the headers. For example on Ubuntu with nvidia, the headers are located in /usr/include/nvidia-current instead of /usr/include, and hence not found by scons.
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@6355 8ced0084-cf51-0410-be5f-012b33b47a6e
2010-11-07 17:45:35 +00:00
Glenn Rice
d0afc20596
Added checks for portaudio and opencl to the cmake build system.
...
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@6351 8ced0084-cf51-0410-be5f-012b33b47a6e
2010-11-06 03:49:18 +00:00
Glenn Rice
7864f3c087
Missed a needed -fPIC.
...
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@6350 8ced0084-cf51-0410-be5f-012b33b47a6e
2010-11-05 23:38:37 +00:00
Glenn Rice
eb167e3ca8
Set "Release" as the default build type. Also cleaned up the CMakeLists.txt file a bit.
...
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@6346 8ced0084-cf51-0410-be5f-012b33b47a6e
2010-11-05 04:19:22 +00:00
Glenn Rice
2383e2b0f5
Improve the compiler flags for the cmake build system. -fPIC only needs to be specified for static libraries that are linked into shared libraries. cmake automatically uses -fPIC for shared libraries. Also ported several other needed compiler flags from the scons build. Set up the debug build, enabled with "-D CMAKE_BUILD_TYPE=Release", to work with wxWidgets debugging.
...
Note that most users will want to use the release build to get a -O3 optimized build. This can be enabled by adding "-D CMAKE_BUILD_TYPE=Release".
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@6344 8ced0084-cf51-0410-be5f-012b33b47a6e
2010-11-05 02:23:24 +00:00
Glenn Rice
3aff478b3a
Add the c++ definition HAVE_CONFIG_H in the scons build and check it before including config.h so the cmake build system doesn't need to worry about conflicts from that file if it exists.
...
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@6342 8ced0084-cf51-0410-be5f-012b33b47a6e
2010-11-04 20:33:45 +00:00
Glenn Rice
4ac40687ea
Okay. Big (possible controversial changes) to the cmake build system.
...
I am officially killing the local/global build crap. The "local" build thing should never have existed. There is now only one build that is essentially what the "global" build was before. This is the way a proper build system should work. I will soon write a wiki page to describe how to properly use the cmake build system, and how you can still set things up to get the "local" build from before. However, that type of build should be considered a developer tool, and not the way that dolphin-emu should be built.
Briefly, to use cmake now do the following from the toplevel of dolphin's source:
mkdir Builddir
cd Builddir
cmake ..
make
make install (you may need superuser privileges)
Note that the scons build is still building dolphin in the old way.
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@6341 8ced0084-cf51-0410-be5f-012b33b47a6e
2010-11-04 13:47:17 +00:00
Glenn Rice
4b0d4ded98
More cmake work.
...
Added autodetection of shared libraries.
Added a check for Xrandr.
Fix OpenAL linkage.
Copy User and Sys directories to lower case in the binary directory.
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@6338 8ced0084-cf51-0410-be5f-012b33b47a6e
2010-11-04 02:01:07 +00:00
Glenn Rice
381f92b151
Fix some linkage issues with the cmake build system.
...
Also X11 is required on *nix systems.
GTK2 is required for building the wxWidgets builds on *nix systems.
Added a check for pulseaudio.
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@6334 8ced0084-cf51-0410-be5f-012b33b47a6e
2010-11-03 04:13:36 +00:00
Glenn Rice
7824855116
Silence some compiler warnings that have accumulated.
...
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@6211 8ced0084-cf51-0410-be5f-012b33b47a6e
2010-09-16 04:22:27 +00:00
Glenn Rice
b7ba3ffc84
Fix a segmentation fault if "Change Disc..." is selected and then the file chooser is cancelled.
...
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@6208 8ced0084-cf51-0410-be5f-012b33b47a6e
2010-09-16 02:12:00 +00:00
Glenn Rice
c551a2ee51
Linux build fix.
...
Also fixed a couple of compiler warnings (one in SystemTimers.cpp that was an actual bug too!).
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@6185 8ced0084-cf51-0410-be5f-012b33b47a6e
2010-09-06 13:38:22 +00:00
Glenn Rice
4a61432f14
Fix the shared data dir for the global build on linux.
...
Also silence some compiler warnings.
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@6108 8ced0084-cf51-0410-be5f-012b33b47a6e
2010-08-18 02:24:02 +00:00
Glenn Rice
7866fade02
Add volume control for the pulse audio backend. Unfortunately that can not be done with the pulse-simple api, so I had to switch to the asynchronous pulse api.
...
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@6104 8ced0084-cf51-0410-be5f-012b33b47a6e
2010-08-17 02:14:04 +00:00
Glenn Rice
9f57345c11
Fix the wiimote refresh button in the new wiimote plugin on linux.
...
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@6087 8ced0084-cf51-0410-be5f-012b33b47a6e
2010-08-11 04:00:27 +00:00
Glenn Rice
97f894ffbd
Fix a problem in the old wiimote plugin in which a bitmap could be created with size 0x0. This fails an assertion in wxWidgets. wxWidgets complains about it in the debug build.
...
Also cleaned that file up. That is probably an exercise in futility though.
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@6086 8ced0084-cf51-0410-be5f-012b33b47a6e
2010-08-11 02:28:40 +00:00
Glenn Rice
a1daa636c2
Take care of some compiler warnings from unused variables, and a little code cleanup.
...
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@6081 8ced0084-cf51-0410-be5f-012b33b47a6e
2010-08-10 01:08:22 +00:00
Glenn Rice
957e7c415e
Several little things:
...
Clean up of the input selected for the opengl x window in linux.
Fix a potential segfault when taking a screenshot (happens consistently when using "Save Targets" from the video debugger window).
Fix a memory corruption error that results from the wrong image size being passed when dumping textures.
Make the screenshot hotkey configurable.
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@6067 8ced0084-cf51-0410-be5f-012b33b47a6e
2010-08-08 00:13:05 +00:00
Glenn Rice
3312435ae2
Fix the linux debug build in a better way so that wxWidgets debugging is still enabled.
...
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@6051 8ced0084-cf51-0410-be5f-012b33b47a6e
2010-08-04 14:41:27 +00:00
Glenn Rice
f5d48a46ee
Oops. Fix scons indentation mistake from my last commit.
...
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@6044 8ced0084-cf51-0410-be5f-012b33b47a6e
2010-08-03 21:44:14 +00:00
Glenn Rice
5ebd001d87
Fix the debug build on linux.
...
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@6043 8ced0084-cf51-0410-be5f-012b33b47a6e
2010-08-03 21:33:50 +00:00
Glenn Rice
22872b383c
Make toggling of word wrap for the log window nicer for linux. Unfortunately this method is only implemented for wxGTK (what not wxMSW? Shocker!).
...
Made it so that Source/Core/DolphinWX/Globals.h is only used for the wxWidgets build, and a little other file inclusion clean up.
Fix an issue where a user runs a game from the open menu or toolbar items with a clean user directory, and henceforth double clicking on the empty game list (where it says double click to browse for games), that game is run again.
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@6037 8ced0084-cf51-0410-be5f-012b33b47a6e
2010-08-03 03:20:44 +00:00
Glenn Rice
26aee8ff76
Create the log window after the menus. This fixes the font ugliness on windows.
...
Fix modality for the config dialogs on windows.
Fix the compress/decompress dialog wxString issues for MacOSX (hopefully).
Fix the DSP-LLE debugger for linux.
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@6031 8ced0084-cf51-0410-be5f-012b33b47a6e
2010-08-02 01:52:00 +00:00