Commit graph

216 commits

Author SHA1 Message Date
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
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
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
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
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