ShuriZma
/
dolphin
mirror of https://github.com/dolphin-emu/dolphin.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
5,707 Commits 5 Branches 11 Tags 1.3 GiB
Commit Graph

111 Commits

Author SHA1 Message Date
Soren Jorvang 391312641c Build GLEW, SDL and zlib as static libraries from Externals as with 
LZO/SFML/SOIL and subject to the same shared_foo exception options.

This makes building a self-contained distribution package much easier.

TBD: Cg and wxWidgets 2.9.


git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@5712 8ced0084-cf51-0410-be5f-012b33b47a6e
 2010-06-16 00:07:52 +00:00
Soren Jorvang 404c625622 Simplify the SCons build: 
On OS X, build all code as Objective-C(++).

Centralize framework handling.

Cleanup.


git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@5645 8ced0084-cf51-0410-be5f-012b33b47a6e
 2010-06-10 14:18:21 +00:00
Soren Jorvang 3ab27a7d87 Revert parts of r5576 and r5598 for Sonicadvance1's sake. 
This reenables the option for building without wx on OS X,
but still leaves wxgl as the default.


git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@5599 8ced0084-cf51-0410-be5f-012b33b47a6e
 2010-06-04 04:59:07 +00:00
Soren Jorvang 52c912a59e Make wxgl mandatory on OS X. 
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@5576 8ced0084-cf51-0410-be5f-012b33b47a6e
 2010-06-03 01:24:26 +00:00
Soren Jorvang 30e437f9e3 Fix some cases of variables being used uninitialized. Also some unused 
variables, writeable strings and dangerously shadowed variables.

index(), gamma(), exp() and y0() are POSIX functions and using those
names can cause namespace confusion.

A number of C files were missing the final newline required by ANSI C
and some versions of GCC are pedantic enough to complain about this.

These changes simply the scons build, allowing us to get rid of
filterWarnings which is simply more trouble than it's worth.


git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@5574 8ced0084-cf51-0410-be5f-012b33b47a6e
 2010-06-02 20:35:12 +00:00
Glenn Rice 140332c02e Move fullscreen display resolution control to the GUI with the rest of the fullscreen toggling code. This removes redundancy of code that was in several places through the various video plugins. Unfortunately it means the fullscreen resolution setting also had to be moved to the main configuration dialog. I am sure that will meet some resistance. 
Also added a window size setting for windowed mode.

Also pulled some X11 specific code out into a separate file.


git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@5395 8ced0084-cf51-0410-be5f-012b33b47a6e
 2010-04-22 04:28:34 +00:00
Glenn Rice 33a64d5db0 Big restructuring of how the video plugin works. In linux and windows you shouldn't see a change in the functionality; however, there are changes in how render to main or not, and fullscreen modes, and such are handled. Input is largely restructured for the video plugin. It is now handled by the host. Keys for pausing and changing fullscreen are configurable. More will probably be later. This is probably classified as highly experimental. 
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@5336 8ced0084-cf51-0410-be5f-012b33b47a6e
 2010-04-12 01:33:10 +00:00
Glenn Rice c455673f87 Added scons options "shared_libname=true" to link agains the system shared libraries for lzo, sfml, and soil. For example add the scons option "shared_lzo=true" for lzo. This will check for the system libraries and then fall back to building and linking statically against the Externals if not found. You must have liblzo2-dev, libsoil-dev, and libsfml-dev installed. Note that you need version 1.5 or later for sfml. Currently scons doesn't check the version for you. 
If you are having trouble with segmentation faults in linux try "shared_soil=true".  That seems to fix the problem.  How do we fix this for the static build?


git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@5182 8ced0084-cf51-0410-be5f-012b33b47a6e
 2010-03-09 22:17:33 +00:00
Glenn Rice 5beb6dfd47 Implement render to main in linux. In order to compile this in you will have to have libgtk2.0-dev (or your distributions equivalent) installed. If not dolphin-emu will still build, but without render to main operational. 
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@5176 8ced0084-cf51-0410-be5f-012b33b47a6e
 2010-03-08 23:29:16 +00:00
Glenn Rice 303769d31c Revert commit 5105 until we sort out how we want this to work in linux. 
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@5110 8ced0084-cf51-0410-be5f-012b33b47a6e
 2010-02-22 16:10:08 +00:00
Glenn Rice 73d575c5c2 On linux don't compile and link against lzo, soil, and sfml "Externals." 
Instead use system libraries liblzo2-dev, libsoil-dev, and libsfml-dev


git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@5105 8ced0084-cf51-0410-be5f-012b33b47a6e
 2010-02-22 00:39:38 +00:00
Glenn Rice 7c76d51c67 Enable fullscreen switching with resolution mode changing using Xrandr in linux. 
This changes the dependency in linux from libxxf86vm-dev to libxrandr-dev.
Use Alt-Return to toggle fullscreen mode (as in windows).


git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@5065 8ced0084-cf51-0410-be5f-012b33b47a6e
 2010-02-16 04:59:45 +00:00
Sonicadvance1 3c537ec137 Fix Compiling in OSX 
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@4523 8ced0084-cf51-0410-be5f-012b33b47a6e
 2009-11-08 23:36:14 +00:00
nakeee 11d90813ff VSW: Copied rasterfont from ogl to prevent inter plugin dependencies 
Added it to scons to fix the unresolved symbol on scons build



git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@4415 8ced0084-cf51-0410-be5f-012b33b47a6e
 2009-10-13 06:12:58 +00:00
Sonicadvance1 0146f3f58f More OpenCL work, got XFB converting which needs more optimization. I haven't checked for FPS changes. My desktop isn't the best to test on anyway (Phenom 1, 32 stream processors). The package check doesn't work for me, so I just checked true if you compile with opencl=true. Requires a bit of cleanup still 
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@4369 8ced0084-cf51-0410-be5f-012b33b47a6e
 2009-10-07 02:48:21 +00:00
Sonicadvance1 0d9543030b Missed some stuff 
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@4300 8ced0084-cf51-0410-be5f-012b33b47a6e
 2009-09-18 20:04:54 +00:00
Sonicadvance1 ced92d8544 Fix compiling in Snow Leopard, the Update stuff in the Video plugin shouldn't be in the GUI since it breaks nowx builds, wasn't sure where to put it, but Render.cpp seemed like the best place. Fixed wiiuse.c, and the SConscripts needed updating for Snow Leopard. Building 32bit in Snow Leopard is apparently broken. and Running 64bit in Snow Leopard seems to fail. Haven't tracked this down yet 
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@4299 8ced0084-cf51-0410-be5f-012b33b47a6e
 2009-09-18 19:56:49 +00:00
hrydgard 700f2ff694 Lots of code and warning cleanup. OGL/D3D: Moved to a shared config class in VideoCommon. This lets VideoCommon code read the config without ugly hacks. Fixed various config race conditions by keeping a copy (g_ActiveConfig) of the g_Config struct which is updated once per frame. 
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@4256 8ced0084-cf51-0410-be5f-012b33b47a6e
 2009-09-13 08:21:35 +00:00
nakeee e0dfe17ca4 OGL: 
Kill not working sdl backend
remove some wxgl code
change defined a bit so resolution detection can be done right with wxgl 
and X11


git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@4239 8ced0084-cf51-0410-be5f-012b33b47a6e
 2009-09-09 20:47:11 +00:00
nakeee bc6323ea0e removed the failed gltest code 
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@4238 8ced0084-cf51-0410-be5f-012b33b47a6e
 2009-09-09 19:52:45 +00:00
hrydgard baede3a7f3 Moving more things out of GL into VideoCommon... 
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@4187 8ced0084-cf51-0410-be5f-012b33b47a6e
 2009-09-03 20:37:35 +00:00
hrydgard 562a4e25ac Some housecleaning around the D3D plugin, start of preparations to share even more code with the GL plugin. 
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@4183 8ced0084-cf51-0410-be5f-012b33b47a6e
 2009-09-03 19:24:16 +00:00
nakeee 9f81006bda make DLCache compile on linux, required some weird casting so tell me 
if something broke


git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@3957 8ced0084-cf51-0410-be5f-012b33b47a6e
 2009-08-10 06:18:10 +00:00
magumagu9 44f3935de1 Linux build fixes. 
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@3601 8ced0084-cf51-0410-be5f-012b33b47a6e
 2009-06-29 18:40:10 +00:00
nakeee 6b2855de5e revert last 2 commits 
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@3533 8ced0084-cf51-0410-be5f-012b33b47a6e
 2009-06-22 09:31:30 +00:00
omegadox 6de0cd1e4b They should be called SU Registers (Setup Unit/Rasterization). BP (Bypass) is really the name of the commands that are passed in. 
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@3531 8ced0084-cf51-0410-be5f-012b33b47a6e
 2009-06-22 07:40:28 +00:00
nakeee da30c24c5e compile fix or why I hate wxstring 
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@3396 8ced0084-cf51-0410-be5f-012b33b47a6e
 2009-06-09 21:10:14 +00:00
nakeee 1e07b26356 Move soil to external, this breaks windows build until deathroi will commit the windows part 
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@3175 8ced0084-cf51-0410-be5f-012b33b47a6e
 2009-05-08 09:31:57 +00:00
omegadox a9e71fe351 OpenGL Plugin: scons script fix 
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@2871 8ced0084-cf51-0410-be5f-012b33b47a6e
 2009-04-05 11:53:24 +00:00
omegadox 1578e3e195 Recoded and moved BPStucts to VideoCommon. Some cleanup in PixelShaderManager. TODO: Have DX use BPFunctions. Note: Compiling DX plugin will not work atm. 
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@2870 8ced0084-cf51-0410-be5f-012b33b47a6e
 2009-04-05 10:49:19 +00:00
nakeee 2d167fa3f0 remove some unused files 
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@2678 8ced0084-cf51-0410-be5f-012b33b47a6e
 2009-03-18 20:24:08 +00:00
LPFaint99 f4ba5b3589 Some scons updates, 
windows scons will build if dirs = 
    'Externals/Bochs_disasm',
    'Externals/LZO',
    'Externals/WiiUseSrc/Src', 
    #'Source/Core/Common/Src',
    #'Source/Core/Core/Src',
   # 'Source/Core/DiscIO/Src',
   # 'Source/Core/VideoCommon/Src',
    #'Source/Core/InputCommon/Src',
    'Source/Plugins/Plugin_VideoOGL/Src',
    #'Source/Plugins/Plugin_DSP_HLE/Src',
    'Source/Plugins/Plugin_DSP_LLE/Src',
    'Source/Plugins/Plugin_PadSimple/Src',
    'Source/Plugins/Plugin_PadSimpleEvnt/Src',
   # 'Source/Plugins/Plugin_nJoy_SDL/Src',
    #'Source/Plugins/Plugin_nJoy_Testing/Src',
    #'Source/Plugins/Plugin_Wiimote/Src',
   # 'Source/Core/DolphinWX/Src',
    'Source/Core/DebuggerWX/Src',

git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@2627 8ced0084-cf51-0410-be5f-012b33b47a6e
 2009-03-09 00:36:59 +00:00
nakeee e1d2ff6f3f win32 example 
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@2607 8ced0084-cf51-0410-be5f-012b33b47a6e
 2009-03-07 22:12:01 +00:00
Marcus Wanners 49335efa71 My package check patch. 
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@2604 8ced0084-cf51-0410-be5f-012b33b47a6e
 2009-03-07 21:05:03 +00:00
nakeee 324abc9a7f fix compile on osx and linux 
added  GetPluginDirectory (please check on windows)


git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@2490 8ced0084-cf51-0410-be5f-012b33b47a6e
 2009-02-28 23:21:51 +00:00
hrydgard fe0be64bd3 Move the message display thing out of Render.cpp 
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@2335 8ced0084-cf51-0410-be5f-012b33b47a6e
 2009-02-21 12:53:10 +00:00
nakeee a0724e8321 scons fix 
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@2114 8ced0084-cf51-0410-be5f-012b33b47a6e
 2009-02-04 18:00:38 +00:00
nakeee 7bb2aee235 compile fix 
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@2112 8ced0084-cf51-0410-be5f-012b33b47a6e
 2009-02-04 17:46:22 +00:00
John Peterson ae9cfbd8e3 Common: Moved Windows console functions to common 
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@1887 8ced0084-cf51-0410-be5f-012b33b47a6e
 2009-01-17 14:28:09 +00:00
Shawn Hoffman ba8c2aa7e4 nakee's work on dolphin events. Also get wxw out of logmanager. This commit wants your comments 
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@1875 8ced0084-cf51-0410-be5f-012b33b47a6e
 2009-01-15 06:48:15 +00:00
omegadox ff5a8e7757 Updated scons for OGL Plugin. 
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@1855 8ced0084-cf51-0410-be5f-012b33b47a6e
 2009-01-12 08:23:09 +00:00
nakeee 89603a91a6 add if gltest on some run away files 
Thanks shuffle!


git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@1832 8ced0084-cf51-0410-be5f-012b33b47a6e
 2009-01-09 00:35:06 +00:00
nakeee 790ee70b36 More code for event handling 
almost working, for some reason the event handler creates 2 instances instead of one
if anyone can see why from the code I'll be like SOOOO happy:P



git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@1798 8ced0084-cf51-0410-be5f-012b33b47a6e
 2009-01-05 22:51:35 +00:00
nakeee acd0e0d8da linux/debug builds fix 
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@1693 8ced0084-cf51-0410-be5f-012b33b47a6e
 2008-12-26 13:19:27 +00:00
hrydgard 2ec3cd6694 Move VertexShaderManager too. 
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@1688 8ced0084-cf51-0410-be5f-012b33b47a6e
 2008-12-26 12:47:32 +00:00
nakeee bd9ebbf8c9 compile fix 
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@1687 8ced0084-cf51-0410-be5f-012b33b47a6e
 2008-12-26 12:39:53 +00:00
nakeee 974ff690f6 added XFStructs.cpp to SConscript 
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@1684 8ced0084-cf51-0410-be5f-012b33b47a6e
 2008-12-26 11:37:41 +00:00
hrydgard 6c916151ab Split out the shader caches into their own files. The goal is to eventually be able to move the "Managers" to VideoCommon. 
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@1681 8ced0084-cf51-0410-be5f-012b33b47a6e
 2008-12-26 11:23:59 +00:00
hrydgard 17a601958c OpcodeDecoding.cpp now shared. 
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@1660 8ced0084-cf51-0410-be5f-012b33b47a6e
 2008-12-25 20:11:42 +00:00
nakeee db15121b5d Some cleanup Should affect windows tell me if it does 
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@1592 8ced0084-cf51-0410-be5f-012b33b47a6e
 2008-12-19 11:46:52 +00:00