Merge branch 'master' of github.com:Themaister/SSNES into ssnes-consoles

This commit is contained in:
TwinAphex51224 2011-11-30 16:56:38 +01:00
commit 4187d70b30
2 changed files with 1 additions and 5 deletions

View File

@ -29,7 +29,7 @@ endif
libsnes ?= -lsnes
LIBS = -lm -lshlwapi
DEFINES = -I. -DHAVE_CONFIGFILE
DEFINES = -I. -DHAVE_CONFIGFILE -DPACKAGE_VERSION=\"0.9.2\"
LDFLAGS = -L. -static-libgcc
LDCXXFLAGS = -static-libstdc++ -s

View File

@ -398,10 +398,6 @@ static int16_t input_state(bool port, unsigned device, unsigned index, unsigned
#define SSNES_DEFAULT_CONF_PATH_STR " Defaults to $XDG_CONFIG_HOME/ssnes/ssnes.cfg,\n\t\tor $HOME/.ssnes.cfg, if $XDG_CONFIG_HOME is not defined."
#endif
#ifdef _WIN32
#define PACKAGE_VERSION "0.9.2"
#endif
#include "config.features.h"
#define _PSUPP(var, name, desc) printf("\t%s:\n\t\t%s: %s\n", name, desc, _##var##_supp ? "yes" : "no")