piwalker/dolphin
1
0
Fork 0
mirror of https://github.com/dolphin-emu/dolphin.git synced 2024-11-15 05:47:56 -07:00
Code Issues Actions Packages Projects Releases Wiki Activity
9,524 Commits 5 Branches 11 Tags 1.3 GiB
0ccaaee38c
Commit Graph

57 Commits

Author SHA1 Message Date
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
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
degasus
1b8d044543 clear cg from project files 2013-02-27 10:55:25 +01:00
Ryan Houdek
717b976875 ARM Support without GLSL 2013-02-26 13:49:00 -06:00
degasus
376a807dea first try of osx fix, mostly by pauldachz 2013-02-07 10:34:29 +01:00
Ryan Houdek
67c1c6b062 Merge branch 'GLES-software' 2012-12-26 12:54:58 -06:00
Ryan Houdek
5169804a61 Remove duplicated X11 code. 2012-12-26 12:12:26 -06:00
Ryan Houdek
93f72d8463 Don't add superfluous whitespace to the CMake file 2012-12-26 11:07:33 -06:00
Ryan Houdek
01953ff64a Rename the interface files and hopefully fix OSX building. 2012-12-25 19:08:24 -06:00
NeoBrainX
4798524b75 Dolphin 3.5 release. 2012-12-24 21:29:24 +01:00
Ryan Houdek
b78f5debe6 Initial push of GLES and GLUtil file breakup. 2012-12-17 14:54:20 -06:00
NeoBrainX
4fc0125fb3 Fix OS X 10.6 compatibility. 
Patch by mathieudel.
 2012-12-07 19:49:08 +01:00
Scott Moreau
1ffb9ce47e Fix broken build when using SDL from Externals. 
The problem here was the logic that detects SDL in the main CMakeLists.txt
is not the same as it is in DolphinWX/CmakeLists.txt to set libraries. When
using SDL from Externals it failed at link time because -lSDL was never set.
This fixes the problem by using the same condition logic to set the libs
as used when detecting SDL in the first place.
 2012-09-02 16:53:15 -06:00
Scott Moreau
6773261a85 Use correct linker flags for SDL. 2012-08-28 03:35:31 -06:00
Pierre Bourdon
d7d2e5b9bf Link explicitly DolphinWX with GTK2 libraries 
Fixes issue 5555.
 2012-08-05 20:51:42 +02: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
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
Maarten ter Huurne
83bf5790a6 Copy translation files into OS X bundle. 2011-12-17 16:26:52 +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
d75f45979b Copy data files into OS X application bundle. 2011-12-12 01:30:42 +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
8a75351674 Link against OpenGL using the info gathered by the FindOpenGL module. 2011-12-05 06:18:04 +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
LPFaint99
5316c6d97b Move GCMemcard from DolphinWX/Memorycards to Core/HW 2011-10-04 13:14:18 -07:00
NeoBrainX
854c4903eb Only link against libav if it's available. 2011-09-12 18:01:45 +02:00
NeoBrainX
06e640532a Various changes which improve FreeBSD support. 
Patches by martymac, all credits go to him ;)
 2011-08-27 20:42:11 +02:00
baby.lueshi
d8fc690838 New "TAS Input" feature for precise joystick inputs. The feature is still a work in progress, but is functional. Currently overwrites any joystick/keyboard analog inputs and does so for all controllers. 
Renamed OnFrame.cpp/h to a more accurate Movie.cpp/h. Made some small changes that may improve movie synchronization.

git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@7620 8ced0084-cf51-0410-be5f-012b33b47a6e
 2011-06-24 06:50:50 +00:00
donkopunchstania
07c4da6084 Add graphics FIFO recorder and player for debugging the graphics system. 
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@7414 8ced0084-cf51-0410-be5f-012b33b47a6e
 2011-03-27 02:55:08 +00:00
Glenn Rice
3b6f7644fd Make log options an AUI window instead of a dialog. 
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@7217 8ced0084-cf51-0410-be5f-012b33b47a6e
 2011-02-21 15:01:00 +00:00
Glenn Rice
c2bc463fe7 Move the log window options from the log window into a separate dialog openned from an item in the options menu. This gives the log window room to show logs. 
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@7191 8ced0084-cf51-0410-be5f-012b33b47a6e
 2011-02-18 12:34:24 +00:00
Glenn Rice
a8992b7960 Move debugger ui files into a subdirectory. Primarily to make it easy to keep debugger strings out of translations, but also because it is more organized. 
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@7163 8ced0084-cf51-0410-be5f-012b33b47a6e
 2011-02-13 06:06:32 +00:00
NeoBrainX
bc6f04adae Move BootManager.cpp to Core since it really doesn't do any wx-specific stuff. 
This one is for NaturalViolence, since he was so eager to see it :P

git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@7152 8ced0084-cf51-0410-be5f-012b33b47a6e
 2011-02-12 21:25:49 +00:00
Glenn Rice
c45a430649 Fix the cmake build. 
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@7138 8ced0084-cf51-0410-be5f-012b33b47a6e
 2011-02-11 21:49:29 +00:00
Jordan Woyak
efd22d234f Merge UI related projects into the main DolphinWX project. 
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@7136 8ced0084-cf51-0410-be5f-012b33b47a6e
 2011-02-11 21:37:52 +00:00
NeoBrainX
42908c5b2e Remove any wx-specific code from Core. 
Move NetPlay code from DolphinWX to Core.
Even NetPlay with nowx should be possible now if anyone felt like implementing a CLI for it ;)


git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@7119 8ced0084-cf51-0410-be5f-012b33b47a6e
 2011-02-08 15:36:15 +00:00
Soren Jorvang
435b25fa55 Fix the CMake build. 
Prevent the PS3 HID crash until I can debug it.

AudioUnits are enabled by default.


git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@7052 8ced0084-cf51-0410-be5f-012b33b47a6e
 2011-02-03 21:11:06 +00:00
Jordan Woyak
dfe84ce0ac Removed the Lua script console and Externals/Lua. The script console was incomplete and no one was working on it. 
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@7051 8ced0084-cf51-0410-be5f-012b33b47a6e
 2011-02-03 20:41:23 +00:00
gnick79
439baff4cc - Moving "Custom Projection Hack" stuff toward a new modal dialog window 
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@7049 8ced0084-cf51-0410-be5f-012b33b47a6e
 2011-02-03 17:51:12 +00:00
sl1nk3.s
a8e2e9ec54 Fix the Audio tab and merge the DSP config into one. 
Unify the DSP settings into DSP.ini

git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@6955 8ced0084-cf51-0410-be5f-012b33b47a6e
 2011-01-29 04:16:05 +00:00
Glenn Rice
f283041970 Linux build fix. 
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@6950 8ced0084-cf51-0410-be5f-012b33b47a6e
 2011-01-28 20:07:32 +00:00
Soren Jorvang
85db30554e Don't bother with a separate NSApplication thread. 
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@6853 8ced0084-cf51-0410-be5f-012b33b47a6e
 2011-01-15 11:05: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
Soren Jorvang
7901e74f00 Reestablish *BSD build using CMake. 
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@6516 8ced0084-cf51-0410-be5f-012b33b47a6e
 2010-12-04 15:19:04 +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
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
j4ck.fr0st
100ab9274f ...and the SCons/cmake stuff :) 
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@6406 8ced0084-cf51-0410-be5f-012b33b47a6e
 2010-11-14 13:34:41 +00:00