Max Eliaser
9fbc5ff27c
Add X11 XInput2 input plugin, including MPX and with support for axis controls.
...
Based on the original XLib plugin, and thus shares some of its warts.
2013-07-20 13:58:02 -08:00
Glenn Rice
63e334f59e
Uh, that was stupid. Forgot to remove the NOT.
2013-07-15 09:22:47 -05:00
Glenn Rice
b2950adc52
When cmake checks for miniupnpc use the MINIUPNPC_VERSION_1_7_OR_HIGHER variable instead of MINIUPNPC_VERSION_PRE1_7. This should fix issue 6422.
2013-07-15 09:20:43 -05:00
Ryan Houdek
ea146627e6
[Android] Enable OpenGL ES 3 by default. Add in a modified GLES3/gl3.h header for supporting it.
2013-07-13 18:42:04 -05:00
Ryan Houdek
e24a551515
[Android] MIPS support...lol
2013-07-11 09:10:44 -05:00
Glenn Rice
1aca5fe798
Remove the cmake check for wxWidgets 2.8.9 that somehow got readded to
...
the code before the correct check for wxWidgets 2.9.3/2.9.4.
Also clean up the indentation in the CMakeLists.txt file.
2013-07-10 21:49:13 -05:00
Glenn Rice
1f6b70bf87
On linux check for a new enough system version of miniupnpc. Fall back
...
to building the version in the externals if it is not available.
2013-07-09 22:07:27 -05:00
John Chadwick
44db305602
Disable UPnP on Android. (Sorry :()
2013-07-09 18:19:56 -04:00
John Chadwick
16cd26d177
Add UPnP support.
...
Feedback is in logs as suggested by skid_au. The checkbox is still there, but
mostly for people who would like to opt out (unfortunately, I can not be sure
how this feature may behave for some routers - there's a hell of a lot of bad
UPnP implementations.)
The Visual Studio stuff is a little messy, so I apologize if anything is a bit
off. I tested most configurations and it worked.
I also tested CMake on Debian Wheezy, Ubuntu Saucy, and Mac OS X Mountain Lion.
All seemed to be OK.
2013-07-09 18:08:43 -04:00
Matthew Parlane
2f00f87e8e
Use working directory for executions.
...
Fixes issue 6318
2013-05-22 23:34:02 +12:00
Ryan Houdek
09def3ed3f
[Android] Add in a compiling option for GLES3
2013-05-05 23:37:01 -05:00
Ryan Houdek
24347e5176
Get latest android cmake to support NDK 8e
2013-04-13 15:09:05 -05:00
Ryan Houdek
605bbf5ca8
Merge remote-tracking branch 'origin/master' into Android-trash
2013-04-13 00:58:37 -05:00
Ryan Houdek
1dd1ebb8bd
Fix ARM building.
2013-04-03 05:20:41 +00:00
Jordan Woyak
1f9e3b460d
Fix CMake warning.
2013-04-01 15:07:45 -05:00
Pierre Bourdon
43d862bff9
Keep a frame pointer register on OSX - libunwind seems to crash when it's not present
2013-03-29 09:58:30 -07:00
Pierre Bourdon
4895e38bd5
This change might work better if I git add the files
2013-03-29 07:31:15 -07:00
Ryan Houdek
7034c79ab9
Big commit. Fix running the APK, I had missed a view in the manifest. Clean up the Android EGL context creation to fit more in line with how Dolphin works. This breaks input at the moment as well. Change the memarena from 768MB to 64MB to allow 1GB phones to potentially run it. Rename EGL_X11 back to EGL since this merge brings in some of soreau's changes to more easily allow different platforms like Wayland and Android. Not quite all of the code because some needs to be cleaned up still.
2013-03-24 21:06:34 -05:00
Ryan Houdek
019b525285
Missed a few clang compiler flags.
2013-03-19 08:56:46 -05:00
Ryan Houdek
61e1659b97
Disabled OSX x86 build since we require 10.7 minimum. This takes support back to late 2006 models. Also, Missed CG framework addition.
2013-03-19 08:50:56 -05:00
Ryan Houdek
8c1091a21f
Merge branch 'master' into GLSL-master
...
Conflicts:
Source/Core/VideoCommon/Src/PixelShaderGen.cpp
Source/Plugins/Plugin_VideoDX11/Src/VertexManager.cpp
Source/Plugins/Plugin_VideoDX9/Src/VertexManager.cpp
2013-03-15 11:19:52 -05:00
Ryan Houdek
c23a6505ad
Fix dup Option and move one to the top where it belongs in the CMake file.
2013-03-13 11:56:23 -05:00
degasus
a1c5e90083
Merge branch 'master' into GLSL-master
...
Conflicts:
CMakeLists.txt
Source/Core/DolphinWX/CMakeLists.txt
Source/Core/DolphinWX/Src/GLInterface.h
Source/Core/VideoCommon/Src/PixelShaderGen.cpp
Source/Core/VideoCommon/Src/TextureCacheBase.cpp
Source/Core/VideoCommon/Src/VertexManagerBase.cpp
Source/Plugins/Plugin_VideoDX11/Src/VertexManager.cpp
Source/Plugins/Plugin_VideoDX9/Src/VertexManager.cpp
Source/Plugins/Plugin_VideoOGL/Plugin_VideoOGL.vcxproj
Source/Plugins/Plugin_VideoOGL/Plugin_VideoOGL.vcxproj.filters
Source/Plugins/Plugin_VideoOGL/Src/GLUtil.h
Source/Plugins/Plugin_VideoOGL/Src/PixelShaderCache.cpp
Source/Plugins/Plugin_VideoOGL/Src/TextureCache.cpp
Source/Plugins/Plugin_VideoOGL/Src/VertexManager.cpp
Source/Plugins/Plugin_VideoOGL/Src/VertexShaderCache.cpp
Source/Plugins/Plugin_VideoOGL/Src/main.cpp
2013-03-06 15:59:29 +01:00
Ryan Houdek
11e4403fb2
Fix accidental change from libpulse-simple to libpulse
2013-03-03 08:38:13 +00:00
Ryan Houdek
717b976875
ARM Support without GLSL
2013-02-26 13:49:00 -06:00
degasus
a629dea4dc
Merge branch 'master' into GLSL-master
...
Conflicts:
CMakeLists.txt
Source/Core/DolphinWX/Dolphin.vcxproj
Source/Core/DolphinWX/Src/GLInterface/WX.cpp
Source/Core/DolphinWX/Src/GLInterface/WX.h
Source/Core/VideoCommon/Src/TextureCacheBase.cpp
Source/Core/VideoCommon/Src/TextureCacheBase.h
Source/Plugins/Plugin_VideoDX11/Src/TextureCache.cpp
Source/Plugins/Plugin_VideoDX11/Src/TextureCache.h
Source/Plugins/Plugin_VideoDX9/Src/TextureCache.cpp
Source/Plugins/Plugin_VideoDX9/Src/TextureCache.h
Source/Plugins/Plugin_VideoOGL/Src/Render.cpp
Source/Plugins/Plugin_VideoOGL/Src/TextureCache.cpp
Source/Plugins/Plugin_VideoOGL/Src/TextureCache.h
Source/Plugins/Plugin_VideoSoftware/Src/SWmain.cpp
damn mipmap_fixes ...
2013-02-18 18:49:20 +01:00
Ryan Houdek
818a376bd4
Fix header guard and definitions not being set to 1
2013-02-12 14:11:29 -06:00
Ryan Houdek
e53d88da2d
Add the option to turn on only the EGL interface to use desktop OpenGL with it.
...
Conflicts:
CMakeLists.txt
2013-02-12 14:09:49 -06:00
Jordan Woyak
e556f47db0
"Fix" using SDL from externals.
2013-02-12 13:59:41 -06:00
Ryan Houdek
8923f0e13b
Fix header guard and definitions not being set to 1
2013-02-11 15:06:40 -06:00
Ryan Houdek
0955135290
Add the option to turn on only the EGL interface to use desktop OpenGL with it.
2013-02-11 13:08:41 -06:00
Jordan Woyak
af9b9c8f45
"Fix" using SDL from externals.
2013-02-05 16:29:52 -06:00
Glenn Rice
18e69acc15
Re-enable a few more warnings.
2013-01-29 21:48:26 -06:00
Glenn Rice
7676c4d43b
For each of the recently added warning flags check to see if the
...
compiler supports the flag before adding it.
2013-01-29 21:28:55 -06:00
Ryan Houdek
d2528615fa
hah, woops.
2013-01-29 14:06:43 -06:00
Ryan Houdek
75f2ba14b4
Hey Parlane. Fixed it.
2013-01-29 13:59:03 -06:00
parlane
65dea7da36
I blame Billiard.
2013-01-29 19:54:10 +00:00
parlane
4efbe1725f
Fix for the fix that didn't fix.
2013-01-29 19:52:44 +00:00
parlane
570997e6a1
4000 warnings about not supporting a warning...
2013-01-29 19:47:58 +00:00
Jordan Woyak
8ab2332854
Enabled more warnings. Get to work!
2013-01-28 20:50:22 -06:00
Ryan Houdek
eb07c005e3
Move the cmake option lines to the top of the Cmake file for easy viewing in vim.
2013-01-25 13:55:05 -06:00
degasus
e0ffdda26e
Merge branch 'immediate-removal' into GLSL-master
...
Conflicts:
Source/Core/VideoCommon/Src/PixelShaderGen.cpp
Source/Plugins/Plugin_VideoSoftware/Src/SWRenderer.cpp
immediate-removal is a new created branch seperated from master but reverted the revert of immediate-removal
so we get less conflicts by merging
2013-01-24 16:58:28 +01:00
skidau
0a4272c96b
Merge branch 'OpenAL'
...
* OpenAL:
Changed SoundTouch to use float samples, allowing SSE to be used. Made the DPL2 decoder disabled by default. Re-added the audio hack used by the Accurate VBeam emulation option.
Added a latency setting to the audio settings. Removed the Sample Rate setting. It is now hardcoded to 48000hz (accurate audio timing).
Skipped timestretching if the emulator is running below 10% speed to prevent buffer overflows.
Removed the synchronisation between the CPU thread and the audio thread. Added code to detect and resume from buffer underruns. Disabled the ability to change the DPL2 option after the game has started. Fixed a memory leak that occurred in the DPL2 decoder. Fixed the OSX build.
Build fix
Added a Dolby Pro Logic II (DPL2) decoder in the OpenAL backend. DPL2 audio is decoded to 5.1. Code adapted from ffdshow. Added an option in the DSP settings to disable the DPL2 decoder in case Dolphin incorrectly detects a 5.1 audio system. Updated the OpenAL files to OpenAL Soft 1.15.1 in the Windows build.
Removed the system timing hack which was activated when the Accurate VBeam option was enabled.
Fixed the include directories in Audio Common for the Windows 32bit build.
Fixed the include directories in Audio Common for the Windows build.
Messed up the static include line
Fix include paths and compiling in Linux. Externals soundtouch is 1.7.1, while Ubuntu 12.10 is 1.6.x. Externals soundtouch is compiled with integer samples, while ubuntu is compiled with float samples. Float samples is probably the more common route. If you're going to use soundtouch, you should probably use SAMPLETYPE instead of explicitly choosing short. This probably breaks the windows build since its includes aren't setup.
OSX: typedef signed char BOOL
OSX build fix
Build fix
Added audio time stretching by using the SoundTouch library.
Implemented correct audio timing.
OpenAL for Windows initial commit
2013-01-15 22:40:12 +11:00
Jordan Woyak
5c371549d3
fix cmake hacks
2013-01-09 18:39:28 -06:00
Ryan Houdek
6b29918ea3
Messed up the static include line
2013-01-09 10:42:05 -06:00
Ryan Houdek
01f4d9f386
Fix include paths and compiling in Linux. Externals soundtouch is 1.7.1, while Ubuntu 12.10 is 1.6.x. Externals soundtouch is compiled with integer samples, while ubuntu is compiled with float samples. Float samples is probably the more common route. If you're going to use soundtouch, you should probably use SAMPLETYPE instead of explicitly choosing short. This probably breaks the windows build since its includes aren't setup.
2013-01-09 10:26:12 -06:00
skidau
63b38be97c
Added audio time stretching by using the SoundTouch library.
2013-01-09 22:57:32 +11:00
degasus
bff02b3b73
Merge branch 'arb_framebuffer' into GLSL-master
...
Conflicts:
Source/Plugins/Plugin_VideoOGL/Src/FramebufferManager.cpp
Source/Plugins/Plugin_VideoOGL/Src/RasterFont.cpp
Source/Plugins/Plugin_VideoOGL/Src/Render.cpp
Source/Plugins/Plugin_VideoOGL/Src/TextureCache.cpp
Source/Plugins/Plugin_VideoOGL/Src/TextureConverter.cpp
2013-01-09 11:00:26 +01:00
Glenn Rice
bb7c262539
Add a linux .desktop file to add dolphin-emu to the menu, and install it
...
when running 'make install'.
2013-01-07 16:50:48 -06:00
Ryan Houdek
b2911516de
Disable the warning about va_list being mangled differently now.
2012-12-30 01:42:33 -06:00
