Fossil SCM

Rename the makefile variable BROKEN_MINGW_CMDLINE (not the C define) to more accurately reflect its usage.

mistachkin 2013-09-26 08:09 trunk
Commit 4137f4cda93bb61aa87934711bf604844091fc0e
Parent a8214df37230c2d…
3 files changed +4 -4 +4 -4 +4 -4
~ src/makemake.tcl ~ win/Makefile.mingw ~ win/Makefile.mingw.mistachkin
M src/makemake.tcl
+4 -4
--- src/makemake.tcl
+++ src/makemake.tcl
@@ -407,13 +407,13 @@
407407
 FOSSIL_TCL_SOURCE = 1
408408
409409
 #### Check if the workaround for the MinGW command line handling needs to
410410
 # be enabled by default.
411411
 #
412
-ifndef BROKEN_MINGW_CMDLINE
412
+ifndef MINGW_IS_32BIT_ONLY
413413
 ifeq (,$(findstring w64-mingw32,$(PREFIX)))
414
-BROKEN_MINGW_CMDLINE = 1
414
+MINGW_IS_32BIT_ONLY = 1
415415
 endif
416416
 endif
417417
418418
 #### The directories where the zlib include and library files are located.
419419
 #
@@ -501,11 +501,11 @@
501501
 RCC += -I$(TCLINCDIR)
502502
 endif
503503
 endif
504504
505505
 # With MinGW command line handling workaround
506
-ifdef BROKEN_MINGW_CMDLINE
506
+ifdef MINGW_IS_32BIT_ONLY
507507
 TCC += -DBROKEN_MINGW_CMDLINE=1 -D_USE_32BIT_TIME_T
508508
 RCC += -DBROKEN_MINGW_CMDLINE=1 -D_USE_32BIT_TIME_T
509509
 endif
510510
511511
 # With HTTPS support
@@ -542,11 +542,11 @@
542542
 # executable that will run in a chroot jail.
543543
 #
544544
 LIB = -static
545545
546546
 # MinGW: If available, use the Unicode capable runtime startup code.
547
-ifndef BROKEN_MINGW_CMDLINE
547
+ifndef MINGW_IS_32BIT_ONLY
548548
 LIB += -municode
549549
 endif
550550
551551
 # OpenSSL: Add the necessary libraries required, if enabled.
552552
 ifdef FOSSIL_ENABLE_SSL
553553
--- src/makemake.tcl
+++ src/makemake.tcl
@@ -407,13 +407,13 @@
407 FOSSIL_TCL_SOURCE = 1
408
409 #### Check if the workaround for the MinGW command line handling needs to
410 # be enabled by default.
411 #
412 ifndef BROKEN_MINGW_CMDLINE
413 ifeq (,$(findstring w64-mingw32,$(PREFIX)))
414 BROKEN_MINGW_CMDLINE = 1
415 endif
416 endif
417
418 #### The directories where the zlib include and library files are located.
419 #
@@ -501,11 +501,11 @@
501 RCC += -I$(TCLINCDIR)
502 endif
503 endif
504
505 # With MinGW command line handling workaround
506 ifdef BROKEN_MINGW_CMDLINE
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
@@ -542,11 +542,11 @@
542 # executable that will run in a chroot jail.
543 #
544 LIB = -static
545
546 # MinGW: If available, use the Unicode capable runtime startup code.
547 ifndef BROKEN_MINGW_CMDLINE
548 LIB += -municode
549 endif
550
551 # OpenSSL: Add the necessary libraries required, if enabled.
552 ifdef FOSSIL_ENABLE_SSL
553
--- src/makemake.tcl
+++ src/makemake.tcl
@@ -407,13 +407,13 @@
407 FOSSIL_TCL_SOURCE = 1
408
409 #### Check if the workaround for the MinGW command line handling needs to
410 # be enabled by default.
411 #
412 ifndef MINGW_IS_32BIT_ONLY
413 ifeq (,$(findstring w64-mingw32,$(PREFIX)))
414 MINGW_IS_32BIT_ONLY = 1
415 endif
416 endif
417
418 #### The directories where the zlib include and library files are located.
419 #
@@ -501,11 +501,11 @@
501 RCC += -I$(TCLINCDIR)
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
@@ -542,11 +542,11 @@
542 # executable that will run in a chroot jail.
543 #
544 LIB = -static
545
546 # MinGW: If available, use the Unicode capable runtime startup code.
547 ifndef MINGW_IS_32BIT_ONLY
548 LIB += -municode
549 endif
550
551 # OpenSSL: Add the necessary libraries required, if enabled.
552 ifdef FOSSIL_ENABLE_SSL
553
M win/Makefile.mingw
+4 -4
--- win/Makefile.mingw
+++ win/Makefile.mingw
@@ -68,13 +68,13 @@
6868
 FOSSIL_TCL_SOURCE = 1
6969
7070
 #### Check if the workaround for the MinGW command line handling needs to
7171
 # be enabled by default.
7272
 #
73
-ifndef BROKEN_MINGW_CMDLINE
73
+ifndef MINGW_IS_32BIT_ONLY
7474
 ifeq (,$(findstring w64-mingw32,$(PREFIX)))
75
-BROKEN_MINGW_CMDLINE = 1
75
+MINGW_IS_32BIT_ONLY = 1
7676
 endif
7777
 endif
7878
7979
 #### The directories where the zlib include and library files are located.
8080
 #
@@ -162,11 +162,11 @@
162162
 RCC += -I$(TCLINCDIR)
163163
 endif
164164
 endif
165165
166166
 # With MinGW command line handling workaround
167
-ifdef BROKEN_MINGW_CMDLINE
167
+ifdef MINGW_IS_32BIT_ONLY
168168
 TCC += -DBROKEN_MINGW_CMDLINE=1 -D_USE_32BIT_TIME_T
169169
 RCC += -DBROKEN_MINGW_CMDLINE=1 -D_USE_32BIT_TIME_T
170170
 endif
171171
172172
 # With HTTPS support
@@ -203,11 +203,11 @@
203203
 # executable that will run in a chroot jail.
204204
 #
205205
 LIB = -static
206206
207207
 # MinGW: If available, use the Unicode capable runtime startup code.
208
-ifndef BROKEN_MINGW_CMDLINE
208
+ifndef MINGW_IS_32BIT_ONLY
209209
 LIB += -municode
210210
 endif
211211
212212
 # OpenSSL: Add the necessary libraries required, if enabled.
213213
 ifdef FOSSIL_ENABLE_SSL
214214
--- win/Makefile.mingw
+++ win/Makefile.mingw
@@ -68,13 +68,13 @@
68 FOSSIL_TCL_SOURCE = 1
69
70 #### Check if the workaround for the MinGW command line handling needs to
71 # be enabled by default.
72 #
73 ifndef BROKEN_MINGW_CMDLINE
74 ifeq (,$(findstring w64-mingw32,$(PREFIX)))
75 BROKEN_MINGW_CMDLINE = 1
76 endif
77 endif
78
79 #### The directories where the zlib include and library files are located.
80 #
@@ -162,11 +162,11 @@
162 RCC += -I$(TCLINCDIR)
163 endif
164 endif
165
166 # With MinGW command line handling workaround
167 ifdef BROKEN_MINGW_CMDLINE
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
@@ -203,11 +203,11 @@
203 # executable that will run in a chroot jail.
204 #
205 LIB = -static
206
207 # MinGW: If available, use the Unicode capable runtime startup code.
208 ifndef BROKEN_MINGW_CMDLINE
209 LIB += -municode
210 endif
211
212 # OpenSSL: Add the necessary libraries required, if enabled.
213 ifdef FOSSIL_ENABLE_SSL
214
--- win/Makefile.mingw
+++ win/Makefile.mingw
@@ -68,13 +68,13 @@
68 FOSSIL_TCL_SOURCE = 1
69
70 #### Check if the workaround for the MinGW command line handling needs to
71 # be enabled by default.
72 #
73 ifndef MINGW_IS_32BIT_ONLY
74 ifeq (,$(findstring w64-mingw32,$(PREFIX)))
75 MINGW_IS_32BIT_ONLY = 1
76 endif
77 endif
78
79 #### The directories where the zlib include and library files are located.
80 #
@@ -162,11 +162,11 @@
162 RCC += -I$(TCLINCDIR)
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
@@ -203,11 +203,11 @@
203 # executable that will run in a chroot jail.
204 #
205 LIB = -static
206
207 # MinGW: If available, use the Unicode capable runtime startup code.
208 ifndef MINGW_IS_32BIT_ONLY
209 LIB += -municode
210 endif
211
212 # OpenSSL: Add the necessary libraries required, if enabled.
213 ifdef FOSSIL_ENABLE_SSL
214
M win/Makefile.mingw.mistachkin
+4 -4
--- win/Makefile.mingw.mistachkin
+++ win/Makefile.mingw.mistachkin
@@ -68,13 +68,13 @@
6868
 FOSSIL_TCL_SOURCE = 1
6969
7070
 #### Check if the workaround for the MinGW command line handling needs to
7171
 # be enabled by default.
7272
 #
73
-ifndef BROKEN_MINGW_CMDLINE
73
+ifndef MINGW_IS_32BIT_ONLY
7474
 ifeq (,$(findstring w64-mingw32,$(PREFIX)))
75
-BROKEN_MINGW_CMDLINE = 1
75
+MINGW_IS_32BIT_ONLY = 1
7676
 endif
7777
 endif
7878
7979
 #### The directories where the zlib include and library files are located.
8080
 #
@@ -162,11 +162,11 @@
162162
 RCC += -I$(TCLINCDIR)
163163
 endif
164164
 endif
165165
166166
 # With MinGW command line handling workaround
167
-ifdef BROKEN_MINGW_CMDLINE
167
+ifdef MINGW_IS_32BIT_ONLY
168168
 TCC += -DBROKEN_MINGW_CMDLINE=1 -D_USE_32BIT_TIME_T
169169
 RCC += -DBROKEN_MINGW_CMDLINE=1 -D_USE_32BIT_TIME_T
170170
 endif
171171
172172
 # With HTTPS support
@@ -203,11 +203,11 @@
203203
 # executable that will run in a chroot jail.
204204
 #
205205
 LIB = -static
206206
207207
 # MinGW: If available, use the Unicode capable runtime startup code.
208
-ifndef BROKEN_MINGW_CMDLINE
208
+ifndef MINGW_IS_32BIT_ONLY
209209
 LIB += -municode
210210
 endif
211211
212212
 # OpenSSL: Add the necessary libraries required, if enabled.
213213
 ifdef FOSSIL_ENABLE_SSL
214214
--- win/Makefile.mingw.mistachkin
+++ win/Makefile.mingw.mistachkin
@@ -68,13 +68,13 @@
68 FOSSIL_TCL_SOURCE = 1
69
70 #### Check if the workaround for the MinGW command line handling needs to
71 # be enabled by default.
72 #
73 ifndef BROKEN_MINGW_CMDLINE
74 ifeq (,$(findstring w64-mingw32,$(PREFIX)))
75 BROKEN_MINGW_CMDLINE = 1
76 endif
77 endif
78
79 #### The directories where the zlib include and library files are located.
80 #
@@ -162,11 +162,11 @@
162 RCC += -I$(TCLINCDIR)
163 endif
164 endif
165
166 # With MinGW command line handling workaround
167 ifdef BROKEN_MINGW_CMDLINE
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
@@ -203,11 +203,11 @@
203 # executable that will run in a chroot jail.
204 #
205 LIB = -static
206
207 # MinGW: If available, use the Unicode capable runtime startup code.
208 ifndef BROKEN_MINGW_CMDLINE
209 LIB += -municode
210 endif
211
212 # OpenSSL: Add the necessary libraries required, if enabled.
213 ifdef FOSSIL_ENABLE_SSL
214
--- win/Makefile.mingw.mistachkin
+++ win/Makefile.mingw.mistachkin
@@ -68,13 +68,13 @@
68 FOSSIL_TCL_SOURCE = 1
69
70 #### Check if the workaround for the MinGW command line handling needs to
71 # be enabled by default.
72 #
73 ifndef MINGW_IS_32BIT_ONLY
74 ifeq (,$(findstring w64-mingw32,$(PREFIX)))
75 MINGW_IS_32BIT_ONLY = 1
76 endif
77 endif
78
79 #### The directories where the zlib include and library files are located.
80 #
@@ -162,11 +162,11 @@
162 RCC += -I$(TCLINCDIR)
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
@@ -203,11 +203,11 @@
203 # executable that will run in a chroot jail.
204 #
205 LIB = -static
206
207 # MinGW: If available, use the Unicode capable runtime startup code.
208 ifndef MINGW_IS_32BIT_ONLY
209 LIB += -municode
210 endif
211
212 # OpenSSL: Add the necessary libraries required, if enabled.
213 ifdef FOSSIL_ENABLE_SSL
214

Keyboard Shortcuts

Open search /
Next entry (timeline) j
Previous entry (timeline) k
Open focused entry Enter
Show this help ?
Toggle theme Top nav button