commit 711c1c1df950a7915bdf1df5cd9f52b9217ac025 Author: Jonathan McDowell Date: Fri Dec 30 19:12:07 2022 +0000 Remove remaining mentions of joyconfig IS_JOYCONFIG was removed back in 2015 (1b7576aa), but there are still some mentions of retroarch-joyconfig in the docs and Makefiles. Clean these up so folk aren't confused about the fact it's no longer available. diff --git a/.gitignore b/.gitignore index 3266549691..af245a3fe7 100644 --- a/.gitignore +++ b/.gitignore @@ -25,8 +25,6 @@ config.log /retroarch_debug.exe /config.h /config.mk -/tools/retroarch-joyconfig -/tools/retroarch-joyconfig.exe *.ncb *.sdf *.opensdf diff --git a/Makefile.classic_sega_mini b/Makefile.classic_sega_mini index befbbb128a..14a96e1219 100644 --- a/Makefile.classic_sega_mini +++ b/Makefile.classic_sega_mini @@ -43,7 +43,6 @@ clean: rm -f input/*.o rm -f tools/*.o rm -f $(BINDIR)/retroarch - rm -f $(BINDIR)/retroarch-joyconfig rm -f $(PNDDIR)/readme.html rm -f retroarch diff --git a/Makefile.classic_snesc b/Makefile.classic_snesc index 927d8a0a51..630c7b5230 100644 --- a/Makefile.classic_snesc +++ b/Makefile.classic_snesc @@ -47,7 +47,6 @@ clean: rm -f input/*.o rm -f tools/*.o rm -f $(BINDIR)/retroarch - rm -f $(BINDIR)/retroarch-joyconfig rm -f $(PNDDIR)/readme.html rm -f retroarch diff --git a/Makefile.pandora b/Makefile.pandora index f214abf8b1..e77f23ebe0 100644 --- a/Makefile.pandora +++ b/Makefile.pandora @@ -11,7 +11,7 @@ all: $(BINDIR)/retroarch pnd: retroarch.pnd -install: all $(BINDIR)/retroarch-joyconfig $(BINDIR)/retroarch-zip $(PNDDIR)/readme.html +install: all $(BINDIR)/retroarch-zip $(PNDDIR)/readme.html retroarch: ./configure --prefix=$PND_BASEDIR/$PRJ --disable-ffmpeg --disable-cg --disable-pulse --disable-jack --enable-opengles @@ -21,10 +21,6 @@ $(BINDIR)/retroarch: retroarch mkdir -p $(BINDIR) cp retroarch $(BINDIR)/retroarch -$(BINDIR)/retroarch-joyconfig: tools/retroarch-joyconfig - mkdir -p $(BINDIR) - cp tools/retroarch-joyconfig $(BINDIR)/retroarch-joyconfig - $(BINDIR)/retroarch-zip: retroarch-zip mkdir -p $(BINDIR) cp retroarch-zip $(BINDIR)/retroarch-zip @@ -49,6 +45,5 @@ clean: rm -f input/*.o rm -f tools/*.o rm -f $(BINDIR)/retroarch - rm -f $(BINDIR)/retroarch-joyconfig rm -f $(PNDDIR)/readme.html rm -f retroarch diff --git a/README.md b/README.md index 8ae99e9d81..70e9d44550 100644 --- a/README.md +++ b/README.md @@ -202,7 +202,7 @@ A sample configuration file is installed to `/etc/retroarch.cfg`. This is the sy RetroArch will on startup create a config file in `$XDG\_CONFIG\_HOME/retroarch/retroarch.cfg` if it does not exist. Users only need to configure a certain option if the desired value deviates from the value defined in config.def.h. -To configure joypads, use the built-in menu or the `retroarch-joyconfig` command-line tool. +To configure joypads, use the built-in menu or manually configure them in `retroarch.cfg`. ## Compiling and installing diff --git a/docs/retroarch-joyconfig.6 b/docs/retroarch-joyconfig.6 deleted file mode 100644 index b20f3b9b50..0000000000 --- a/docs/retroarch-joyconfig.6 +++ /dev/null @@ -1,83 +0,0 @@ -.\" retroarch-joyconfig.6: - -.TH "RETROARCH-JOYCONFIG" "6" "October 1, 2011" "RETROARCH-JOYCONFIG" "System Manager's Manual: retroarch-joyconfig" - -.SH NAME - -retroarch-joyconfig \- Tool to configure joypad bindings for \fBretroarch\fR. - -.SH SYNOPSIS - -\fBretroarch-joyconfig\fR [OPTIONS]... - -.SH "DESCRIPTION" - -\fBretroarch-joyconfig is a simple tool that allows updating or creating a configuration file for \fBretroarch\fR. -It reads in necessary joypad bindings for a certain user and joypad. - -.SH "EXAMPLE COMMANDLINES" - -.TP -\fBConfigure joypad for user 1, using first joypad. Configuration is dumped to a file.\fR -retroarch-joyconfig -p 1 -j 0 -o inputconfig.cfg - -.TP -\fBConfigure joypad for user 1, using first joypad. Update retroarch.cfg directly.\fR -retroarch-joyconfig -p 1 -j 0 -i retroarch.cfg -o retroarch.cfg - -.TP -\fBConfigure joypad for user 1, using first joypad. Configuration is dumped to stdout.\fR -retroarch-joyconfig -p 1 -j 0 - -.TP -\fBCreate an autoconfig file using first joypad.\fR -retroarch-joyconfig -j 0 -a ~/.config/retroarch/autoconfig/pad.cfg - -.SH "GENERAL OPTIONS" - -.TP -\fB--player PLAYER, -p PLAYER\fR -Configuration will be done for the user PLAYER. This can be from 1 up to and including 5 (multitap). -Default is configuration for user 1. - -.TP -\fB--joypad PAD, -j PAD\fR -Which joypad to use when configuring. Use a numeric indexing. Default here is 0 (first joypad). - -.TP -\fB--driver DRIVER, -d DRIVER\fR -Uses a particular joypad driver instead of the first available one. - -.TP -\fB--input PATH, -i PATH\fR -Use config file found in PATH as a base. Old configuration values can be overwritten by new values when configuring binds. If not used, an empty config file will be used as a base. Using this option only does \fBnot\fR update the file found in PATH. - -.TP -\fB--output PATH, -o PATH\fR -Writes the final config to a file, rather than \fBstdout\fR. If -i and -o point to the same file, the file found in PATH will simply be updated with the new configs. - -.TP -\fB-a PATH, --autoconfig PATH\fR -Also writes an autoconfigure file for the joypad which was configured. It can be used by RetroArch to automatically configure a joypad when it's plugged in. - -.TP -\fB--misc, -m\fR -Also configure some binds that aren't directly related to RetroPad, such as save states, menu toggle, etc. -Only configures some of the most useful binds. - -.TP -\fB--allmisc, -M\fR -Same as --misc, but goes through every bind available (40+). Very exhaustive. - -.TP -\fB-t SECONDS, --timeout SECONDS\fR -Adds a timeout of N seconds to each bind. If timed out, the bind will not be used. - -.TP -\fB--help, -h\fR -Prints help message. - -.SH "SEE ALSO" -\fBretroarch\fR(6) - -.\" diff --git a/docs/retroarch.6 b/docs/retroarch.6 index c6bf53d93c..dcaa402ac0 100644 --- a/docs/retroarch.6 +++ b/docs/retroarch.6 @@ -233,6 +233,3 @@ Disables all kinds of content patching. .TP \fB-D, --detach\fR Detach from the current console. This is currently only relevant for Microsoft Windows. - -.SH "SEE ALSO" -\fBretroarch-joyconfig\fR(6) diff --git a/retroarch.cfg b/retroarch.cfg index ce951b282e..a2c7649217 100644 --- a/retroarch.cfg +++ b/retroarch.cfg @@ -499,7 +499,7 @@ # input_player8_joypad_index = 7 # Input device buttons. -# Figure these out by using RetroArch-Phoenix or retroarch-joyconfig. +# Figure these out by using the RetroArch configuration menu # You can use joypad hats with hnxx, where n is the hat, and xx is a string representing direction. # E.g. "h0up" # input_player1_a_btn = @@ -875,7 +875,7 @@ # If a joypad is plugged in, that joypad will be autoconfigured if a config file # corresponding to that joypad is present in joypad_autoconfig_dir. # Input binds which are made explicit (input_playerN_*_btn/axis) will take priority over autoconfigs. -# Autoconfigs can be created with retroarch-joyconfig, manually, or with a frontend. +# Autoconfigs can be created with manually, or with the frontend. # Requires input_autodetect_enable to be enabled. # joypad_autoconfig_dir =