[mupen64plus-ui-console] 119/172: Imported Upstream version 1.99.5+22+0f89ae786d3e
Sven Eckelmann
ecsv-guest at moszumanska.debian.org
Thu Nov 26 06:07:39 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 24db8dcc2dcb0123a580253485a6b38ca92ed0fc
Author: Sven Eckelmann <sven at narfation.org>
Date: Fri Feb 8 09:35:18 2013 +0100
Imported Upstream version 1.99.5+22+0f89ae786d3e
---
doc/mupen64plus.6 | 188 +++++++++++++++++++++++++++++++++++++++++++++++++
doc/mupen64plus.6.gz | Bin 2406 -> 0 bytes
projects/unix/Makefile | 78 ++++++++++++++++----
src/main.c | 2 +-
4 files changed, 253 insertions(+), 15 deletions(-)
diff --git a/doc/mupen64plus.6 b/doc/mupen64plus.6
new file mode 100644
index 0000000..00f6dbd
--- /dev/null
+++ b/doc/mupen64plus.6
@@ -0,0 +1,188 @@
+.TH "mupen64plus" 6
+.SH NAME
+mupen64plus \- Console front\(hyend for the Mupen64Plus N64 emulator
+.SH SYNOPSIS
+.B mupen64plus
+[parameters(s)] [romfile]
+.SH DESCRIPTION
+Mupen64Plus is a plugin\(hybased N64 emulator for Linux/Unix, OSX, and Windows which is capable of accurately playing many games.
+Included are four MIPS R4300 CPU emulators, with dynamic recompilers for 32\(hybit x86 and 64\(hybit amd64 systems, and necessary plugins for audio, graphical rendering (RDP), signal co\(hyprocessor (RSP), and input.
+There are currently two OpenGL video plugins available: the included Rice Video, and Arachnoid (at http://bitbucket.org/wahrhaft/mupen64plus\-video\-arachnoid/).
+
+The most current documentation can be found at the project's homepage:
+
+http://code.google.com/p/mupen64plus
+.TP
+.B \-h, \-\-help
+Print help message.
+.TP
+.B \-\-noosd
+Disable onscreen display.
+.TP
+.B \-\-osd
+Enable onscreen display.
+.TP
+.B \-\-fullscreen
+Run emulator in fullscreen display mode.
+.TP
+.B \-\-windowed
+Run emulator in windowed display mode.
+.TP
+.B \-\-resolution \fRres
+Display resolution (640\(mu480, 800\(mu600, 1024\(mu768, etc)
+.TP
+.B \-\-cheats \fRcheat\(hyspec
+Enable or list cheat codes for the given rom file.
+.TP
+.B \-\-corelib \fRfilepath
+Specifies a filename (optionally with a preceding directory path) to load a specific Mupen64Plus core library.
+.TP
+.B \-\-configdir \fRdirectory
+Specifies a directory to look for the mupen64plus.cfg file.
+Default is \fI~/.config/mupen64plus/\fR.
+.TP
+.B \-\-datadir \fRdirectory
+Specifies a directory to search for shared data files (fonts, cheat codes, .ini files).
+Default is \fIPREFIX/share/mupen64plus/\fR.
+.TP
+.B \-\-plugindir \fRdirectory
+Specifies a directory to search for plugin files.
+Default is \fIPREFIX/lib/mupen64plus/\fR.
+.TP
+.B \-\-sshotdir \fRdirectory
+Specifies a directory to save screenshots captured during gameplay.
+Default is \fI~/.local/share/mupen64plus/screenshot/\fR.
+.TP
+.B \-\-gfx \fRplugin\(hyspec
+Specifies a \fIplugin\(hyspec\fR to select a graphics plugin for use during emulation.
+.TP
+.B \-\-audio \fRplugin\(hyspec
+Specifies a \fIplugin\(hyspec\fR to select an audio plugin for use during emulation.
+.TP
+.B \-\-input \fRplugin\(hyspec
+Specifies a \fIplugin\(hyspec\fR to select an input plugin for use during emulation.
+.TP
+.B \-\-rsp \fRplugin\(hyspec
+Specifies a \fIplugin\(hyspec\fR to select an RSP plugin for use during emulation.
+.TP
+.B \-\-emumode \fRmode
+Specifies which mode the emulator core should run in.
+\fImode\fR should be set to one of the following numbers: 0=Pure Interpreter, 1=Cached Interpreter, 2=Dynamic Recompiler (DynaRec).
+.TP
+.B \-\-testshots \fRlist
+Take screenshots at frames given in the comma\(hyseparated \fIlist\fR, then quit.
+.TP
+.B \-\-core\-compare\-send
+Use the core comparison debugging feature, in data sending mode.
+If the core was not compiled with support for the Core Comparison feature, then the emulator will exit with an error.
+.TP
+.B \-\-core\-compare\-recv
+Use the core comparison debugging feature, in data receiving mode.
+If the core was not compiled with support for the Core Comparison feature, then the emulator will exit with an error.
+.TP
+.B \-\-set \fRparam\(hyspec
+Set the value of a Mupen64Plus configuration parameter.
+This option may be used multiple times.
+The format of \fIparam\(hyspec\fR is Section\(hyName[Param\(hyName]=Value
+.TP
+.B \-\-saveoptions
+Save the given command\(hyline options into the mupen64plus configuration file to use as defaults in the future.
+Since the console front\(hyend needs to load the core library before reading the configuration file, the \-\-corelib option cannot be saved.
+.TP
+.B \-\-verbose
+Print lots of information.
+Useful for debugging but unnecessary for normal use.
+.SH plugin\(hyspec
+.TP
+.B (plugin\-name)
+Filename (without path) of plugin to use.
+Application will search through several directories to look for a matching plugin name.
+.TP
+.B (plugin\-path)
+Full directory path and filename of plugin.
+.TP
+.B 'dummy'
+Use the dummy plugin.
+.SH cheat\(hyspec
+.TP
+.B 'list'
+Show all of the available cheat codes.
+.TP
+.B 'all'
+Enable all of the available cheat codes.
+.TP
+.B (codelist)
+A comma separated list of cheat code numbers to enable.
+.SH KEY COMMANDS
+The following shortcut keys can be used during emulation.
+These are the default key values; nearly all of them may be set to different keys by editing the mupen64plus configuration file.
+.TP
+.B Escape
+Quit the emulator.
+.TP
+.B 0\-9
+Select virtual 'slot' for save/load state.
+.TP
+.B F5
+Save emulator state to current slot.
+.TP
+.B F7
+Load emulator state from current slot.
+.TP
+.B F9
+Reset emulator.
+.TP
+.B F10
+Slow down emulator speed by 5 percent.
+.TP
+.B F11
+Speed up emulator speed by 5 percent.
+.TP
+.B F12
+Take screenshot.
+.TP
+.B Alt\(hyEnter
+Toggle fullscreen mode.
+This is not supported on Windows.
+.TP
+.B p or P
+Pause/continue emulation.
+.TP
+.B m or M
+Mute/unmute sound.
+.TP
+.B f or F
+Fast Forward (playback at 250% normal speed as long as key is pressed).
+.TP
+.B g or G
+Press GameShark button (if cheats are enabled).
+.TP
+.B / or ?
+Advance one frame if paused.
+.TP
+.B [
+Decrease volume.
+.TP
+.B ]
+Increase volume.
+.SH FILES
+The default location for the Mupen64plus configuration file is \fI~/.config/mupen64plus/\fR.
+The default location of the saved screenshots is \fI~/.local/share/mupen64plus/screenshot/\fR.
+The default location of the save states is \fI~/.local/share/mupen64plus/save/\fR.
+.SH BUGS
+To report bugs or make feature requests, use the issue tracker on the Mupen64Plus project site:
+
+http://code.google.com/p/mupen64plus/issues/list
+.SH AUTHORS
+Mupen64Plus was originally started by Richard42 and nmn, and is based on Mupen64 (originally written by Hacktarux).
+
+This man page was written by ebenblues, and updated by Richard42.
+
+.SH COPYRIGHT
+Mupen64Plus is \(co 2008\-2010 The Mupen64Plus Team
+License GPLv2+: GNU GPL version 2 or later <http://gnu.org/licenses/gpl.html>
+
+This is free software: you are free to change and redistribute it.
+There is NO WARRANTY, to the extent permitted by law.
+
+
diff --git a/doc/mupen64plus.6.gz b/doc/mupen64plus.6.gz
deleted file mode 100644
index d0a1b87..0000000
Binary files a/doc/mupen64plus.6.gz and /dev/null differ
diff --git a/projects/unix/Makefile b/projects/unix/Makefile
index cc92fdd..d574a66 100644
--- a/projects/unix/Makefile
+++ b/projects/unix/Makefile
@@ -21,7 +21,7 @@
# Makefile for Mupen64plus-ui-console
# detect operation system
-UNAME = $(shell uname -s)
+UNAME ?= $(shell uname -s)
OS := NONE
ifeq ("$(UNAME)","Linux")
OS = LINUX
@@ -45,6 +45,9 @@ endif
ifneq ("$(filter GNU/kFreeBSD kfreebsd,$(UNAME))","")
OS = LINUX
endif
+ifeq ("$(patsubst MINGW%,MINGW,$(UNAME))","MINGW")
+ OS = MINGW
+endif
ifeq ("$(OS)","NONE")
$(error OS type "$(UNAME)" not supported. Please file bug report at 'http://code.google.com/p/mupen64plus/issues')
endif
@@ -90,8 +93,19 @@ endif
# base CFLAGS, LDLIBS, and LDFLAGS
OPTFLAGS ?= -O3
-CFLAGS += $(OPTFLAGS) -ffast-math -fno-strict-aliasing -pthread -I../../src
-LDLIBS += -pthread
+WARNFLAGS ?= -Wall
+
+# default configuration programs
+SDL_CONFIG = $(CROSS_COMPILE)sdl-config
+
+CFLAGS += $(OPTFLAGS) $(WARNFLAGS) -ffast-math -fno-strict-aliasing -I../../src
+ifeq ($(OS), MINGW)
+ CFLAGS += -lpthread
+ LDLIBS += -lpthread
+else
+ CFLAGS += -pthread
+ LDLIBS += -pthread
+endif
ifeq ($(PIE), 1)
CFLAGS += -fPIE
@@ -106,19 +120,39 @@ ifeq ($(OS), LINUX)
LDLIBS += -ldl
endif
ifeq ($(OS), OSX)
+ # Select the proper SDK
+ # Also, SDKs are stored in a different location since XCode 4.3
+ OSX_SDK ?= $(shell sw_vers -productVersion | cut -f1 -f2 -d .)
+ OSX_XCODEMAJ = $(shell xcodebuild -version | grep '[0-9]*\.[0-9]*' | cut -f2 -d ' ' | cut -f1 -d .)
+ OSX_XCODEMIN = $(shell xcodebuild -version | grep '[0-9]*\.[0-9]*' | cut -f2 -d ' ' | cut -f2 -d .)
+ OSX_XCODEGE43 = $(shell echo "`expr $(OSX_XCODEMAJ) \>= 4``expr $(OSX_XCODEMIN) \>= 3`")
+ ifeq ($(OSX_XCODEGE43), 11)
+ OSX_SYSROOT := /Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs
+ else
+ OSX_SYSROOT := /Developer/SDKs
+ endif
+
# The mac version of SDL requires inclusion of SDL_main in the executable
- LDLIBS += -ldl $(shell sdl-config --libs)
+ CFLAGS += $(shell $(SDL_CONFIG) --cflags)
+ LDLIBS += -ldl $(shell $(SDL_CONFIG) --libs)
ifeq ($(CPU), X86)
ifeq ($(ARCH_DETECTED), 64BITS)
- CFLAGS += -pipe -arch x86_64 -mmacosx-version-min=10.5 -isysroot /Developer/SDKs/MacOSX10.5.sdk
+ CFLAGS += -pipe -arch x86_64 -mmacosx-version-min=$(OSX_SDK) -isysroot $(OSX_SYSROOT)/MacOSX$(OSX_SDK).sdk
LDFLAGS += -arch x86_64
else
- CFLAGS += -pipe -mmmx -msse -fomit-frame-pointer -arch i686 -mmacosx-version-min=10.5 -isysroot /Developer/SDKs/MacOSX10.5.sdk
+ CFLAGS += -pipe -mmmx -msse -fomit-frame-pointer -arch i686 -mmacosx-version-min=$(OSX_SDK) -isysroot $(OSX_SYSROOT)/MacOSX$(OSX_SDK).sdk
LDFLAGS += -arch i686
endif
endif
endif
+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
+endif
+
ifeq ($(BIG_ENDIAN), 1)
CFLAGS += -DM64P_BIG_ENDIAN
endif
@@ -163,8 +197,8 @@ endif
endif
# set base program pointers and flags
-CC ?= gcc
-CXX ?= g++
+CC = $(CROSS_COMPILE)gcc
+CXX = $(CROSS_COMPILE)g++
RM ?= rm -f
INSTALL ?= install
MKDIR ?= mkdir -p
@@ -201,7 +235,13 @@ ifeq ($(MANDIR),)
endif
SRCDIR = ../../src
-OBJDIR = _obj
+OBJDIR = _obj$(POSTFIX)
+
+ifeq ("$(OS)","MINGW")
+ EXEEXT = .exe
+else
+ EXEEXT =
+endif
# list of source files to compile
SOURCE = \
@@ -209,9 +249,17 @@ SOURCE = \
$(SRCDIR)/compare_core.c \
$(SRCDIR)/core_interface.c \
$(SRCDIR)/main.c \
- $(SRCDIR)/plugin.c \
+ $(SRCDIR)/plugin.c
+
+ifeq ($(OS), MINGW)
+SOURCE += \
+ $(SRCDIR)/osal_dynamiclib_win32.c \
+ $(SRCDIR)/osal_files_win32.c
+else
+SOURCE += \
$(SRCDIR)/osal_dynamiclib_unix.c \
$(SRCDIR)/osal_files_unix.c
+endif
# generate a list of object files build, make a temporary directory for them
OBJECTS := $(patsubst $(SRCDIR)/%.c, $(OBJDIR)/%.o, $(filter %.c, $(SOURCE)))
@@ -219,7 +267,7 @@ OBJDIRS = $(dir $(OBJECTS))
$(shell $(MKDIR) $(OBJDIRS))
# build targets
-TARGET = mupen64plus
+TARGET = mupen64plus$(POSTFIX)$(EXEEXT)
targets:
@echo "Mupen64Plus-ui-console makefile."
@@ -235,7 +283,9 @@ targets:
@echo " SHAREDIR=path == default path to search for shared data files"
@echo " APIDIR=path == path to find Mupen64Plus Core headers"
@echo " OPTFLAGS=flags == compiler optimization (default: -O3)"
+ @echo " WARNFLAGS=flag == compiler warning levels (default: -Wall)"
@echo " PIE=(1|0) == Force enable/disable of position independent executables"
+ @echo " POSTFIX=name == String added to the name of the the build (default: '')"
@echo " Install Options:"
@echo " PREFIX=path == install/uninstall prefix (default: /usr/local/)"
@echo " BINDIR=path == path to install mupen64plus binary (default: PREFIX/bin/)"
@@ -249,7 +299,7 @@ targets:
all: $(TARGET)
clean:
- $(RM) -r ./_obj $(TARGET)
+ $(RM) -r $(OBJDIR) $(TARGET)
rebuild: clean all
@@ -257,10 +307,10 @@ install: $(TARGET)
$(INSTALL) -d "$(DESTDIR)$(BINDIR)"
$(INSTALL) -m 0755 $(INSTALL_STRIP_FLAG) $(TARGET) "$(DESTDIR)$(BINDIR)"
$(INSTALL) -d "$(DESTDIR)$(MANDIR)/man6"
- $(INSTALL) -m 0644 ../../doc/mupen64plus.6.gz "$(DESTDIR)$(MANDIR)/man6"
+ $(INSTALL) -m 0644 ../../doc/mupen64plus.6 "$(DESTDIR)$(MANDIR)/man6"
uninstall:
- $(RM) "$(DESTDIR)$(BINDIR)/$(TARGET)" "$(DESTDIR)$(MANDIR)/man6/mupen64plus.6.gz"
+ $(RM) "$(DESTDIR)$(BINDIR)/$(TARGET)" "$(DESTDIR)$(MANDIR)/man6/mupen64plus.6"
# build dependency files
CFLAGS += -MD
diff --git a/src/main.c b/src/main.c
index 82c4323..f8c47db 100644
--- a/src/main.c
+++ b/src/main.c
@@ -32,7 +32,7 @@
// The mac version of SDL requires inclusion of SDL_main in the executable
#ifdef __APPLE__
-#include <SDL/SDL_main.h>
+ #include <SDL_main.h>
#endif
#include "cheat.h"
--
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