stjr/Kart-Public
0
0
Fork 0
mirror of https://git.do.srb2.org/KartKrew/Kart-Public.git synced 2024-11-10 23:31:50 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch 'master' into software-fixes

Browse source
This commit is contained in:
Alam Ed Arias 2016-06-01 11:17:57 -04:00
commit 87cf02e21b
3 changed files with 9 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
.travis.yml
View file

@ -188,6 +188,9 @@ matrix:
osx_image: xcode7.3 osx_image: xcode7.3
#Apple LLVM version 7.3.0 (clang-703.0.31) #Apple LLVM version 7.3.0 (clang-703.0.31)
allow_failures: allow_failures:
- compiler: clang-3.5
- compiler: clang-3.6
- compiler: clang-3.7
- compiler: clang-3.8 - compiler: clang-3.8
cache: cache:

2
src/sdl/i_main.c
View file

@ -214,12 +214,14 @@ int main(int argc, char **argv)
#if defined (_WIN32) && !defined (_XBOX) #if defined (_WIN32) && !defined (_XBOX)
#ifndef _WIN32_WCE #ifndef _WIN32_WCE
{ {
#if 0 // just load the DLL
p_IsDebuggerPresent pfnIsDebuggerPresent = (p_IsDebuggerPresent)GetProcAddress(GetModuleHandleA("kernel32.dll"), "IsDebuggerPresent"); p_IsDebuggerPresent pfnIsDebuggerPresent = (p_IsDebuggerPresent)GetProcAddress(GetModuleHandleA("kernel32.dll"), "IsDebuggerPresent");
if ((!pfnIsDebuggerPresent || !pfnIsDebuggerPresent()) if ((!pfnIsDebuggerPresent || !pfnIsDebuggerPresent())
#ifdef BUGTRAP #ifdef BUGTRAP
&& !InitBugTrap() && !InitBugTrap()
#endif #endif
) )
#endif
{ {
LoadLibraryA("exchndl.dll"); LoadLibraryA("exchndl.dll");
} }

4
src/win32/win_main.c
View file

@ -644,13 +644,16 @@ int WINAPI WinMain (HINSTANCE hInstance,
{ {
int Result = -1; int Result = -1;
#if 0
// Win95 and NT <4 don't have this, so link at runtime. // Win95 and NT <4 don't have this, so link at runtime.
p_IsDebuggerPresent pfnIsDebuggerPresent = (p_IsDebuggerPresent)GetProcAddress(GetModuleHandleA("kernel32.dll"),"IsDebuggerPresent"); p_IsDebuggerPresent pfnIsDebuggerPresent = (p_IsDebuggerPresent)GetProcAddress(GetModuleHandleA("kernel32.dll"),"IsDebuggerPresent");
#endif
UNREFERENCED_PARAMETER(hPrevInstance); UNREFERENCED_PARAMETER(hPrevInstance);
UNREFERENCED_PARAMETER(lpCmdLine); UNREFERENCED_PARAMETER(lpCmdLine);
UNREFERENCED_PARAMETER(nCmdShow); UNREFERENCED_PARAMETER(nCmdShow);
#if 0
#ifdef BUGTRAP #ifdef BUGTRAP
// Try BugTrap first. // Try BugTrap first.
if((!pfnIsDebuggerPresent || !pfnIsDebuggerPresent()) && InitBugTrap()) if((!pfnIsDebuggerPresent || !pfnIsDebuggerPresent()) && InitBugTrap())
@ -660,6 +663,7 @@ int WINAPI WinMain (HINSTANCE hInstance,
#endif #endif
// Try Dr MinGW's exception handler. // Try Dr MinGW's exception handler.
if (!pfnIsDebuggerPresent || !pfnIsDebuggerPresent()) if (!pfnIsDebuggerPresent || !pfnIsDebuggerPresent())
#endif
LoadLibraryA("exchndl.dll"); LoadLibraryA("exchndl.dll");
prevExceptionFilter = SetUnhandledExceptionFilter(RecordExceptionInfo); prevExceptionFilter = SetUnhandledExceptionFilter(RecordExceptionInfo);