Fossil SCM

MinGW makefile integration fixes, mostly for zlib. Also, Clang can define _MSC_VER in some circumstances; therefore, check for Clang first in 'config.h'.

mistachkin 2016-05-28 00:16 trunk
Commit 8f2dd0106ef3b5aab0d21d320770cb84de945657
Parent de609c7cac37d95…
4 files changed +11 -11 +18 -17 +18 -17 +19 -18
~ src/config.h ~ src/makemake.tcl ~ win/Makefile.mingw ~ win/Makefile.mingw.mistachkin
M src/config.h
+11 -11
--- src/config.h
+++ src/config.h
@@ -99,10 +99,21 @@
9999
 # define COMPILER_NAME "pellesc32-" COMPILER_VERSION
100100
 # else
101101
 # define COMPILER_NAME "pellesc32"
102102
 # endif
103103
 # endif
104
+# elif defined(__clang__)
105
+# if !defined(COMPILER_VERSION)
106
+# if defined(__clang_version__)
107
+# define COMPILER_VERSION __clang_version__
108
+# endif
109
+# endif
110
+# if defined(COMPILER_VERSION) && !defined(NO_COMPILER_VERSION)
111
+# define COMPILER_NAME "clang-" COMPILER_VERSION
112
+# else
113
+# define COMPILER_NAME "clang"
114
+# endif
104115
 # elif defined(_MSC_VER)
105116
 # if !defined(COMPILER_VERSION)
106117
 # define COMPILER_VERSION COMPILER_STRINGIFY(_MSC_VER)
107118
 # endif
108119
 # if defined(COMPILER_VERSION) && !defined(NO_COMPILER_VERSION)
@@ -137,21 +148,10 @@
137148
 # if defined(COMPILER_VERSION) && !defined(NO_COMPILER_VERSION)
138149
 # define COMPILER_NAME "mingw32-" COMPILER_VERSION
139150
 # else
140151
 # define COMPILER_NAME "mingw32"
141152
 # endif
142
-# elif defined(__clang__)
143
-# if !defined(COMPILER_VERSION)
144
-# if defined(__clang_version__)
145
-# define COMPILER_VERSION __clang_version__
146
-# endif
147
-# endif
148
-# if defined(COMPILER_VERSION) && !defined(NO_COMPILER_VERSION)
149
-# define COMPILER_NAME "clang-" COMPILER_VERSION
150
-# else
151
-# define COMPILER_NAME "clang"
152
-# endif
153153
 # elif defined(__GNUC__)
154154
 # if !defined(COMPILER_VERSION)
155155
 # if defined(__VERSION__)
156156
 # define COMPILER_VERSION __VERSION__
157157
 # endif
158158
--- src/config.h
+++ src/config.h
@@ -99,10 +99,21 @@
99 # define COMPILER_NAME "pellesc32-" COMPILER_VERSION
100 # else
101 # define COMPILER_NAME "pellesc32"
102 # endif
103 # endif
 
 
 
 
 
 
 
 
 
 
 
104 # elif defined(_MSC_VER)
105 # if !defined(COMPILER_VERSION)
106 # define COMPILER_VERSION COMPILER_STRINGIFY(_MSC_VER)
107 # endif
108 # if defined(COMPILER_VERSION) && !defined(NO_COMPILER_VERSION)
@@ -137,21 +148,10 @@
137 # if defined(COMPILER_VERSION) && !defined(NO_COMPILER_VERSION)
138 # define COMPILER_NAME "mingw32-" COMPILER_VERSION
139 # else
140 # define COMPILER_NAME "mingw32"
141 # endif
142 # elif defined(__clang__)
143 # if !defined(COMPILER_VERSION)
144 # if defined(__clang_version__)
145 # define COMPILER_VERSION __clang_version__
146 # endif
147 # endif
148 # if defined(COMPILER_VERSION) && !defined(NO_COMPILER_VERSION)
149 # define COMPILER_NAME "clang-" COMPILER_VERSION
150 # else
151 # define COMPILER_NAME "clang"
152 # endif
153 # elif defined(__GNUC__)
154 # if !defined(COMPILER_VERSION)
155 # if defined(__VERSION__)
156 # define COMPILER_VERSION __VERSION__
157 # endif
158
--- src/config.h
+++ src/config.h
@@ -99,10 +99,21 @@
99 # define COMPILER_NAME "pellesc32-" COMPILER_VERSION
100 # else
101 # define COMPILER_NAME "pellesc32"
102 # endif
103 # endif
104 # elif defined(__clang__)
105 # if !defined(COMPILER_VERSION)
106 # if defined(__clang_version__)
107 # define COMPILER_VERSION __clang_version__
108 # endif
109 # endif
110 # if defined(COMPILER_VERSION) && !defined(NO_COMPILER_VERSION)
111 # define COMPILER_NAME "clang-" COMPILER_VERSION
112 # else
113 # define COMPILER_NAME "clang"
114 # endif
115 # elif defined(_MSC_VER)
116 # if !defined(COMPILER_VERSION)
117 # define COMPILER_VERSION COMPILER_STRINGIFY(_MSC_VER)
118 # endif
119 # if defined(COMPILER_VERSION) && !defined(NO_COMPILER_VERSION)
@@ -137,21 +148,10 @@
148 # if defined(COMPILER_VERSION) && !defined(NO_COMPILER_VERSION)
149 # define COMPILER_NAME "mingw32-" COMPILER_VERSION
150 # else
151 # define COMPILER_NAME "mingw32"
152 # endif
 
 
 
 
 
 
 
 
 
 
 
153 # elif defined(__GNUC__)
154 # if !defined(COMPILER_VERSION)
155 # if defined(__VERSION__)
156 # define COMPILER_VERSION __VERSION__
157 # endif
158
M src/makemake.tcl
+18 -17
--- src/makemake.tcl
+++ src/makemake.tcl
@@ -626,19 +626,19 @@
626626
 #
627627
 ifndef X64
628628
 SSLCONFIG = mingw
629629
 ifndef FOSSIL_ENABLE_MINIZ
630630
 ZLIBCONFIG = LOC="-DASMV -DASMINF" OBJA="inffas86.o match.o"
631
-LIBTARGETS = $(ZLIBDIR)/inffas86.o $(ZLIBDIR)/match.o
631
+ZLIBTARGETS = $(ZLIBDIR)/inffas86.o $(ZLIBDIR)/match.o
632632
 else
633633
 ZLIBCONFIG =
634
-LIBTARGETS =
634
+ZLIBTARGETS =
635635
 endif
636636
 else
637637
 SSLCONFIG = mingw64
638638
 ZLIBCONFIG =
639
-LIBTARGETS =
639
+ZLIBTARGETS =
640640
 endif
641641
642642
 #### Disable creation of the OpenSSL shared libraries. Also, disable support
643643
 # for both SSLv2 and SSLv3 (i.e. thereby forcing the use of TLS).
644644
 #
@@ -1065,42 +1065,43 @@
10651065
 $(OBJDIR)/th_tcl.o <<<NEXT_LINE>>>
10661066
 $(OBJDIR)/cson_amalgamation.o
10671067
 }]
10681068
10691069
 writeln {
1070
-zlib:
1071
- $(MAKE) -C $(ZLIBDIR) PREFIX=$(PREFIX) $(ZLIBCONFIG) -f win32/Makefile.gcc libz.a
1072
-
1073
-clean-zlib:
1074
- $(MAKE) -C $(ZLIBDIR) PREFIX=$(PREFIX) -f win32/Makefile.gcc clean
1075
-
10761070
 $(ZLIBDIR)/inffas86.o:
10771071
 $(TCC) -c -o $@ -DASMINF -I$(ZLIBDIR) -O3 $(ZLIBDIR)/contrib/inflate86/inffas86.c
10781072
10791073
 $(ZLIBDIR)/match.o:
10801074
 $(TCC) -c -o $@ -DASMV $(ZLIBDIR)/contrib/asm686/match.S
10811075
1076
+zlib: $(ZLIBTARGETS)
1077
+ $(MAKE) -C $(ZLIBDIR) PREFIX=$(PREFIX) CC=$(PREFIX)$(TCCEXE) $(ZLIBCONFIG) -f win32/Makefile.gcc libz.a
10821078
1083
-ifndef FOSSIL_ENABLE_MINIZ
1084
-LIBTARGETS += zlib
1079
+clean-zlib:
1080
+ $(MAKE) -C $(ZLIBDIR) PREFIX=$(PREFIX) CC=$(PREFIX)$(TCCEXE) -f win32/Makefile.gcc clean
1081
+
1082
+ifdef FOSSIL_ENABLE_MINIZ
1083
+BLDTARGETS =
1084
+else
1085
+BLDTARGETS = zlib
10851086
 endif
10861087
1087
-openssl: $(LIBTARGETS)
1088
+openssl: $(BLDTARGETS)
10881089
 cd $(OPENSSLLIBDIR);./Configure --cross-compile-prefix=$(PREFIX) $(SSLCONFIG)
1089
- $(MAKE) -C $(OPENSSLLIBDIR) build_libs
1090
+ $(MAKE) -C $(OPENSSLLIBDIR) CC=$(TCCEXE) build_libs
10901091
10911092
 clean-openssl:
1092
- $(MAKE) -C $(OPENSSLLIBDIR) clean
1093
+ $(MAKE) -C $(OPENSSLLIBDIR) CC=$(TCCEXE) clean
10931094
10941095
 tcl:
10951096
 cd $(TCLSRCDIR)/win;./configure
1096
- $(MAKE) -C $(TCLSRCDIR)/win $(TCLTARGET)
1097
+ $(MAKE) -C $(TCLSRCDIR)/win CC=$(TCCEXE) $(TCLTARGET)
10971098
10981099
 clean-tcl:
1099
- $(MAKE) -C $(TCLSRCDIR)/win distclean
1100
+ $(MAKE) -C $(TCLSRCDIR)/win CC=$(TCCEXE) distclean
11001101
1101
-APPTARGETS += $(LIBTARGETS)
1102
+APPTARGETS += $(BLDTARGETS)
11021103
11031104
 ifdef FOSSIL_BUILD_SSL
11041105
 APPTARGETS += openssl
11051106
 endif
11061107
11071108
--- src/makemake.tcl
+++ src/makemake.tcl
@@ -626,19 +626,19 @@
626 #
627 ifndef X64
628 SSLCONFIG = mingw
629 ifndef FOSSIL_ENABLE_MINIZ
630 ZLIBCONFIG = LOC="-DASMV -DASMINF" OBJA="inffas86.o match.o"
631 LIBTARGETS = $(ZLIBDIR)/inffas86.o $(ZLIBDIR)/match.o
632 else
633 ZLIBCONFIG =
634 LIBTARGETS =
635 endif
636 else
637 SSLCONFIG = mingw64
638 ZLIBCONFIG =
639 LIBTARGETS =
640 endif
641
642 #### Disable creation of the OpenSSL shared libraries. Also, disable support
643 # for both SSLv2 and SSLv3 (i.e. thereby forcing the use of TLS).
644 #
@@ -1065,42 +1065,43 @@
1065 $(OBJDIR)/th_tcl.o <<<NEXT_LINE>>>
1066 $(OBJDIR)/cson_amalgamation.o
1067 }]
1068
1069 writeln {
1070 zlib:
1071 $(MAKE) -C $(ZLIBDIR) PREFIX=$(PREFIX) $(ZLIBCONFIG) -f win32/Makefile.gcc libz.a
1072
1073 clean-zlib:
1074 $(MAKE) -C $(ZLIBDIR) PREFIX=$(PREFIX) -f win32/Makefile.gcc clean
1075
1076 $(ZLIBDIR)/inffas86.o:
1077 $(TCC) -c -o $@ -DASMINF -I$(ZLIBDIR) -O3 $(ZLIBDIR)/contrib/inflate86/inffas86.c
1078
1079 $(ZLIBDIR)/match.o:
1080 $(TCC) -c -o $@ -DASMV $(ZLIBDIR)/contrib/asm686/match.S
1081
 
 
1082
1083 ifndef FOSSIL_ENABLE_MINIZ
1084 LIBTARGETS += zlib
 
 
 
 
 
1085 endif
1086
1087 openssl: $(LIBTARGETS)
1088 cd $(OPENSSLLIBDIR);./Configure --cross-compile-prefix=$(PREFIX) $(SSLCONFIG)
1089 $(MAKE) -C $(OPENSSLLIBDIR) build_libs
1090
1091 clean-openssl:
1092 $(MAKE) -C $(OPENSSLLIBDIR) clean
1093
1094 tcl:
1095 cd $(TCLSRCDIR)/win;./configure
1096 $(MAKE) -C $(TCLSRCDIR)/win $(TCLTARGET)
1097
1098 clean-tcl:
1099 $(MAKE) -C $(TCLSRCDIR)/win distclean
1100
1101 APPTARGETS += $(LIBTARGETS)
1102
1103 ifdef FOSSIL_BUILD_SSL
1104 APPTARGETS += openssl
1105 endif
1106
1107
--- src/makemake.tcl
+++ src/makemake.tcl
@@ -626,19 +626,19 @@
626 #
627 ifndef X64
628 SSLCONFIG = mingw
629 ifndef FOSSIL_ENABLE_MINIZ
630 ZLIBCONFIG = LOC="-DASMV -DASMINF" OBJA="inffas86.o match.o"
631 ZLIBTARGETS = $(ZLIBDIR)/inffas86.o $(ZLIBDIR)/match.o
632 else
633 ZLIBCONFIG =
634 ZLIBTARGETS =
635 endif
636 else
637 SSLCONFIG = mingw64
638 ZLIBCONFIG =
639 ZLIBTARGETS =
640 endif
641
642 #### Disable creation of the OpenSSL shared libraries. Also, disable support
643 # for both SSLv2 and SSLv3 (i.e. thereby forcing the use of TLS).
644 #
@@ -1065,42 +1065,43 @@
1065 $(OBJDIR)/th_tcl.o <<<NEXT_LINE>>>
1066 $(OBJDIR)/cson_amalgamation.o
1067 }]
1068
1069 writeln {
 
 
 
 
 
 
1070 $(ZLIBDIR)/inffas86.o:
1071 $(TCC) -c -o $@ -DASMINF -I$(ZLIBDIR) -O3 $(ZLIBDIR)/contrib/inflate86/inffas86.c
1072
1073 $(ZLIBDIR)/match.o:
1074 $(TCC) -c -o $@ -DASMV $(ZLIBDIR)/contrib/asm686/match.S
1075
1076 zlib: $(ZLIBTARGETS)
1077 $(MAKE) -C $(ZLIBDIR) PREFIX=$(PREFIX) CC=$(PREFIX)$(TCCEXE) $(ZLIBCONFIG) -f win32/Makefile.gcc libz.a
1078
1079 clean-zlib:
1080 $(MAKE) -C $(ZLIBDIR) PREFIX=$(PREFIX) CC=$(PREFIX)$(TCCEXE) -f win32/Makefile.gcc clean
1081
1082 ifdef FOSSIL_ENABLE_MINIZ
1083 BLDTARGETS =
1084 else
1085 BLDTARGETS = zlib
1086 endif
1087
1088 openssl: $(BLDTARGETS)
1089 cd $(OPENSSLLIBDIR);./Configure --cross-compile-prefix=$(PREFIX) $(SSLCONFIG)
1090 $(MAKE) -C $(OPENSSLLIBDIR) CC=$(TCCEXE) build_libs
1091
1092 clean-openssl:
1093 $(MAKE) -C $(OPENSSLLIBDIR) CC=$(TCCEXE) clean
1094
1095 tcl:
1096 cd $(TCLSRCDIR)/win;./configure
1097 $(MAKE) -C $(TCLSRCDIR)/win CC=$(TCCEXE) $(TCLTARGET)
1098
1099 clean-tcl:
1100 $(MAKE) -C $(TCLSRCDIR)/win CC=$(TCCEXE) distclean
1101
1102 APPTARGETS += $(BLDTARGETS)
1103
1104 ifdef FOSSIL_BUILD_SSL
1105 APPTARGETS += openssl
1106 endif
1107
1108
M win/Makefile.mingw
+18 -17
--- win/Makefile.mingw
+++ win/Makefile.mingw
@@ -142,19 +142,19 @@
142142
 #
143143
 ifndef X64
144144
 SSLCONFIG = mingw
145145
 ifndef FOSSIL_ENABLE_MINIZ
146146
 ZLIBCONFIG = LOC="-DASMV -DASMINF" OBJA="inffas86.o match.o"
147
-LIBTARGETS = $(ZLIBDIR)/inffas86.o $(ZLIBDIR)/match.o
147
+ZLIBTARGETS = $(ZLIBDIR)/inffas86.o $(ZLIBDIR)/match.o
148148
 else
149149
 ZLIBCONFIG =
150
-LIBTARGETS =
150
+ZLIBTARGETS =
151151
 endif
152152
 else
153153
 SSLCONFIG = mingw64
154154
 ZLIBCONFIG =
155
-LIBTARGETS =
155
+ZLIBTARGETS =
156156
 endif
157157
158158
 #### Disable creation of the OpenSSL shared libraries. Also, disable support
159159
 # for both SSLv2 and SSLv3 (i.e. thereby forcing the use of TLS).
160160
 #
@@ -972,42 +972,43 @@
972972
 $(OBJDIR)/th_lang.o \
973973
 $(OBJDIR)/th_tcl.o \
974974
 $(OBJDIR)/cson_amalgamation.o
975975
976976
977
-zlib:
978
- $(MAKE) -C $(ZLIBDIR) PREFIX=$(PREFIX) $(ZLIBCONFIG) -f win32/Makefile.gcc libz.a
979
-
980
-clean-zlib:
981
- $(MAKE) -C $(ZLIBDIR) PREFIX=$(PREFIX) -f win32/Makefile.gcc clean
982
-
983977
 $(ZLIBDIR)/inffas86.o:
984978
 $(TCC) -c -o $@ -DASMINF -I$(ZLIBDIR) -O3 $(ZLIBDIR)/contrib/inflate86/inffas86.c
985979
986980
 $(ZLIBDIR)/match.o:
987981
 $(TCC) -c -o $@ -DASMV $(ZLIBDIR)/contrib/asm686/match.S
988982
983
+zlib: $(ZLIBTARGETS)
984
+ $(MAKE) -C $(ZLIBDIR) PREFIX=$(PREFIX) CC=$(PREFIX)$(TCCEXE) $(ZLIBCONFIG) -f win32/Makefile.gcc libz.a
989985
990
-ifndef FOSSIL_ENABLE_MINIZ
991
-LIBTARGETS += zlib
986
+clean-zlib:
987
+ $(MAKE) -C $(ZLIBDIR) PREFIX=$(PREFIX) CC=$(PREFIX)$(TCCEXE) -f win32/Makefile.gcc clean
988
+
989
+ifdef FOSSIL_ENABLE_MINIZ
990
+BLDTARGETS =
991
+else
992
+BLDTARGETS = zlib
992993
 endif
993994
994
-openssl: $(LIBTARGETS)
995
+openssl: $(BLDTARGETS)
995996
 cd $(OPENSSLLIBDIR);./Configure --cross-compile-prefix=$(PREFIX) $(SSLCONFIG)
996
- $(MAKE) -C $(OPENSSLLIBDIR) build_libs
997
+ $(MAKE) -C $(OPENSSLLIBDIR) CC=$(TCCEXE) build_libs
997998
998999
 clean-openssl:
999
- $(MAKE) -C $(OPENSSLLIBDIR) clean
1000
+ $(MAKE) -C $(OPENSSLLIBDIR) CC=$(TCCEXE) clean
10001001
10011002
 tcl:
10021003
 cd $(TCLSRCDIR)/win;./configure
1003
- $(MAKE) -C $(TCLSRCDIR)/win $(TCLTARGET)
1004
+ $(MAKE) -C $(TCLSRCDIR)/win CC=$(TCCEXE) $(TCLTARGET)
10041005
10051006
 clean-tcl:
1006
- $(MAKE) -C $(TCLSRCDIR)/win distclean
1007
+ $(MAKE) -C $(TCLSRCDIR)/win CC=$(TCCEXE) distclean
10071008
1008
-APPTARGETS += $(LIBTARGETS)
1009
+APPTARGETS += $(BLDTARGETS)
10091010
10101011
 ifdef FOSSIL_BUILD_SSL
10111012
 APPTARGETS += openssl
10121013
 endif
10131014
10141015
--- win/Makefile.mingw
+++ win/Makefile.mingw
@@ -142,19 +142,19 @@
142 #
143 ifndef X64
144 SSLCONFIG = mingw
145 ifndef FOSSIL_ENABLE_MINIZ
146 ZLIBCONFIG = LOC="-DASMV -DASMINF" OBJA="inffas86.o match.o"
147 LIBTARGETS = $(ZLIBDIR)/inffas86.o $(ZLIBDIR)/match.o
148 else
149 ZLIBCONFIG =
150 LIBTARGETS =
151 endif
152 else
153 SSLCONFIG = mingw64
154 ZLIBCONFIG =
155 LIBTARGETS =
156 endif
157
158 #### Disable creation of the OpenSSL shared libraries. Also, disable support
159 # for both SSLv2 and SSLv3 (i.e. thereby forcing the use of TLS).
160 #
@@ -972,42 +972,43 @@
972 $(OBJDIR)/th_lang.o \
973 $(OBJDIR)/th_tcl.o \
974 $(OBJDIR)/cson_amalgamation.o
975
976
977 zlib:
978 $(MAKE) -C $(ZLIBDIR) PREFIX=$(PREFIX) $(ZLIBCONFIG) -f win32/Makefile.gcc libz.a
979
980 clean-zlib:
981 $(MAKE) -C $(ZLIBDIR) PREFIX=$(PREFIX) -f win32/Makefile.gcc clean
982
983 $(ZLIBDIR)/inffas86.o:
984 $(TCC) -c -o $@ -DASMINF -I$(ZLIBDIR) -O3 $(ZLIBDIR)/contrib/inflate86/inffas86.c
985
986 $(ZLIBDIR)/match.o:
987 $(TCC) -c -o $@ -DASMV $(ZLIBDIR)/contrib/asm686/match.S
988
 
 
989
990 ifndef FOSSIL_ENABLE_MINIZ
991 LIBTARGETS += zlib
 
 
 
 
 
992 endif
993
994 openssl: $(LIBTARGETS)
995 cd $(OPENSSLLIBDIR);./Configure --cross-compile-prefix=$(PREFIX) $(SSLCONFIG)
996 $(MAKE) -C $(OPENSSLLIBDIR) build_libs
997
998 clean-openssl:
999 $(MAKE) -C $(OPENSSLLIBDIR) clean
1000
1001 tcl:
1002 cd $(TCLSRCDIR)/win;./configure
1003 $(MAKE) -C $(TCLSRCDIR)/win $(TCLTARGET)
1004
1005 clean-tcl:
1006 $(MAKE) -C $(TCLSRCDIR)/win distclean
1007
1008 APPTARGETS += $(LIBTARGETS)
1009
1010 ifdef FOSSIL_BUILD_SSL
1011 APPTARGETS += openssl
1012 endif
1013
1014
--- win/Makefile.mingw
+++ win/Makefile.mingw
@@ -142,19 +142,19 @@
142 #
143 ifndef X64
144 SSLCONFIG = mingw
145 ifndef FOSSIL_ENABLE_MINIZ
146 ZLIBCONFIG = LOC="-DASMV -DASMINF" OBJA="inffas86.o match.o"
147 ZLIBTARGETS = $(ZLIBDIR)/inffas86.o $(ZLIBDIR)/match.o
148 else
149 ZLIBCONFIG =
150 ZLIBTARGETS =
151 endif
152 else
153 SSLCONFIG = mingw64
154 ZLIBCONFIG =
155 ZLIBTARGETS =
156 endif
157
158 #### Disable creation of the OpenSSL shared libraries. Also, disable support
159 # for both SSLv2 and SSLv3 (i.e. thereby forcing the use of TLS).
160 #
@@ -972,42 +972,43 @@
972 $(OBJDIR)/th_lang.o \
973 $(OBJDIR)/th_tcl.o \
974 $(OBJDIR)/cson_amalgamation.o
975
976
 
 
 
 
 
 
977 $(ZLIBDIR)/inffas86.o:
978 $(TCC) -c -o $@ -DASMINF -I$(ZLIBDIR) -O3 $(ZLIBDIR)/contrib/inflate86/inffas86.c
979
980 $(ZLIBDIR)/match.o:
981 $(TCC) -c -o $@ -DASMV $(ZLIBDIR)/contrib/asm686/match.S
982
983 zlib: $(ZLIBTARGETS)
984 $(MAKE) -C $(ZLIBDIR) PREFIX=$(PREFIX) CC=$(PREFIX)$(TCCEXE) $(ZLIBCONFIG) -f win32/Makefile.gcc libz.a
985
986 clean-zlib:
987 $(MAKE) -C $(ZLIBDIR) PREFIX=$(PREFIX) CC=$(PREFIX)$(TCCEXE) -f win32/Makefile.gcc clean
988
989 ifdef FOSSIL_ENABLE_MINIZ
990 BLDTARGETS =
991 else
992 BLDTARGETS = zlib
993 endif
994
995 openssl: $(BLDTARGETS)
996 cd $(OPENSSLLIBDIR);./Configure --cross-compile-prefix=$(PREFIX) $(SSLCONFIG)
997 $(MAKE) -C $(OPENSSLLIBDIR) CC=$(TCCEXE) build_libs
998
999 clean-openssl:
1000 $(MAKE) -C $(OPENSSLLIBDIR) CC=$(TCCEXE) clean
1001
1002 tcl:
1003 cd $(TCLSRCDIR)/win;./configure
1004 $(MAKE) -C $(TCLSRCDIR)/win CC=$(TCCEXE) $(TCLTARGET)
1005
1006 clean-tcl:
1007 $(MAKE) -C $(TCLSRCDIR)/win CC=$(TCCEXE) distclean
1008
1009 APPTARGETS += $(BLDTARGETS)
1010
1011 ifdef FOSSIL_BUILD_SSL
1012 APPTARGETS += openssl
1013 endif
1014
1015
M win/Makefile.mingw.mistachkin
+19 -18
--- win/Makefile.mingw.mistachkin
+++ win/Makefile.mingw.mistachkin
@@ -142,19 +142,19 @@
142142
 #
143143
 ifndef X64
144144
 SSLCONFIG = mingw
145145
 ifndef FOSSIL_ENABLE_MINIZ
146146
 ZLIBCONFIG = LOC="-DASMV -DASMINF" OBJA="inffas86.o match.o"
147
-LIBTARGETS = $(ZLIBDIR)/inffas86.o $(ZLIBDIR)/match.o
147
+ZLIBTARGETS = $(ZLIBDIR)/inffas86.o $(ZLIBDIR)/match.o
148148
 else
149149
 ZLIBCONFIG =
150
-LIBTARGETS =
150
+ZLIBTARGETS =
151151
 endif
152152
 else
153153
 SSLCONFIG = mingw64
154154
 ZLIBCONFIG =
155
-LIBTARGETS =
155
+ZLIBTARGETS =
156156
 endif
157157
158158
 #### Disable creation of the OpenSSL shared libraries. Also, disable support
159159
 # for both SSLv2 and SSLv3 (i.e. thereby forcing the use of TLS).
160160
 #
@@ -972,42 +972,43 @@
972972
 $(OBJDIR)/th_lang.o \
973973
 $(OBJDIR)/th_tcl.o \
974974
 $(OBJDIR)/cson_amalgamation.o
975975
976976
977
-zlib:
978
- $(MAKE) -C $(ZLIBDIR) PREFIX=$(PREFIX) $(ZLIBCONFIG) -f win32/Makefile.gcc libz.a
979
-
980
-clean-zlib:
981
- $(MAKE) -C $(ZLIBDIR) PREFIX=$(PREFIX) -f win32/Makefile.gcc clean
982
-
983977
 $(ZLIBDIR)/inffas86.o:
984978
 $(TCC) -c -o $@ -DASMINF -I$(ZLIBDIR) -O3 $(ZLIBDIR)/contrib/inflate86/inffas86.c
985979
986980
 $(ZLIBDIR)/match.o:
987981
 $(TCC) -c -o $@ -DASMV $(ZLIBDIR)/contrib/asm686/match.S
988982
983
+zlib: $(ZLIBTARGETS)
984
+ $(MAKE) -C $(ZLIBDIR) PREFIX=$(PREFIX) CC=$(PREFIX)$(TCCEXE) $(ZLIBCONFIG) -f win32/Makefile.gcc libz.a
989985
990
-ifndef FOSSIL_ENABLE_MINIZ
991
-LIBTARGETS += zlib
986
+clean-zlib:
987
+ $(MAKE) -C $(ZLIBDIR) PREFIX=$(PREFIX) CC=$(PREFIX)$(TCCEXE) -f win32/Makefile.gcc clean
988
+
989
+ifdef FOSSIL_ENABLE_MINIZ
990
+BLDTARGETS =
991
+else
992
+BLDTARGETS = zlib
992993
 endif
993994
994
-openssl: $(LIBTARGETS)
995
+openssl: $(BLDTARGETS)
995996
 cd $(OPENSSLLIBDIR);./Configure --cross-compile-prefix=$(PREFIX) $(SSLCONFIG)
996
- $(MAKE) -C $(OPENSSLLIBDIR) build_libs
997
+ $(MAKE) -C $(OPENSSLLIBDIR) CC=$(TCCEXE) build_libs
997998
998999
 clean-openssl:
999
- $(MAKE) -C $(OPENSSLLIBDIR) clean
1000
+ $(MAKE) -C $(OPENSSLLIBDIR) CC=$(TCCEXE) clean
10001001
10011002
 tcl:
10021003
 cd $(TCLSRCDIR)/win;./configure
1003
- $(MAKE) -C $(TCLSRCDIR)/win $(TCLTARGET)
1004
+ $(MAKE) -C $(TCLSRCDIR)/win CC=$(TCCEXE) $(TCLTARGET)
10041005
10051006
 clean-tcl:
1006
- $(MAKE) -C $(TCLSRCDIR)/win distclean
1007
+ $(MAKE) -C $(TCLSRCDIR)/win CC=$(TCCEXE) distclean
10071008
1008
-APPTARGETS += $(LIBTARGETS)
1009
+APPTARGETS += $(BLDTARGETS)
10091010
10101011
 ifdef FOSSIL_BUILD_SSL
10111012
 APPTARGETS += openssl
10121013
 endif
10131014
@@ -2136,11 +2137,11 @@
21362137
 -DSQLITE_ENABLE_FTS3_PARENTHESIS \
21372138
 -DSQLITE_ENABLE_DBSTAT_VTAB \
21382139
 -DSQLITE_ENABLE_JSON1 \
21392140
 -DSQLITE_ENABLE_FTS5 \
21402141
 -DSQLITE_WIN32_NO_ANSI \
2141
- -D_HAVE__MINGW_H \
2142
+ $(MINGW_OPTIONS) \
21422143
 -DSQLITE_USE_MALLOC_H \
21432144
 -DSQLITE_USE_MSIZE
21442145
21452146
 SHELL_OPTIONS = -Dmain=sqlite3_shell \
21462147
 -DSQLITE_SHELL_IS_UTF8=1 \
21472148
--- win/Makefile.mingw.mistachkin
+++ win/Makefile.mingw.mistachkin
@@ -142,19 +142,19 @@
142 #
143 ifndef X64
144 SSLCONFIG = mingw
145 ifndef FOSSIL_ENABLE_MINIZ
146 ZLIBCONFIG = LOC="-DASMV -DASMINF" OBJA="inffas86.o match.o"
147 LIBTARGETS = $(ZLIBDIR)/inffas86.o $(ZLIBDIR)/match.o
148 else
149 ZLIBCONFIG =
150 LIBTARGETS =
151 endif
152 else
153 SSLCONFIG = mingw64
154 ZLIBCONFIG =
155 LIBTARGETS =
156 endif
157
158 #### Disable creation of the OpenSSL shared libraries. Also, disable support
159 # for both SSLv2 and SSLv3 (i.e. thereby forcing the use of TLS).
160 #
@@ -972,42 +972,43 @@
972 $(OBJDIR)/th_lang.o \
973 $(OBJDIR)/th_tcl.o \
974 $(OBJDIR)/cson_amalgamation.o
975
976
977 zlib:
978 $(MAKE) -C $(ZLIBDIR) PREFIX=$(PREFIX) $(ZLIBCONFIG) -f win32/Makefile.gcc libz.a
979
980 clean-zlib:
981 $(MAKE) -C $(ZLIBDIR) PREFIX=$(PREFIX) -f win32/Makefile.gcc clean
982
983 $(ZLIBDIR)/inffas86.o:
984 $(TCC) -c -o $@ -DASMINF -I$(ZLIBDIR) -O3 $(ZLIBDIR)/contrib/inflate86/inffas86.c
985
986 $(ZLIBDIR)/match.o:
987 $(TCC) -c -o $@ -DASMV $(ZLIBDIR)/contrib/asm686/match.S
988
 
 
989
990 ifndef FOSSIL_ENABLE_MINIZ
991 LIBTARGETS += zlib
 
 
 
 
 
992 endif
993
994 openssl: $(LIBTARGETS)
995 cd $(OPENSSLLIBDIR);./Configure --cross-compile-prefix=$(PREFIX) $(SSLCONFIG)
996 $(MAKE) -C $(OPENSSLLIBDIR) build_libs
997
998 clean-openssl:
999 $(MAKE) -C $(OPENSSLLIBDIR) clean
1000
1001 tcl:
1002 cd $(TCLSRCDIR)/win;./configure
1003 $(MAKE) -C $(TCLSRCDIR)/win $(TCLTARGET)
1004
1005 clean-tcl:
1006 $(MAKE) -C $(TCLSRCDIR)/win distclean
1007
1008 APPTARGETS += $(LIBTARGETS)
1009
1010 ifdef FOSSIL_BUILD_SSL
1011 APPTARGETS += openssl
1012 endif
1013
@@ -2136,11 +2137,11 @@
2136 -DSQLITE_ENABLE_FTS3_PARENTHESIS \
2137 -DSQLITE_ENABLE_DBSTAT_VTAB \
2138 -DSQLITE_ENABLE_JSON1 \
2139 -DSQLITE_ENABLE_FTS5 \
2140 -DSQLITE_WIN32_NO_ANSI \
2141 -D_HAVE__MINGW_H \
2142 -DSQLITE_USE_MALLOC_H \
2143 -DSQLITE_USE_MSIZE
2144
2145 SHELL_OPTIONS = -Dmain=sqlite3_shell \
2146 -DSQLITE_SHELL_IS_UTF8=1 \
2147
--- win/Makefile.mingw.mistachkin
+++ win/Makefile.mingw.mistachkin
@@ -142,19 +142,19 @@
142 #
143 ifndef X64
144 SSLCONFIG = mingw
145 ifndef FOSSIL_ENABLE_MINIZ
146 ZLIBCONFIG = LOC="-DASMV -DASMINF" OBJA="inffas86.o match.o"
147 ZLIBTARGETS = $(ZLIBDIR)/inffas86.o $(ZLIBDIR)/match.o
148 else
149 ZLIBCONFIG =
150 ZLIBTARGETS =
151 endif
152 else
153 SSLCONFIG = mingw64
154 ZLIBCONFIG =
155 ZLIBTARGETS =
156 endif
157
158 #### Disable creation of the OpenSSL shared libraries. Also, disable support
159 # for both SSLv2 and SSLv3 (i.e. thereby forcing the use of TLS).
160 #
@@ -972,42 +972,43 @@
972 $(OBJDIR)/th_lang.o \
973 $(OBJDIR)/th_tcl.o \
974 $(OBJDIR)/cson_amalgamation.o
975
976
 
 
 
 
 
 
977 $(ZLIBDIR)/inffas86.o:
978 $(TCC) -c -o $@ -DASMINF -I$(ZLIBDIR) -O3 $(ZLIBDIR)/contrib/inflate86/inffas86.c
979
980 $(ZLIBDIR)/match.o:
981 $(TCC) -c -o $@ -DASMV $(ZLIBDIR)/contrib/asm686/match.S
982
983 zlib: $(ZLIBTARGETS)
984 $(MAKE) -C $(ZLIBDIR) PREFIX=$(PREFIX) CC=$(PREFIX)$(TCCEXE) $(ZLIBCONFIG) -f win32/Makefile.gcc libz.a
985
986 clean-zlib:
987 $(MAKE) -C $(ZLIBDIR) PREFIX=$(PREFIX) CC=$(PREFIX)$(TCCEXE) -f win32/Makefile.gcc clean
988
989 ifdef FOSSIL_ENABLE_MINIZ
990 BLDTARGETS =
991 else
992 BLDTARGETS = zlib
993 endif
994
995 openssl: $(BLDTARGETS)
996 cd $(OPENSSLLIBDIR);./Configure --cross-compile-prefix=$(PREFIX) $(SSLCONFIG)
997 $(MAKE) -C $(OPENSSLLIBDIR) CC=$(TCCEXE) build_libs
998
999 clean-openssl:
1000 $(MAKE) -C $(OPENSSLLIBDIR) CC=$(TCCEXE) clean
1001
1002 tcl:
1003 cd $(TCLSRCDIR)/win;./configure
1004 $(MAKE) -C $(TCLSRCDIR)/win CC=$(TCCEXE) $(TCLTARGET)
1005
1006 clean-tcl:
1007 $(MAKE) -C $(TCLSRCDIR)/win CC=$(TCCEXE) distclean
1008
1009 APPTARGETS += $(BLDTARGETS)
1010
1011 ifdef FOSSIL_BUILD_SSL
1012 APPTARGETS += openssl
1013 endif
1014
@@ -2136,11 +2137,11 @@
2137 -DSQLITE_ENABLE_FTS3_PARENTHESIS \
2138 -DSQLITE_ENABLE_DBSTAT_VTAB \
2139 -DSQLITE_ENABLE_JSON1 \
2140 -DSQLITE_ENABLE_FTS5 \
2141 -DSQLITE_WIN32_NO_ANSI \
2142 $(MINGW_OPTIONS) \
2143 -DSQLITE_USE_MALLOC_H \
2144 -DSQLITE_USE_MSIZE
2145
2146 SHELL_OPTIONS = -Dmain=sqlite3_shell \
2147 -DSQLITE_SHELL_IS_UTF8=1 \
2148

Keyboard Shortcuts

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