diff options
| author | ntoskrnl <ntoskrnl11@yahoo.com> | 2012-08-01 19:28:43 (GMT) |
|---|---|---|
| committer | Simon Robertshaw <simon@hardwired.org.uk> | 2012-08-02 14:21:43 (GMT) |
| commit | 18bf7ce155ebabc8bea89f44841ea58708bb98c1 (patch) | |
| tree | 3f4522fbde4cfbfe269aff1d35d192228f318a4b | |
| parent | 4343faa10fd46744430e28126d33a7a3a0b3b6e1 (diff) | |
| download | powder-18bf7ce155ebabc8bea89f44841ea58708bb98c1.zip powder-18bf7ce155ebabc8bea89f44841ea58708bb98c1.tar.gz | |
Build fixes for WIN64
| -rw-r--r-- | SConscript | 5 | ||||
| -rw-r--r-- | src/Update.cpp | 2 |
2 files changed, 5 insertions, 2 deletions
@@ -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 853043d..290b5df 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; |