From 18bf7ce155ebabc8bea89f44841ea58708bb98c1 Mon Sep 17 00:00:00 2001 From: ntoskrnl Date: Wed, 1 Aug 2012 22:28:43 +0300 Subject: [PATCH] Build fixes for WIN64 --- SConscript | 5 ++++- src/Update.cpp | 2 +- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/SConscript b/SConscript index e00c2f944..8a87707b4 100644 --- a/SConscript +++ b/SConscript @@ -114,7 +114,10 @@ if(GetOption('win')): env.Append(LIBS=['winmm', 'gdi32']) env.Append(CPPDEFINES=["WIN"]) env.Append(LINKFLAGS=['-mwindows']) -if(GetOption('lin'): + if(GetOption('_64bit')): + env.Append(CPPDEFINES=['__CRT__NO_INLINE']) + env.Append(LINKFLAGS=['-Wl,--stack=16777216']) +if(GetOption('lin')): openGLLibs = ['GL'] env.Append(LIBS=['X11', 'rt']) env.Append(CPPDEFINES=["LIN"]) diff --git a/src/Update.cpp b/src/Update.cpp index 853043d59..290b5df49 100644 --- a/src/Update.cpp +++ b/src/Update.cpp @@ -100,7 +100,7 @@ int update_start(char *data, int len) } fclose(f); - if ((int)ShellExecute(NULL, "open", self, NULL, NULL, SW_SHOWNORMAL) <= 32) + if ((uintptr_t)ShellExecute(NULL, "open", self, NULL, NULL, SW_SHOWNORMAL) <= 32) { DeleteFile(self); goto fail;