Commit Graph

270 Commits

Author SHA1 Message Date
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
Sonicadvance1
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
XTra.KrazzY
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
XTra.KrazzY
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
Sonicadvance1
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
Sonicadvance1
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
nakeee
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
nakeee
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
nakeee
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
hrydgard
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
nakeee
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
XTra.KrazzY
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
nakeee
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
Sonicadvance1
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
nakeee
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
Sonicadvance1
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
nakeee
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
nakeee
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
nakeee
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
tmator
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
nakeee
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
nakeee
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
nakeee
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
Shawn Hoffman
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
nakeee
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
nakeee
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
nakeee
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
nakeee
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
LPFaint99
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
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
Marcus Wanners
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
Marcus Wanners
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
nakeee
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
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
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
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
nakeee
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
nakeee
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
nakeee
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
nakeee
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
nakeee
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
nakeee
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
nakeee
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
nakeee
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
tmator
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
bushing
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
nakeee
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
nakeee
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
nakeee
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
nakeee
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
magumagu9
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
nakeee
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
nakeee
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
bushing
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
Sonicadvance1
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
bushing
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
nakeee
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
nakeee
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
nakeee
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
nakeee
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
nakeee
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
nakeee
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
nakeee
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
nakeee
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
nakeee
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
nakeee
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
nakeee
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
hrydgard
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
nakeee
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
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
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
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
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
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
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
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
nakeee
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
Sonicadvance1
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
nakeee
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
nakeee
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
nakeee
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
nakeee
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
nakeee
167196aa10 move it to Libs
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@1217 8ced0084-cf51-0410-be5f-012b33b47a6e
2008-11-19 10:49:36 +00:00
nakeee
ec19b6b024 some linux wiimote stuff
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@1213 8ced0084-cf51-0410-be5f-012b33b47a6e
2008-11-19 10:22:29 +00:00
nakeee
759441082a mac fix
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@1205 8ced0084-cf51-0410-be5f-012b33b47a6e
2008-11-18 08:33:49 +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
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
nakeee
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
tmator
a03f39ac36 now core, padsimple and dsp null can be buil in 64bit on osx
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@947 8ced0084-cf51-0410-be5f-012b33b47a6e
2008-10-24 15:48:36 +00:00
tmator
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
Maarten ter Huurne
9c5438cb0b Whatever you do, do not mix tabs and spaces!
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@897 8ced0084-cf51-0410-be5f-012b33b47a6e
2008-10-17 09:44:44 +00:00
Sonicadvance1
5f0ea50453 Woops, committed my modified scons file
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@794 8ced0084-cf51-0410-be5f-012b33b47a6e
2008-10-08 16:45:09 +00:00
Sonicadvance1
5c53460817 Made the SSE work with GCC 4.3 and above, may also work with 4.2 and above
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@793 8ced0084-cf51-0410-be5f-012b33b47a6e
2008-10-08 16:43:40 +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
Sonicadvance1
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
Sonicadvance1
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
nakeee
a8f484a668 LLE is out for repairs
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@754 8ced0084-cf51-0410-be5f-012b33b47a6e
2008-10-03 09:38:04 +00:00
XTra.KrazzY
53b4dda6c7 Me and Nakeee created a null DSP device, supported in both Windows and linux (tested). Framerate boost and less DSound/LibAO errors. Pending work: Clean up UCodes and create something more...null. We could also hack into the HW Audio Interface (would be actual null device). Also screws up a bit of Wind Waker RTC (awesome day/night transition in save selection menu. 80FPS in save selection menu, 120FPS in logos.
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@694 8ced0084-cf51-0410-be5f-012b33b47a6e
2008-09-25 18:45:53 +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
6e424f152a Made layout more consistent.
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@628 8ced0084-cf51-0410-be5f-012b33b47a6e
2008-09-23 00:24:28 +00:00
Maarten ter Huurne
866d15d3d8 Moved closing of the Configure environment before the env.ParseConfig() calls, since those use the normal environment (env), not the Configure environment (conf).
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@625 8ced0084-cf51-0410-be5f-012b33b47a6e
2008-09-23 00:07:51 +00:00
nakeee
3a130d4263 change src to Src
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@604 8ced0084-cf51-0410-be5f-012b33b47a6e
2008-09-22 06:50:27 +00:00
nakeee
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
nakeee
84a1a1cd64 Ensure scons version >= 0.98
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@599 8ced0084-cf51-0410-be5f-012b33b47a6e
2008-09-21 16:09:59 +00:00
nakeee
284669181e Cache command line arguments given to scon in args.cache
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@598 8ced0084-cf51-0410-be5f-012b33b47a6e
2008-09-21 15:55:27 +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
nakeee
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
Sonicadvance1
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
XTra.KrazzY
558f453dde more scons fixes
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@584 8ced0084-cf51-0410-be5f-012b33b47a6e
2008-09-20 10:24:00 +00:00
XTra.KrazzY
b69a707ceb Fixed "verbose=False" being recognized as true error in SConstruct
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@583 8ced0084-cf51-0410-be5f-012b33b47a6e
2008-09-20 10:21:33 +00:00
nakeee
f63a845d9f adding lots of features to SConstruct, scons -h to see, known bug: verbose=False is treated as true no idea why...
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@581 8ced0084-cf51-0410-be5f-012b33b47a6e
2008-09-19 15:03:31 +00:00
Maarten ter Huurne
78bb1cf82d Made layout (indent and quotes) more consistent.
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@580 8ced0084-cf51-0410-be5f-012b33b47a6e
2008-09-18 22:19:01 +00:00
Maarten ter Huurne
dae082e59e Added "-fno-exceptions" to compile flags, so GCC knows we do not use exceptions and can generate more efficient code.
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@579 8ced0084-cf51-0410-be5f-012b33b47a6e
2008-09-18 10:06:55 +00:00
nakeee
a3fbbff516 scons lint=1 now adds -Werror
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@578 8ced0084-cf51-0410-be5f-012b33b47a6e
2008-09-18 10:04:03 +00:00
nakeee
e4271b82da you can now use scons debug=1 for -g and -DLOGGING while regular
build is with -O3


git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@577 8ced0084-cf51-0410-be5f-012b33b47a6e
2008-09-18 09:49:58 +00:00
nakeee
4de10e2d94 make LLE "work" on linux
also with XK's patch to fix LLE save state


git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@539 8ced0084-cf51-0410-be5f-012b33b47a6e
2008-09-16 13:53:11 +00:00
masken
f6e4aad94f Added preliminary Wiimote plugin spec, and an empty test plugin.
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@508 8ced0084-cf51-0410-be5f-012b33b47a6e
2008-09-13 10:28:23 +00:00
nakeee
e5a126e231 lzo compiles on linux (almost working)
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@496 8ced0084-cf51-0410-be5f-012b33b47a6e
2008-09-12 09:15:54 +00:00
nakeee
f5ffe10fca Don't use -g and -O3 together
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@491 8ced0084-cf51-0410-be5f-012b33b47a6e
2008-09-10 16:42:29 +00:00
Maarten ter Huurne
684c1d08a8 Changed case of "Src" in "Source/Core/DolphinWX/Src".
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@480 8ced0084-cf51-0410-be5f-012b33b47a6e
2008-09-08 06:39:17 +00:00
nakeee
4bbfff3cac many warning fixes
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@422 8ced0084-cf51-0410-be5f-012b33b47a6e
2008-09-01 12:11:08 +00:00
Maarten ter Huurne
ee39265c1a Disabled "float-equal" warning: it was causing too many false positives, especially in "wx/math.h".
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@354 8ced0084-cf51-0410-be5f-012b33b47a6e
2008-08-27 12:01:18 +00:00
Maarten ter Huurne
26c28d3a4f "-fvisibility-inlines-hidden" is a C++-only flag, so include it in CXXFLAGS but not in CCFLAGS.
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@353 8ced0084-cf51-0410-be5f-012b33b47a6e
2008-08-27 11:52:28 +00:00
Maarten ter Huurne
d8b3122e0d Minimized symbol visibility for GCC build. Fixes problem with two instances of x64Emitter getting mixed up and generating only part of the required opcodes. I get video on 32-bit Linux now :)
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@336 8ced0084-cf51-0410-be5f-012b33b47a6e
2008-08-27 01:42:11 +00:00
Maarten ter Huurne
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