Fossil SCM
forgot makemake.tcl and Makefile.mingw.mistachkin changes
Commit
08802c4af47279c6a1124a5725f1ed5e67da4744
Parent
2459ee7b71172d7…
2 files changed
+7
-1
+9
-3
+7
-1
| --- src/makemake.tcl | ||
| +++ src/makemake.tcl | ||
| @@ -503,11 +503,17 @@ | ||
| 503 | 503 | endif |
| 504 | 504 | |
| 505 | 505 | #### We add the -static option here so that we can build a static |
| 506 | 506 | # executable that will run in a chroot jail. |
| 507 | 507 | # |
| 508 | -LIB = -static -municode | |
| 508 | +LIB = -static | |
| 509 | + | |
| 510 | +ifeq ($(PREFIX),) | |
| 511 | +TCC += -DBROKEN_MINGW_CMDLINE | |
| 512 | +else | |
| 513 | +LIB += -municode | |
| 514 | +endif | |
| 509 | 515 | |
| 510 | 516 | # OpenSSL: Add the necessary libraries required, if enabled. |
| 511 | 517 | ifdef FOSSIL_ENABLE_SSL |
| 512 | 518 | LIB += -lssl -lcrypto -lgdi32 |
| 513 | 519 | endif |
| 514 | 520 |
| --- src/makemake.tcl | |
| +++ src/makemake.tcl | |
| @@ -503,11 +503,17 @@ | |
| 503 | endif |
| 504 | |
| 505 | #### We add the -static option here so that we can build a static |
| 506 | # executable that will run in a chroot jail. |
| 507 | # |
| 508 | LIB = -static -municode |
| 509 | |
| 510 | # OpenSSL: Add the necessary libraries required, if enabled. |
| 511 | ifdef FOSSIL_ENABLE_SSL |
| 512 | LIB += -lssl -lcrypto -lgdi32 |
| 513 | endif |
| 514 |
| --- src/makemake.tcl | |
| +++ src/makemake.tcl | |
| @@ -503,11 +503,17 @@ | |
| 503 | endif |
| 504 | |
| 505 | #### We add the -static option here so that we can build a static |
| 506 | # executable that will run in a chroot jail. |
| 507 | # |
| 508 | LIB = -static |
| 509 | |
| 510 | ifeq ($(PREFIX),) |
| 511 | TCC += -DBROKEN_MINGW_CMDLINE |
| 512 | else |
| 513 | LIB += -municode |
| 514 | endif |
| 515 | |
| 516 | # OpenSSL: Add the necessary libraries required, if enabled. |
| 517 | ifdef FOSSIL_ENABLE_SSL |
| 518 | LIB += -lssl -lcrypto -lgdi32 |
| 519 | endif |
| 520 |
+9
-3
| --- win/Makefile.mingw.mistachkin | ||
| +++ win/Makefile.mingw.mistachkin | ||
| @@ -13,14 +13,14 @@ | ||
| 13 | 13 | # |
| 14 | 14 | |
| 15 | 15 | #### Select one of MinGW, MinGW-64 (32-bit) or MinGW-w64 (64-bit) compilers. |
| 16 | 16 | # By default, this is an empty string (i.e. use the native compiler). |
| 17 | 17 | # |
| 18 | -PREFIX = | |
| 18 | +# PREFIX = | |
| 19 | 19 | # PREFIX = mingw32- |
| 20 | 20 | # PREFIX = i686-pc-mingw32- |
| 21 | -# PREFIX = i686-w64-mingw32- | |
| 21 | +PREFIX = i686-w64-mingw32- | |
| 22 | 22 | # PREFIX = x86_64-w64-mingw32- |
| 23 | 23 | |
| 24 | 24 | #### The toplevel directory of the source tree. Fossil can be built |
| 25 | 25 | # in a directory that is separate from the source tree. Just change |
| 26 | 26 | # the following to point from the build directory to the src/ folder. |
| @@ -173,11 +173,17 @@ | ||
| 173 | 173 | endif |
| 174 | 174 | |
| 175 | 175 | #### We add the -static option here so that we can build a static |
| 176 | 176 | # executable that will run in a chroot jail. |
| 177 | 177 | # |
| 178 | -LIB = -static -municode | |
| 178 | +LIB = -static | |
| 179 | + | |
| 180 | +ifeq ($(PREFIX),) | |
| 181 | +TCC += -DBROKEN_MINGW_CMDLINE | |
| 182 | +else | |
| 183 | +LIB += -municode | |
| 184 | +endif | |
| 179 | 185 | |
| 180 | 186 | # OpenSSL: Add the necessary libraries required, if enabled. |
| 181 | 187 | ifdef FOSSIL_ENABLE_SSL |
| 182 | 188 | LIB += -lssl -lcrypto -lgdi32 |
| 183 | 189 | endif |
| 184 | 190 |
| --- win/Makefile.mingw.mistachkin | |
| +++ win/Makefile.mingw.mistachkin | |
| @@ -13,14 +13,14 @@ | |
| 13 | # |
| 14 | |
| 15 | #### Select one of MinGW, MinGW-64 (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 = |
| 19 | # PREFIX = mingw32- |
| 20 | # PREFIX = i686-pc-mingw32- |
| 21 | # PREFIX = i686-w64-mingw32- |
| 22 | # PREFIX = x86_64-w64-mingw32- |
| 23 | |
| 24 | #### The toplevel directory of the source tree. Fossil can be built |
| 25 | # in a directory that is separate from the source tree. Just change |
| 26 | # the following to point from the build directory to the src/ folder. |
| @@ -173,11 +173,17 @@ | |
| 173 | endif |
| 174 | |
| 175 | #### We add the -static option here so that we can build a static |
| 176 | # executable that will run in a chroot jail. |
| 177 | # |
| 178 | LIB = -static -municode |
| 179 | |
| 180 | # OpenSSL: Add the necessary libraries required, if enabled. |
| 181 | ifdef FOSSIL_ENABLE_SSL |
| 182 | LIB += -lssl -lcrypto -lgdi32 |
| 183 | endif |
| 184 |
| --- win/Makefile.mingw.mistachkin | |
| +++ win/Makefile.mingw.mistachkin | |
| @@ -13,14 +13,14 @@ | |
| 13 | # |
| 14 | |
| 15 | #### Select one of MinGW, MinGW-64 (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 = |
| 19 | # PREFIX = mingw32- |
| 20 | # PREFIX = i686-pc-mingw32- |
| 21 | PREFIX = i686-w64-mingw32- |
| 22 | # PREFIX = x86_64-w64-mingw32- |
| 23 | |
| 24 | #### The toplevel directory of the source tree. Fossil can be built |
| 25 | # in a directory that is separate from the source tree. Just change |
| 26 | # the following to point from the build directory to the src/ folder. |
| @@ -173,11 +173,17 @@ | |
| 173 | endif |
| 174 | |
| 175 | #### We add the -static option here so that we can build a static |
| 176 | # executable that will run in a chroot jail. |
| 177 | # |
| 178 | LIB = -static |
| 179 | |
| 180 | ifeq ($(PREFIX),) |
| 181 | TCC += -DBROKEN_MINGW_CMDLINE |
| 182 | else |
| 183 | LIB += -municode |
| 184 | endif |
| 185 | |
| 186 | # OpenSSL: Add the necessary libraries required, if enabled. |
| 187 | ifdef FOSSIL_ENABLE_SSL |
| 188 | LIB += -lssl -lcrypto -lgdi32 |
| 189 | endif |
| 190 |