Fossil SCM
Fix x64 compilation on Windows using the MSVC toolset included with VS 2012.
Commit
ed544f3d9c2c734826def031bf8d281b69018581
Parent
3eea7413accdd63…
3 files changed
+1
-1
+1
-1
+5
-1
+1
-1
| --- src/makemake.tcl | ||
| +++ src/makemake.tcl | ||
| @@ -968,11 +968,11 @@ | ||
| 968 | 968 | !endif |
| 969 | 969 | |
| 970 | 970 | CFLAGS = -nologo -MT -O2 |
| 971 | 971 | BCC = $(CC) $(CFLAGS) |
| 972 | 972 | TCC = $(CC) -c $(CFLAGS) $(MSCDEF) $(INCL) |
| 973 | -RCC = rc -D_WIN32 -D_MSC_VER $(INCL) | |
| 973 | +RCC = rc $(CFLAGS) $(MSCDEF) $(INCL) | |
| 974 | 974 | LIBS = $(ZLIB) ws2_32.lib advapi32.lib |
| 975 | 975 | LIBDIR = -LIBPATH:$(ZLIBDIR) |
| 976 | 976 | |
| 977 | 977 | !ifdef FOSSIL_ENABLE_JSON |
| 978 | 978 | TCC = $(TCC) -DFOSSIL_ENABLE_JSON=1 |
| 979 | 979 |
| --- src/makemake.tcl | |
| +++ src/makemake.tcl | |
| @@ -968,11 +968,11 @@ | |
| 968 | !endif |
| 969 | |
| 970 | CFLAGS = -nologo -MT -O2 |
| 971 | BCC = $(CC) $(CFLAGS) |
| 972 | TCC = $(CC) -c $(CFLAGS) $(MSCDEF) $(INCL) |
| 973 | RCC = rc -D_WIN32 -D_MSC_VER $(INCL) |
| 974 | LIBS = $(ZLIB) ws2_32.lib advapi32.lib |
| 975 | LIBDIR = -LIBPATH:$(ZLIBDIR) |
| 976 | |
| 977 | !ifdef FOSSIL_ENABLE_JSON |
| 978 | TCC = $(TCC) -DFOSSIL_ENABLE_JSON=1 |
| 979 |
| --- src/makemake.tcl | |
| +++ src/makemake.tcl | |
| @@ -968,11 +968,11 @@ | |
| 968 | !endif |
| 969 | |
| 970 | CFLAGS = -nologo -MT -O2 |
| 971 | BCC = $(CC) $(CFLAGS) |
| 972 | TCC = $(CC) -c $(CFLAGS) $(MSCDEF) $(INCL) |
| 973 | RCC = rc $(CFLAGS) $(MSCDEF) $(INCL) |
| 974 | LIBS = $(ZLIB) ws2_32.lib advapi32.lib |
| 975 | LIBDIR = -LIBPATH:$(ZLIBDIR) |
| 976 | |
| 977 | !ifdef FOSSIL_ENABLE_JSON |
| 978 | TCC = $(TCC) -DFOSSIL_ENABLE_JSON=1 |
| 979 |
+1
-1
| --- win/Makefile.msc | ||
| +++ win/Makefile.msc | ||
| @@ -38,11 +38,11 @@ | ||
| 38 | 38 | !endif |
| 39 | 39 | |
| 40 | 40 | CFLAGS = -nologo -MT -O2 |
| 41 | 41 | BCC = $(CC) $(CFLAGS) |
| 42 | 42 | TCC = $(CC) -c $(CFLAGS) $(MSCDEF) $(INCL) |
| 43 | -RCC = rc -D_WIN32 -D_MSC_VER $(INCL) | |
| 43 | +RCC = rc $(CFLAGS) $(MSCDEF) $(INCL) | |
| 44 | 44 | LIBS = $(ZLIB) ws2_32.lib advapi32.lib |
| 45 | 45 | LIBDIR = -LIBPATH:$(ZLIBDIR) |
| 46 | 46 | |
| 47 | 47 | !ifdef FOSSIL_ENABLE_JSON |
| 48 | 48 | TCC = $(TCC) -DFOSSIL_ENABLE_JSON=1 |
| 49 | 49 |
| --- win/Makefile.msc | |
| +++ win/Makefile.msc | |
| @@ -38,11 +38,11 @@ | |
| 38 | !endif |
| 39 | |
| 40 | CFLAGS = -nologo -MT -O2 |
| 41 | BCC = $(CC) $(CFLAGS) |
| 42 | TCC = $(CC) -c $(CFLAGS) $(MSCDEF) $(INCL) |
| 43 | RCC = rc -D_WIN32 -D_MSC_VER $(INCL) |
| 44 | LIBS = $(ZLIB) ws2_32.lib advapi32.lib |
| 45 | LIBDIR = -LIBPATH:$(ZLIBDIR) |
| 46 | |
| 47 | !ifdef FOSSIL_ENABLE_JSON |
| 48 | TCC = $(TCC) -DFOSSIL_ENABLE_JSON=1 |
| 49 |
| --- win/Makefile.msc | |
| +++ win/Makefile.msc | |
| @@ -38,11 +38,11 @@ | |
| 38 | !endif |
| 39 | |
| 40 | CFLAGS = -nologo -MT -O2 |
| 41 | BCC = $(CC) $(CFLAGS) |
| 42 | TCC = $(CC) -c $(CFLAGS) $(MSCDEF) $(INCL) |
| 43 | RCC = rc $(CFLAGS) $(MSCDEF) $(INCL) |
| 44 | LIBS = $(ZLIB) ws2_32.lib advapi32.lib |
| 45 | LIBDIR = -LIBPATH:$(ZLIBDIR) |
| 46 | |
| 47 | !ifdef FOSSIL_ENABLE_JSON |
| 48 | TCC = $(TCC) -DFOSSIL_ENABLE_JSON=1 |
| 49 |
+5
-1
| --- win/include/dirent.h | ||
| +++ win/include/dirent.h | ||
| @@ -90,13 +90,17 @@ | ||
| 90 | 90 | * First version. |
| 91 | 91 | *****************************************************************************/ |
| 92 | 92 | #ifndef DIRENT_H |
| 93 | 93 | #define DIRENT_H |
| 94 | 94 | |
| 95 | -#if !defined(_68K_) && !defined(_MPPC_) && !defined(_X86_) && !defined(_IA64_) && !defined(_AMD64_) && defined(_M_IX86) | |
| 95 | +#if !defined(_68K_) && !defined(_MPPC_) && !defined(_X86_) && !defined(_IA64_) && !defined(_AMD64_) && !defined(_ARM_) && defined(_M_IX86) | |
| 96 | 96 | # define _X86_ |
| 97 | 97 | #endif |
| 98 | +#if !defined(_68K_) && !defined(_MPPC_) && !defined(_X86_) && !defined(_IA64_) && !defined(_AMD64_) && !defined(_ARM_) && defined(_M_AMD64) | |
| 99 | +#define _AMD64_ | |
| 100 | +#endif | |
| 101 | + | |
| 98 | 102 | #include <stdio.h> |
| 99 | 103 | #include <stdarg.h> |
| 100 | 104 | #include <windef.h> |
| 101 | 105 | #include <winbase.h> |
| 102 | 106 | #include <wchar.h> |
| 103 | 107 |
| --- win/include/dirent.h | |
| +++ win/include/dirent.h | |
| @@ -90,13 +90,17 @@ | |
| 90 | * First version. |
| 91 | *****************************************************************************/ |
| 92 | #ifndef DIRENT_H |
| 93 | #define DIRENT_H |
| 94 | |
| 95 | #if !defined(_68K_) && !defined(_MPPC_) && !defined(_X86_) && !defined(_IA64_) && !defined(_AMD64_) && defined(_M_IX86) |
| 96 | # define _X86_ |
| 97 | #endif |
| 98 | #include <stdio.h> |
| 99 | #include <stdarg.h> |
| 100 | #include <windef.h> |
| 101 | #include <winbase.h> |
| 102 | #include <wchar.h> |
| 103 |
| --- win/include/dirent.h | |
| +++ win/include/dirent.h | |
| @@ -90,13 +90,17 @@ | |
| 90 | * First version. |
| 91 | *****************************************************************************/ |
| 92 | #ifndef DIRENT_H |
| 93 | #define DIRENT_H |
| 94 | |
| 95 | #if !defined(_68K_) && !defined(_MPPC_) && !defined(_X86_) && !defined(_IA64_) && !defined(_AMD64_) && !defined(_ARM_) && defined(_M_IX86) |
| 96 | # define _X86_ |
| 97 | #endif |
| 98 | #if !defined(_68K_) && !defined(_MPPC_) && !defined(_X86_) && !defined(_IA64_) && !defined(_AMD64_) && !defined(_ARM_) && defined(_M_AMD64) |
| 99 | #define _AMD64_ |
| 100 | #endif |
| 101 | |
| 102 | #include <stdio.h> |
| 103 | #include <stdarg.h> |
| 104 | #include <windef.h> |
| 105 | #include <winbase.h> |
| 106 | #include <wchar.h> |
| 107 |