The-Homebrew-Cloud/dolphin
2
0
Fork 0
mirror of https://github.com/dolphin-emu/dolphin.git synced 2025-01-09 15:49:25 +01:00
Code Issues Packages Projects Releases Wiki Activity
16,354 Commits 6 Branches 12 Tags 1.3 GiB
Commit Graph

298 Commits

Author SHA1 Message Date
Matthew Parlane
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
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
Matthew Parlane
e8624cc0f2 Merge branch 'gdbstub' into wii-network 
Conflicts:
	Source/Core/Core/Src/ConfigManager.cpp
 2013-01-08 21:21:05 +13:00
Matthew Parlane
5b96fb766f Merge branch 'master' into wii-network 2013-01-08 21:18:48 +13:00
Matthew Parlane
0ec7ef4b99 Merge branch 'master' into gdbstub 2013-01-08 20:27:34 +13: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
Matthew Parlane
b7fd1225ba Started gdb stub support. 2013-01-06 23:28:27 +13:00
Matthew Parlane
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
Matthew Parlane
29f91eef97 Merge branch 'master' into wii-usb 2012-12-30 21:37:45 +13:00
Ryan Houdek
b2911516de Disable the warning about va_list being mangled differently now. 2012-12-30 01:42:33 -06:00
Matthew Parlane
cc4d491d6c Add ability to enable GPROF in cmake. 2012-12-30 17:48:22 +13:00
Matthew Parlane
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
Matthew Parlane
13bd235c11 Merge branch 'master' into wii-usb 2012-12-29 17:47:52 +13:00
degasus
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
Ryan Houdek
67c1c6b062 Merge branch 'GLES-software' 2012-12-26 12:54:58 -06:00
Ryan Houdek
01953ff64a Rename the interface files and hopefully fix OSX building. 2012-12-25 19:08:24 -06:00
NeoBrainX
5ac1e908b1 Truly unstable. 2012-12-24 22:12:33 +01:00
NeoBrainX
9a9f567f28 ... and back to unstable again 2012-12-24 21:29:24 +01:00
NeoBrainX
4798524b75 Dolphin 3.5 release. 2012-12-24 21:29:24 +01:00
Ryan Houdek
9209253e0d Initial removal of Nvidia CG. Still some more cleanup to go 2012-12-24 11:09:52 -06:00
Ryan Houdek
296b9b1c16 Small bit of clean up in GLES-software. 2012-12-24 09:37:12 -06:00
Matthew Parlane
d9dd94ac8b Add Libusb to cmake and HID files. 2012-12-24 12:58:11 +13:00
Ryan Houdek
b78f5debe6 Initial push of GLES and GLUtil file breakup. 2012-12-17 14:54:20 -06:00
Pierre Bourdon
764cd455b3 Revert "fix Snow Leopard compatibility" 
This change broke compilation on some OSX 10.7 configurations.

This reverts commit b2e2e49fe49715a3dd77f138b8365046550d99b2.
 2012-11-13 10:22:56 +01:00
Shawn Hoffman
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
Ryan Houdek
3a5b6aed91 Missed a line here 2012-10-09 23:43:22 -05:00
Ryan Houdek
189d12b61c If CG isn't available, still compile and fallback on GLSL 2012-10-09 23:43:22 -05:00
Scott Moreau
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
Pierre Bourdon
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
Pierre Bourdon
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
Glenn Rice
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
godisgovernment
d5ae3e90a8 cmake elif() -> elseif() 2012-03-26 03:27:18 +00:00
Shawn Hoffman
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
Shawn Hoffman
f7423a0a4f Merge branch 'master' into wxw3-update 
Conflicts:
	Source/Core/DolphinWX/Src/LogWindow.cpp
 2012-03-22 17:57:38 -07:00
Pierre Bourdon
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
Shawn Hoffman
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
Shawn Hoffman
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
Andrew de los Reyes
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
Pierre Bourdon
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
Shawn Hoffman
6eb2cb2666 Merge branch 'master' into wii-network 2012-02-27 22:36:41 -08:00
Jordan Woyak
8a8dc77ef1 enable c++11 compilation in cmakelists 2012-02-24 14:19:24 -06:00
Pierre Bourdon
40e6e9b9fa Fix Linux build 2012-02-18 09:50:21 +01:00
Maarten ter Huurne
15dac4584f Override PATH on OS X to avoid picking up pkg-config from MacPorts. 2011-12-19 02:57:00 +01:00
Maarten ter Huurne
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
Maarten ter Huurne
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
Maarten ter Huurne
74d552f3ca Removed debug prints. 2011-12-17 15:32:41 +01:00