vivlim
/
Kart-Public
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'master' into next

This commit is contained in:
Alam Ed Arias 2016-06-01 11:45:57 -04:00
parent ef290723c2 d86dc67218
commit 0444e8a14c
3 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.travis.yml
View File

@ -172,7 +172,7 @@ matrix:
# - os: osx # - os: osx
# osx_image: beta-xcode6.3 # osx_image: beta-xcode6.3
# #I think xcode.6.3 VM is broken, it does not boot # #I think xcode.6.3 VM is broken, it does not boot
# - os: osx - os: osx
osx_image: xcode6.4 osx_image: xcode6.4
#Apple LLVM version 6.1.0 (clang-602.0.53) (based on LLVM 3.6.0svn) #Apple LLVM version 6.1.0 (clang-602.0.53) (based on LLVM 3.6.0svn)
- os: osx - os: osx

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);