[mupen64plus-ui-console] 142/172: Imported Upstream version 2.0
Sven Eckelmann
ecsv-guest at moszumanska.debian.org
Thu Nov 26 06:07:42 UTC 2015
This is an automated email from the git hooks/post-receive script.
ecsv-guest pushed a commit to branch armhf_test
in repository mupen64plus-ui-console.
commit cbfc4b35cf2830c6acc485b21f3ed246f2dd2abc
Author: Sven Eckelmann <sven at narfation.org>
Date: Fri Jul 5 09:38:41 2013 +0200
Imported Upstream version 2.0
---
README | 45 +++++++++++++++++++++++++++++++++++++--------
RELEASE | 7 +++++++
projects/unix/Makefile | 29 +++++++++++++----------------
src/main.c | 7 ++-----
src/version.h | 6 +++---
5 files changed, 62 insertions(+), 32 deletions(-)
diff --git a/README b/README
index 6c755dd..5c0caca 100644
--- a/README
+++ b/README
@@ -1,13 +1,23 @@
-Mupen64Plus-UI-Console README
------------------------------
+===============================================================================
+-------------------------------------------------------------------------------
+Mupen64plus-ui-console README v2.0
+-------------------------------------------------------------------------------
+===============================================================================
-README Sections
- 1. Command-line options
+The latest documentation for this plugin can be found at:
-1. Command-line options
-------------------------
+https://code.google.com/p/mupen64plus/wiki/UIConsoleUsage
-Run 'mupen64plus --help' for a complete list of command-line options:
+-------------------------------------------------------------------------------
+Console Options
+-------------------------------------------------------------------------------
+
+At startup, the mupen64plus program will look for a user configuration file
+called 'mupen64plus.cfg'. If this file does not exist, it will be created and
+default settings will be written. If desired, an alternate config directory can
+be specified using the --configdir commandline option.
+
+Run 'mupen64plus --help' for a complete list of commandline options:
$ mupen64plus --help
Usage: mupen64plus [parameter(s)] [romfile]
@@ -21,7 +31,7 @@ Parameters:
--nospeedlimit : disable core speed limiter (should be used with dummy audio plugin)
--cheats (cheat-spec) : enable or list cheat codes for the given rom file
--corelib (filepath) : use core library (filepath) (can be only filename or full path)
- --configdir (dir) : force configation directory to (dir); should contain mupen64plus.conf
+ --configdir (dir) : force configation directory to (dir); should contain mupen64plus.cfg
--datadir (dir) : search for shared data files (.ini files, languages, etc) in (dir)
--plugindir (dir) : search for plugins in (dir)
--sshotdir (dir) : set screenshot directory to (dir)
@@ -49,4 +59,23 @@ Parameters:
(codelist) : a comma-separated list of cheat code numbers to enable,
with dashes to use code variables (ex 1-2 to use cheat 1 option 2)
+-------------------------------------------------------------------------------
+Cheats
+-------------------------------------------------------------------------------
+
+To list the available cheats in the rom:
+
+mupen64plus --cheats list "/path/to/my/rom.v64"
+
+If there are cheats in the rom, you will get (in the output console):
+
+UI-Console: 3 cheat code(s) found for ROM 'MY ROM'
+ 0: [Enable All Levels] (This is needed to be able to Play all Levels of the Game)
+ 1: [Enable All Weapons] (This is needed to be able to Play with all Weapons of the Game)
+ 2: etc...
+
+All you have to do to use this cheats is:
+
+mupen64plus --cheats 0,1,2 "/path/to/my/rom.v64"
+
diff --git a/RELEASE b/RELEASE
index ab52f5e..e2b6666 100644
--- a/RELEASE
+++ b/RELEASE
@@ -1,6 +1,13 @@
Mupen64Plus-UI-Console RELEASE
------------------------------
+Mupen64Plus-UI-Console Front-End v2.0 - July 4, 2013
+----------------------------------------------------
+ - Project files for Visual Studio 2012
+ - Makefile changes
+ - add support for PowerPC and MinGW32 builds
+ - add cross-compiling support to build Win32 executables (MXE) under Linux
+
Mupen64Plus-UI-Console Front-End v1.99.5 - March 10, 2012
---------------------------------------------------------
- New option to disable internal core speed limiter (for benchmarking)
diff --git a/projects/unix/Makefile b/projects/unix/Makefile
index b6ee494..848a3ae 100644
--- a/projects/unix/Makefile
+++ b/projects/unix/Makefile
@@ -128,18 +128,6 @@ ifeq ($(OS), OSX)
OSX_SYSROOT := /Developer/SDKs
endif
- # The mac version of SDL requires inclusion of SDL_main in the executable
- ifeq ($(origin SDL_CFLAGS) $(origin SDL_LDLIBS), undefined undefined)
- SDL_CONFIG = $(CROSS_COMPILE)sdl-config
- ifeq ($(shell which $(SDL_CONFIG) 2>/dev/null),)
- $(error No SDL development libraries found!)
- endif
- SDL_CFLAGS += $(shell $(SDL_CONFIG) --cflags)
- SDL_LDLIBS += $(shell $(SDL_CONFIG) --libs)
- endif
- CFLAGS += $(SDL_CFLAGS)
- LDLIBS += $(SDL_LDLIBS)
-
ifeq ($(CPU), X86)
ifeq ($(ARCH_DETECTED), 64BITS)
CFLAGS += -pipe -arch x86_64 -mmacosx-version-min=$(OSX_SDK) -isysroot $(OSX_SYSROOT)/MacOSX$(OSX_SDK).sdk
@@ -149,11 +137,20 @@ ifeq ($(OS), OSX)
endif
endif
+# test for presence of SDL
+ifeq ($(origin SDL_CFLAGS) $(origin SDL_LDLIBS), undefined undefined)
+ SDL_CONFIG = $(CROSS_COMPILE)sdl-config
+ ifeq ($(shell which $(SDL_CONFIG) 2>/dev/null),)
+ $(error No SDL development libraries found!)
+ endif
+ SDL_CFLAGS += $(shell $(SDL_CONFIG) --cflags)
+ SDL_LDLIBS += $(shell $(SDL_CONFIG) --libs)
+endif
+CFLAGS += $(SDL_CFLAGS)
+LDLIBS += $(SDL_LDLIBS)
+
ifeq ($(OS), MINGW)
- # Do NOT include SDL_main for Windows; we are building a console app!
- # NO -mwindows either! (it will still be a valid 32-bit Windows program)
- CFLAGS += -I/usr/local/include/SDL -D_GNU_SOURCE=1
- LDLIBS += -L/usr/local/lib -lmingw32 -lSDL
+ LDLIBS += -mconsole
endif
ifeq ($(BIG_ENDIAN), 1)
diff --git a/src/main.c b/src/main.c
index c7f20e2..447503a 100644
--- a/src/main.c
+++ b/src/main.c
@@ -30,10 +30,7 @@
#include <stdlib.h>
#include <stdarg.h>
-// The mac version of SDL requires inclusion of SDL_main in the executable
-#ifdef __APPLE__
- #include <SDL_main.h>
-#endif
+#include <SDL_main.h>
#include "cheat.h"
#include "main.h"
@@ -235,7 +232,7 @@ static void printUsage(const char *progname)
" --nospeedlimit : disable core speed limiter (should be used with dummy audio plugin)\n"
" --cheats (cheat-spec) : enable or list cheat codes for the given rom file\n"
" --corelib (filepath) : use core library (filepath) (can be only filename or full path)\n"
- " --configdir (dir) : force configation directory to (dir); should contain mupen64plus.conf\n"
+ " --configdir (dir) : force configation directory to (dir); should contain mupen64plus.cfg\n"
" --datadir (dir) : search for shared data files (.ini files, languages, etc) in (dir)\n"
" --plugindir (dir) : search for plugins in (dir)\n"
" --sshotdir (dir) : set screenshot directory to (dir)\n"
diff --git a/src/version.h b/src/version.h
index d26973d..7344653 100644
--- a/src/version.h
+++ b/src/version.h
@@ -27,9 +27,9 @@
#define VERSION_H
#define CONSOLE_UI_NAME "Mupen64Plus Console User-Interface"
-#define CONSOLE_UI_VERSION 0x016305
-#define CORE_API_VERSION 0x20001
-#define CONFIG_API_VERSION 0x20000
+#define CONSOLE_UI_VERSION 0x020000
+#define CORE_API_VERSION 0x020001
+#define CONFIG_API_VERSION 0x020000
#define MINIMUM_CORE_VERSION 0x016300
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-games/mupen64plus-ui-console.git
More information about the Pkg-games-commits
mailing list