mirror of
https://git.do.srb2.org/KartKrew/Kart-Public.git
synced 2025-02-03 06:51:00 +00:00
build: include own copy of SDL2main
This commit is contained in:
Alam Ed Arias
parent
ef488d2b03
commit
6aa1aeb838
5 changed files with 203 additions and 420 deletions
|
|
@ -12,7 +12,7 @@
|
||||||
</ClCompile>
|
</ClCompile>
|
||||||
<Link />
|
<Link />
|
||||||
<Link>
|
<Link>
|
||||||
<AdditionalDependencies>SDL2main.lib;SDL2.lib;SDL2_mixer.lib;%(AdditionalDependencies)</AdditionalDependencies>
|
<AdditionalDependencies>SDL2.lib;SDL2_mixer.lib;%(AdditionalDependencies)</AdditionalDependencies>
|
||||||
</Link>
|
</Link>
|
||||||
</ItemDefinitionGroup>
|
</ItemDefinitionGroup>
|
||||||
<ItemGroup />
|
<ItemGroup />
|
||||||
|
|
|
||||||
|
|
@ -11,7 +11,7 @@
|
||||||
<PreprocessorDefinitions>%(PreprocessorDefinitions)</PreprocessorDefinitions>
|
<PreprocessorDefinitions>%(PreprocessorDefinitions)</PreprocessorDefinitions>
|
||||||
</ClCompile>
|
</ClCompile>
|
||||||
<Link>
|
<Link>
|
||||||
<AdditionalDependencies>SDL2main.lib;SDL2.lib;SDL2_mixer.lib;%(AdditionalDependencies)</AdditionalDependencies>
|
<AdditionalDependencies>SDL2.lib;SDL2_mixer.lib;%(AdditionalDependencies)</AdditionalDependencies>
|
||||||
</Link>
|
</Link>
|
||||||
</ItemDefinitionGroup>
|
</ItemDefinitionGroup>
|
||||||
<ItemGroup />
|
<ItemGroup />
|
||||||
|
|
|
||||||
|
|
@ -1,406 +0,0 @@
|
||||||
/*
|
|
||||||
SDL_main.c, placed in the public domain by Sam Lantinga 4/13/98
|
|
||||||
|
|
||||||
The WinMain function -- calls your program's main() function
|
|
||||||
*/
|
|
||||||
|
|
||||||
#include <stdio.h>
|
|
||||||
#include <string.h>
|
|
||||||
#include <ctype.h>
|
|
||||||
#include <stdlib.h>
|
|
||||||
#define RPC_NO_WINDOWS_H
|
|
||||||
#include <windows.h>
|
|
||||||
#include <malloc.h> /* For _alloca() */
|
|
||||||
|
|
||||||
#include <tchar.h>
|
|
||||||
|
|
||||||
#ifdef _WIN32_WCE
|
|
||||||
# define DIR_SEPERATOR TEXT("\\")
|
|
||||||
# define _tgetcwd(str,len) wcscpy(str,TEXT(""))
|
|
||||||
# define setbuf(f,b)
|
|
||||||
# define setvbuf(w,x,y,z)
|
|
||||||
# define _tremove(x) DeleteFile(x)
|
|
||||||
#else
|
|
||||||
# define DIR_SEPERATOR TEXT("/")
|
|
||||||
# include <direct.h>
|
|
||||||
#endif
|
|
||||||
|
|
||||||
/* Include the SDL main definition header */
|
|
||||||
#ifdef _MSC_VER
|
|
||||||
#pragma warning(disable : 4214 4244)
|
|
||||||
#endif
|
|
||||||
#include "SDL.h"
|
|
||||||
#include "SDL_main.h"
|
|
||||||
#ifdef _MSC_VER
|
|
||||||
#pragma warning(default : 4214 4244)
|
|
||||||
#endif
|
|
||||||
#include "../../win32/win_dbg.h"
|
|
||||||
#define USE_MESSAGEBOX
|
|
||||||
|
|
||||||
#ifdef main
|
|
||||||
# ifndef _WIN32_WCE_EMULATION
|
|
||||||
# undef main
|
|
||||||
# endif /* _WIN32_WCE_EMULATION */
|
|
||||||
#endif /* main */
|
|
||||||
|
|
||||||
/* The standard output files */
|
|
||||||
//#ifdef _WIN32_WCE
|
|
||||||
//#define STDOUT_FILE TEXT("/Storage Card/SRB2DEMO/stdout.txt")
|
|
||||||
//#define STDERR_FILE TEXT("/Storage Card/SRB2DEMO/stderr.txt")
|
|
||||||
//#else
|
|
||||||
#define STDOUT_FILE TEXT("stdout.txt")
|
|
||||||
#define STDERR_FILE TEXT("stderr.txt")
|
|
||||||
//#endif
|
|
||||||
|
|
||||||
#ifndef NO_STDIO_REDIRECT
|
|
||||||
static TCHAR stdoutPath[MAX_PATH];
|
|
||||||
static TCHAR stderrPath[MAX_PATH];
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#if defined(_WIN32_WCE) && _WIN32_WCE < 300
|
|
||||||
/* seems to be undefined in Win CE although in online help */
|
|
||||||
#define isspace(a) (((CHAR)a == ' ') || ((CHAR)a == '\t'))
|
|
||||||
|
|
||||||
/* seems to be undefined in Win CE although in online help */
|
|
||||||
char *strrchr(char *str, int c)
|
|
||||||
{
|
|
||||||
char *p;
|
|
||||||
|
|
||||||
/* Skip to the end of the string */
|
|
||||||
p=str;
|
|
||||||
while (*p)
|
|
||||||
p++;
|
|
||||||
|
|
||||||
/* Look for the given character */
|
|
||||||
while ( (p >= str) && (*p != (CHAR)c) )
|
|
||||||
p--;
|
|
||||||
|
|
||||||
/* Return NULL if character not found */
|
|
||||||
if ( p < str ) {
|
|
||||||
p = NULL;
|
|
||||||
}
|
|
||||||
return p;
|
|
||||||
}
|
|
||||||
#endif /* _WIN32_WCE < 300 */
|
|
||||||
|
|
||||||
/* Parse a command line buffer into arguments */
|
|
||||||
static int ParseCommandLine(char *cmdline, char **argv)
|
|
||||||
{
|
|
||||||
char *bufp;
|
|
||||||
int argc;
|
|
||||||
|
|
||||||
argc = 0;
|
|
||||||
for ( bufp = cmdline; *bufp; ) {
|
|
||||||
/* Skip leading whitespace */
|
|
||||||
while ( isspace(*bufp) ) {
|
|
||||||
++bufp;
|
|
||||||
}
|
|
||||||
/* Skip over argument */
|
|
||||||
if ( *bufp == '"' ) {
|
|
||||||
++bufp;
|
|
||||||
if ( *bufp ) {
|
|
||||||
if ( argv ) {
|
|
||||||
argv[argc] = bufp;
|
|
||||||
}
|
|
||||||
++argc;
|
|
||||||
}
|
|
||||||
/* Skip over word */
|
|
||||||
while ( *bufp && (*bufp != '"') ) {
|
|
||||||
++bufp;
|
|
||||||
}
|
|
||||||
} else {
|
|
||||||
if ( *bufp ) {
|
|
||||||
if ( argv ) {
|
|
||||||
argv[argc] = bufp;
|
|
||||||
}
|
|
||||||
++argc;
|
|
||||||
}
|
|
||||||
/* Skip over word */
|
|
||||||
while ( *bufp && ! isspace(*bufp) ) {
|
|
||||||
++bufp;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
if ( *bufp ) {
|
|
||||||
if ( argv ) {
|
|
||||||
*bufp = '\0';
|
|
||||||
}
|
|
||||||
++bufp;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
if ( argv ) {
|
|
||||||
argv[argc] = NULL;
|
|
||||||
}
|
|
||||||
return(argc);
|
|
||||||
}
|
|
||||||
|
|
||||||
/* Show an error message */
|
|
||||||
static void ShowError(const char *title, const char *message)
|
|
||||||
{
|
|
||||||
/* If USE_MESSAGEBOX is defined, you need to link with user32.lib */
|
|
||||||
#ifdef USE_MESSAGEBOX
|
|
||||||
MessageBoxA(NULL,
|
|
||||||
message,
|
|
||||||
title,
|
|
||||||
MB_ICONEXCLAMATION|MB_OK);
|
|
||||||
#else
|
|
||||||
fprintf(stderr, "%s: %s\n", title, message);
|
|
||||||
#endif
|
|
||||||
}
|
|
||||||
|
|
||||||
/* Pop up an out of memory message, returns to Windows */
|
|
||||||
static BOOL OutOfMemory(void)
|
|
||||||
{
|
|
||||||
ShowError("Fatal Error", "Out of memory - aborting");
|
|
||||||
return FALSE;
|
|
||||||
}
|
|
||||||
|
|
||||||
/* Remove the output files if there was no output written */
|
|
||||||
static void __cdecl cleanup_output(void)
|
|
||||||
{
|
|
||||||
#ifndef NO_STDIO_REDIRECT
|
|
||||||
FILE *file;
|
|
||||||
int empty;
|
|
||||||
#endif
|
|
||||||
|
|
||||||
/* Flush the output in case anything is queued */
|
|
||||||
fclose(stdout);
|
|
||||||
fclose(stderr);
|
|
||||||
|
|
||||||
#ifndef NO_STDIO_REDIRECT
|
|
||||||
/* See if the files have any output in them */
|
|
||||||
if ( stdoutPath[0] ) {
|
|
||||||
file = _tfopen(stdoutPath, TEXT("rb"));
|
|
||||||
if ( file ) {
|
|
||||||
empty = (fgetc(file) == EOF) ? 1 : 0;
|
|
||||||
fclose(file);
|
|
||||||
if ( empty ) {
|
|
||||||
_tremove(stdoutPath);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
if ( stderrPath[0] ) {
|
|
||||||
file = _tfopen(stderrPath, TEXT("rb"));
|
|
||||||
if ( file ) {
|
|
||||||
empty = (fgetc(file) == EOF) ? 1 : 0;
|
|
||||||
fclose(file);
|
|
||||||
if ( empty ) {
|
|
||||||
_tremove(stderrPath);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
#endif
|
|
||||||
}
|
|
||||||
|
|
||||||
#if defined(_MSC_VER) && !defined(_WIN32_WCE)
|
|
||||||
/* The VC++ compiler needs main defined */
|
|
||||||
#define console_main main
|
|
||||||
#endif
|
|
||||||
|
|
||||||
/* This is where execution begins [console apps] */
|
|
||||||
int console_main(int argc, char *argv[])
|
|
||||||
{
|
|
||||||
size_t n;
|
|
||||||
int st;
|
|
||||||
char *bufp, *appname;
|
|
||||||
|
|
||||||
/* Get the class name from argv[0] */
|
|
||||||
appname = argv[0];
|
|
||||||
if ( (bufp=strrchr(argv[0], '\\')) != NULL ) {
|
|
||||||
appname = bufp+1;
|
|
||||||
} else
|
|
||||||
if ( (bufp=strrchr(argv[0], '/')) != NULL ) {
|
|
||||||
appname = bufp+1;
|
|
||||||
}
|
|
||||||
|
|
||||||
if ( (bufp=strrchr(appname, '.')) == NULL )
|
|
||||||
n = strlen(appname);
|
|
||||||
else
|
|
||||||
n = (bufp-appname);
|
|
||||||
|
|
||||||
bufp = (char *)alloca(n+1);
|
|
||||||
if ( bufp == NULL ) {
|
|
||||||
return OutOfMemory();
|
|
||||||
}
|
|
||||||
strncpy(bufp, appname, n);
|
|
||||||
bufp[n] = '\0';
|
|
||||||
appname = bufp;
|
|
||||||
|
|
||||||
/* Load SDL dynamic link library */
|
|
||||||
if ( SDL_Init(SDL_INIT_NOPARACHUTE) < 0 ) {
|
|
||||||
ShowError("WinMain() error", SDL_GetError());
|
|
||||||
return(FALSE);
|
|
||||||
}
|
|
||||||
atexit(cleanup_output);
|
|
||||||
atexit(SDL_Quit);
|
|
||||||
|
|
||||||
#ifndef DISABLE_VIDEO
|
|
||||||
#if 0
|
|
||||||
/* Create and register our class *
|
|
||||||
DJM: If we do this here, the user nevers gets a chance to
|
|
||||||
putenv(SDL_WINDOWID). This is already called later by
|
|
||||||
the (DIB|DX5)_CreateWindow function, so it should be
|
|
||||||
safe to comment it out here.
|
|
||||||
if ( SDL_RegisterApp(appname, CS_BYTEALIGNCLIENT,
|
|
||||||
GetModuleHandle(NULL)) < 0 ) {
|
|
||||||
ShowError("WinMain() error", SDL_GetError());
|
|
||||||
exit(1);
|
|
||||||
}*/
|
|
||||||
#else
|
|
||||||
/* Sam:
|
|
||||||
We still need to pass in the application handle so that
|
|
||||||
DirectInput will initialize properly when SDL_RegisterApp()
|
|
||||||
is called later in the video initialization.
|
|
||||||
*/
|
|
||||||
SDL_SetModuleHandle(GetModuleHandle(NULL));
|
|
||||||
#endif /* 0 */
|
|
||||||
#endif /* !DISABLE_VIDEO */
|
|
||||||
|
|
||||||
/* Run the application main() code */
|
|
||||||
st = SDL_main(argc, argv);
|
|
||||||
|
|
||||||
/* Exit cleanly, calling atexit() functions */
|
|
||||||
//exit(0);
|
|
||||||
cleanup_output();
|
|
||||||
SDL_Quit();
|
|
||||||
|
|
||||||
/* Hush little compiler, don't you cry... */
|
|
||||||
return st;
|
|
||||||
}
|
|
||||||
|
|
||||||
/* This is where execution begins [windowed apps] */
|
|
||||||
#ifdef _WIN32_WCE
|
|
||||||
int WINAPI WinMain(HINSTANCE hInst, HINSTANCE hPrev, LPWSTR szCmdLine, int sw)
|
|
||||||
#else
|
|
||||||
int WINAPI WinMain(HINSTANCE hInst, HINSTANCE hPrev, LPSTR szCmdLine, int sw)
|
|
||||||
#endif
|
|
||||||
{
|
|
||||||
HINSTANCE handle;
|
|
||||||
int Result = -1;
|
|
||||||
char **argv;
|
|
||||||
int argc;
|
|
||||||
LPSTR cmdline;
|
|
||||||
#ifdef _WIN32_WCE
|
|
||||||
size_t nLen;
|
|
||||||
LPTSTR bufp;
|
|
||||||
#else
|
|
||||||
LPSTR bufp;
|
|
||||||
#endif
|
|
||||||
#ifndef NO_STDIO_REDIRECT
|
|
||||||
FILE *newfp;
|
|
||||||
#endif
|
|
||||||
|
|
||||||
/* Start up DDHELP.EXE before opening any files, so DDHELP doesn't
|
|
||||||
keep them open. This is a hack.. hopefully it will be fixed
|
|
||||||
someday. DDHELP.EXE starts up the first time DDRAW.DLL is loaded.
|
|
||||||
*/
|
|
||||||
hPrev = hInst = NULL;
|
|
||||||
sw = 0;
|
|
||||||
handle = LoadLibrary(TEXT("DDRAW.DLL"));
|
|
||||||
if ( handle != NULL ) {
|
|
||||||
FreeLibrary(handle);
|
|
||||||
}
|
|
||||||
|
|
||||||
#ifndef NO_STDIO_REDIRECT
|
|
||||||
_tgetcwd( stdoutPath, sizeof( stdoutPath ) );
|
|
||||||
_tcscat( stdoutPath, DIR_SEPERATOR STDOUT_FILE );
|
|
||||||
|
|
||||||
/* Redirect standard input and standard output */
|
|
||||||
newfp = _tfreopen(stdoutPath, TEXT("w"), stdout);
|
|
||||||
|
|
||||||
#ifndef _WIN32_WCE
|
|
||||||
if ( newfp == NULL ) { /* This happens on NT */
|
|
||||||
#if !defined(stdout)
|
|
||||||
stdout = _tfopen(stdoutPath, TEXT("w"));
|
|
||||||
#else
|
|
||||||
newfp = _tfopen(stdoutPath, TEXT("w"));
|
|
||||||
if ( newfp ) {
|
|
||||||
*stdout = *newfp;
|
|
||||||
}
|
|
||||||
#endif
|
|
||||||
}
|
|
||||||
#endif /* _WIN32_WCE */
|
|
||||||
|
|
||||||
_tgetcwd( stderrPath, sizeof( stderrPath ) );
|
|
||||||
_tcscat( stderrPath, DIR_SEPERATOR STDERR_FILE );
|
|
||||||
|
|
||||||
newfp = _tfreopen(stderrPath, TEXT("w"), stderr);
|
|
||||||
#ifndef _WIN32_WCE
|
|
||||||
if ( newfp == NULL ) { /* This happens on NT */
|
|
||||||
#if !defined(stderr)
|
|
||||||
stderr = _tfopen(stderrPath, TEXT("w"));
|
|
||||||
#else
|
|
||||||
newfp = _tfopen(stderrPath, TEXT("w"));
|
|
||||||
if ( newfp ) {
|
|
||||||
*stderr = *newfp;
|
|
||||||
}
|
|
||||||
#endif
|
|
||||||
}
|
|
||||||
#endif /* _WIN32_WCE */
|
|
||||||
|
|
||||||
setvbuf(stdout, NULL, _IOLBF, BUFSIZ); /* Line buffered */
|
|
||||||
setbuf(stderr, NULL); /* No buffering */
|
|
||||||
#endif /* !NO_STDIO_REDIRECT */
|
|
||||||
|
|
||||||
#ifdef _WIN32_WCE
|
|
||||||
nLen = wcslen(szCmdLine)+128+1;
|
|
||||||
bufp = (wchar_t *)alloca(nLen*2);
|
|
||||||
wcscpy (bufp, TEXT("\""));
|
|
||||||
GetModuleFileName(NULL, bufp+1, 128-3);
|
|
||||||
wcscpy (bufp+wcslen(bufp), TEXT("\" "));
|
|
||||||
wcsncpy(bufp+wcslen(bufp), szCmdLine,nLen-wcslen(bufp));
|
|
||||||
nLen = wcslen(bufp)+1;
|
|
||||||
cmdline = (char *)alloca(nLen);
|
|
||||||
if ( cmdline == NULL ) {
|
|
||||||
return OutOfMemory();
|
|
||||||
}
|
|
||||||
WideCharToMultiByte(CP_ACP, 0, bufp, -1, cmdline, nLen, NULL, NULL);
|
|
||||||
#else
|
|
||||||
szCmdLine = NULL;
|
|
||||||
/* Grab the command line (use alloca() on Windows) */
|
|
||||||
bufp = GetCommandLineA();
|
|
||||||
cmdline = (LPSTR)alloca(strlen(bufp)+1);
|
|
||||||
if ( cmdline == NULL ) {
|
|
||||||
return OutOfMemory();
|
|
||||||
}
|
|
||||||
strcpy(cmdline, bufp);
|
|
||||||
#endif
|
|
||||||
|
|
||||||
/* Parse it into argv and argc */
|
|
||||||
argc = ParseCommandLine(cmdline, NULL);
|
|
||||||
argv = (char **)alloca((argc+1)*(sizeof *argv));
|
|
||||||
if ( argv == NULL ) {
|
|
||||||
return OutOfMemory();
|
|
||||||
}
|
|
||||||
ParseCommandLine(cmdline, argv);
|
|
||||||
|
|
||||||
#ifdef BUGTRAP
|
|
||||||
/* Try BugTrap. */
|
|
||||||
if(InitBugTrap())
|
|
||||||
Result = console_main(argc, argv);
|
|
||||||
else
|
|
||||||
{
|
|
||||||
#endif
|
|
||||||
|
|
||||||
/* Run the main program (after a little SDL initialization) */
|
|
||||||
#ifndef _WIN32_WCE
|
|
||||||
__try
|
|
||||||
#endif
|
|
||||||
{
|
|
||||||
Result = console_main(argc, argv);
|
|
||||||
}
|
|
||||||
#ifndef _WIN32_WCE
|
|
||||||
__except ( RecordExceptionInfo(GetExceptionInformation()))
|
|
||||||
{
|
|
||||||
SetUnhandledExceptionFilter(EXCEPTION_CONTINUE_SEARCH); //Do nothing here.
|
|
||||||
}
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#ifdef BUGTRAP
|
|
||||||
} /* BT failure clause. */
|
|
||||||
|
|
||||||
/* This is safe even if BT didn't start. */
|
|
||||||
ShutdownBugTrap();
|
|
||||||
#endif
|
|
||||||
|
|
||||||
return Result;
|
|
||||||
}
|
|
||||||
200
src/sdl/SDL_main/SDL_windows_main.c
Normal file
200
src/sdl/SDL_main/SDL_windows_main.c
Normal file
|
|
@ -0,0 +1,200 @@
|
||||||
|
/*
|
||||||
|
SDL_windows_main.c, placed in the public domain by Sam Lantinga 4/13/98
|
||||||
|
|
||||||
|
The WinMain function -- calls your program's main() function
|
||||||
|
*/
|
||||||
|
#include "SDL_config.h"
|
||||||
|
|
||||||
|
#ifdef __WIN32__
|
||||||
|
|
||||||
|
#include <windows.h>
|
||||||
|
|
||||||
|
/* Include the SDL main definition header */
|
||||||
|
#include "SDL.h"
|
||||||
|
#include "SDL_main.h"
|
||||||
|
|
||||||
|
#ifdef main
|
||||||
|
# undef main
|
||||||
|
#endif /* main */
|
||||||
|
|
||||||
|
static void
|
||||||
|
UnEscapeQuotes(char *arg)
|
||||||
|
{
|
||||||
|
char *last = NULL;
|
||||||
|
|
||||||
|
while (*arg) {
|
||||||
|
if (*arg == '"' && (last != NULL && *last == '\\')) {
|
||||||
|
char *c_curr = arg;
|
||||||
|
char *c_last = last;
|
||||||
|
|
||||||
|
while (*c_curr) {
|
||||||
|
*c_last = *c_curr;
|
||||||
|
c_last = c_curr;
|
||||||
|
c_curr++;
|
||||||
|
}
|
||||||
|
*c_last = '\0';
|
||||||
|
}
|
||||||
|
last = arg;
|
||||||
|
arg++;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/* Parse a command line buffer into arguments */
|
||||||
|
static int
|
||||||
|
ParseCommandLine(char *cmdline, char **argv)
|
||||||
|
{
|
||||||
|
char *bufp;
|
||||||
|
char *lastp = NULL;
|
||||||
|
int argc, last_argc;
|
||||||
|
|
||||||
|
argc = last_argc = 0;
|
||||||
|
for (bufp = cmdline; *bufp;) {
|
||||||
|
/* Skip leading whitespace */
|
||||||
|
while (SDL_isspace(*bufp)) {
|
||||||
|
++bufp;
|
||||||
|
}
|
||||||
|
/* Skip over argument */
|
||||||
|
if (*bufp == '"') {
|
||||||
|
++bufp;
|
||||||
|
if (*bufp) {
|
||||||
|
if (argv) {
|
||||||
|
argv[argc] = bufp;
|
||||||
|
}
|
||||||
|
++argc;
|
||||||
|
}
|
||||||
|
/* Skip over word */
|
||||||
|
lastp = bufp;
|
||||||
|
while (*bufp && (*bufp != '"' || *lastp == '\\')) {
|
||||||
|
lastp = bufp;
|
||||||
|
++bufp;
|
||||||
|
}
|
||||||
|
} else {
|
||||||
|
if (*bufp) {
|
||||||
|
if (argv) {
|
||||||
|
argv[argc] = bufp;
|
||||||
|
}
|
||||||
|
++argc;
|
||||||
|
}
|
||||||
|
/* Skip over word */
|
||||||
|
while (*bufp && !SDL_isspace(*bufp)) {
|
||||||
|
++bufp;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
if (*bufp) {
|
||||||
|
if (argv) {
|
||||||
|
*bufp = '\0';
|
||||||
|
}
|
||||||
|
++bufp;
|
||||||
|
}
|
||||||
|
|
||||||
|
/* Strip out \ from \" sequences */
|
||||||
|
if (argv && last_argc != argc) {
|
||||||
|
UnEscapeQuotes(argv[last_argc]);
|
||||||
|
}
|
||||||
|
last_argc = argc;
|
||||||
|
}
|
||||||
|
if (argv) {
|
||||||
|
argv[argc] = NULL;
|
||||||
|
}
|
||||||
|
return (argc);
|
||||||
|
}
|
||||||
|
|
||||||
|
/* Pop up an out of memory message, returns to Windows */
|
||||||
|
static BOOL
|
||||||
|
OutOfMemory(void)
|
||||||
|
{
|
||||||
|
SDL_ShowSimpleMessageBox(SDL_MESSAGEBOX_ERROR, "Fatal Error", "Out of memory - aborting", NULL);
|
||||||
|
return FALSE;
|
||||||
|
}
|
||||||
|
|
||||||
|
#if defined(_MSC_VER)
|
||||||
|
/* The VC++ compiler needs main/wmain defined */
|
||||||
|
# define console_ansi_main main
|
||||||
|
# if UNICODE
|
||||||
|
# define console_wmain wmain
|
||||||
|
# endif
|
||||||
|
#endif
|
||||||
|
|
||||||
|
/* WinMain, main, and wmain eventually call into here. */
|
||||||
|
static int
|
||||||
|
main_utf8(int argc, char *argv[])
|
||||||
|
{
|
||||||
|
SDL_SetMainReady();
|
||||||
|
|
||||||
|
/* Run the application main() code */
|
||||||
|
return SDL_main(argc, argv);
|
||||||
|
}
|
||||||
|
|
||||||
|
/* This is where execution begins [console apps, ansi] */
|
||||||
|
int
|
||||||
|
console_ansi_main(int argc, char *argv[])
|
||||||
|
{
|
||||||
|
/* !!! FIXME: are these in the system codepage? We need to convert to UTF-8. */
|
||||||
|
return main_utf8(argc, argv);
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
#if UNICODE
|
||||||
|
/* This is where execution begins [console apps, unicode] */
|
||||||
|
int
|
||||||
|
console_wmain(int argc, wchar_t *wargv[], wchar_t *wenvp)
|
||||||
|
{
|
||||||
|
int retval = 0;
|
||||||
|
char **argv = SDL_stack_alloc(char*, argc);
|
||||||
|
int i;
|
||||||
|
|
||||||
|
for (i = 0; i < argc; ++i) {
|
||||||
|
argv[i] = WIN_StringToUTF8(wargv[i]);
|
||||||
|
}
|
||||||
|
|
||||||
|
retval = main_utf8(argc, argv);
|
||||||
|
|
||||||
|
/* !!! FIXME: we are leaking all the elements of argv we allocated. */
|
||||||
|
SDL_stack_free(argv);
|
||||||
|
|
||||||
|
return retval;
|
||||||
|
}
|
||||||
|
#endif
|
||||||
|
|
||||||
|
/* This is where execution begins [windowed apps] */
|
||||||
|
int WINAPI
|
||||||
|
WinMain(HINSTANCE hInst, HINSTANCE hPrev, LPSTR szCmdLine, int sw)
|
||||||
|
{
|
||||||
|
char **argv;
|
||||||
|
int argc;
|
||||||
|
char *cmdline;
|
||||||
|
|
||||||
|
/* Grab the command line */
|
||||||
|
TCHAR *text = GetCommandLine();
|
||||||
|
#if UNICODE
|
||||||
|
cmdline = WIN_StringToUTF8(text);
|
||||||
|
#else
|
||||||
|
/* !!! FIXME: are these in the system codepage? We need to convert to UTF-8. */
|
||||||
|
cmdline = SDL_strdup(text);
|
||||||
|
#endif
|
||||||
|
if (cmdline == NULL) {
|
||||||
|
return OutOfMemory();
|
||||||
|
}
|
||||||
|
|
||||||
|
/* Parse it into argv and argc */
|
||||||
|
argc = ParseCommandLine(cmdline, NULL);
|
||||||
|
argv = SDL_stack_alloc(char *, argc + 1);
|
||||||
|
if (argv == NULL) {
|
||||||
|
return OutOfMemory();
|
||||||
|
}
|
||||||
|
ParseCommandLine(cmdline, argv);
|
||||||
|
|
||||||
|
/* Run the main program */
|
||||||
|
main_utf8(argc, argv);
|
||||||
|
|
||||||
|
SDL_stack_free(argv);
|
||||||
|
|
||||||
|
SDL_free(cmdline);
|
||||||
|
|
||||||
|
/* Hush little compiler, don't you cry... */
|
||||||
|
return 0;
|
||||||
|
}
|
||||||
|
|
||||||
|
#endif /* __WIN32__ */
|
||||||
|
|
||||||
|
/* vi: set ts=4 sw=4 expandtab: */
|
||||||
|
|
@ -475,18 +475,6 @@
|
||||||
<AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
|
<AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
|
||||||
<PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
|
<PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
|
||||||
</ClCompile>
|
</ClCompile>
|
||||||
<ClCompile Include="SDL_main\SDL_win32_main.c">
|
|
||||||
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
|
|
||||||
<AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
|
|
||||||
<PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
|
|
||||||
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
|
|
||||||
<AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
|
|
||||||
<PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
|
|
||||||
<AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
|
|
||||||
<PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
|
|
||||||
<AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
|
|
||||||
<PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
|
|
||||||
</ClCompile>
|
|
||||||
<ClCompile Include="..\win32\win_dbg.c">
|
<ClCompile Include="..\win32\win_dbg.c">
|
||||||
<AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
|
<AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
|
||||||
<PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
|
<PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
|
||||||
|
|
@ -1245,6 +1233,7 @@
|
||||||
<AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
|
<AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
|
||||||
<PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
|
<PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
|
||||||
</ClCompile>
|
</ClCompile>
|
||||||
|
<ClCompile Include="SDL_main\SDL_windows_main.c" />
|
||||||
<ClCompile Include="sdl_sound.c" />
|
<ClCompile Include="sdl_sound.c" />
|
||||||
</ItemGroup>
|
</ItemGroup>
|
||||||
<ItemGroup>
|
<ItemGroup>
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue