Fossil SCM

Attempt to fix Win64 MinGW build. Doesn't work yet.

jan.nijtmans 2013-10-11 11:13 UTC trunk

Commit e25410039dc67d9046a664a8fa38cf904c07f1f0

Parent c30cd93b918f855…

4 files changed +3 -3 +2 -2 +2 -2 +2 -2

M src/config.h

+3 -3

		--- src/config.h
		+++ src/config.h
		@@ -25,13 +25,13 @@
25	25	#ifndef _FILE_OFFSET_BITS
26	26	# define _FILE_OFFSET_BITS 64
27	27	#endif
28	28	#define _LARGEFILE_SOURCE 1
29	29
30		-/* Make sure that in 64-bit builds, _USE_32BIT_TIME_T is NEVER defined. */
31		-#ifdef _WIN64
32		-# undef _USE_32BIT_TIME_T
	30	+/* Make sure that in Win32 builds, _USE_32BIT_TIME_T is always defined. */
	31	+#if defined(_WIN32) && !defined(_WIN64)
	32	+# define _USE_32BIT_TIME_T
33	33	#endif
34	34
35	35	#ifdef HAVE_AUTOCONFIG_H
36	36	#include "autoconfig.h"
37	37	#endif
38	38

	--- src/config.h
	+++ src/config.h
	@@ -25,13 +25,13 @@
25	#ifndef _FILE_OFFSET_BITS
26	# define _FILE_OFFSET_BITS 64
27	#endif
28	#define _LARGEFILE_SOURCE 1
29
30	/* Make sure that in 64-bit builds, _USE_32BIT_TIME_T is NEVER defined. */
31	#ifdef _WIN64
32	# undef _USE_32BIT_TIME_T
33	#endif
34
35	#ifdef HAVE_AUTOCONFIG_H
36	#include "autoconfig.h"
37	#endif
38

	--- src/config.h
	+++ src/config.h
	@@ -25,13 +25,13 @@
25	#ifndef _FILE_OFFSET_BITS
26	# define _FILE_OFFSET_BITS 64
27	#endif
28	#define _LARGEFILE_SOURCE 1
29
30	/* Make sure that in Win32 builds, _USE_32BIT_TIME_T is always defined. */
31	#if defined(_WIN32) && !defined(_WIN64)
32	# define _USE_32BIT_TIME_T
33	#endif
34
35	#ifdef HAVE_AUTOCONFIG_H
36	#include "autoconfig.h"
37	#endif
38

M src/makemake.tcl

+2 -2

		--- src/makemake.tcl
		+++ src/makemake.tcl
		@@ -502,12 +502,12 @@
502	502	endif
503	503	endif
504	504
505	505	# With MinGW command line handling workaround
506	506	ifdef MINGW_IS_32BIT_ONLY
507		-TCC += -DBROKEN_MINGW_CMDLINE=1 -D_USE_32BIT_TIME_T
508		-RCC += -DBROKEN_MINGW_CMDLINE=1 -D_USE_32BIT_TIME_T
	507	+TCC += -DBROKEN_MINGW_CMDLINE=1
	508	+RCC += -DBROKEN_MINGW_CMDLINE=1
509	509	endif
510	510
511	511	# With HTTPS support
512	512	ifdef FOSSIL_ENABLE_SSL
513	513	TCC += -DFOSSIL_ENABLE_SSL=1
514	514

	--- src/makemake.tcl
	+++ src/makemake.tcl
	@@ -502,12 +502,12 @@
502	endif
503	endif
504
505	# With MinGW command line handling workaround
506	ifdef MINGW_IS_32BIT_ONLY
507	TCC += -DBROKEN_MINGW_CMDLINE=1 -D_USE_32BIT_TIME_T
508	RCC += -DBROKEN_MINGW_CMDLINE=1 -D_USE_32BIT_TIME_T
509	endif
510
511	# With HTTPS support
512	ifdef FOSSIL_ENABLE_SSL
513	TCC += -DFOSSIL_ENABLE_SSL=1
514

	--- src/makemake.tcl
	+++ src/makemake.tcl
	@@ -502,12 +502,12 @@
502	endif
503	endif
504
505	# With MinGW command line handling workaround
506	ifdef MINGW_IS_32BIT_ONLY
507	TCC += -DBROKEN_MINGW_CMDLINE=1
508	RCC += -DBROKEN_MINGW_CMDLINE=1
509	endif
510
511	# With HTTPS support
512	ifdef FOSSIL_ENABLE_SSL
513	TCC += -DFOSSIL_ENABLE_SSL=1
514

M win/Makefile.mingw

+2 -2

		--- win/Makefile.mingw
		+++ win/Makefile.mingw
		@@ -163,12 +163,12 @@
163	163	endif
164	164	endif
165	165
166	166	# With MinGW command line handling workaround
167	167	ifdef MINGW_IS_32BIT_ONLY
168		-TCC += -DBROKEN_MINGW_CMDLINE=1 -D_USE_32BIT_TIME_T
169		-RCC += -DBROKEN_MINGW_CMDLINE=1 -D_USE_32BIT_TIME_T
	168	+TCC += -DBROKEN_MINGW_CMDLINE=1
	169	+RCC += -DBROKEN_MINGW_CMDLINE=1
170	170	endif
171	171
172	172	# With HTTPS support
173	173	ifdef FOSSIL_ENABLE_SSL
174	174	TCC += -DFOSSIL_ENABLE_SSL=1
175	175

	--- win/Makefile.mingw
	+++ win/Makefile.mingw
	@@ -163,12 +163,12 @@
163	endif
164	endif
165
166	# With MinGW command line handling workaround
167	ifdef MINGW_IS_32BIT_ONLY
168	TCC += -DBROKEN_MINGW_CMDLINE=1 -D_USE_32BIT_TIME_T
169	RCC += -DBROKEN_MINGW_CMDLINE=1 -D_USE_32BIT_TIME_T
170	endif
171
172	# With HTTPS support
173	ifdef FOSSIL_ENABLE_SSL
174	TCC += -DFOSSIL_ENABLE_SSL=1
175

	--- win/Makefile.mingw
	+++ win/Makefile.mingw
	@@ -163,12 +163,12 @@
163	endif
164	endif
165
166	# With MinGW command line handling workaround
167	ifdef MINGW_IS_32BIT_ONLY
168	TCC += -DBROKEN_MINGW_CMDLINE=1
169	RCC += -DBROKEN_MINGW_CMDLINE=1
170	endif
171
172	# With HTTPS support
173	ifdef FOSSIL_ENABLE_SSL
174	TCC += -DFOSSIL_ENABLE_SSL=1
175

M win/Makefile.mingw.mistachkin

+2 -2

		--- win/Makefile.mingw.mistachkin
		+++ win/Makefile.mingw.mistachkin
		@@ -163,12 +163,12 @@
163	163	endif
164	164	endif
165	165
166	166	# With MinGW command line handling workaround
167	167	ifdef MINGW_IS_32BIT_ONLY
168		-TCC += -DBROKEN_MINGW_CMDLINE=1 -D_USE_32BIT_TIME_T
169		-RCC += -DBROKEN_MINGW_CMDLINE=1 -D_USE_32BIT_TIME_T
	168	+TCC += -DBROKEN_MINGW_CMDLINE=1
	169	+RCC += -DBROKEN_MINGW_CMDLINE=1
170	170	endif
171	171
172	172	# With HTTPS support
173	173	ifdef FOSSIL_ENABLE_SSL
174	174	TCC += -DFOSSIL_ENABLE_SSL=1
175	175

	--- win/Makefile.mingw.mistachkin
	+++ win/Makefile.mingw.mistachkin
	@@ -163,12 +163,12 @@
163	endif
164	endif
165
166	# With MinGW command line handling workaround
167	ifdef MINGW_IS_32BIT_ONLY
168	TCC += -DBROKEN_MINGW_CMDLINE=1 -D_USE_32BIT_TIME_T
169	RCC += -DBROKEN_MINGW_CMDLINE=1 -D_USE_32BIT_TIME_T
170	endif
171
172	# With HTTPS support
173	ifdef FOSSIL_ENABLE_SSL
174	TCC += -DFOSSIL_ENABLE_SSL=1
175

	--- win/Makefile.mingw.mistachkin
	+++ win/Makefile.mingw.mistachkin
	@@ -163,12 +163,12 @@
163	endif
164	endif
165
166	# With MinGW command line handling workaround
167	ifdef MINGW_IS_32BIT_ONLY
168	TCC += -DBROKEN_MINGW_CMDLINE=1
169	RCC += -DBROKEN_MINGW_CMDLINE=1
170	endif
171
172	# With HTTPS support
173	ifdef FOSSIL_ENABLE_SSL
174	TCC += -DFOSSIL_ENABLE_SSL=1
175