Fossil SCM
Makefile fixes to enable Tcl to be statically linked to Fossil.
Commit
6e6e55a12d471b0d11b9e68463f5aed31783f637
Parent
2d2b45bb178f309…
1 file changed
+4
-4
+4
-4
| --- win/Makefile.mingw.mistachkin | ||
| +++ win/Makefile.mingw.mistachkin | ||
| @@ -67,11 +67,11 @@ | ||
| 67 | 67 | TCC += -DFOSSIL_ENABLE_SSL=1 |
| 68 | 68 | endif |
| 69 | 69 | |
| 70 | 70 | # With Tcl support |
| 71 | 71 | ifdef FOSSIL_ENABLE_TCL |
| 72 | -TCC += -DFOSSIL_ENABLE_TCL=1 | |
| 72 | +TCC += -DFOSSIL_ENABLE_TCL=1 -DSTATIC_BUILD | |
| 73 | 73 | endif |
| 74 | 74 | |
| 75 | 75 | #### Extra arguments for linking the finished binary. Fossil needs |
| 76 | 76 | # to link against the Z-Lib compression library. There are no |
| 77 | 77 | # other dependencies. We sometimes add the -static option here |
| @@ -83,15 +83,15 @@ | ||
| 83 | 83 | # OpenSSL: |
| 84 | 84 | ifdef FOSSIL_ENABLE_SSL |
| 85 | 85 | LIB += -lssl -lcrypto -lgdi32 |
| 86 | 86 | endif |
| 87 | 87 | |
| 88 | -LIB += -lmingwex -lz -lws2_32 | |
| 89 | - | |
| 90 | 88 | ifdef FOSSIL_ENABLE_TCL |
| 91 | -LIB += -ltcl86t | |
| 89 | +LIB += -ltcl86s | |
| 92 | 90 | endif |
| 91 | + | |
| 92 | +LIB += -lmingwex -lz -lnetapi32 -lkernel32 -luser32 -ladvapi32 -lws2_32 | |
| 93 | 93 | |
| 94 | 94 | #### Tcl shell for use in running the fossil testsuite. This is only |
| 95 | 95 | # used for testing. If you do not run |
| 96 | 96 | # |
| 97 | 97 | TCLSH = tclsh |
| 98 | 98 |
| --- win/Makefile.mingw.mistachkin | |
| +++ win/Makefile.mingw.mistachkin | |
| @@ -67,11 +67,11 @@ | |
| 67 | TCC += -DFOSSIL_ENABLE_SSL=1 |
| 68 | endif |
| 69 | |
| 70 | # With Tcl support |
| 71 | ifdef FOSSIL_ENABLE_TCL |
| 72 | TCC += -DFOSSIL_ENABLE_TCL=1 |
| 73 | endif |
| 74 | |
| 75 | #### Extra arguments for linking the finished binary. Fossil needs |
| 76 | # to link against the Z-Lib compression library. There are no |
| 77 | # other dependencies. We sometimes add the -static option here |
| @@ -83,15 +83,15 @@ | |
| 83 | # OpenSSL: |
| 84 | ifdef FOSSIL_ENABLE_SSL |
| 85 | LIB += -lssl -lcrypto -lgdi32 |
| 86 | endif |
| 87 | |
| 88 | LIB += -lmingwex -lz -lws2_32 |
| 89 | |
| 90 | ifdef FOSSIL_ENABLE_TCL |
| 91 | LIB += -ltcl86t |
| 92 | endif |
| 93 | |
| 94 | #### Tcl shell for use in running the fossil testsuite. This is only |
| 95 | # used for testing. If you do not run |
| 96 | # |
| 97 | TCLSH = tclsh |
| 98 |
| --- win/Makefile.mingw.mistachkin | |
| +++ win/Makefile.mingw.mistachkin | |
| @@ -67,11 +67,11 @@ | |
| 67 | TCC += -DFOSSIL_ENABLE_SSL=1 |
| 68 | endif |
| 69 | |
| 70 | # With Tcl support |
| 71 | ifdef FOSSIL_ENABLE_TCL |
| 72 | TCC += -DFOSSIL_ENABLE_TCL=1 -DSTATIC_BUILD |
| 73 | endif |
| 74 | |
| 75 | #### Extra arguments for linking the finished binary. Fossil needs |
| 76 | # to link against the Z-Lib compression library. There are no |
| 77 | # other dependencies. We sometimes add the -static option here |
| @@ -83,15 +83,15 @@ | |
| 83 | # OpenSSL: |
| 84 | ifdef FOSSIL_ENABLE_SSL |
| 85 | LIB += -lssl -lcrypto -lgdi32 |
| 86 | endif |
| 87 | |
| 88 | ifdef FOSSIL_ENABLE_TCL |
| 89 | LIB += -ltcl86s |
| 90 | endif |
| 91 | |
| 92 | LIB += -lmingwex -lz -lnetapi32 -lkernel32 -luser32 -ladvapi32 -lws2_32 |
| 93 | |
| 94 | #### Tcl shell for use in running the fossil testsuite. This is only |
| 95 | # used for testing. If you do not run |
| 96 | # |
| 97 | TCLSH = tclsh |
| 98 |