Charlemagne Lasse
60b193c95c
Let travis handle the package installation directly
...
The before_install currently fails on Travis CI with:
The following packages have unmet dependencies:
libsdl2-dev : Depends: libegl1-mesa-dev
Depends: libgles2-mesa-dev
E: Unable to correct problems, you have held broken packages.
This can currently only be solved by using the apt addon to install
packages.
2017-09-01 09:56:19 +02:00
Bobby Smiles
8e63bfa5f7
Revert "Allow using compiler other than gcc"
...
This reverts commit f13e35b373
.
2017-06-24 13:34:53 -06:00
bsmiles32
dc36c1e7ac
Merge pull request #32 from loganmc10/patch-1
...
Allow using compiler other than gcc
2017-06-22 20:20:53 -06:00
Logan McNaughton
f13e35b373
Allow using compiler other than gcc
2017-06-20 21:16:16 -06:00
Richard Goedeken
20f18fc435
Merge pull request #29 from loganmc10/vidext
...
Add support for VIDEXT_HEADER
2017-04-05 22:59:15 -07:00
Richard Goedeken
0abb73fcb7
Merge pull request #28 from fprimex/fprimex-macos-version-min
...
bump macosx-version-min to 10.6 for SDL2.0.5
2017-03-16 23:57:48 -07:00
Logan McNaughton
7aac7adb5f
Add support for VIDEXT_HEADER
2017-03-16 21:20:48 -06:00
Brent Woodruff
5639129cfc
bump macosx-version-min to 10.6 for SDL2.0.5
2017-03-16 22:52:35 -04:00
Dorian Fevrier
1e9a53456c
Merge pull request #27 from Gillou68310/load_on_first_int
...
New implementation of the savestate loaded at startup option.
2016-10-20 13:32:30 +02:00
Gillou68310
334db80b55
New implementation of the savestate loaded at startup option.
...
The savestate will be loaded on the first safe state interrupt instead of being loaded on the first frame.
2016-10-19 17:15:06 +02:00
Richard Goedeken
07dba790c8
Merge pull request #26 from charlemagnelasse/master
...
Use Ubuntu Trusty as base system for Travis CI
2016-09-01 18:04:19 -07:00
Charlemagne Lasse
fcca5a0813
Use Ubuntu Trusty as base system for Travis CI
2016-09-01 20:23:59 +02:00
Richard Goedeken
bdcd13b3ed
change VS2013 project files to build with the XP-compatible vc120 toolset, so the resulting binaries will run on pre-vista machines
2016-07-13 20:04:06 -07:00
Richard Goedeken
c52baffa34
revert last commit, put the x64 builds back in the MSVC project file
2016-03-27 19:51:07 -07:00
Richard Goedeken
6b8aa2e63c
win32 build fixes
2016-03-17 22:26:54 -07:00
Richard Goedeken
1474de74d7
Merge pull request #22 from Gillou68310/x64
...
Added x64 configuration to VisualStudio2013 project file
2015-09-12 21:52:14 -07:00
Gillou68310
f5db412261
Added x64 configuration to VisualStudio2013 project file
2015-08-28 15:58:58 +02:00
Richard Goedeken
3fc549b5c3
Merge pull request #21 from bentley/openbsd
...
Remove unnecessary OpenBSD warning.
2015-06-08 06:31:56 -07:00
Anthony J. Bentley
b8dff88aed
Remove unnecessary OpenBSD warning.
2015-06-08 01:51:13 -06:00
Richard Goedeken
f89efa27d1
add new solution configuration for Release (New Dynarec)
2015-04-26 13:41:22 -07:00
Richard Goedeken
58cf524522
update text files and version number for upcoming 2.5 release
2015-04-26 12:32:06 -07:00
Richard Goedeken
cd103ec918
Merge pull request #20 from conchurnavid/includes
...
Cleanup includes order and add missing includes
2015-03-21 21:33:23 -07:00
Conchúr Navid
e1b4a8f1e3
Add missing includes and forward declarations
2015-03-21 13:47:40 +01:00
Conchúr Navid
9818963be4
Sort the includes based on type and names
2015-03-21 10:58:40 +01:00
Conchúr Navid
f0b0a1249e
Fix executable bits of files
2015-03-21 10:53:38 +01:00
Richard Goedeken
398b96c3b2
added project/solution file for Visual Studio 2013. removed older MSVS project files. fix code compatilibity problems with MSVC
2015-02-22 07:13:34 -08:00
Richard Goedeken
42747beafd
Merge pull request #18 from Nebuleon/build-changes
...
Drop architecture checks for cross-platform project
2015-02-01 14:14:33 -08:00
Nebuleon Fumika
ac12e2cf3a
Ignore the correct Unix executable in .gitignore
2015-01-26 09:27:21 +00:00
Nebuleon Fumika
cb4e055c54
Unix Makefile: Discard unnecessary architecture checks
...
Unlike the Mupen64Plus Core, which is sensitive to the architecture
it's compiled for due to its just-in-time compilers, this project does
not require architecture-specific glue code, only operating system
checks to load dynamic libraries.
2015-01-26 09:22:04 +00:00
Dorian Fevrier
48441f5647
Merge pull request #17 from littleguy77/master
...
Fix windows build regression introduced in PR 12.
The EXPORT command breaks the build in windows due to conflicting
declaration of sdl_main by SDL_main.h, when built for WIN32. No such
conflict exists for non-windows builds.
Here we just substitute the non-windows definition of EXPORT.
2015-01-17 22:34:15 -05:00
littleguy77
44f0f5060d
Fix windows build regression introduced in PR 12.
...
The EXPORT command breaks the build in windows due to conflicting
declaration of sdl_main by SDL_main.h, when built for WIN32. No such
conflict exists for non-windows builds.
Here we just substitute the non-windows definition of EXPORT.
2015-01-17 20:18:37 -05:00
Dorian Fevrier
8c56a77f45
Merge pull request #16 from mupen64plus/revert-14-master
...
Revert "Remove SDL build dependency."
2015-01-14 11:27:38 -05:00
Dorian Fevrier
b2bbc856ab
Revert "Remove SDL build dependency."
2015-01-14 08:34:08 -05:00
Dorian Fevrier
8edabd0a78
Merge pull request #14 from littleguy77/master
...
Remove SDL build dependency.
2015-01-14 00:32:26 -05:00
littleguy77
87ef78922a
Remove SDL build dependency.
2015-01-13 12:43:58 -05:00
Richard Goedeken
fb5134b37e
Merge pull request #13 from mupen64plus-ae/vanilla
...
Merge Android Edition history
2015-01-10 18:57:25 -08:00
littleguy77
ce0619035b
Merge remote-tracking branch 'upstream/master'
2015-01-10 20:55:10 -05:00
Richard Goedeken
3ddfb4d973
Merge pull request #12 from littleguy77/master
...
Allow external state callback to be specified via build flag...
2015-01-10 09:09:21 -08:00
littleguy77
f3d45ddbbe
Allow external state callback to be specified via build flag...
...
... and allow main() to be called by external module.
Useful for UI implementations that simply layer on top of ui-console
(rather than reimplement it). In such cases, ui-console can be built as
a library rather than top-level executable. The higher-level UI can
then "launch" the ui-console implementation in its own process/thread
by calling main directly (rather than spawning a separate ui-console
process). This is not only a general convenience, but also allows the
higher-level UI to provide a state callback to synchronize its display.
This commit facilitates downstream UI development, but is not likely to
be of interest to general users who build ui-console from makefile.
Therefore, the CALLBACK_* build flags are omitted from the makefile help
text.
2015-01-08 22:55:40 -05:00
Richard Goedeken
be26692c40
Merge pull request #11 from Gillou68310/master
...
Added project files for MSVC2010
2015-01-07 22:54:21 -08:00
Gillou68310
1b08f8c445
Added project files for MSVC2010
2015-01-07 15:40:29 +01:00
Will Nayes
4e145eae6e
Updated README with regs, bp commands.
2014-12-30 16:37:08 -06:00
Will Nayes
969970dcde
Added basic breakpoints add/rm. Added printout of current op. Added exit/quit.
2014-12-30 16:34:47 -06:00
littleguy77
7c140db778
build: Remove Android makefile.
2014-12-18 22:09:51 -05:00
littleguy77
5dcf54f00d
Merge remote-tracking branch 'upstream/master'
2014-12-18 22:09:19 -05:00
Will Nayes
175503cde5
No padding on all-zeroes register values.
2014-12-18 19:35:24 -06:00
Will Nayes
8fb22f1096
Use SDL threading instead of pthreads.
2014-12-18 19:29:23 -06:00
Will Nayes
5ce862533c
Added GPR printout with value-changed indication.
2014-12-16 21:10:33 -06:00
Richard Goedeken
90fefcab64
Merge pull request #7 from mupen64plus/invert_callbacks
...
fix: can't load saved state and do screenshot because only one callback ...
2014-12-14 07:44:03 -08:00
Dorian Fevrier
c495ff81e6
fix bad logic to set frame callback
2014-12-13 15:56:26 -05:00