Fossil SCM
Same change a previous commit, but for custom makefile
Commit
ee5b8648987d93cdddf24de09e93a54b86b48011
Parent
3616b7489bcff72…
1 file changed
+8
-1
+8
-1
| --- win/Makefile.mingw.mistachkin | ||
| +++ win/Makefile.mingw.mistachkin | ||
| @@ -100,19 +100,26 @@ | ||
| 100 | 100 | #### The directories where the zlib include and library files are located. |
| 101 | 101 | # |
| 102 | 102 | ZINCDIR = $(SRCDIR)/../compat/zlib |
| 103 | 103 | ZLIBDIR = $(SRCDIR)/../compat/zlib |
| 104 | 104 | |
| 105 | -ifeq (,$(findstring x86_64-w64-mingw32,$(PREFIX))) | |
| 105 | +ifndef X64 | |
| 106 | +ifneq (,$(findstring x86_64-w64-mingw32,$(PREFIX))) | |
| 107 | +X64 = 1 | |
| 108 | +endif | |
| 109 | +endif | |
| 110 | + | |
| 111 | +ifndef X64 | |
| 106 | 112 | SSLCONFIG = mingw |
| 107 | 113 | ZLIBCONFIG = LOC="-DASMV -DASMINF" OBJA="inffas86.o match.o" |
| 108 | 114 | LIBTARGETS = $(ZLIBDIR)/inffas86.o $(ZLIBDIR)/match.o |
| 109 | 115 | else |
| 110 | 116 | SSLCONFIG = mingw64 |
| 111 | 117 | ZLIBCONFIG = |
| 112 | 118 | LIBTARGETS = |
| 113 | 119 | endif |
| 120 | + | |
| 114 | 121 | ifndef FOSSIL_ENABLE_MINIZ |
| 115 | 122 | SSLCONFIG += --with-zlib-lib=$(PWD)/$(ZLIBDIR) --with-zlib-include=$(PWD)/$(ZLIBDIR) zlib |
| 116 | 123 | endif |
| 117 | 124 | |
| 118 | 125 | #### The directories where the OpenSSL include and library files are located. |
| 119 | 126 |
| --- win/Makefile.mingw.mistachkin | |
| +++ win/Makefile.mingw.mistachkin | |
| @@ -100,19 +100,26 @@ | |
| 100 | #### The directories where the zlib include and library files are located. |
| 101 | # |
| 102 | ZINCDIR = $(SRCDIR)/../compat/zlib |
| 103 | ZLIBDIR = $(SRCDIR)/../compat/zlib |
| 104 | |
| 105 | ifeq (,$(findstring x86_64-w64-mingw32,$(PREFIX))) |
| 106 | SSLCONFIG = mingw |
| 107 | ZLIBCONFIG = LOC="-DASMV -DASMINF" OBJA="inffas86.o match.o" |
| 108 | LIBTARGETS = $(ZLIBDIR)/inffas86.o $(ZLIBDIR)/match.o |
| 109 | else |
| 110 | SSLCONFIG = mingw64 |
| 111 | ZLIBCONFIG = |
| 112 | LIBTARGETS = |
| 113 | endif |
| 114 | ifndef FOSSIL_ENABLE_MINIZ |
| 115 | SSLCONFIG += --with-zlib-lib=$(PWD)/$(ZLIBDIR) --with-zlib-include=$(PWD)/$(ZLIBDIR) zlib |
| 116 | endif |
| 117 | |
| 118 | #### The directories where the OpenSSL include and library files are located. |
| 119 |
| --- win/Makefile.mingw.mistachkin | |
| +++ win/Makefile.mingw.mistachkin | |
| @@ -100,19 +100,26 @@ | |
| 100 | #### The directories where the zlib include and library files are located. |
| 101 | # |
| 102 | ZINCDIR = $(SRCDIR)/../compat/zlib |
| 103 | ZLIBDIR = $(SRCDIR)/../compat/zlib |
| 104 | |
| 105 | ifndef X64 |
| 106 | ifneq (,$(findstring x86_64-w64-mingw32,$(PREFIX))) |
| 107 | X64 = 1 |
| 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 | |
| 121 | ifndef FOSSIL_ENABLE_MINIZ |
| 122 | SSLCONFIG += --with-zlib-lib=$(PWD)/$(ZLIBDIR) --with-zlib-include=$(PWD)/$(ZLIBDIR) zlib |
| 123 | endif |
| 124 | |
| 125 | #### The directories where the OpenSSL include and library files are located. |
| 126 |