Fossil SCM
Don't compile some zlib optimized assembler sources when compiled with FOSSIL_ENABLE_MINIZ.
Commit
8a5c394ba4c5da8e76f7be360b0c794b2f249df7
Parent
f3455a56eef0f73…
1 file changed
+5
+5
| --- win/Makefile.mingw | ||
| +++ win/Makefile.mingw | ||
| @@ -108,12 +108,17 @@ | ||
| 108 | 108 | endif |
| 109 | 109 | endif |
| 110 | 110 | |
| 111 | 111 | ifndef X64 |
| 112 | 112 | SSLCONFIG = mingw |
| 113 | +ifndef FOSSIL_ENABLE_MINIZ | |
| 113 | 114 | ZLIBCONFIG = LOC="-DASMV -DASMINF" OBJA="inffas86.o match.o" |
| 114 | 115 | LIBTARGETS = $(ZLIBDIR)/inffas86.o $(ZLIBDIR)/match.o |
| 116 | +else | |
| 117 | +ZLIBCONFIG = | |
| 118 | +LIBTARGETS = | |
| 119 | +endif | |
| 115 | 120 | else |
| 116 | 121 | SSLCONFIG = mingw64 |
| 117 | 122 | ZLIBCONFIG = |
| 118 | 123 | LIBTARGETS = |
| 119 | 124 | endif |
| 120 | 125 |
| --- win/Makefile.mingw | |
| +++ win/Makefile.mingw | |
| @@ -108,12 +108,17 @@ | |
| 108 | endif |
| 109 | endif |
| 110 | |
| 111 | ifndef X64 |
| 112 | SSLCONFIG = mingw |
| 113 | ZLIBCONFIG = LOC="-DASMV -DASMINF" OBJA="inffas86.o match.o" |
| 114 | LIBTARGETS = $(ZLIBDIR)/inffas86.o $(ZLIBDIR)/match.o |
| 115 | else |
| 116 | SSLCONFIG = mingw64 |
| 117 | ZLIBCONFIG = |
| 118 | LIBTARGETS = |
| 119 | endif |
| 120 |
| --- win/Makefile.mingw | |
| +++ win/Makefile.mingw | |
| @@ -108,12 +108,17 @@ | |
| 108 | endif |
| 109 | endif |
| 110 | |
| 111 | ifndef X64 |
| 112 | SSLCONFIG = mingw |
| 113 | ifndef FOSSIL_ENABLE_MINIZ |
| 114 | ZLIBCONFIG = LOC="-DASMV -DASMINF" OBJA="inffas86.o match.o" |
| 115 | LIBTARGETS = $(ZLIBDIR)/inffas86.o $(ZLIBDIR)/match.o |
| 116 | else |
| 117 | ZLIBCONFIG = |
| 118 | LIBTARGETS = |
| 119 | endif |
| 120 | else |
| 121 | SSLCONFIG = mingw64 |
| 122 | ZLIBCONFIG = |
| 123 | LIBTARGETS = |
| 124 | endif |
| 125 |