Commit Graph

100 Commits

Author SHA1 Message Date
Soren Jorvang 244448014a Prevent double inclusion of CommonPaths.h as pointed out by Glenn.
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@5922 8ced0084-cf51-0410-be5f-012b33b47a6e
2010-07-20 03:23:25 +00:00
Soren Jorvang 6813a75ab2 Some pathnames are used both by SCons and cpp which can be a bit tricky.
Should revisit and make the distinction more explicit.

Put the Data and Sys directories under Resources in the OS X app bundle.

Construct config.h (now lower-case to avoid confusion with other Config.h
instances in the tree) in the root. One tiny step towards a read-only
and cross-buildable source tree.

Some minor bits of non-Linux Unix portability.


git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@5921 8ced0084-cf51-0410-be5f-012b33b47a6e
2010-07-20 02:45:31 +00:00
Soren Jorvang a2b1f829cb Get rid of a number of unnecessary env.Clones.
Use SCons' convenient # shorthand for the root of our tree.
 
Also various minor cleanup of SConscripts.


git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@5915 8ced0084-cf51-0410-be5f-012b33b47a6e
2010-07-19 03:42:37 +00:00
Soren Jorvang caeabf8bea Slightly cleanup of mmap(2) flags:
Move MAP_32BIT to MemoryUtil.h.
MAP_VARIABLE is simply the absence of MAP_FIXED.
Replace MAP_ANONYMOUS with the more traditional MAP_ANON - Linux is compatible.


git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@5899 8ced0084-cf51-0410-be5f-012b33b47a6e
2010-07-18 05:15:16 +00:00
Soren Jorvang addb89fecc Allow full-length Unix pathnames.
Move bits of HAVE_OPENCL/HAVE_WX for OS X from SConstruct to header files.

Use /usr/lib/libz on OS X now that we no longer have -L/opt/local/lib in
the library path. It is still possible that we could pick up a libz in
/usr/local/lib that would make the application non-redistributable, but
the danger is much less than previously.

Also bits of minor portability cleanup.


git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@5868 8ced0084-cf51-0410-be5f-012b33b47a6e
2010-07-10 21:17:08 +00:00
Soren Jorvang 2bcdf4f5a4 Remove NSAutoreleasePools that are no longer necessary now that pools
are properly declared at thread entry/exit. I am leaving the ones in
Wiiuse while there's still a small hope that it may be used outside of
Dolphin, though.

Move the fixed MAP_32BIT definition for OS X to Common.h.

UDPNunchuk.cpp was deleted, so update the scons build.


git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@5864 8ced0084-cf51-0410-be5f-012b33b47a6e
2010-07-09 22:31:04 +00:00
Soren Jorvang 0284a7a1df Some more attempts at cleaning up the scons build and more clearly
identifying which options and parameters go with which platforms etc.

OS X, like Windows, now no longer uses Config.h. Configure() is still
used for the wx-config parameters, but that is a temporary measure.

Globals.cpp has never been used.


git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@5860 8ced0084-cf51-0410-be5f-012b33b47a6e
2010-07-09 01:26:53 +00:00
Soren Jorvang 39ae36398f Copy the version string obtained from svnversion at runtime instead of
using it as a constant in several places. Saves a few bytes and the time
it takes to recompile a bunch of files whenever svnversion twitches.

Using the SVN version string as an integer is not portable as the Unix
svnversion always includes e.g. the "M" suffix for a modified tree.

Windows people, please check my change to Plugin_VideoDX9/Src/main.cpp
as I don't really understand how _T() and the %hs format string work.


git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@5852 8ced0084-cf51-0410-be5f-012b33b47a6e
2010-07-08 15:25:01 +00:00
Rodolfo Osvaldo Bogado fc12291806 some fixes to my last commit and ....
modify shader generator to produce native sm 4.0 code.
eliminate compatibility mode in dx11 so now all shader must work much better.
please test.

git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@5691 8ced0084-cf51-0410-be5f-012b33b47a6e
2010-06-14 14:36:01 +00:00
Rodolfo Osvaldo Bogado 41266b5ed0 fast fix for pixel shader compilation in dx11
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@5687 8ced0084-cf51-0410-be5f-012b33b47a6e
2010-06-14 03:09:44 +00:00
luisr142004 2e783d9769 space changes, merge #defines, language fix, and code reorder/cleanup :P
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@5614 8ced0084-cf51-0410-be5f-012b33b47a6e
2010-06-05 01:38:22 +00:00
Soren Jorvang 3edae70ea0 Hack this dodgy compile-time assert so it works with gcc.
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@5486 8ced0084-cf51-0410-be5f-012b33b47a6e
2010-05-26 20:47:56 +00:00
Glenn Rice b2e0dc2519 Netplay build fix for linux, and a little clean up.
For some reason something in (or included in) Frame.h messes up the SFML inclusion in NetPlay.cpp.


git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@5426 8ced0084-cf51-0410-be5f-012b33b47a6e
2010-05-01 21:27:48 +00:00
Jordan Woyak a6d6d27328 NetPlay: completely redone - should be somewhat usable when using Single Core and DSP LLE Plugin.
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@5425 8ced0084-cf51-0410-be5f-012b33b47a6e
2010-05-01 19:10:35 +00:00
Shawn Hoffman c15b1d3219 OS X: enable path in Jit64::stX. fix wxw assert on opening ConfigMain. __force_align_arg_pointer__ not needed on x64 builds
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@5393 8ced0084-cf51-0410-be5f-012b33b47a6e
2010-04-20 13:19:36 +00:00
Shawn Hoffman 675fc84255 trunk: Don't enable selection of mic device if dolphin is not compiled with portaudio support.
Restrict SI AM Baseboard device to port 1.

git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@5278 8ced0084-cf51-0410-be5f-012b33b47a6e
2010-04-04 19:25:49 +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
hrydgard 576990c5a3 JitIL is no longer a separate .exe/binary - it's now a simple option, Dolphin.exe now contains both cores.
Advantages:
* Less confusion for users
* No need to build twice to make sure you didn't break something
* Easier to switch between the cores for testing

Disadvantages:
* None, as far as I can tell :) Maybe some extra code complexity, but not much.

Also break some include chains that caused <windows.h> to get included into everything, slowing down the build on Windows. There's more to do here though, there's still a lot of files that get it included that don't need it at all.

git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@4891 8ced0084-cf51-0410-be5f-012b33b47a6e
2010-01-19 19:28:27 +00:00
Shawn Hoffman 73af91281a allow dumping of all symbols to a signature file
*hopefully* fix the memleak when scrubbing wii discs.

git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@4588 8ced0084-cf51-0410-be5f-012b33b47a6e
2009-11-18 21:11:05 +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
death2droid b3194e596e Fix win32 build and remove a warning from sln.
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@4243 8ced0084-cf51-0410-be5f-012b33b47a6e
2009-09-09 23:19:24 +00:00
hrydgard 987a6185e6 Linux: Alsa backend for the audio plugins. Didn't succeed in reducing latency though, but hopefully will work better than libao - shouldn't hang weirdly at underruns, I hope, like libao does.
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@4240 8ced0084-cf51-0410-be5f-012b33b47a6e
2009-09-09 21:26:33 +00:00
Shawn Hoffman 6e61c32495 dspspy: fix a bug with ConsoleHelper
dspspy: remove some alignment for some vars. (should not have caused issues anyways)
dspCodeUtil: pad ucodes converted to headers to 32byte multiples with nops (this is only mimicing what is seen in nintendo ucodes, probably because their's are originating on disc)
Common.h: fix typo for gcc version of GC_ALIGNED32 (wtf? how did this work before?!)
createtest.pl: add "jmp end_of_test" to the end of generated ucodes.


git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@3994 8ced0084-cf51-0410-be5f-012b33b47a6e
2009-08-16 00:37:01 +00:00
Shawn Hoffman 95344be674 misc cleanup
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@3942 8ced0084-cf51-0410-be5f-012b33b47a6e
2009-08-06 06:18:22 +00:00
XTra.KrazzY c86d2e5129 Now ALL copyright dates are fixed to the legally correct year: The year in which the project began. Now we don't have to change it every year :)
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@3898 8ced0084-cf51-0410-be5f-012b33b47a6e
2009-07-28 21:32:10 +00:00
Nolan Check d85f5a6937 Rearrange LogManager includes. The main purpose is to make it possible to modify Thread.h without recompiling the whole entire project.
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@3770 8ced0084-cf51-0410-be5f-012b33b47a6e
2009-07-12 21:58:32 +00:00
nakeee 697ce7b1ab createtest fixes and compile fixes for linux
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@3482 8ced0084-cf51-0410-be5f-012b33b47a6e
2009-06-17 21:44:03 +00:00
XTra.KrazzY 0b082d303b Tiny commit:
1. OpenAL is now selectable by default (I don't know why it was disabled)
2. Informativeness on Zelda UCode

git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@3395 8ced0084-cf51-0410-be5f-012b33b47a6e
2009-06-09 20:22:53 +00:00
nakeee b9cdcb1819 added HAVE_SFML so the code compiles without it
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@3221 8ced0084-cf51-0410-be5f-012b33b47a6e
2009-05-13 22:23:54 +00:00
Shawn Hoffman ccdec4308a really fix building without OAL, and disable it (for time being i guess) on windows...crazy non-static libs no one wants to deal with
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@2811 8ced0084-cf51-0410-be5f-012b33b47a6e
2009-03-31 03:58:47 +00:00
nakeee ce7ee4d4a3 Small fixup
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@2806 8ced0084-cf51-0410-be5f-012b33b47a6e
2009-03-30 17:45:35 +00:00
omegadox eb0cab140f Some code cleanup
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@2768 8ced0084-cf51-0410-be5f-012b33b47a6e
2009-03-28 08:57:34 +00:00
hrydgard 6dc4194767 OGL plugin: +Autoscale option (attempts to remove borders, even without XFB). Lots of cleanup, especially around aspect ratio and similar stuff. MP2 scanner still broken, wonder when that happened?
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@2470 8ced0084-cf51-0410-be5f-012b33b47a6e
2009-02-28 16:33:59 +00:00
hrydgard 4bdb4aa0d1 Merge large parts of nakeee's "Soap" branch into trunk, after fixing a few crash bugs in FileUtil.cpp.
Not really anything interesting, just some better comments, some slightly more portable/cleaner code in places.

git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@2459 8ced0084-cf51-0410-be5f-012b33b47a6e
2009-02-28 01:26:56 +00:00
nakeee d43c22b8dc Linux compile fix,
added SLEEP to common, please use this macro if really don't want to use the sleep in thread


git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@2390 8ced0084-cf51-0410-be5f-012b33b47a6e
2009-02-23 09:54:12 +00:00
fires.gc 5c2694a629 added support to load WAD files of the WII
the WiiWAD loader encrypts the WAD, loads the NAND AppLoader and executes it. The NAND Loader will load more parts of the WAD to memory and execute them.

Some WADs show the loading screen but hanging because the BT devices cant be initialized. Dolphin is not able to connect to devices that arnt validates per SYSCONF. Perhaps a global flag is wrong or missing or we have to preload the SYSCONF by hand (or fix/improve the BT handling :))

git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@2348 8ced0084-cf51-0410-be5f-012b33b47a6e
2009-02-22 00:40:52 +00:00
John Peterson fcdd2a8e17 Wiimote:
1. Fixed the dual mode. You should now be able to change between the real and emulated Wiimote at any time, even when the Nunchuck is connected. It also supports third party Wireless Nunchucks that never sends any calibration values. The Nunchuck status should be automatically updated. The Nunchuck stick may get stuck, but that should fix itself if you disconnect and reconnect again. The only important problems seems to be that the real Wiimote fails to answer sometimes so that the Core functions disconnect it.

2. Began looking at how to reconnect the Wiimote after an unwanted HCI disconnect command

git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@2129 8ced0084-cf51-0410-be5f-012b33b47a6e
2009-02-07 03:16:41 +00:00
XTra.KrazzY 77215fd27c Joined work of nakee and mine, cleanup the logging code a bit.
This solves the random __Log symbol and crash problem on linux
Please tell us if you find problems in the logging code


git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@2109 8ced0084-cf51-0410-be5f-012b33b47a6e
2009-02-04 15:28:39 +00:00
Shawn Hoffman b4158a28ee cross-platformize strncasecmp
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@2029 8ced0084-cf51-0410-be5f-012b33b47a6e
2009-01-29 02:13:36 +00:00
hrydgard 70bc8167f8 Warp back to 1983!!! (rev 1983, that is, not the year :P)
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@1997 8ced0084-cf51-0410-be5f-012b33b47a6e
2009-01-23 21:28:55 +00:00
nakeee 87bfe821eb Added input manager handles the sdl init/quit for now
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@1984 8ced0084-cf51-0410-be5f-012b33b47a6e
2009-01-22 22:32:57 +00:00
John Peterson ae9cfbd8e3 Common: Moved Windows console functions to common
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@1887 8ced0084-cf51-0410-be5f-012b33b47a6e
2009-01-17 14:28:09 +00:00
LPFaint99 7afc53c3a1 Revert r1861
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@1879 8ced0084-cf51-0410-be5f-012b33b47a6e
2009-01-16 02:58:34 +00:00
LPFaint99 f1a3bc1397 Move #include <window.h> from all files that include it and common.h to common.h
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@1861 8ced0084-cf51-0410-be5f-012b33b47a6e
2009-01-13 04:23:26 +00:00
John Peterson b7f1e937bb LogManager: Opt out of <wx/datetime.h> even if you have wx
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@1765 8ced0084-cf51-0410-be5f-012b33b47a6e
2009-01-04 16:52:28 +00:00
magumagu9 05df5c8f3f Minor fix to rotation helpers so they don't do undefined shifts.
Probably not a big deal realistically, but better to be safe than sorry.



git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@1725 8ced0084-cf51-0410-be5f-012b33b47a6e
2008-12-31 20:42:23 +00:00
John Peterson 5e5e507121 nJoy: Enabled keyboard input (only for buttons so far) through wxWidgets in the main application. It only works when you render to the main window.
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@1706 8ced0084-cf51-0410-be5f-012b33b47a6e
2008-12-28 18:50:24 +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
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