summaryrefslogtreecommitdiff
path: root/SConstruct
AgeCommit message (Collapse)Author
2010-06-03Make wxgl mandatory on OS X.nJoySoren Jorvang
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@5576 8ced0084-cf51-0410-be5f-012b33b47a6e
2010-06-02Oops, didn't mean to enable -Werror for devel builds.Soren Jorvang
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@5575 8ced0084-cf51-0410-be5f-012b33b47a6e
2010-06-02Fix some cases of variables being used uninitialized. Also some unusedSoren Jorvang
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-01Now that Core Audio works, reduce the number of build permutations a bit Soren Jorvang
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-05-27Slightly redo how Linux global builds get the prefix/lib location.Soren Jorvang
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@5516 8ced0084-cf51-0410-be5f-012b33b47a6e
2010-05-27On OS X, create a release dmg if bundle=True like on Linux.Soren Jorvang
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@5513 8ced0084-cf51-0410-be5f-012b33b47a6e
2010-05-26Always build a universal binary on OS X. This requires wxWidgets >= 2.9.Soren Jorvang
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-04-23osx buildfixShawn Hoffman
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@5402 8ced0084-cf51-0410-be5f-012b33b47a6e
2010-04-22Move fullscreen display resolution control to the GUI with the rest of the ↵Glenn Rice
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-14Moved InputPluginCommon into the Plugins directory. I don't think it made ↵Jordan Woyak
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-13Linux compile fix for billard's changes. nakeee
(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-12UnitTests compiles on non win32nakeee
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@5343 8ced0084-cf51-0410-be5f-012b33b47a6e
2010-04-12Big restructuring of how the video plugin works. In linux and windows you ↵Glenn Rice
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-02A few changes to the GCPadNew needed to compile in linux, and put GCPadNew ↵Glenn Rice
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-01Remove GCPadNew from the linux build until I get a chance to fix it.Glenn Rice
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-01Clean up of new Plugin, get it compiling in Linux/OSX, Linux side, you need ↵Sonicadvance1
to add the Xlib portion to SConscript git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@5258 8ced0084-cf51-0410-be5f-012b33b47a6e
2010-03-14Fix an issue with scons not using cached command line argumentsGlenn Rice
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@5196 8ced0084-cf51-0410-be5f-012b33b47a6e
2010-03-09Added scons options "shared_libname=true" to link agains the system shared ↵Glenn Rice
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-05Add a universal option to the osx flag, does not work yet since scons strips ↵Sonicadvance1
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-02-22Revert commit 5105 until we sort out how we want this to work in linux.Glenn Rice
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@5110 8ced0084-cf51-0410-be5f-012b33b47a6e
2010-02-22On linux don't compile and link against lzo, soil, and sfml "Externals."Glenn Rice
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-21SFML on linux/osx now compiles from external (static)nakeee
removed HAVE_SFML ifdefs git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@5101 8ced0084-cf51-0410-be5f-012b33b47a6e
2010-02-12Compiling with rev 63470 of wxWidgets now works with OSX x86_64. There are a ↵Sonicadvance1
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-05pgo scons patch taken from nakeee
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-02Code cleanup to improve readability.Glenn Rice
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@4995 8ced0084-cf51-0410-be5f-012b33b47a6e
2010-02-02Linux global build. At least the basic footwork is done here.Glenn Rice
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-01-28PadSimple is out of phase.ayuanx
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-23Fixes the capital letter as well as path that could cause problem in future ↵ayuanx
(Finish) git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@4935 8ced0084-cf51-0410-be5f-012b33b47a6e
2010-01-23Added GCpad to SConstruct, should compile fine on Linux and Mac OSX now.j4ck.fr0st
(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-19removed now obsolete build configurations Release_JITIL from vcproj and ↵j4ck.fr0st
jittest from scons git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@4896 8ced0084-cf51-0410-be5f-012b33b47a6e
2010-01-16Another scons fix/hack for OSX.j4ck.fr0st
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-15scons fix for MacOSX prior to Snow Leopard, and 32-bit compiles on SL.j4ck.fr0st
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
2009-12-02Use ggdb on linux/osxnakeee
enable omit-frame-pointer on release git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@4636 8ced0084-cf51-0410-be5f-012b33b47a6e
2009-11-19Didn't mean for this to get committedSonicadvance1
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@4592 8ced0084-cf51-0410-be5f-012b33b47a6e
2009-11-19Clean up Wiiuse to allow less _WIN32 defines. Windows side now spits out ↵Sonicadvance1
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-15Configure lua for target platform, fixes linker warning about tmpnambztdlinux
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@4581 8ced0084-cf51-0410-be5f-012b33b47a6e
2009-11-11Fix GCC 4.5 Compiling. -fvisibility=hidden seems to break it, so it was ↵Sonicadvance1
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-10-15Pulse audio empty struct implementation. Working on it thoughnakeee
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@4428 8ced0084-cf51-0410-be5f-012b33b47a6e
2009-10-15Audio: alsa is now default on linux, scons switch openal off by default ↵nakeee
(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-12Started fixing SW video compilation for linux, must go home nowXTra.KrazzY
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@4410 8ced0084-cf51-0410-be5f-012b33b47a6e
2009-10-09fix osx wx29 buildtmator
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@4389 8ced0084-cf51-0410-be5f-012b33b47a6e
2009-10-07wx 2.9 works in 64bit with snow leopardtmator
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@4374 8ced0084-cf51-0410-be5f-012b33b47a6e
2009-10-07More OpenCL work, got XFB converting which needs more optimization. I ↵Sonicadvance1
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-09-30OpenGL and OpenCL are NOT related! (Committed here are some scons fixes)XTra.KrazzY
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@4349 8ced0084-cf51-0410-be5f-012b33b47a6e
2009-09-30OpenCL: A bit more work.XTra.KrazzY
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@4347 8ced0084-cf51-0410-be5f-012b33b47a6e
2009-09-24Update the XCode Project a bit, doesn't even build in that yet. Modify the ↵Sonicadvance1
Sconstruct to allow a noao build git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@4317 8ced0084-cf51-0410-be5f-012b33b47a6e
2009-09-18Fix compiling in Snow Leopard, the Update stuff in the Video plugin ↵Sonicadvance1
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-15DSP: added automatic alsa test.nakeee
Should fix issue 1403 git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@4274 8ced0084-cf51-0410-be5f-012b33b47a6e
2009-09-09OGL: nakeee
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-09removed the failed gltest code nakeee
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@4238 8ced0084-cf51-0410-be5f-012b33b47a6e