Fossil SCM

Allow using native x64 mingw toolchain

baruch 2014-11-09 13:56 trunk
Commit 3616b7489bcff723a0ed6497597e30fb6cf8ae85
Parent bc3db82dff93a9a…
2 files changed +8 -1 +8 -1
~ src/makemake.tcl ~ win/Makefile.mingw
M src/makemake.tcl
+8 -1
--- src/makemake.tcl
+++ src/makemake.tcl
@@ -522,19 +522,26 @@
522522
 #### The directories where the zlib include and library files are located.
523523
 #
524524
 ZINCDIR = $(SRCDIR)/../compat/zlib
525525
 ZLIBDIR = $(SRCDIR)/../compat/zlib
526526
527
-ifeq (,$(findstring x86_64-w64-mingw32,$(PREFIX)))
527
+ifndef X64
528
+ifneq (,$(findstring x86_64-w64-mingw32,$(PREFIX)))
529
+X64 = 1
530
+endif
531
+endif
532
+
533
+ifndef X64
528534
 SSLCONFIG = mingw
529535
 ZLIBCONFIG = LOC="-DASMV -DASMINF" OBJA="inffas86.o match.o"
530536
 LIBTARGETS = $(ZLIBDIR)/inffas86.o $(ZLIBDIR)/match.o
531537
 else
532538
 SSLCONFIG = mingw64
533539
 ZLIBCONFIG =
534540
 LIBTARGETS =
535541
 endif
542
+
536543
 ifndef FOSSIL_ENABLE_MINIZ
537544
 SSLCONFIG += --with-zlib-lib=$(PWD)/$(ZLIBDIR) --with-zlib-include=$(PWD)/$(ZLIBDIR) zlib
538545
 endif
539546
540547
 #### The directories where the OpenSSL include and library files are located.
541548
--- src/makemake.tcl
+++ src/makemake.tcl
@@ -522,19 +522,26 @@
522 #### The directories where the zlib include and library files are located.
523 #
524 ZINCDIR = $(SRCDIR)/../compat/zlib
525 ZLIBDIR = $(SRCDIR)/../compat/zlib
526
527 ifeq (,$(findstring x86_64-w64-mingw32,$(PREFIX)))
 
 
 
 
 
 
528 SSLCONFIG = mingw
529 ZLIBCONFIG = LOC="-DASMV -DASMINF" OBJA="inffas86.o match.o"
530 LIBTARGETS = $(ZLIBDIR)/inffas86.o $(ZLIBDIR)/match.o
531 else
532 SSLCONFIG = mingw64
533 ZLIBCONFIG =
534 LIBTARGETS =
535 endif
 
536 ifndef FOSSIL_ENABLE_MINIZ
537 SSLCONFIG += --with-zlib-lib=$(PWD)/$(ZLIBDIR) --with-zlib-include=$(PWD)/$(ZLIBDIR) zlib
538 endif
539
540 #### The directories where the OpenSSL include and library files are located.
541
--- src/makemake.tcl
+++ src/makemake.tcl
@@ -522,19 +522,26 @@
522 #### The directories where the zlib include and library files are located.
523 #
524 ZINCDIR = $(SRCDIR)/../compat/zlib
525 ZLIBDIR = $(SRCDIR)/../compat/zlib
526
527 ifndef X64
528 ifneq (,$(findstring x86_64-w64-mingw32,$(PREFIX)))
529 X64 = 1
530 endif
531 endif
532
533 ifndef X64
534 SSLCONFIG = mingw
535 ZLIBCONFIG = LOC="-DASMV -DASMINF" OBJA="inffas86.o match.o"
536 LIBTARGETS = $(ZLIBDIR)/inffas86.o $(ZLIBDIR)/match.o
537 else
538 SSLCONFIG = mingw64
539 ZLIBCONFIG =
540 LIBTARGETS =
541 endif
542
543 ifndef FOSSIL_ENABLE_MINIZ
544 SSLCONFIG += --with-zlib-lib=$(PWD)/$(ZLIBDIR) --with-zlib-include=$(PWD)/$(ZLIBDIR) zlib
545 endif
546
547 #### The directories where the OpenSSL include and library files are located.
548
M win/Makefile.mingw
+8 -1
--- win/Makefile.mingw
+++ win/Makefile.mingw
@@ -100,19 +100,26 @@
100100
 #### The directories where the zlib include and library files are located.
101101
 #
102102
 ZINCDIR = $(SRCDIR)/../compat/zlib
103103
 ZLIBDIR = $(SRCDIR)/../compat/zlib
104104
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
106112
 SSLCONFIG = mingw
107113
 ZLIBCONFIG = LOC="-DASMV -DASMINF" OBJA="inffas86.o match.o"
108114
 LIBTARGETS = $(ZLIBDIR)/inffas86.o $(ZLIBDIR)/match.o
109115
 else
110116
 SSLCONFIG = mingw64
111117
 ZLIBCONFIG =
112118
 LIBTARGETS =
113119
 endif
120
+
114121
 ifndef FOSSIL_ENABLE_MINIZ
115122
 SSLCONFIG += --with-zlib-lib=$(PWD)/$(ZLIBDIR) --with-zlib-include=$(PWD)/$(ZLIBDIR) zlib
116123
 endif
117124
118125
 #### The directories where the OpenSSL include and library files are located.
119126
--- win/Makefile.mingw
+++ win/Makefile.mingw
@@ -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
+++ win/Makefile.mingw
@@ -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

Keyboard Shortcuts

Open search /
Next entry (timeline) j
Previous entry (timeline) k
Open focused entry Enter
Show this help ?
Toggle theme Top nav button