49674400e0
On linux make the build default to autodetection of glew, sdl, zlib, lzo, sfml-network, and soil, with an option to override the autodetection to force a static build.
...
MaxOSX will always use a static builds of those libraries as per soren's wishes.
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@5729 8ced0084-cf51-0410-be5f-012b33b47a6e
2010-06-17 01:18:22 +00:00
b63e15e412
Don't try to link with dynamic versions of the LZO/SFML/SOIL libraries
...
on Linux when building a release image to make it more general.
OpenCL is new in OS X 10.6, so we can't restrict ourselves to the 10.5
compatibility SDK when OpenCL is enabled.
OpenCL really should be a runtime option (and weakly linked on OS X).
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@5727 8ced0084-cf51-0410-be5f-012b33b47a6e
2010-06-16 16:35:19 +00:00
ce3eb2a13b
Automatically detect and use shared library packages for
...
LZO/SFML/SOIL as already done for GLEW/SDL/zlib.
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@5723 8ced0084-cf51-0410-be5f-012b33b47a6e
2010-06-16 12:42:49 +00:00
d24e5a37a6
Build with shared libraries whenever possible on Linux;
...
on OS X, always build with static libraries from Externals.
XXX LZO/SFML/SOIL are currently static only on Linux as well,
as they have been all along, because of a conflict between
CheckPKG('FOO') and the SHARED_FOO conditionals - on the second
build run with static version of these libraries, CheckPKG picks
them up, negating SHARED_FOO and making the code try to include
the canonical locations for these packages. The easiest fix is
probably to adjust the relative pathnames for those header files
in Externals, so that the same ones are included in the shared
and static cases.
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@5722 8ced0084-cf51-0410-be5f-012b33b47a6e
2010-06-16 11:39:23 +00:00
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
b560d2456e
Integrate the standalone memcard manager into the main build.
...
Use 10.5 SDK header files in an attempt to keep us honest and
10.5 compatible. I'd do the same with system libraries, but
the linker gives strange errors when I try that. We also link
against third party libraries from Macports that haven't had
any magic 10.5 compat dust sprinkled over them, so maybe it
isn't very important anyway.
Move the OS X variable section in SConstruct upwards a bit to
have the settings apply to more of the config tests. SCons'
ParseConfig causes problems for the -arch tuples, though, so
the SDL check still isn't quite as comprehensive as it should
be.
Put the XCode project out of its misery.
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@5693 8ced0084-cf51-0410-be5f-012b33b47a6e
2010-06-14 18:07:29 +00:00
8cae2fee56
Merge the pad plugin into Dolphin. Since there's only one plugin left under active development, and it's awesome, we no longer have a need for a pad plugin mechanism.
...
In the future if we merge wiimote too, this will bring the advantage that the two will be able to cooperate, to no longer fight over control of input devices which can sometimes cause problems.
Thanks shuffle2 for the patience.
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@5670 8ced0084-cf51-0410-be5f-012b33b47a6e
2010-06-13 09:14:40 +00:00
1936772725
Linux build fix
...
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@5667 8ced0084-cf51-0410-be5f-012b33b47a6e
2010-06-12 20:33:29 +00:00
1cd25e2406
(cleanup) InputPluginCommon is dead. Long live InputCommon and InputUICommon.
...
I hope I didn't break the mac+linux builds - if i did, fixing it should be a simple matter of adjusting the sconscripts.
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@5661 8ced0084-cf51-0410-be5f-012b33b47a6e
2010-06-12 17:39:33 +00:00
ebbe2d905c
Delete the old GCPad plugin. GCPadNew should now be better in pretty much every way, so it's time.
...
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@5656 8ced0084-cf51-0410-be5f-012b33b47a6e
2010-06-12 13:50:24 +00:00
e7f7eff2b6
Remove a few unused HAVE_FOO's and make the SDL check global.
...
ulong is not a standard type.
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@5649 8ced0084-cf51-0410-be5f-012b33b47a6e
2010-06-11 08:51:46 +00:00
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
9016c90d47
Test linking with libsdl as part of its configure test to verify that
...
the library is of the correct binary format and such.
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@5641 8ced0084-cf51-0410-be5f-012b33b47a6e
2010-06-09 19:41:17 +00:00
f78332a259
The openal and noao parameters are no longer necessary.
...
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@5631 8ced0084-cf51-0410-be5f-012b33b47a6e
2010-06-06 21:14:56 +00:00
9c3c7c5443
Implement pulseaudio output. It is rather crude but seems to work.
...
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@5626 8ced0084-cf51-0410-be5f-012b33b47a6e
2010-06-06 04:02:16 +00:00
53f9858b94
Don't open a tty to display progress. It is unnecessary and may not be available on some systems. This breaks builds in clean root environments which do not have /dev/tty.
...
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@5620 8ced0084-cf51-0410-be5f-012b33b47a6e
2010-06-05 16:42:04 +00:00
9ed6d98e2c
wx 2.9 pasto and a few nits.
...
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@5617 8ced0084-cf51-0410-be5f-012b33b47a6e
2010-06-05 03:03:01 +00:00
63dbcf4f97
Check that the libraries claimed by wx-config can actually be linked
...
with. This avoids having wx problems show up as a problem with a
subsequent dependency, namely Cg.
See issue #2175 .
Also add explicit depdendency on zlib.
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@5607 8ced0084-cf51-0410-be5f-012b33b47a6e
2010-06-04 21:00:39 +00:00
1435c2527a
After party
...
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@5601 8ced0084-cf51-0410-be5f-012b33b47a6e
2010-06-04 05:21:46 +00:00
84c55c3e4e
Deprecate nowx on OS X (but keep it building for sanity checking).
...
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@5598 8ced0084-cf51-0410-be5f-012b33b47a6e
2010-06-04 02:58:35 +00:00
4a18908c57
Reapply r5586 and r5587:
...
Have lint mean -Werror at least until the issue with
-Warray-bounds and -Wunused-result can be resolved.
Avoid producing empty object files:
CoreRecording.cpp is not configured through the build system,
so just give it a dummy symbol when it's not compiled in.
ChunkFile.cpp and DSPBreakpoints.cpp are no longer used.
ExtendedTrace.cpp is Windows-only.
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@5592 8ced0084-cf51-0410-be5f-012b33b47a6e
2010-06-03 18:49:35 +00:00
c6cba79eb0
Reapply 5580 : trying to fix issue 2670
...
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@5591 8ced0084-cf51-0410-be5f-012b33b47a6e
2010-06-03 18:46:19 +00:00
a3c96ac42c
Warp back to 5578. Sorry for the lost changes, please re-apply. Reason: 5579 is a complete disaster.
...
Not only does it change tons of files to switch to a new and non-working (it doesn't parse my ini files, at least) ini parser, it also reshuffles a lot of code and removes a plugin. The latter part is fine, but doing these two major switches in one revision, one of which is broken, is completely unacceptable. I said to merge tiny changes, not massive reworkings.
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@5589 8ced0084-cf51-0410-be5f-012b33b47a6e
2010-06-03 18:05:08 +00:00
a281430b6b
Have lint mean -Werror at least until the issue with
...
-Warray-bounds and -Wunused-result can be resolved.
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@5586 8ced0084-cf51-0410-be5f-012b33b47a6e
2010-06-03 07:49:30 +00:00
a34ad40517
An almost linux/osx compile fix beside some undefined references
...
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@5581 8ced0084-cf51-0410-be5f-012b33b47a6e
2010-06-03 05:59:58 +00:00
edabeffaaf
trying to fix issue 2670
...
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@5580 8ced0084-cf51-0410-be5f-012b33b47a6e
2010-06-03 04:58:36 +00:00
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
3a7b8c51c6
Oops, didn't mean to enable -Werror for devel builds.
...
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@5575 8ced0084-cf51-0410-be5f-012b33b47a6e
2010-06-02 20:49:18 +00:00
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
9d7b569ccb
Now that Core Audio works, reduce the number of build permutations a bit
...
by not linking in other Unix audio modules.
Use kAudioUnitSubType_DefaultOutput instead of kAudioUnitSubType_HALOutput
so that a runtime switch to another audio device is automatically handled.
Use ERROR_LOG for audio errors.
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@5562 8ced0084-cf51-0410-be5f-012b33b47a6e
2010-06-01 20:45:30 +00:00
687f125315
Slightly redo how Linux global builds get the prefix/lib location.
...
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@5516 8ced0084-cf51-0410-be5f-012b33b47a6e
2010-05-27 12:13:37 +00:00
0119497f3a
On OS X, create a release dmg if bundle=True like on Linux.
...
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@5513 8ced0084-cf51-0410-be5f-012b33b47a6e
2010-05-27 03:51:00 +00:00
774035d715
Always build a universal binary on OS X. This requires wxWidgets >= 2.9.
...
Enable -Werror (OS X only so far - please test and enable on other platforms).
Clean up library handling a bit.
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@5504 8ced0084-cf51-0410-be5f-012b33b47a6e
2010-05-26 21:31:50 +00:00
1d8db5ce3f
osx buildfix
...
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@5402 8ced0084-cf51-0410-be5f-012b33b47a6e
2010-04-23 19:15:44 +00:00
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
ba89d91872
Moved InputPluginCommon into the Plugins directory. I don't think it made sense in Core. Some minor fixes to the new wiimote plugin also.
...
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@5362 8ced0084-cf51-0410-be5f-012b33b47a6e
2010-04-14 03:48:37 +00:00
379c469343
Linux compile fix for billard's changes.
...
(Had to do it myself since glen is now a windows person :P)
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@5356 8ced0084-cf51-0410-be5f-012b33b47a6e
2010-04-13 06:09:45 +00:00
e7dc6c26ce
UnitTests compiles on non win32
...
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@5343 8ced0084-cf51-0410-be5f-012b33b47a6e
2010-04-12 05:33:17 +00:00
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
2742be1c2e
A few changes to the GCPadNew needed to compile in linux, and put GCPadNew back into the linux build. Also changed file properties to eol-style native.
...
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@5268 8ced0084-cf51-0410-be5f-012b33b47a6e
2010-04-02 02:48:24 +00:00
a744391aac
Remove GCPadNew from the linux build until I get a chance to fix it.
...
It breaks the linux build now. SDL version 1.3.0, which includes SDL_haptic, is not available for most linux distributions at this time.
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@5264 8ced0084-cf51-0410-be5f-012b33b47a6e
2010-04-01 11:49:44 +00:00
d2cee0a869
Clean up of new Plugin, get it compiling in Linux/OSX, Linux side, you need to add the Xlib portion to SConscript
...
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@5258 8ced0084-cf51-0410-be5f-012b33b47a6e
2010-04-01 02:59:40 +00:00
c5d4c2c1b1
Fix an issue with scons not using cached command line arguments
...
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@5196 8ced0084-cf51-0410-be5f-012b33b47a6e
2010-03-14 21:01:02 +00:00
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
d18ab50520
Add a universal option to the osx flag, does not work yet since scons strips out the -arch flag that it thinks is a duplicate, add to linker flags since cross compiling on OSX was failing since it was trying to link everything as the wrong arch. Re-Enable the loadstores in 32bit Dolphin in OSX, due to the reason described in the comments (Fast 32bit OSX!). Add an alert if the memory space ends up above 32bit in *nix sides, since it will ALWAYS be above in 64bit OSX, Will try to fix.
...
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@5155 8ced0084-cf51-0410-be5f-012b33b47a6e
2010-03-05 09:23:28 +00:00
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
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
7de17cb9c2
SFML on linux/osx now compiles from external (static)
...
removed HAVE_SFML ifdefs
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@5101 8ced0084-cf51-0410-be5f-012b33b47a6e
2010-02-21 20:09:49 +00:00
060bbcf067
Compiling with rev 63470 of wxWidgets now works with OSX x86_64. There are a BUNCH of errors while running, none fatal from what I've seen. This also fixes Dolphin creating multiple NSWindows when running multiple games.
...
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@5041 8ced0084-cf51-0410-be5f-012b33b47a6e
2010-02-12 12:41:53 +00:00
5485506293
pgo scons patch taken from
...
http://forums.dolphin-emu.com/archive/index.php/thread-3852.html
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@5012 8ced0084-cf51-0410-be5f-012b33b47a6e
2010-02-05 09:53:33 +00:00
05a998f777
Code cleanup to improve readability.
...
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@4995 8ced0084-cf51-0410-be5f-012b33b47a6e
2010-02-02 23:21:19 +00:00
feba09f7a3
Linux global build. At least the basic footwork is done here.
...
Basic usage: "sudo scons install=global install"
Hopefully this doesn't break builds on Macs. I have tested this on linux and windows.
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@4994 8ced0084-cf51-0410-be5f-012b33b47a6e
2010-02-02 21:56:29 +00:00
802504dd18
PadSimple is out of phase.
...
Thanks to glennricster for testing GCPad on Linux.
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@4976 8ced0084-cf51-0410-be5f-012b33b47a6e
2010-01-28 03:29:49 +00:00
0128e92068
Fixes the capital letter as well as path that could cause problem in future (Finish)
...
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@4935 8ced0084-cf51-0410-be5f-012b33b47a6e
2010-01-23 17:30:40 +00:00
6b2466c869
Added GCpad to SConstruct, should compile fine on Linux and Mac OSX now.
...
(some things need cleanup, waiting for ayuanx to finish it)
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@4932 8ced0084-cf51-0410-be5f-012b33b47a6e
2010-01-23 12:59:02 +00:00
832a616cb0
removed now obsolete build configurations Release_JITIL from vcproj and jittest from scons
...
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@4896 8ced0084-cf51-0410-be5f-012b33b47a6e
2010-01-19 20:21:17 +00:00
93bb45aaf2
Another scons fix/hack for OSX.
...
wx-config keeps returning -arch i386, breaking 64-bit builds.
Thats the only place where a tuple occurs, filtering out non-strings should be fine for now until we find a better way to do this.
This commit only affects Mac OSX.
utils.py is reverted on purpose. if anything like this happens again, it will most likely fail and indicate more work.
Thanks to tmator and knatsch who tested the patch on r4843
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@4851 8ced0084-cf51-0410-be5f-012b33b47a6e
2010-01-16 12:22:53 +00:00
e7f8068b12
scons fix for MacOSX prior to Snow Leopard, and 32-bit compiles on SL.
...
This fixes "NameError: name 'wxmods' is not defined" reported by some users on the MacOSX_Build wiki page, along with a small issue in filterWarnings.
Someone on pre-SL (Leopard or Tiger) please test this change.
Fixes Issue 1890
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@4843 8ced0084-cf51-0410-be5f-012b33b47a6e
2010-01-15 16:16:21 +00:00
afdfd29fcd
Use ggdb on linux/osx
...
enable omit-frame-pointer on release
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@4636 8ced0084-cf51-0410-be5f-012b33b47a6e
2009-12-02 10:24:15 +00:00
1aa5e09db9
Didn't mean for this to get committed
...
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@4592 8ced0084-cf51-0410-be5f-012b33b47a6e
2009-11-19 22:48:14 +00:00
3af4c50af1
Clean up Wiiuse to allow less _WIN32 defines. Windows side now spits out regular packets, and takes in regular packets. Like a normal OS should :} This shouldn't break Windows wiimote, Linux Wiimote doesn't work with this revision. Will require the new plugin which doesn't have emulated Wiimote at all.
...
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@4591 8ced0084-cf51-0410-be5f-012b33b47a6e
2009-11-19 22:47:57 +00:00
d28a1e06f5
Configure lua for target platform, fixes linker warning about tmpnam
...
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@4581 8ced0084-cf51-0410-be5f-012b33b47a6e
2009-11-15 21:25:44 +00:00
ebc696c58e
Fix GCC 4.5 Compiling. -fvisibility=hidden seems to break it, so it was removed. Non-POD objects are now errors instead of warnings in 4.5, so I had to remove the wxString::Format. and a Fix where GCC 4.5 introduced strndup. Compiling with nowx=true gave me linker problems for some reason, and I added the -flto flag but commented out. Dunno what it will do yet.
...
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@4530 8ced0084-cf51-0410-be5f-012b33b47a6e
2009-11-11 11:07:04 +00:00
5834fa6710
Pulse audio empty struct implementation. Working on it though
...
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@4428 8ced0084-cf51-0410-be5f-012b33b47a6e
2009-10-15 17:28:23 +00:00
8e44891b3a
Audio: alsa is now default on linux, scons switch openal off by default (openal=yes to enabled)
...
minor clean up in audio config code
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@4426 8ced0084-cf51-0410-be5f-012b33b47a6e
2009-10-15 06:50:04 +00:00
c2ae2e8d58
Started fixing SW video compilation for linux, must go home now
...
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@4410 8ced0084-cf51-0410-be5f-012b33b47a6e
2009-10-12 16:29:32 +00:00
d9066c728f
fix osx wx29 build
...
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@4389 8ced0084-cf51-0410-be5f-012b33b47a6e
2009-10-09 04:47:36 +00:00
f768ae5586
wx 2.9 works in 64bit with snow leopard
...
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@4374 8ced0084-cf51-0410-be5f-012b33b47a6e
2009-10-07 10:13:20 +00:00
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
4499444a86
OpenGL and OpenCL are NOT related! (Committed here are some scons fixes)
...
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@4349 8ced0084-cf51-0410-be5f-012b33b47a6e
2009-09-30 12:58:02 +00:00
aa1fd81e37
OpenCL: A bit more work.
...
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@4347 8ced0084-cf51-0410-be5f-012b33b47a6e
2009-09-30 00:39:32 +00:00
e8508f7175
Update the XCode Project a bit, doesn't even build in that yet. Modify the Sconstruct to allow a noao build
...
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@4317 8ced0084-cf51-0410-be5f-012b33b47a6e
2009-09-24 22:56:50 +00:00
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
1619433ae7
DSP: added automatic alsa test.
...
Should fix issue 1403
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@4274 8ced0084-cf51-0410-be5f-012b33b47a6e
2009-09-15 10:47:19 +00:00
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
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
0a576c7508
Linux: Tons of warning cleanup plus workaround a nasty crash problem in StatusBarMessage.
...
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@4234 8ced0084-cf51-0410-be5f-012b33b47a6e
2009-09-08 21:16:05 +00:00
b0a09c55b4
Compile fix
...
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@4068 8ced0084-cf51-0410-be5f-012b33b47a6e
2009-08-26 19:39:11 +00:00
68957ed5e9
Added the Lua (5.1.4) external dependency. Verify this compiles on Linux too. Now all we need to do is implement some interface.
...
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@4038 8ced0084-cf51-0410-be5f-012b33b47a6e
2009-08-23 13:13:58 +00:00
17303d3be9
remove njoy_testing from sconstruct/sln (yea I hope I didn't break it:)
...
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@3865 8ced0084-cf51-0410-be5f-012b33b47a6e
2009-07-20 21:29:52 +00:00
4cfcf9bdd5
Sorry for intruding in to the core. Fixed NoGUI mode in Linux, add back the instruction names as comments in the JIT tables, was a bit hard to find certain instructions.Trying to find a good way to get The JIT dependencies removed in a nice fashion
...
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@3776 8ced0084-cf51-0410-be5f-012b33b47a6e
2009-07-13 06:34:12 +00:00
b2f36d4401
Forgot a file
...
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@3711 8ced0084-cf51-0410-be5f-012b33b47a6e
2009-07-08 08:29:22 +00:00
e91ab24bce
Linux compile fix
...
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@3519 8ced0084-cf51-0410-be5f-012b33b47a6e
2009-06-21 09:35:31 +00:00
1a6b9d8174
Some clean up
...
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@3377 8ced0084-cf51-0410-be5f-012b33b47a6e
2009-06-08 14:36:00 +00:00
6f9a49b930
Netplay compiles on linux, please test
...
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@3229 8ced0084-cf51-0410-be5f-012b33b47a6e
2009-05-14 08:46:18 +00:00
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
439523163e
fix some dir issue on osx, if there is a problem on windows or linux, see this : GetSysDirectory in FileUtil.cpp
...
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@3173 8ced0084-cf51-0410-be5f-012b33b47a6e
2009-05-07 21:19:55 +00:00
9e427a4e59
Disabled portaudio on osx for now
...
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@3062 8ced0084-cf51-0410-be5f-012b33b47a6e
2009-04-24 09:54:51 +00:00
5f862cf297
more scons build fixups
...
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@2960 8ced0084-cf51-0410-be5f-012b33b47a6e
2009-04-12 21:30:22 +00:00
0fa8d7683a
Fixing compile on linux
...
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@2959 8ced0084-cf51-0410-be5f-012b33b47a6e
2009-04-12 19:56:59 +00:00
5dbdc4e6cf
linux build fix
...
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@2936 8ced0084-cf51-0410-be5f-012b33b47a6e
2009-04-08 20:21:07 +00:00
65daec3554
Removing old LLE plugin
...
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@2927 8ced0084-cf51-0410-be5f-012b33b47a6e
2009-04-08 13:42:30 +00:00
58a78cb2b5
Make openal works on linux
...
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@2805 8ced0084-cf51-0410-be5f-012b33b47a6e
2009-03-30 17:24:55 +00:00
07381b9962
Starting audio common
...
Going to slowly make LLE-testing and HLE use it
(This commit is missing some proj files for windows)
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@2741 8ced0084-cf51-0410-be5f-012b33b47a6e
2009-03-23 17:56:37 +00:00
788cc73867
Just so I can play a bit without annoying f|res:)
...
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@2740 8ced0084-cf51-0410-be5f-012b33b47a6e
2009-03-23 09:10:32 +00:00
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
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
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
91acd10fe6
Fix for the first error in the Windows scons build system. Now, I'm stuck on a package checking error (line 216), and I don't know the correct way to fix it. Any help?
...
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@2596 8ced0084-cf51-0410-be5f-012b33b47a6e
2009-03-07 12:33:26 +00:00
3f840806b3
Scons changes: fastlog compiles DEBUGFAST
...
devel doesn't compile with LOGGING (level 2 is enough).
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@2560 8ced0084-cf51-0410-be5f-012b33b47a6e
2009-03-05 16:26:05 +00:00
d410b768c3
Added check for fink/macports paths in osx
...
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@2540 8ced0084-cf51-0410-be5f-012b33b47a6e
2009-03-03 22:34:32 +00:00
65b10ebe9f
Added portaudio version
...
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@2538 8ced0084-cf51-0410-be5f-012b33b47a6e
2009-03-03 20:14:39 +00:00
3ba6731816
Small linux/osx fix
...
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@2509 8ced0084-cf51-0410-be5f-012b33b47a6e
2009-03-02 01:28:12 +00:00
9b00d84c5d
Revent accidental hci.h change add better portaudio detection
...
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@2506 8ced0084-cf51-0410-be5f-012b33b47a6e
2009-03-01 12:56:07 +00:00
660bdaac19
enable experimental mic support on linux if port audio is found
...
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@2491 8ced0084-cf51-0410-be5f-012b33b47a6e
2009-03-01 00:07:17 +00:00
9ec81d4bf0
linux compile fixes
...
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@2377 8ced0084-cf51-0410-be5f-012b33b47a6e
2009-02-22 21:37:36 +00:00
4200f69c5a
fix unresolved symbols
...
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@2188 8ced0084-cf51-0410-be5f-012b33b47a6e
2009-02-09 21:19:35 +00:00
1026b3b6f1
Commited chaoscode's patch to fix re2 and mp1
...
disabled njoy on linux as it doesn't compile (need to talk to JP about the right fix)
added ugly hack to include the right SDL.h on linux
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@2179 8ced0084-cf51-0410-be5f-012b33b47a6e
2009-02-09 18:31:16 +00:00
bde4241e9e
fixed underrun buffer in hle on linux
...
made wiimote compile on linux again
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@2093 8ced0084-cf51-0410-be5f-012b33b47a6e
2009-02-03 22:06:18 +00:00
a7025c1591
testgl=1 compile fix
...
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@2036 8ced0084-cf51-0410-be5f-012b33b47a6e
2009-01-29 11:12:53 +00:00
7d86f7e3e0
Disabled wiimote on non windows, until build is fixed
...
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@2035 8ced0084-cf51-0410-be5f-012b33b47a6e
2009-01-29 10:20:15 +00:00
8f2d1136a7
fix njoy build for non win32 os, and small osx64 build fix
...
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@1965 8ced0084-cf51-0410-be5f-012b33b47a6e
2009-01-20 20:21:05 +00:00
9f5aaf8413
place plugins inside app bundle on osx
...
(also btw, all Macs have Cocoa...)
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@1839 8ced0084-cf51-0410-be5f-012b33b47a6e
2009-01-09 12:11:48 +00:00
772f17c1c7
remove wx check in nowx
...
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@1827 8ced0084-cf51-0410-be5f-012b33b47a6e
2009-01-08 11:50:49 +00:00
90560511c9
moving around some event handler code
...
creating inputcommon
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@1766 8ced0084-cf51-0410-be5f-012b33b47a6e
2009-01-04 19:54:56 +00:00
034986a7ac
better oprofile detection
...
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@1764 8ced0084-cf51-0410-be5f-012b33b47a6e
2009-01-04 10:37:10 +00:00
952dfcd610
Some code cleanup + added scons flavor=prof
...
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@1763 8ced0084-cf51-0410-be5f-012b33b47a6e
2009-01-04 10:20:38 +00:00
94a51a7817
Allow testing WIP JIT by using "scons jittest=1". Done by the request
...
of nakeee. Hopefully this works the way I think it does.
And of course, use at your own risk...
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@1760 8ced0084-cf51-0410-be5f-012b33b47a6e
2009-01-04 09:12:12 +00:00
de7abc6bd0
By JP's request
...
Build directory is now per flavour
Debug build will add -debug i.e. Binary/i686-debug/Dolphin
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@1705 8ced0084-cf51-0410-be5f-012b33b47a6e
2008-12-28 17:56:59 +00:00
a679e345fd
Started working on pad evnt
...
fix for testgl
fix for njoy-sdl to work in debug
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@1674 8ced0084-cf51-0410-be5f-012b33b47a6e
2008-12-26 09:20:01 +00:00
34b92fe7c5
We need to be more careful about stack alignment on Darwin. These patches
...
fix the alignment of gcc-generated code (as opposed to JIT code).
There are probably more places this is needed :(
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@1651 8ced0084-cf51-0410-be5f-012b33b47a6e
2008-12-25 02:53:56 +00:00
4486e3a49c
Some more Testsuite programs. The Time one is interesting because it shows that the time is off by around 3 minutes, Modified the sconstruct to remove the flag for stackrealign since it kills GCC 4.3.2
...
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@1647 8ced0084-cf51-0410-be5f-012b33b47a6e
2008-12-24 09:46:50 +00:00
6fc28cae8c
OS X needs -mstackrealign for JIT to work; should not break anything on other platforms
...
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@1644 8ced0084-cf51-0410-be5f-012b33b47a6e
2008-12-24 03:09:21 +00:00
b5dcdcf779
More cleanup again I hope I didn't break anything, please check
...
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@1593 8ced0084-cf51-0410-be5f-012b33b47a6e
2008-12-19 13:56:53 +00:00
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
2bb169ce37
Moved the wx anti debug flag to scons
...
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@1591 8ced0084-cf51-0410-be5f-012b33b47a6e
2008-12-19 09:36:27 +00:00
6cadaa947a
forgot to add the fastlog as legal flag
...
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@1572 8ced0084-cf51-0410-be5f-012b33b47a6e
2008-12-18 00:45:55 +00:00
e6424f750b
scons changes
...
added fastlog flavour with LOGGING and -O3
changed debug to include _DEBUG
changed devel to include DEBUGFAST
for now wxonassert is disabled as I couldn't make it work
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@1571 8ced0084-cf51-0410-be5f-012b33b47a6e
2008-12-18 00:37:24 +00:00
2a2a83b7c8
small clean up
...
enabled njoy_test
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@1563 8ced0084-cf51-0410-be5f-012b33b47a6e
2008-12-17 10:30:44 +00:00
7f8cc4ec62
more nowx fixes
...
disabled njoy test build
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@1545 8ced0084-cf51-0410-be5f-012b33b47a6e
2008-12-14 23:52:01 +00:00
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
8b24a9b498
object files now go into Build/system-arch
...
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@1496 8ced0084-cf51-0410-be5f-012b33b47a6e
2008-12-11 00:45:14 +00:00
f395257edc
added scons wxgl flag
...
remove OSX64 define
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@1494 8ced0084-cf51-0410-be5f-012b33b47a6e
2008-12-10 23:39:59 +00:00
32a7c530e6
define mess and some other small fixes
...
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@1493 8ced0084-cf51-0410-be5f-012b33b47a6e
2008-12-10 23:23:05 +00:00
6384f9b420
Remove unnecessary "something" from the SConstruct. Fixes build on Ubunto 8.10 for me.
...
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@1487 8ced0084-cf51-0410-be5f-012b33b47a6e
2008-12-10 21:21:58 +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
70471b1964
added scons wxconfig=path flag
...
fixed lib detection
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@1472 8ced0084-cf51-0410-be5f-012b33b47a6e
2008-12-09 23:47:18 +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
0b7252b8f5
more small fixes
...
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@1426 8ced0084-cf51-0410-be5f-012b33b47a6e
2008-12-07 19:09:14 +00:00
38708f2976
another small cleanup of sconsx
...
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@1415 8ced0084-cf51-0410-be5f-012b33b47a6e
2008-12-06 23:32:10 +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
a54e7ba3ad
bluez detection
...
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@1396 8ced0084-cf51-0410-be5f-012b33b47a6e
2008-12-04 15:15:21 +00:00
f767128244
fix compile on mac
...
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@1395 8ced0084-cf51-0410-be5f-012b33b47a6e
2008-12-04 14:29:24 +00:00
4df7675d19
Commiting a Linux fix, and along with it is my current work on the nJoy plugin to make it better and use axises as buttons, buttons as axises, and axises as the triggers.
...
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@1372 8ced0084-cf51-0410-be5f-012b33b47a6e
2008-12-02 01:08:21 +00:00
c4cbea22ab
added scons CC= and CXX= options
...
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@1350 8ced0084-cf51-0410-be5f-012b33b47a6e
2008-11-30 22:05:43 +00:00
6e4a5d8cda
Moved wiimote_test to wiimote
...
Some linux compile fixes
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@1266 8ced0084-cf51-0410-be5f-012b33b47a6e
2008-11-23 08:44:02 +00:00
aabee66444
forgot the lib path
...
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@1221 8ced0084-cf51-0410-be5f-012b33b47a6e
2008-11-19 15:00:19 +00:00
d73eaf1c34
added rpath to LIBS
...
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@1218 8ced0084-cf51-0410-be5f-012b33b47a6e
2008-11-19 11:41:42 +00:00
Glenn Rice