ecd9800968
Merge branch 'master' into mono-portable
...
Conflicts:
BizHawk.Client.DiscoHawk/DiscoHawk.cs
BizHawk.Client.EmuHawk/Extensions/ControlExtensions.cs
BizHawk.Emulation.Cores/Consoles/Nintendo/SNES/LibsnesApi.cs
BizHawk.Emulation.Cores/Consoles/Nintendo/SNES/LibsnesCore.cs
libsnes/bsnes/target-libsnes/libsnes_pwrap.cpp
2017-03-14 20:36:35 -05:00
4a52b60ca5
Version: add a dummy source file so that some versions of csc.exe won't give error 2008, killing the build scripts
2017-02-24 14:03:12 +03:00
c93697baee
Merge branch 'master' into mono-portable
...
Conflicts:
.gitignore
BizHawk.Client.ApiHawk/BizHawk.Client.ApiHawk.csproj
BizHawk.Client.Common/BizHawk.Client.Common.csproj
BizHawk.Client.Common/lua/LuaSandbox.cs
BizHawk.Client.Common/movie/conversions/MovieConversionExtensions.cs
BizHawk.Client.Common/tools/Cheat.cs
BizHawk.Client.Common/tools/Watch/WatchList/WatchList.cs
BizHawk.Client.EmuHawk/AVOut/FFmpegWriter.cs
BizHawk.Client.EmuHawk/BizHawk.Client.EmuHawk.csproj
BizHawk.Client.EmuHawk/DisplayManager/DisplayManager.cs
BizHawk.Client.EmuHawk/MainForm.cs
BizHawk.Client.EmuHawk/movie/RecordMovie.cs
BizHawk.Client.EmuHawk/tools/GameShark.cs
BizHawk.Emulation.Common/Interfaces/IInputPollable.cs
BizHawk.Emulation.Cores/BizHawk.Emulation.Cores.csproj
BizHawk.Emulation.Cores/CPUs/MOS 6502X/MOS6502X.cs
BizHawk.Emulation.Cores/Computers/Commodore64/C64.IInputPollable.cs
BizHawk.Emulation.Cores/Consoles/Nintendo/GBA/LibmGBA.cs
BizHawk.Emulation.Cores/Consoles/Nintendo/GBA/MGBAHawk.cs
BizHawk.Emulation.Cores/Consoles/Nintendo/QuickNES/QuickNES.ITraceable.c
s
BizHawk.Emulation.Cores/Consoles/Nintendo/QuickNES/QuickNES.cs
BizHawk.Emulation.Cores/Consoles/Nintendo/SNES/LibsnesCore.cs
BizHawk.Emulation.Cores/Consoles/Sega/SMS/SMS.cs
BizHawk.Emulation.Cores/Consoles/Sega/gpgx/GPGX.cs
BizHawk.Emulation.Cores/Consoles/Sony/PSX/Octoshock.cs
Dist/changelog.txt
output/Lua/Genesis/Earthworm Jim 2.lua
output/Lua/SNES/Super Mario World.lua
output/dll/mgba.dll
quicknes/bizinterface.cpp
quicknes/mingw/Makefile
2016-03-07 20:34:23 -06:00
2a0e859a85
Add 64 bit build (doesn't work yet), move SlimDX.dll
2016-02-28 15:06:03 -05:00
df7c3c31e5
Fix for Version project so it builds under MSBuild via MonoDevelop. Provided by "scubed" on the forum.
...
- Works on my machine.
2016-01-02 12:16:13 -06:00
b140811080
Changes that make BSNES try to run on OS X. Can not proceed further, due to lack of support for named pipes in Mono.
2015-07-19 20:13:04 -05:00
74d7bf32b6
Merge branch 'master' into mono-portable
...
Conflicts:
.gitignore
Version/version.csproj
2015-07-15 21:42:53 -05:00
8847a35425
employ git build tool in veersion project building
2015-06-24 20:45:08 -05:00
23ce145962
Fix Version project on OS X 10.11
...
Mono can’t be in /usr/bin/ anymore, so it wasn’t working.
It still doesn’t work now, because we’re not using SVN anymore so it
can’t run svnversion, but I figured it would be better to check this in
for when the version tool is fixed.
2015-06-24 19:02:36 -05:00
5b466e5d70
New portable branch re-created from master with hopefully all of the changes made to the old one, plus some cleanup of things that got mangled from repeated merges.
2015-06-23 22:22:11 -05:00
9497991fcd
my visual studio keeps wanting to update this. it looks better so i guess i'll keep it.
2015-06-23 17:20:58 -05:00
e7fe6252c6
* Added a project which can contain build-related tools (and msbuild tasks if we ever need them) and gave it responsibility for managing the svn revision stuff.
...
* With a little more work, it could handle unix and git checkouts too.
* It could pull revisions from submodules as well, if they werent useless gibberish in git
* Unaddressed: theres still a problem where depending on how emuhawk is built, the version project might not trigger
2015-03-04 09:33:04 +00:00
837e1053b5
revert a line in 8998, msbuild now works, I don't know if this broke anything 8998 was trying to do though
2015-02-01 18:43:56 +00:00
c2621e798d
fix subwcrev stuff. this time, fixes stale versions on f5 or ctrl+f5 builds.
...
in the future, we should use svn msbuild community tasks for even cleverer and leaner solutions (which dont depend on subwcrev.exe...)
2015-02-01 03:01:31 +00:00
0a345b0084
Issue 368: Set all platform targets to x86, rename build platforms to match, and remove unused build platforms.
2015-01-13 15:28:58 +00:00
e0c09a553b
redo how subwcrev stuff is done, so that the subwcrev process doesnt have to run for every project. improves build times.
2014-12-09 19:20:22 +00:00
Sappharad