bb817fbced
scon fixes SDL compiles
...
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@1525 8ced0084-cf51-0410-be5f-012b33b47a6e
2008-12-13 23:19:56 +00:00
d61cbd747f
Small linux fix
...
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@1512 8ced0084-cf51-0410-be5f-012b33b47a6e
2008-12-12 11:57:15 +00:00
835f38c6e0
osx compile fixes + wx latest non working try
...
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@1501 8ced0084-cf51-0410-be5f-012b33b47a6e
2008-12-11 22:08:44 +00:00
900407c1fe
scons osx cleanup
...
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@1485 8ced0084-cf51-0410-be5f-012b33b47a6e
2008-12-10 18:33:13 +00:00
8fdfe2583c
scons fixes
...
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@1464 8ced0084-cf51-0410-be5f-012b33b47a6e
2008-12-09 21:46:32 +00:00
736409632e
compile fix on linux
...
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@1460 8ced0084-cf51-0410-be5f-012b33b47a6e
2008-12-09 18:10:16 +00:00
50c215a067
Forgot glu
...
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@1427 8ced0084-cf51-0410-be5f-012b33b47a6e
2008-12-07 19:13:44 +00:00
5f11ae5dbd
some more scons cleanup
...
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@1414 8ced0084-cf51-0410-be5f-012b33b47a6e
2008-12-06 22:28:32 +00:00
064d45024c
(requires review for windows/mac)
...
Fix up so that various libraries wont be fatal for build with scons
wiiuse lib is used only if HAVE_WIIUSE is defined to 1
made major cleanup for darwin and osx64
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@1404 8ced0084-cf51-0410-be5f-012b33b47a6e
2008-12-05 13:46:19 +00:00
d2c2bd52ef
forgot to update the SConscript
...
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@1344 8ced0084-cf51-0410-be5f-012b33b47a6e
2008-11-30 15:06:34 +00:00
2c74f66070
No more Binary in svn + scons clean up
...
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@1158 8ced0084-cf51-0410-be5f-012b33b47a6e
2008-11-13 08:12:48 +00:00
b47f349c96
Got rid of default Dolphin.ini
...
Default plugins are now in Paths.h
Important note for scons users, plugin names now match the one on windows!!!
make sure to remove the old ones!! and update your .ini!!
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@1131 8ced0084-cf51-0410-be5f-012b33b47a6e
2008-11-11 20:59:48 +00:00
2a4e584e02
Linux compiling fix
...
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@1121 8ced0084-cf51-0410-be5f-012b33b47a6e
2008-11-11 07:31:40 +00:00
418f8a2b23
opengl scons compile fix on linux
...
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@990 8ced0084-cf51-0410-be5f-012b33b47a6e
2008-10-28 14:19:28 +00:00
a7be7689c1
add cocoa in ogl plugin
...
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@976 8ced0084-cf51-0410-be5f-012b33b47a6e
2008-10-27 20:29:32 +00:00
8f3aa9e67b
more osx64 work
...
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@963 8ced0084-cf51-0410-be5f-012b33b47a6e
2008-10-25 17:47:46 +00:00
bc79d22f5e
Move pipeline back into VertexLoader. Started work on VertexLoaderManager, which will cache VertexLoaders. (yep, the design plan changed a little bit).
...
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@956 8ced0084-cf51-0410-be5f-012b33b47a6e
2008-10-25 12:35:55 +00:00
72d8c3344b
Code movin' and cleanup again, in the GL plugin. Planning to turn NativeVertexFormat into something cachable, instead of locked to each VertexLoader.
...
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@948 8ced0084-cf51-0410-be5f-012b33b47a6e
2008-10-24 23:08:46 +00:00
4b2c7310b7
Move more stuff out of Globals.h in gl plugin. Changed gl plugin precompiled header to a new stdafx.h, you may have to Build->Clean after updating to this rev.
...
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@940 8ced0084-cf51-0410-be5f-012b33b47a6e
2008-10-22 21:23:40 +00:00
85781409e4
Remove OpenGL stuff from Globals.h. Stuff that doesn't use GL shouldn't include it.
...
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@939 8ced0084-cf51-0410-be5f-012b33b47a6e
2008-10-22 21:02:37 +00:00
39df6c5624
Move out Cg shader generators to VideoCommon (hope to use this in the DX plugin in the future). Also move out stats code. Comment a lot and cleanup. Kill DX9 Globals.cpp.
...
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@938 8ced0084-cf51-0410-be5f-012b33b47a6e
2008-10-22 20:54:40 +00:00
03763372ac
first step to get dolphin on osx 64 with a no wx version (WIP)
...
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@924 8ced0084-cf51-0410-be5f-012b33b47a6e
2008-10-20 17:32:15 +00:00
dcbc8e78d4
Massive style & comment cleanup of (mostly) GL plugin - also split some large files. A minor speedup for BP writes - merged the two switch()-es.
...
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@899 8ced0084-cf51-0410-be5f-012b33b47a6e
2008-10-17 11:30:14 +00:00
92f661b390
Fix Linux compiling and Make Filesystemviewer show MakerID correctly
...
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@831 8ced0084-cf51-0410-be5f-012b33b47a6e
2008-10-10 16:20:13 +00:00
4789072ad9
include games
...
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@768 8ced0084-cf51-0410-be5f-012b33b47a6e
2008-10-04 20:15:19 +00:00
c7ae1fd402
Reverted r762 and r763 - i don't see any good reason to keep this revision as long as nobody fixes the windows build (btw: i don't understand why we need a non-WX build at all). if someone is going to fix it he can revert this revision.
...
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@766 8ced0084-cf51-0410-be5f-012b33b47a6e
2008-10-04 17:26:12 +00:00
580193658a
Linux: Woops, SConscripts were broken, fixed. I think I broke using wx..maybe. Too tired to fix right now, must sleep
...
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@763 8ced0084-cf51-0410-be5f-012b33b47a6e
2008-10-04 08:27:56 +00:00
9a3ebd0c3b
Linux: Compiling with nowx=true now builds the entire project without WX, this isn't tested in Windows so it's always on via Common.h, You can test/fix it yourself that way. Also fixed Compiling again
...
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@762 8ced0084-cf51-0410-be5f-012b33b47a6e
2008-10-04 07:57:28 +00:00
d4711a605f
test for x11 and xxf86vm
...
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@666 8ced0084-cf51-0410-be5f-012b33b47a6e
2008-09-24 17:47:51 +00:00
148fd7b96e
Do not forget to append the LINKFLAGS. Replaced "-framework name" with "-Wl,-framework,name" because the space inside the option seems to confuse SCons.
...
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@626 8ced0084-cf51-0410-be5f-012b33b47a6e
2008-09-23 00:11:33 +00:00
420e304d2c
fix compilation on linux, I wonder how it worked before
...
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@605 8ced0084-cf51-0410-be5f-012b33b47a6e
2008-09-22 07:25:57 +00:00
e0291e735c
cleaned up SConscripts
...
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@602 8ced0084-cf51-0410-be5f-012b33b47a6e
2008-09-21 19:54:29 +00:00
3e2419776f
fixed scons=parsing
...
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@591 8ced0084-cf51-0410-be5f-012b33b47a6e
2008-09-20 22:06:22 +00:00
720efb825d
Linux: I made Sconscript call wx-config inside of the main SConstruct, added a nowx argument, Made the filesystemviewer use the correct struct and fixed a silly scissor error that was made
...
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@589 8ced0084-cf51-0410-be5f-012b33b47a6e
2008-09-20 17:31:54 +00:00
0f4c4b6e1c
SConscript made all the rest of env.Copy into env.Clone
...
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@542 8ced0084-cf51-0410-be5f-012b33b47a6e
2008-09-16 16:50:09 +00:00
3e029639df
Removed jpeg dependency in GL plugin, added Rumble to Linux nJoy. and reverted my accidental Dolphin ini file
...
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@379 8ced0084-cf51-0410-be5f-012b33b47a6e
2008-08-29 09:55:17 +00:00
59974dfb5b
Only use "-fPIC" for compiling objects that will be part of dynamic libs. Make SConscripts inherit the compile flags from the top level instead of overriding them.
...
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@329 8ced0084-cf51-0410-be5f-012b33b47a6e
2008-08-26 22:28:42 +00:00
8013f92863
Support SDL video on any platform. It is only enabled by default on Mac OS X though. So in practice nothing changes, but we have more flexibility in debugging.
...
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@317 8ced0084-cf51-0410-be5f-012b33b47a6e
2008-08-26 00:57:16 +00:00
6a426c1654
Cleanup and refactoring. Only the platform specific parts are in a platform specific block now, the rest is shared instead of duplicated.
...
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@316 8ced0084-cf51-0410-be5f-012b33b47a6e
2008-08-26 00:18:00 +00:00
35fdbdc360
Remove MACOSX define, now use __APPLE__
...
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@311 8ced0084-cf51-0410-be5f-012b33b47a6e
2008-08-25 19:44:11 +00:00
19bcb6a21c
Linux side doesn't need libjpeg, crazy Mac users
...
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@277 8ced0084-cf51-0410-be5f-012b33b47a6e
2008-08-23 07:53:03 +00:00
d27b79f413
Added "jpeg" to list of libs to link against.
...
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@264 8ced0084-cf51-0410-be5f-012b33b47a6e
2008-08-22 00:06:27 +00:00
3ef0eb979d
Move some code out of the plugins into VideoCommon. No functional change.
...
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@255 8ced0084-cf51-0410-be5f-012b33b47a6e
2008-08-21 17:49:06 +00:00
4e9b5a40fd
Look for libs in MacPorts install dir (/opt/local). This seems to be the easiest way to get libjpeg on OS X.
...
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@253 8ced0084-cf51-0410-be5f-012b33b47a6e
2008-08-21 00:27:10 +00:00
7937befe73
Added XFB.cpp to list of files to build.
...
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@215 8ced0084-cf51-0410-be5f-012b33b47a6e
2008-08-14 22:25:45 +00:00
1b70b3dc7a
OS X build fix: Replaced hardcoded "-framework SDL" by output of "sdl-config" script. Also use "sdl-config" for the CXXFLAGS.
...
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@194 8ced0084-cf51-0410-be5f-012b33b47a6e
2008-08-14 00:22:03 +00:00
ac6d34cd10
Added mth patchs / icon and a fist SDL support on OGL plugin, not work ...
...
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@182 8ced0084-cf51-0410-be5f-012b33b47a6e
2008-08-12 23:17:29 +00:00
89cb286812
Some osx build fix for OGL plugin. Not working ...
...
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@143 8ced0084-cf51-0410-be5f-012b33b47a6e
2008-08-06 21:07:31 +00:00
c469243372
Minor change, now compiles and runs (GUI only) in Fedora Core 9
...
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@72 8ced0084-cf51-0410-be5f-012b33b47a6e
2008-07-23 22:54:53 +00:00
d8ed24fd29
nJoy:
...
- This version should compile on linux.
- The about and config dialogs are disabled (win32 should be replaced by wxWidgets)
- This version is untested, so if you want to try it out, use a premade nJoy.ini from a windows install.
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@70 8ced0084-cf51-0410-be5f-012b33b47a6e
2008-07-23 18:53:54 +00:00
485ec4b341
Linux: Fixes to Compile
...
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@69 8ced0084-cf51-0410-be5f-012b33b47a6e
2008-07-23 16:39:02 +00:00
aae00ef799
Linux/All: Changes to OpenGL plugin config window, effects all platforms. Removed nasty Tomaha default font. Compiles now
...
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@65 8ced0084-cf51-0410-be5f-012b33b47a6e
2008-07-23 16:04:58 +00:00
1d175eadd7
Linux: Fixes so it compiles in 32bit. Now a Config dialog for the video plugin, Linux only, if you want to change for Windows, work on it
...
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@61 8ced0084-cf51-0410-be5f-012b33b47a6e
2008-07-23 08:49:58 +00:00
c33cf08a2f
Linux: Fixes a few things, Should Compile in Linux. Ran Crazy Taxi horribly
...
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@38 8ced0084-cf51-0410-be5f-012b33b47a6e
2008-07-21 01:27:13 +00:00
c7795c41b7
Linux: Fix ups for people running Linux. If it breaks anything, punch me in the face.
...
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@30 8ced0084-cf51-0410-be5f-012b33b47a6e
2008-07-20 11:02:41 +00:00
775dc8a9c0
Initial megacommit.
...
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@4 8ced0084-cf51-0410-be5f-012b33b47a6e
2008-07-12 17:40:22 +00:00
nakeee