71681de81a
[GLExtensions] Initial code drop for GLExtensions. This drops GLEW entirely from the codebase. This has been tested on Android and Linux+ATI. Of course untested on Windows and Apple. Also untested with Linux + EGL but should be fine there. There are most likely a couple of extensions I'm missing which would result in null pointer runs but not bad for the initial commit.
...
Conflicts:
CMakeLists.txt
Externals/GLew/glew.vcxproj
Externals/GLew/glew.vcxproj.filters
Source/Core/VideoBackends/OGL/CMakeLists.txt
Source/Core/VideoBackends/OGL/GLFunctions.cpp
Source/Core/VideoBackends/OGL/GLFunctions.h
Source/Core/VideoBackends/OGL/GLUtil.h
Source/Core/VideoBackends/OGL/Render.cpp
Source/VSProps/Base.props
2014-01-17 15:50:51 +01:00
1118226f27
Merge branch 'master' into buffer_storage
2013-12-31 19:18:30 -06:00
34692ab826
Remove unnecessary Src/ folders
2013-12-31 14:03:19 -05:00
d8ceb97a60
[buffer_storage] Require GLEW 1.10 which has the new OpenGL 4.4 methods. Fixes linux build.
2013-12-27 15:37:31 -06:00
a87e0e7489
Remove our GLU dependency. Fix static zlib
2013-12-23 16:01:34 -07:00
63ab203923
Fix ARM unix build.
2013-12-12 21:17:42 +00:00
c21003feab
If we are using OpenGL ES 3, then don't check for OpenGL/GLU
2013-12-12 13:42:15 -06:00
7ff429152d
Fix Cmake failure.
2013-12-12 13:35:22 -06:00
eb3b933dd0
Remove all instances of OpenCL in the Dolphin Project. A brief history of OpenCL in Dolphin. OpenCL was originally added to the Dolphin codebase 1 month after it was released with OS X Snow Leopard in 2009. OpenCL was one of the largest group projects that Dolphin ever has had. The OpenCL texture decoder was originally aded with version 1.0 of the OpenCL spec; This version didn't have the capability of a OpenCL-OpenGL interop which would allow for uploading textures once and have it decoded directly to a OpenGL texure. This was to be worked out when the OpenCL 1.1 spec was released and allowed the interop. This work has never been done, and no one in the team is willing to work on it for various reasons. OpenCL has had the unreasonable expectation that it increases the performance of video games that require a large amount of EFB copies like NSMBW. In reality, enabling OpenCL just put the graphics card in a higher power mode which increased the game speed. This is due to the unfortunate effect of Dolphin tending to not push GPUs out of their lower frequency power savings modes. Thanks to everyone that had contributed to the OpenCL texture decoder.
2013-12-11 15:15:55 -06:00
1dfe303119
[ANDROID] Fix ARMv5 build.
2013-11-30 12:25:01 -06:00
49eef423a8
[Android-overlay] Add the new overlay icons. Support configuring them. Disable hardfloat since it has issues since Dalvik doesn't understand passing floats due to ABI differences.
2013-11-29 18:37:33 -06:00
2c09e8fc5a
[Android] Enable hard-float support. Requires Android NDK r9b.
2013-11-24 16:43:53 -06:00
13578dc0b3
[Android] Enable the ability to find OpenMP on Android...which isn't used in the generic texture decoder so no win.
2013-11-24 16:28:20 -06:00
117bf435b0
Fix GUI-less build. Also potentially OS X. We now require libpng due to our screenshot code relying on it now. WXWidgets links in libpng by itself so it isn't noticed in a wxwidgets build. OS X seems to not have libpng linked in from wxWidgets so just link in libpng at all times.
2013-11-15 01:09:38 +00:00
bfdc913714
Actually enable PCH.
2013-10-20 16:55:01 -04:00
de1773affb
Basic precompiled header support for Linux/OS X. Shaves 20-30% off full rebuild time on my system.
2013-10-17 00:07:35 -04:00
4cdce55615
Don't define _M_IX86 on ARM(!).
...
Also define _M_* in a common location, and clean up code that these
changes break (including DSPJit files that assume X86 yet are compiled
on ARM for some reason...)
2013-09-24 01:30:41 -04:00
146cf56295
Darwin: Don't overwrite the C compiler if the user set one manually.
2013-09-24 01:14:56 -04:00
2395725200
We're not stable anymore :(
2013-09-22 16:28:09 +02:00
c25be031fc
Dolphin 4.0 release
2013-09-22 16:00:57 +02:00
aa202c2e21
Move global gameinis from User to Sys. Get rid of SHARED_USER.
2013-09-14 06:08:30 +02:00
d9dd0a7874
Fix building with polarssl from the externals.
2013-09-11 23:35:52 -05:00
53fb0622f0
Fix the glew check. GLES3 can be used on non-Android platforms.
2013-09-08 07:21:33 +00:00
d617efc5ef
When checking for glew, don't fail if a working system version is not
...
found so we can fall back to the Externals version.
2013-09-07 12:40:40 -05:00
a3d86ceead
When checking for glew via cmake check to see that the system version of glew
...
is at least 1.8 and has the methods of glew 1.9. This is an annoying
hack to deal with Ubuntu's glew setup, which is glew 1.8 with 1.9
methods patched in.
2013-09-07 12:24:32 -05:00
eb8e03fab5
Add a check for a shared polarssl library. This checks to see that the
...
system version is new enough, and is compiled with havege support.
2013-09-02 20:07:47 -05:00
b6728c1405
Avoid unnecessary bundle copies on OS X:
...
- Make "copy data into bundle" depend on the files actually being
changed, rather than being run on every build.
- postprocess_bundle depends on system files and checking the Dolphin
binary and all that, and would be iffy to try to avoid rerunning;
but it's only needed to produce a redistributable bundle, so add
SKIP_POSTPROCESS_BUNDLE to skip it for development.
2013-08-30 17:54:52 -04:00
18fd690533
Only use static iconv on Android.
2013-08-29 05:53:15 -05:00
cb8e7a1be5
Work around check_lib not finding iconv.
2013-08-29 05:40:16 -05:00
160d72a9ae
[Android] Add in a static libiconv library so non English games don't crash Dolphin Mobile.
2013-08-29 04:43:31 -05:00
73be79f4e0
Fix trailing whitespaces in all files where some were added
2013-08-25 02:49:58 +02:00
b6e054a2be
Merge branch 'master' into wii-network
...
Conflicts:
Source/Core/Core/Core.vcxproj
Source/Core/Core/Core.vcxproj.filters
Source/Core/Core/Src/CoreParameter.cpp
Source/Core/DolphinWX/Dolphin.vcxproj
Source/Core/DolphinWX/Dolphin.vcxproj.filters
2013-08-23 00:51:12 +12:00
17918472ae
Fix random d...
2013-08-16 19:26:34 +12:00
9de7611ff9
Merge branch 'master' into wii-network
...
Conflicts:
CMakeLists.txt
Source/Core/Core/Core.vcxproj
Source/Core/DolphinWX/Dolphin.vcxproj
Source/Core/DolphinWX/Dolphin.vcxproj.filters
Source/Dolphin_2010.sln
Source/VSProps/Dolphin.Win32.props
Source/VSProps/Dolphin.x64.props
2013-08-16 19:17:07 +12:00
d8b39b9dcf
Support PolarSSL on *nix
...
Removed unneeded PolarSSL directories.
Remove duplicate sha1 and md5 files.
Define out SSL test file writing.
Fix format string bug and warning.
2013-08-15 23:36:17 +12:00
a279001472
Remove "-0" from stable version numbers in a more foolproof manner for vs and cmake builds.
2013-08-10 17:19:19 -05:00
3239e4946f
Use pkg-config to check for XInput2
2013-07-21 00:45:03 -04:00
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
63e334f59e
Uh, that was stupid. Forgot to remove the NOT.
2013-07-15 09:22:47 -05:00
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
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
e24a551515
[Android] MIPS support...lol
2013-07-11 09:10:44 -05:00
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
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
44db305602
Disable UPnP on Android. (Sorry :()
2013-07-09 18:19:56 -04:00
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
2f00f87e8e
Use working directory for executions.
...
Fixes issue 6318
2013-05-22 23:34:02 +12:00
09def3ed3f
[Android] Add in a compiling option for GLES3
2013-05-05 23:37:01 -05:00
934e150596
Merge branch 'master' into wii-network
...
Conflicts:
Source/Core/Core/Src/Boot/Boot_BS2Emu.cpp
Source/Core/Core/Src/ConfigManager.cpp
Source/Core/Core/Src/HLE/HLE_OS.h
Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp
Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.h
Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_net.cpp
Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_net.h
2013-04-24 00:48:00 +12:00
b652f1974f
Completed port to gnutls for linux.
2013-04-24 00:32:44 +12:00
24347e5176
Get latest android cmake to support NDK 8e
2013-04-13 15:09:05 -05:00
605bbf5ca8
Merge remote-tracking branch 'origin/master' into Android-trash
2013-04-13 00:58:37 -05:00
0c9d8d34e1
Merge branch 'master' into wii-network
...
Conflicts:
Source/Core/Core/CMakeLists.txt
2013-04-11 19:55:36 +12:00
1dd1ebb8bd
Fix ARM building.
2013-04-03 05:20:41 +00:00
1f9e3b460d
Fix CMake warning.
2013-04-01 15:07:45 -05:00
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
4895e38bd5
This change might work better if I git add the files
2013-03-29 07:31:15 -07:00
7784fa4c67
Merge branch 'master' into wii-network
...
# By Ryan Houdek (185) and others
# Via degasus (12) and others
* master: (625 commits)
Revert "Don't open/close file for every file operation." as it was crashing PokePark in Windows builds.
Array overrun fixed in VertexShaderCache for the DX11 plugin.
Fixed DSPTool build.
Windows build fix
Go back to assuming every HID device is a wiimote on Windows. Fixed issue 6117. Unfixed issue 6031.
VideoSoftware: Improve fog range adjustment by using less magic and more comments.
revert RasterFont for VideoSoftware
ogl: fix virtual xfb
Windows build fix from web interface...
Adjusted the audio loop criteria, using >= on the Wii and == on GC. This fixes the audio static that occurred in Wii games after hours of play.
Forced the exception check only for ARAM DMA transfers. Removed the Eternal Darkness boot hack and replaced it with an exception check.
VideoSoftware: Implement fog range adjustment, fixing issue 6147.
implement 4xSSAA for OGL
move ogl-only settings into backend
Fix description of disable fog, and move it to enhancements tab.
Reverted rd76ca5783743 as it was made obsolete by r1d550f4496e4.
Removed the tracking of the FIFO Writes as it was made obsolete by r1d550f4496e4.
Forced the external exception check to occur sooner by changing the downcount.
Mark the Direct3D9 backend deprecated.
Prefer D3D11 and OpenGL over D3D9 by default.
...
Conflicts:
CMakeLists.txt
Source/Core/Common/Common.vcxproj.filters
Source/Core/Common/Src/CommonPaths.h
Source/Core/Core/Core.vcxproj.filters
Source/Core/Core/Src/Core.cpp
Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_FileIO.cpp
Source/VSProps/Dolphin.Win32.props
Source/VSProps/Dolphin.x64.props
2013-03-27 13:19:23 +11:00
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
019b525285
Missed a few clang compiler flags.
2013-03-19 08:56:46 -05:00
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
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
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
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
11e4403fb2
Fix accidental change from libpulse-simple to libpulse
2013-03-03 08:38:13 +00:00
717b976875
ARM Support without GLSL
2013-02-26 13:49:00 -06:00
c30b8c9eae
Merge branch 'master' into wii-network
...
Conflicts:
Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_FileIO.cpp
2013-02-23 17:02:58 +13:00
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
818a376bd4
Fix header guard and definitions not being set to 1
2013-02-12 14:11:29 -06:00
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
e556f47db0
"Fix" using SDL from externals.
2013-02-12 13:59:41 -06:00
8923f0e13b
Fix header guard and definitions not being set to 1
2013-02-11 15:06:40 -06:00
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
3d480c088f
Merge branch 'master' into wii-network
...
Conflicts:
Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE.cpp
2013-02-09 20:13:11 +13:00
af9b9c8f45
"Fix" using SDL from externals.
2013-02-05 16:29:52 -06:00
33b0a11747
Merge branch 'master' into wii-network
2013-02-01 01:32:54 +13:00
18e69acc15
Re-enable a few more warnings.
2013-01-29 21:48:26 -06:00
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
d2528615fa
hah, woops.
2013-01-29 14:06:43 -06:00
75f2ba14b4
Hey Parlane. Fixed it.
2013-01-29 13:59:03 -06:00
65dea7da36
I blame Billiard.
2013-01-29 19:54:10 +00:00
4efbe1725f
Fix for the fix that didn't fix.
2013-01-29 19:52:44 +00:00
570997e6a1
4000 warnings about not supporting a warning...
2013-01-29 19:47:58 +00:00
8ab2332854
Enabled more warnings. Get to work!
2013-01-28 20:50:22 -06:00
2dd077028f
Merge branch 'master' into wii-network
2013-01-28 22:00:47 +13:00
ca4ea817e0
Merge branch 'master' into wii-network
...
Conflicts:
Source/Core/Common/Src/CommonPaths.h
Source/Core/Common/Src/FileUtil.h
Source/Core/Core/Src/HLE/HLE.cpp
Source/Core/Core/Src/PowerPC/Interpreter/Interpreter.cpp
2013-01-26 21:46:12 +13:00
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
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
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
9754fda516
Merge branch 'wii-usb' into temp merge branch
...
Conflicts:
Source/Core/Common/Src/Log.h
Source/Core/Core/Core.vcxproj
Source/Core/Core/Core.vcxproj.filters
Source/VSProps/Dolphin.Win32.props
Source/VSProps/Dolphin.x64.props
2013-01-11 23:07:12 +13:00
5c371549d3
fix cmake hacks
2013-01-09 18:39:28 -06:00
6b29918ea3
Messed up the static include line
2013-01-09 10:42:05 -06:00
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
63b38be97c
Added audio time stretching by using the SoundTouch library.
2013-01-09 22:57:32 +11:00
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
e8624cc0f2
Merge branch 'gdbstub' into wii-network
...
Conflicts:
Source/Core/Core/Src/ConfigManager.cpp
2013-01-08 21:21:05 +13:00
5b96fb766f
Merge branch 'master' into wii-network
2013-01-08 21:18:48 +13:00
0ec7ef4b99
Merge branch 'master' into gdbstub
2013-01-08 20:27:34 +13:00
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
b7fd1225ba
Started gdb stub support.
2013-01-06 23:28:27 +13:00
e0c9a1fd09
Merge branch 'master' into wii-network
...
Conflicts:
Source/Core/Common/Src/CommonPaths.h
Source/Core/Core/CMakeLists.txt
Source/Core/Core/Src/Boot/Boot_BS2Emu.cpp
Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp
Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_net.cpp
2013-01-01 23:28:46 +13:00
29f91eef97
Merge branch 'master' into wii-usb
2012-12-30 21:37:45 +13:00
b2911516de
Disable the warning about va_list being mangled differently now.
2012-12-30 01:42:33 -06:00
cc4d491d6c
Add ability to enable GPROF in cmake.
2012-12-30 17:48:22 +13:00
3b459fb500
Add better FindLibUsb support for MacOSX.
...
Make LibUSB optional, don't compile HID support if it doesn't exist.
A lot less hacky. Works quite well on Ubuntu now.
2012-12-30 16:57:37 +13:00
13bd235c11
Merge branch 'master' into wii-usb
2012-12-29 17:47:52 +13:00
316a33d1e6
Merge branch 'master' into GLSL-master
...
Conflicts:
Source/Core/DolphinWX/Src/VideoConfigDiag.h
Source/Plugins/Plugin_VideoOGL/Src/GLUtil.h
Source/Plugins/Plugin_VideoOGL/Src/Render.cpp
Source/Plugins/Plugin_VideoOGL/Src/TextureCache.cpp
Source/Plugins/Plugin_VideoOGL/Src/TextureConverter.cpp
2012-12-27 10:36:54 +01:00
67c1c6b062
Merge branch 'GLES-software'
2012-12-26 12:54:58 -06:00
01953ff64a
Rename the interface files and hopefully fix OSX building.
2012-12-25 19:08:24 -06:00
5ac1e908b1
Truly unstable.
2012-12-24 22:12:33 +01:00
9a9f567f28
... and back to unstable again
2012-12-24 21:29:24 +01:00
4798524b75
Dolphin 3.5 release.
2012-12-24 21:29:24 +01:00
9209253e0d
Initial removal of Nvidia CG. Still some more cleanup to go
2012-12-24 11:09:52 -06:00
296b9b1c16
Small bit of clean up in GLES-software.
2012-12-24 09:37:12 -06:00
d9dd94ac8b
Add Libusb to cmake and HID files.
2012-12-24 12:58:11 +13:00
b78f5debe6
Initial push of GLES and GLUtil file breakup.
2012-12-17 14:54:20 -06:00
764cd455b3
Revert "fix Snow Leopard compatibility"
...
This change broke compilation on some OSX 10.7 configurations.
This reverts commit b2e2e49fe4
2012-11-13 10:22:56 +01:00
b2e2e49fe4
fix Snow Leopard compatibility
...
Checking for clang in Xcode bundle seems pointless, command line tools should be installed.
Setting the path explicity to avoid fink/macports/homebrew prevents use of locally installed packages like clang and wxwidgets.
Realistically using opencl means the minimum OSX version targetable is 10.6.
Correct TARGET_SYSROOT check, add required -mmacosx-version-min to linker flags.
also using wxwidgets gl component.
2012-10-22 16:45:37 -07:00
3a5b6aed91
Missed a line here
2012-10-09 23:43:22 -05:00
189d12b61c
If CG isn't available, still compile and fallback on GLSL
2012-10-09 23:43:22 -05:00
80c15f21b4
Add SDL2 support to build system.
...
Dolphin code already builds against SDL2 but the build system never
checks for SDL2, which is the what latest SDL is called now. SDL2
replaces SDL 1.3. This allows Dolphin to be build against SDL2, which
activates certain new features such as the haptic interface.
2012-07-12 19:47:17 -06:00
c83f87dfc4
Moved the _FILE_OFFSET_BITS=64 definition before the dependency checks. Fixes compilation on Linux x86.
2012-05-17 00:11:55 +02:00
fdff4cb1ff
Merge branch 'master' into wii-network
...
Conflicts:
Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE.cpp
Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_FileIO.cpp
Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp
Source/VSProps/Dolphin.Win32.props
Source/VSProps/Dolphin.x64.props
2012-05-16 09:27:37 +02:00
40640217f1
Fix hide mouse cursor on linux.
...
Fix emulator window position when rendering to main on linux.
Allow building against wxWidgets 2.9.3 on linux.
2012-05-02 14:40:40 -05:00
d5ae3e90a8
cmake elif() -> elseif()
2012-03-26 03:27:18 +00:00
4130116a85
fix building on OS X when no OSX SDK is installed. (i.e. just commandline tools)
2012-03-22 18:11:45 -07:00
f7423a0a4f
Merge branch 'master' into wxw3-update
...
Conflicts:
Source/Core/DolphinWX/Src/LogWindow.cpp
2012-03-22 17:57:38 -07:00
5242f09104
Fix Linux build: search for gthread-2.0 and pangocairo, then add both these libs to wx dependencies
2012-03-23 01:06:45 +01:00
c0992cc73e
Build fix:
...
Don't use isascii() - just do it ourselves
Bump required wxw version (for shared libs)
There still seems to be linking issues on some linux distros, I can't reproduce it though...
2012-03-19 23:16:01 -07:00
6091774ade
get wxw3 building on linux
...
kind of hacky because currently, shared libpng is always expected to be used
on darwin, libpng in externals is always used
2012-03-19 04:59:49 -07:00
ed3f9ce288
Switch Mac compiler to Clang.
...
Specifically:
- Look for clang and clang++ in the new (Xcode 4.3) location first,
then the old (Xcode 4.2) location.
- Look for sysroot in the new (Xcode 4.3) location first, then the old
(Xcode 4.2) location.
2012-03-18 15:11:31 -07:00
b69a1d225a
Use -std=gnu++0x instead of -std=c++0x
...
Bluez uses the non standard "typeof" instead of "__typeof__" in bluetooth.h.
Both GCC and Clang reject that with std=c++0x but accept it with gnu++0x.
2012-03-08 10:01:40 +01:00
6eb2cb2666
Merge branch 'master' into wii-network
2012-02-27 22:36:41 -08:00
8a8dc77ef1
enable c++11 compilation in cmakelists
2012-02-24 14:19:24 -06:00
40e6e9b9fa
Fix Linux build
2012-02-18 09:50:21 +01:00
15dac4584f
Override PATH on OS X to avoid picking up pkg-config from MacPorts.
2011-12-19 02:57:00 +01:00
6f27a29d51
Prefer static libs from Externals on OS X.
...
Several people had trouble building against systemwide installed libs.
And even if the build succeeds, the resulting bundle would not work on
other Macs.
2011-12-19 00:57:20 +01:00
c4eb150c7e
Skip XRANDR check if X11 is not found.
...
Our code does not compile when HAVE_XRANDR=1 and HAVE_X11=0.
This combination would not normally exist, but on OS X we skip the X11
check so it is possible for X11 to be "not found" even when the OS does
support it. On OS X 10.6 this was not a problem because XRANDR is not
detected there, but apparently on OS X 10.7 XRANDR is available.
2011-12-18 14:38:06 +01:00
74d552f3ca
Removed debug prints.
2011-12-17 15:32:41 +01:00
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
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
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
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
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
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
c1cf4f80cf
Added bundle version and copyright string to OS X bundle info.
2011-12-11 16:21:17 +01:00
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
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
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
d440dfe9b2
Link against systemwide LZO using the info gathered by check_lib().
2011-12-05 05:33:35 +01:00
Ryan Houdek