Commit Graph

195 Commits

Author SHA1 Message Date
nakeee 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
Soren Jorvang 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
Soren Jorvang 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
hrydgard 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
hrydgard 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
Soren Jorvang 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
nakeee 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
nakeee 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
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 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
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
Soren Jorvang 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
Soren Jorvang 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
Soren Jorvang 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
Soren Jorvang 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
Shawn Hoffman 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
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
Jordan Woyak 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
nakeee 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
nakeee 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
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 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
Glenn Rice 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
Sonicadvance1 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
Glenn Rice 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
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
Sonicadvance1 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
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
nakeee 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
Sonicadvance1 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
nakeee 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
Glenn Rice 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
Glenn Rice 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
ayuanx 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
ayuanx 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
j4ck.fr0st 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
j4ck.fr0st 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
j4ck.fr0st 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
j4ck.fr0st 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
nakeee 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
Sonicadvance1 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
Sonicadvance1 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
bztdlinux 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
Sonicadvance1 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
nakeee 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
nakeee 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
XTra.KrazzY 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
tmator 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
tmator 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