mirror of
https://github.com/libretro/RetroArch
synced 2025-03-20 01:21:03 +00:00
Merge branch 'master' of github.com:Themaister/SSNES
This commit is contained in:
commit
f8a03a7d5d
@ -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++
|
||||
|
@ -1,6 +0,0 @@
|
||||
int real_main(int argc, char *argv[]);
|
||||
|
||||
int main(int argc, char *argv[])
|
||||
{
|
||||
return real_main(argc, argv);
|
||||
}
|
@ -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);
|
||||
|
||||
|
Loading…
x
Reference in New Issue
Block a user