Commit Graph

33 Commits

Author SHA1 Message Date
Soren Jorvang 1afcf4cc69 Use the debug option for conf.CheckWXConfig on OS X as on Unix.
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@6085 8ced0084-cf51-0410-be5f-012b33b47a6e
2010-08-10 08:30:04 +00:00
Soren Jorvang 52d3137598 Build with -msse3 on OS X. The first Intel Macs were Core Duo/Solo, which
had SSE3. Keep -msse2 on other platforms. Not sure if there are actually
any Dolphin-capable machines out there without SSE3, but..

Use -search_paths_first to give our statically linked libraries precedence
over /usr/local/lib. 

Some work-in-progress changes to facilitate a more easily redistributable
application bundle on OS X.

Group compiler/preprocessor/linker flags together to make the full set
more intuitively apparent.

The various libraries in Externals have rather inconsistent conventions
for include paths. Best to encapsulate that knowledge in foo/SConscript.

Re-use utils.GenerateRevFile for all three places in the build system 
where we need the SVN revision number.


git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@6030 8ced0084-cf51-0410-be5f-012b33b47a6e
2010-08-01 16:30:22 +00:00
Soren Jorvang 24fdf942a4 Use .cpp suffix when detecting libraries. On some systems, g++
is required to correctly link with C++ libraries like wxw.

Tell OS X that the user is doing something when using the wiimote
so that the screensaver doesn't come on when playing a Wii game.

Replace unnecessary floating point with integer math.

Remove unnecessary <sys/stat.h>'s.

Correct a few type nits.


git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@5995 8ced0084-cf51-0410-be5f-012b33b47a6e
2010-07-29 13:29:15 +00:00
Soren Jorvang 09b5dfbd53 Prevent Python from stripping off the final newline of the main(){}
autoconfiguration tests. Some versions of gcc care enough about ANSI C
to complain about this.
 
Use the Linux install hierarchy conventions on other Unices as well.
 
XKeysymToString returns NULL on unknown keysyms, which is not a valid
std::string initializer.
 
There appears to be some disagreement regarding the second parameter
to iconv(). Some versions/installations have it as const, others don't.
Unfortunately, due to wonderful C++ brain damage, implicit conversion 
from const to non-const doesn't work here.


git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@5945 8ced0084-cf51-0410-be5f-012b33b47a6e
2010-07-22 07:55:35 +00:00
Soren Jorvang d18085c3ad Don't bother using autoconfiguration to find the OpenCL and Cg
frameworks on OS X.

Try to be a little clearer about which configuration options apply    
to which platform(s). Should pave the way slightly for win32 scons. 
 
We have accidentally been using LUA_USE_LINUX on OS X all along.
Turns out that LUA_USE_MACOSX is for an ancient version of OS X and
LUA_USE_LINUX is a reasonable set of defaults for modern Unices, so
just keep using that.


git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@5804 8ced0084-cf51-0410-be5f-012b33b47a6e
2010-06-26 19:17:43 +00:00
Soren Jorvang 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
Soren Jorvang 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
Soren Jorvang 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
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 492636c3fa Temporarily back out r5521 until a more complete answer to the
filterWarnings problems is ready, as it currently breaks the OS X build.


git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@5538 8ced0084-cf51-0410-be5f-012b33b47a6e
2010-05-29 20:31:09 +00:00
bztdlinux 5663872c7c Avoid newline errors, will cause library checks to fail otherwise if -Werror is on.
Dunno why this is in our code, I think scons has this built in ?


git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@5521 8ced0084-cf51-0410-be5f-012b33b47a6e
2010-05-27 22:19:16 +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 02527b21ff lp's fix for bundle name
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@4461 8ced0084-cf51-0410-be5f-012b33b47a6e
2009-10-24 20:29:52 +00:00
LPFaint99 153ec6836e second attempt at showing if a build is was compiled with local modifications
(first attempt was r3889; tested on linux this time :D)

git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@3979 8ced0084-cf51-0410-be5f-012b33b47a6e
2009-08-14 06:48:15 +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
nakeee 401d7d53e9 port audio detection fix
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@2566 8ced0084-cf51-0410-be5f-012b33b47a6e
2009-03-06 14:48:39 +00:00
nakeee 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
nakeee 935cf770b0 Small fix for last commit
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@2539 8ced0084-cf51-0410-be5f-012b33b47a6e
2009-03-03 20:28:51 +00:00
nakeee 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
nakeee 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
nakeee ea67c4eb0a opsss osx fix
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@1465 8ced0084-cf51-0410-be5f-012b33b47a6e
2008-12-09 22:07:11 +00:00
nakeee 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
nakeee 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
nakeee 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
nakeee 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
nakeee 11053cb1f7 basic tar bundle for scons
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@1159 8ced0084-cf51-0410-be5f-012b33b47a6e
2008-11-13 10:04:10 +00:00
nakeee 1fb3779ed6 Found another SVN_STR
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@781 8ced0084-cf51-0410-be5f-012b33b47a6e
2008-10-05 19:31:51 +00:00
nakeee 6336af92a1 add svnrev.h to linux
solves issue 93


git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@780 8ced0084-cf51-0410-be5f-012b33b47a6e
2008-10-05 18:49:55 +00:00
nakeee 76dc8a86b3 added some tests
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@665 8ced0084-cf51-0410-be5f-012b33b47a6e
2008-09-24 17:39:15 +00:00
Maarten ter Huurne 26b6e7df49 The workaround for Mac OS X broke the build; without the workaround it builds fine. Maybe the workaround was designed for an older SCons version?
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@627 8ced0084-cf51-0410-be5f-012b33b47a6e
2008-09-23 00:16:57 +00:00
nakeee 1ecfba6692 forgot the utils file
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@603 8ced0084-cf51-0410-be5f-012b33b47a6e
2008-09-21 19:56:24 +00:00
nakeee b6407396d8 wxwidget test
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@594 8ced0084-cf51-0410-be5f-012b33b47a6e
2008-09-21 13:13:20 +00:00