Fossil SCM
Regenerate and sync-up MinGW makefiles.
Commit
e947fce957171e440f40f5affdcec58204883f2e
Parent
e5bbc1bf161fc4e…
2 files changed
+13
-7
+13
-7
+13
-7
| --- win/Makefile.mingw | ||
| +++ win/Makefile.mingw | ||
| @@ -9,10 +9,14 @@ | ||
| 9 | 9 | # to regenerate this file. |
| 10 | 10 | # |
| 11 | 11 | # This is a makefile for use on Cygwin/Darwin/FreeBSD/Linux/Windows using |
| 12 | 12 | # MinGW or MinGW-w64. |
| 13 | 13 | # |
| 14 | +# Some of the special options which can be passed to make | |
| 15 | +# USE_WINDOWS=1 if building under a windows command prompt | |
| 16 | +# X64=1 if using an unprefixed 64-bit mingw compiler | |
| 17 | +# | |
| 14 | 18 | |
| 15 | 19 | #### Select one of MinGW, MinGW-w64 (32-bit) or MinGW-w64 (64-bit) compilers. |
| 16 | 20 | # By default, this is an empty string (i.e. use the native compiler). |
| 17 | 21 | # |
| 18 | 22 | PREFIX = |
| @@ -197,23 +201,25 @@ | ||
| 197 | 201 | # will run on the target platform. This is usually the same |
| 198 | 202 | # as BCC, unless you are cross-compiling. This C compiler builds |
| 199 | 203 | # the finished binary for fossil. The BCC compiler above is used |
| 200 | 204 | # for building intermediate code-generator tools. |
| 201 | 205 | # |
| 202 | -TCC = $(PREFIX)gcc -Os -Wall | |
| 203 | - | |
| 204 | -#### When not using the miniz compression library, zlib is required. | |
| 205 | -# | |
| 206 | -ifndef FOSSIL_ENABLE_MINIZ | |
| 207 | -TCC += -L$(ZLIBDIR) -I$(ZINCDIR) | |
| 208 | -endif | |
| 206 | +TCC = $(PREFIX)gcc -Wall | |
| 209 | 207 | |
| 210 | 208 | #### Add the necessary command line options to build with debugging |
| 211 | 209 | # symbols, if enabled. |
| 212 | 210 | # |
| 213 | 211 | ifdef FOSSIL_ENABLE_SYMBOLS |
| 214 | 212 | TCC += -g |
| 213 | +else | |
| 214 | +TCC += -Os | |
| 215 | +endif | |
| 216 | + | |
| 217 | +#### When not using the miniz compression library, zlib is required. | |
| 218 | +# | |
| 219 | +ifndef FOSSIL_ENABLE_MINIZ | |
| 220 | +TCC += -L$(ZLIBDIR) -I$(ZINCDIR) | |
| 215 | 221 | endif |
| 216 | 222 | |
| 217 | 223 | #### Compile resources for use in building executables that will run |
| 218 | 224 | # on the target platform. |
| 219 | 225 | # |
| 220 | 226 |
| --- win/Makefile.mingw | |
| +++ win/Makefile.mingw | |
| @@ -9,10 +9,14 @@ | |
| 9 | # to regenerate this file. |
| 10 | # |
| 11 | # This is a makefile for use on Cygwin/Darwin/FreeBSD/Linux/Windows using |
| 12 | # MinGW or MinGW-w64. |
| 13 | # |
| 14 | |
| 15 | #### Select one of MinGW, MinGW-w64 (32-bit) or MinGW-w64 (64-bit) compilers. |
| 16 | # By default, this is an empty string (i.e. use the native compiler). |
| 17 | # |
| 18 | PREFIX = |
| @@ -197,23 +201,25 @@ | |
| 197 | # will run on the target platform. This is usually the same |
| 198 | # as BCC, unless you are cross-compiling. This C compiler builds |
| 199 | # the finished binary for fossil. The BCC compiler above is used |
| 200 | # for building intermediate code-generator tools. |
| 201 | # |
| 202 | TCC = $(PREFIX)gcc -Os -Wall |
| 203 | |
| 204 | #### When not using the miniz compression library, zlib is required. |
| 205 | # |
| 206 | ifndef FOSSIL_ENABLE_MINIZ |
| 207 | TCC += -L$(ZLIBDIR) -I$(ZINCDIR) |
| 208 | endif |
| 209 | |
| 210 | #### Add the necessary command line options to build with debugging |
| 211 | # symbols, if enabled. |
| 212 | # |
| 213 | ifdef FOSSIL_ENABLE_SYMBOLS |
| 214 | TCC += -g |
| 215 | endif |
| 216 | |
| 217 | #### Compile resources for use in building executables that will run |
| 218 | # on the target platform. |
| 219 | # |
| 220 |
| --- win/Makefile.mingw | |
| +++ win/Makefile.mingw | |
| @@ -9,10 +9,14 @@ | |
| 9 | # to regenerate this file. |
| 10 | # |
| 11 | # This is a makefile for use on Cygwin/Darwin/FreeBSD/Linux/Windows using |
| 12 | # MinGW or MinGW-w64. |
| 13 | # |
| 14 | # Some of the special options which can be passed to make |
| 15 | # USE_WINDOWS=1 if building under a windows command prompt |
| 16 | # X64=1 if using an unprefixed 64-bit mingw compiler |
| 17 | # |
| 18 | |
| 19 | #### Select one of MinGW, MinGW-w64 (32-bit) or MinGW-w64 (64-bit) compilers. |
| 20 | # By default, this is an empty string (i.e. use the native compiler). |
| 21 | # |
| 22 | PREFIX = |
| @@ -197,23 +201,25 @@ | |
| 201 | # will run on the target platform. This is usually the same |
| 202 | # as BCC, unless you are cross-compiling. This C compiler builds |
| 203 | # the finished binary for fossil. The BCC compiler above is used |
| 204 | # for building intermediate code-generator tools. |
| 205 | # |
| 206 | TCC = $(PREFIX)gcc -Wall |
| 207 | |
| 208 | #### Add the necessary command line options to build with debugging |
| 209 | # symbols, if enabled. |
| 210 | # |
| 211 | ifdef FOSSIL_ENABLE_SYMBOLS |
| 212 | TCC += -g |
| 213 | else |
| 214 | TCC += -Os |
| 215 | endif |
| 216 | |
| 217 | #### When not using the miniz compression library, zlib is required. |
| 218 | # |
| 219 | ifndef FOSSIL_ENABLE_MINIZ |
| 220 | TCC += -L$(ZLIBDIR) -I$(ZINCDIR) |
| 221 | endif |
| 222 | |
| 223 | #### Compile resources for use in building executables that will run |
| 224 | # on the target platform. |
| 225 | # |
| 226 |
+13
-7
| --- win/Makefile.mingw.mistachkin | ||
| +++ win/Makefile.mingw.mistachkin | ||
| @@ -9,10 +9,14 @@ | ||
| 9 | 9 | # to regenerate this file. |
| 10 | 10 | # |
| 11 | 11 | # This is a makefile for use on Cygwin/Darwin/FreeBSD/Linux/Windows using |
| 12 | 12 | # MinGW or MinGW-w64. |
| 13 | 13 | # |
| 14 | +# Some of the special options which can be passed to make | |
| 15 | +# USE_WINDOWS=1 if building under a windows command prompt | |
| 16 | +# X64=1 if using an unprefixed 64-bit mingw compiler | |
| 17 | +# | |
| 14 | 18 | |
| 15 | 19 | #### Select one of MinGW, MinGW-w64 (32-bit) or MinGW-w64 (64-bit) compilers. |
| 16 | 20 | # By default, this is an empty string (i.e. use the native compiler). |
| 17 | 21 | # |
| 18 | 22 | PREFIX = |
| @@ -197,23 +201,25 @@ | ||
| 197 | 201 | # will run on the target platform. This is usually the same |
| 198 | 202 | # as BCC, unless you are cross-compiling. This C compiler builds |
| 199 | 203 | # the finished binary for fossil. The BCC compiler above is used |
| 200 | 204 | # for building intermediate code-generator tools. |
| 201 | 205 | # |
| 202 | -TCC = $(PREFIX)gcc -Os -Wall | |
| 203 | - | |
| 204 | -#### When not using the miniz compression library, zlib is required. | |
| 205 | -# | |
| 206 | -ifndef FOSSIL_ENABLE_MINIZ | |
| 207 | -TCC += -L$(ZLIBDIR) -I$(ZINCDIR) | |
| 208 | -endif | |
| 206 | +TCC = $(PREFIX)gcc -Wall | |
| 209 | 207 | |
| 210 | 208 | #### Add the necessary command line options to build with debugging |
| 211 | 209 | # symbols, if enabled. |
| 212 | 210 | # |
| 213 | 211 | ifdef FOSSIL_ENABLE_SYMBOLS |
| 214 | 212 | TCC += -g |
| 213 | +else | |
| 214 | +TCC += -Os | |
| 215 | +endif | |
| 216 | + | |
| 217 | +#### When not using the miniz compression library, zlib is required. | |
| 218 | +# | |
| 219 | +ifndef FOSSIL_ENABLE_MINIZ | |
| 220 | +TCC += -L$(ZLIBDIR) -I$(ZINCDIR) | |
| 215 | 221 | endif |
| 216 | 222 | |
| 217 | 223 | #### Compile resources for use in building executables that will run |
| 218 | 224 | # on the target platform. |
| 219 | 225 | # |
| 220 | 226 |
| --- win/Makefile.mingw.mistachkin | |
| +++ win/Makefile.mingw.mistachkin | |
| @@ -9,10 +9,14 @@ | |
| 9 | # to regenerate this file. |
| 10 | # |
| 11 | # This is a makefile for use on Cygwin/Darwin/FreeBSD/Linux/Windows using |
| 12 | # MinGW or MinGW-w64. |
| 13 | # |
| 14 | |
| 15 | #### Select one of MinGW, MinGW-w64 (32-bit) or MinGW-w64 (64-bit) compilers. |
| 16 | # By default, this is an empty string (i.e. use the native compiler). |
| 17 | # |
| 18 | PREFIX = |
| @@ -197,23 +201,25 @@ | |
| 197 | # will run on the target platform. This is usually the same |
| 198 | # as BCC, unless you are cross-compiling. This C compiler builds |
| 199 | # the finished binary for fossil. The BCC compiler above is used |
| 200 | # for building intermediate code-generator tools. |
| 201 | # |
| 202 | TCC = $(PREFIX)gcc -Os -Wall |
| 203 | |
| 204 | #### When not using the miniz compression library, zlib is required. |
| 205 | # |
| 206 | ifndef FOSSIL_ENABLE_MINIZ |
| 207 | TCC += -L$(ZLIBDIR) -I$(ZINCDIR) |
| 208 | endif |
| 209 | |
| 210 | #### Add the necessary command line options to build with debugging |
| 211 | # symbols, if enabled. |
| 212 | # |
| 213 | ifdef FOSSIL_ENABLE_SYMBOLS |
| 214 | TCC += -g |
| 215 | endif |
| 216 | |
| 217 | #### Compile resources for use in building executables that will run |
| 218 | # on the target platform. |
| 219 | # |
| 220 |
| --- win/Makefile.mingw.mistachkin | |
| +++ win/Makefile.mingw.mistachkin | |
| @@ -9,10 +9,14 @@ | |
| 9 | # to regenerate this file. |
| 10 | # |
| 11 | # This is a makefile for use on Cygwin/Darwin/FreeBSD/Linux/Windows using |
| 12 | # MinGW or MinGW-w64. |
| 13 | # |
| 14 | # Some of the special options which can be passed to make |
| 15 | # USE_WINDOWS=1 if building under a windows command prompt |
| 16 | # X64=1 if using an unprefixed 64-bit mingw compiler |
| 17 | # |
| 18 | |
| 19 | #### Select one of MinGW, MinGW-w64 (32-bit) or MinGW-w64 (64-bit) compilers. |
| 20 | # By default, this is an empty string (i.e. use the native compiler). |
| 21 | # |
| 22 | PREFIX = |
| @@ -197,23 +201,25 @@ | |
| 201 | # will run on the target platform. This is usually the same |
| 202 | # as BCC, unless you are cross-compiling. This C compiler builds |
| 203 | # the finished binary for fossil. The BCC compiler above is used |
| 204 | # for building intermediate code-generator tools. |
| 205 | # |
| 206 | TCC = $(PREFIX)gcc -Wall |
| 207 | |
| 208 | #### Add the necessary command line options to build with debugging |
| 209 | # symbols, if enabled. |
| 210 | # |
| 211 | ifdef FOSSIL_ENABLE_SYMBOLS |
| 212 | TCC += -g |
| 213 | else |
| 214 | TCC += -Os |
| 215 | endif |
| 216 | |
| 217 | #### When not using the miniz compression library, zlib is required. |
| 218 | # |
| 219 | ifndef FOSSIL_ENABLE_MINIZ |
| 220 | TCC += -L$(ZLIBDIR) -I$(ZINCDIR) |
| 221 | endif |
| 222 | |
| 223 | #### Compile resources for use in building executables that will run |
| 224 | # on the target platform. |
| 225 | # |
| 226 |