Commit graph

342 commits

Author SHA1 Message Date
Dorian Fevrier
7d5247b399 fix: can't load saved state and do screenshot because only one callback function is allowed. Now everything is done inside one single callback function 2014-12-12 20:07:29 -05:00
Richard Goedeken
36c51b5c8f Merge pull request #6 from mupen64plus/savestate_loading
add savestate loading at rom startup support
2014-12-11 21:43:27 -08:00
Dorian Fevrier
0bc3036a58 Merge branch 'savestate_loading' of https://github.com/mupen64plus/mupen64plus-ui-console into savestate_loading
Conflicts:
	src/main.c
2014-12-11 23:28:55 -05:00
Dorian Fevrier
566c9f9903 add savestate loading at rom startup support 2014-12-11 23:25:30 -05:00
Dorian Fevrier
91f0a28d85 add savestate loading at rom startup support 2014-12-11 23:21:45 -05:00
Paul Lamb
a04f4f2b53 Merge from upstream 2014-12-02 19:05:21 -06:00
Will Nayes
29363909e0 Fixes after fetching upstream. 2014-11-23 17:54:01 -06:00
Will Nayes
1703b25649 Initial debugger code with run/pause/step. 2014-11-23 16:36:50 -06:00
Richard Goedeken
76937ae2e8 Merge pull request #5 from bentley/manpage-flags
Minor manpage macro improvements
2014-11-09 16:23:45 -08:00
Anthony J. Bentley
7ee1328d4d Use Unicode hyphens and apostrophes when available. 2014-11-08 19:29:57 -07:00
Anthony J. Bentley
fe425d1bcf Mark up author names with the An macro. 2014-11-08 19:26:23 -07:00
Anthony J. Bentley
e7e218406c The Fl macro nests, so use that for marking up --flags. 2014-11-08 19:21:52 -07:00
Paul Lamb
af28634085 Merge from upstream 2014-11-08 11:26:04 -06:00
Richard Goedeken
fe680206dc Merge pull request #4 from fayvel/xdg-desktop
Fix xdg desktop file
2014-09-06 21:00:44 -07:00
Fayvel Victor
fc64df7ae7 Don't show desktop entry in start menu
mupen64plus just closes when it is started without valid ROM as argument. It
should only be shown as program to open application/x-n64-rom files.
2014-09-05 13:39:20 +02:00
Fayvel Victor
c5381217a2 Add Keywords to desktop file 2014-09-05 13:38:39 +02:00
Richard Goedeken
fb21340f22 Merge pull request #3 from fayvel/travisci
Add Travis CI configuration file for automatic build tests
2014-07-07 22:08:27 -07:00
Fayvel Victor
b393896e1b Add Travis CI configuration file for automatic build tests
Github provides a Travis CI integration which makes it easy to have a quick
check of a patch before a pull request is accepted. It is not enough to prove
the correctness of a contribution but at least helps to avoid some of the worst
build problems.

This feature *must* be enabled by the mupen64plus administrator *before this
commit is merged*:

- https://travis-ci.org/profile/mupen64plus
- Login via your Github account
- Make sure you are on "https://travis-ci.org/profile/mupen64plus"
- Switch repository to "On"
2014-07-06 12:31:58 +02:00
Richard Goedeken
6f0b800cd1 SDL 1.2 is not deprecated for us, and we shouldnt frighten the user with 6 lines of exclamation points 2014-05-04 11:32:31 -07:00
Ursula Abendroth
ad9815f6c4 Switch by default to SDL2 for Mupen64Plus 2.1
The current version of SDL is 2.0.3. All new releases of distributions contain
this library already. Current Linux distributions and OpenBSD even backporting
patches from Mupen64Plus 2.1 repo to use SDL 2. Android and other mobile
platform don't have support for legacy SDL 1.2.

People like Anthony J. Bentley and Riley Labrecque already requested
a new release of Mupen64Plus 2.1 with SDL2
2014-04-23 19:32:56 +02:00
Richard Goedeken
79022e7499 Merge pull request #1 from bsmiles32/desktop_integration
Add application desktop file and icons.
2014-02-16 21:27:08 -08:00
Bobby Smiles
60d72dc650 Add application desktop file and icons.
SVG logo information
source: https://en.wikipedia.org/wiki/File:Mupen64plus.svg
author: Scott 'Tillin9' Knauert
license: Creative Commons Attribution-Share Alike 3.0 Unported
2014-02-15 03:28:59 +01:00
littleguy77
8622e12da3 android: Add android edition customizations. 2014-01-28 17:35:58 -05:00
littleguy77
ac8a254ac7 build: Add android makefile. 2014-01-28 17:35:45 -05:00
Sven Eckelmann
d1bbbcca5f Replace references to bitbucket with github 2013-12-19 14:35:03 +01:00
Sven Eckelmann
da9e9b4d3b Force line ending type for specific files
Different operation systems (Unix vs. Windows) use different line ending types.
It can easily happen that users from different systems edit files and replace
all line endings of a file with the system specific version. This screws up
diffs and makes merges harder.

Git can normalize line endings for specific files and avoid this problem.
Binary files should be marked to avoid accidentally normalization.
2013-12-19 14:19:07 +01:00
Sven Eckelmann
4999d06015 Convert .hgignore to .gitignore 2013-12-19 14:13:38 +01:00
Richard Goedeken
16996c73bd merged heads, made a few man page changes 2013-09-21 14:11:04 -07:00
Anthony J. Bentley
6c4695cae5 Use more appropriate lists. 2013-09-20 23:02:28 -06:00
Anthony J. Bentley
9986f7a85d Update outdated plugin information. 2013-09-20 22:57:58 -06:00
Anthony J. Bentley
d1408e91c2 Make the manpage match what --help prints out. 2013-09-20 22:50:45 -06:00
Anthony J. Bentley
69cfb75a50 Update manpage to use semantic mdoc macros. 2013-09-20 22:44:46 -06:00
Sven Eckelmann
212be30f54 Don't fail rebuild when header is removed
The *.d depends files for make just list the files used when building an
object file. Removing a file listed in such a dependency file causes make to
search for a way to recreate it. This usually cannot work because these files
aren't autogenerated.

The gcc option -MP can be used to generate empty rule for these files. Removing
a file in a dependency list will then execute this empty rule and continue with
the execution of the creation of the object file. This compilation process will
then automatically correct the dependency file.
2013-09-20 10:31:48 +02:00
littleguy77
4cff083518 Define printf/debug callback for Android builds. 2013-08-30 09:42:28 -04:00
richard42
5d19eca9b5 simplify OSX platform detection in makefile using xcode-select. based on patch from John Pender 2013-07-08 07:39:48 -07:00
Richard Goedeken
ccfa8cf3c3 Added tag 2.0 for changeset 6665d52da57b 2013-07-04 15:48:15 -07:00
Richard Goedeken
04fe4dad22 update version number to 2.0 2013-07-03 07:09:38 -07:00
Richard Goedeken
61c419cee7 updated README 2013-06-27 22:57:15 -07:00
Richard Goedeken
ba2e1d0192 update README and command-line usage console output 2013-06-27 22:31:55 -07:00
Richard Goedeken
77748f1c00 update text files for upcoming 2.0 release 2013-06-26 22:53:10 -07:00
Sven Eckelmann
9a3c294a88 Avoid crash caused by missing initial SDL startup
SDL needs to overwrite the main function to initialize the inner state on some
operating systems. Not doing it this way will cause random crashes and
undefined behaviour.

Systems which need a special main function are for example Apple MacOS,
Android, iPhone or Win32. SDL will handle it automatically and keep systems
without such requirement with an untouched main function.
2013-06-25 14:57:05 +02:00
Richard Goedeken
64d7fa307e tagged v2.0-rc2 2013-06-01 18:00:33 -07:00
richard42
5bf3cc39f6 update msvc11 solution file to use the moved glide64mk2 project files in 'msvc11' 2013-06-01 08:19:46 -07:00
richard42
d1b19e9893 Update msvc11 project file to visual studio 2012 (msvc11) 2013-06-01 07:58:59 -07:00
Sven Eckelmann
dccdaa03ee Allow to statically set SDL_(CFLAGS|LIBS) without sdl-config
n.pepinpe requested in #540 to allow overwriting the automatically searched
CFLAGS and LIBS for used libraries. This should allow distributors to set the
build configuration without patching the makefile. This is important for
systems were pkg-config or sdl-config aren't normally used.
2013-05-11 12:26:18 +02:00
Sven Eckelmann
ff73a2f421 Enable Link-time optimization by default
The GCC introduced Link-time optimization in GCC 4.5 (2010-04-14). This should
be long enough available that interested users have upgraded to a compiler
supporting it.

The MSVC project already enabled WholeProgramOptimization since a long time.
Enabling it by default in GCC seems to be equally valid.
2013-05-11 11:25:56 +02:00
Sven Eckelmann
ef07d7d1c7 Add CFLAGS to the linker step
The GCC manual states for different parameters that the options for compilation
must also be used when linking. The options for compilation are stored in
CFLAGS and added to LINK.o to fix the behavior.

Option which need this are for example -fPIC/-fPIE or -flto.
2013-05-11 10:51:36 +02:00
Richard Goedeken
d048eee443 add glide64mk2 to the solution file 2013-03-20 22:31:21 -07:00
Richard Goedeken
d0cebb5307 add msvc11 project and solution files from mudlord 2013-03-20 22:25:20 -07:00
Richard Goedeken
340c135b7c fixed compiler warnings 2013-03-09 21:30:06 -08:00