Merge branch 'master' of github.com:Themaister/SSNES

This commit is contained in:
TwinAphex51224 2012-01-05 18:38:49 +01:00
commit f8a03a7d5d
3 changed files with 6 additions and 12 deletions

View File

@ -1,7 +1,7 @@
TARGET = ssnes.exe
JTARGET = ssnes-joyconfig.exe
OBJ = ssnes.o file.o driver.o conf/config_file.o settings.o dynamic.o message.o rewind.o movie.o gfx/gfx_common.o bps.o ups.o strl.o screenshot.o audio/hermite.o getopt.o audio/utils.o posix_string.o
JOBJ = conf/config_file.o tools/main-stub.o tools/ssnes-joyconfig.o strl.o posix_string.o
JOBJ = conf/config_file.o tools/ssnes-joyconfig.o strl.o posix_string.o
CC = gcc
CXX = g++

View File

@ -1,6 +0,0 @@
int real_main(int argc, char *argv[]);
int main(int argc, char *argv[])
{
return real_main(argc, argv);
}

View File

@ -301,12 +301,12 @@ static void parse_input(int argc, char *argv[])
}
// Windows is being bitchy. Cannot include SDL.h with a file that has main() it seems ... It simply won't run at all even with -lSDLmain.
#ifdef _WIN32
int real_main(int argc, char *argv[])
#else
int main(int argc, char *argv[])
// Need SDL_main on OSX.
#ifndef __APPLE__
#undef main
#endif
int main(int argc, char *argv[])
{
parse_input(argc, argv);