Fossil SCM
New target "openssl" in win/Makefile.mingw, for building the openssl static libraries on mingw32
Commit
f469c27d26d2937ed0198ed0b9f07dd2d83ed1ef
Parent
b7625d8d8cd6d08…
3 files changed
+6
-2
+4
+4
+6
-2
| --- src/makemake.tcl | ||
| +++ src/makemake.tcl | ||
| @@ -691,10 +691,14 @@ | ||
| 691 | 691 | endif |
| 692 | 692 | |
| 693 | 693 | zlib: |
| 694 | 694 | $(MAKE) -C $(ZLIBDIR) PREFIX=$(PREFIX) -f win32/Makefile.gcc libz.a |
| 695 | 695 | |
| 696 | +openssl: zlib | |
| 697 | + cd $(OPENSSLLIBDIR);./Configure --cross-compile-prefix=$(PREFIX) --with-zlib-lib=$(PWD)/$(ZLIBDIR) --with-zlib-include=$(PWD)/$(ZLIBDIR) zlib mingw | |
| 698 | + $(MAKE) -C $(OPENSSLLIBDIR) | |
| 699 | + | |
| 696 | 700 | $(APPNAME): $(OBJDIR)/headers $(OBJ) $(EXTRAOBJ) $(OBJDIR)/fossil.o zlib |
| 697 | 701 | $(TCC) -o $(APPNAME) $(OBJ) $(EXTRAOBJ) $(LIB) $(OBJDIR)/fossil.o |
| 698 | 702 | |
| 699 | 703 | # This rule prevents make from using its default rules to try build |
| 700 | 704 | # an executable named "manifest" out of the file named "manifest.c" |
| @@ -1231,17 +1235,17 @@ | ||
| 1231 | 1235 | |
| 1232 | 1236 | # define the sqlite files, which need special flags on compile |
| 1233 | 1237 | SQLITESRC=sqlite3.c |
| 1234 | 1238 | ORIGSQLITESRC=$(foreach sf,$(SQLITESRC),$(SRCDIR)$(sf)) |
| 1235 | 1239 | SQLITEOBJ=$(foreach sf,$(SQLITESRC),$(sf:.c=.obj)) |
| 1236 | -SQLITEDEFINES=-DSQLITE_OMIT_LOAD_EXTENSION=1 -DSQLITE_THREADSAFE=0 -DSQLITE_DEFAULT_FILE_FORMAT=4 -Dlocaltime=fossil_localtime -DSQLITE_ENABLE_LOCKING_STYLE=0 | |
| 1240 | +SQLITEDEFINES=-DSQLITE_OMIT_LOAD_EXTENSION=1 -DSQLITE_THREADSAFE=0 -DSQLITE_DEFAULT_FILE_FORMAT=4 -Dlocaltime=fossil_localtime -DSQLITE_ENABLE_LOCKING_STYLE=0 -DSQLITE_WIN32_NO_ANSI | |
| 1237 | 1241 | |
| 1238 | 1242 | # define the sqlite shell files, which need special flags on compile |
| 1239 | 1243 | SQLITESHELLSRC=shell.c |
| 1240 | 1244 | ORIGSQLITESHELLSRC=$(foreach sf,$(SQLITESHELLSRC),$(SRCDIR)$(sf)) |
| 1241 | 1245 | SQLITESHELLOBJ=$(foreach sf,$(SQLITESHELLSRC),$(sf:.c=.obj)) |
| 1242 | -SQLITESHELLDEFINES=-Dmain=sqlite3_shell -DSQLITE_OMIT_LOAD_EXTENSION=1 | |
| 1246 | +SQLITESHELLDEFINES=-Dmain=sqlite3_shell -DSQLITE_OMIT_LOAD_EXTENSION=1 -Dsqlite3_strglob=strglob | |
| 1243 | 1247 | |
| 1244 | 1248 | # define the th scripting files, which need special flags on compile |
| 1245 | 1249 | THSRC=th.c th_lang.c |
| 1246 | 1250 | ORIGTHSRC=$(foreach sf,$(THSRC),$(SRCDIR)$(sf)) |
| 1247 | 1251 | THOBJ=$(foreach sf,$(THSRC),$(sf:.c=.obj)) |
| 1248 | 1252 |
| --- src/makemake.tcl | |
| +++ src/makemake.tcl | |
| @@ -691,10 +691,14 @@ | |
| 691 | endif |
| 692 | |
| 693 | zlib: |
| 694 | $(MAKE) -C $(ZLIBDIR) PREFIX=$(PREFIX) -f win32/Makefile.gcc libz.a |
| 695 | |
| 696 | $(APPNAME): $(OBJDIR)/headers $(OBJ) $(EXTRAOBJ) $(OBJDIR)/fossil.o zlib |
| 697 | $(TCC) -o $(APPNAME) $(OBJ) $(EXTRAOBJ) $(LIB) $(OBJDIR)/fossil.o |
| 698 | |
| 699 | # This rule prevents make from using its default rules to try build |
| 700 | # an executable named "manifest" out of the file named "manifest.c" |
| @@ -1231,17 +1235,17 @@ | |
| 1231 | |
| 1232 | # define the sqlite files, which need special flags on compile |
| 1233 | SQLITESRC=sqlite3.c |
| 1234 | ORIGSQLITESRC=$(foreach sf,$(SQLITESRC),$(SRCDIR)$(sf)) |
| 1235 | SQLITEOBJ=$(foreach sf,$(SQLITESRC),$(sf:.c=.obj)) |
| 1236 | SQLITEDEFINES=-DSQLITE_OMIT_LOAD_EXTENSION=1 -DSQLITE_THREADSAFE=0 -DSQLITE_DEFAULT_FILE_FORMAT=4 -Dlocaltime=fossil_localtime -DSQLITE_ENABLE_LOCKING_STYLE=0 |
| 1237 | |
| 1238 | # define the sqlite shell files, which need special flags on compile |
| 1239 | SQLITESHELLSRC=shell.c |
| 1240 | ORIGSQLITESHELLSRC=$(foreach sf,$(SQLITESHELLSRC),$(SRCDIR)$(sf)) |
| 1241 | SQLITESHELLOBJ=$(foreach sf,$(SQLITESHELLSRC),$(sf:.c=.obj)) |
| 1242 | SQLITESHELLDEFINES=-Dmain=sqlite3_shell -DSQLITE_OMIT_LOAD_EXTENSION=1 |
| 1243 | |
| 1244 | # define the th scripting files, which need special flags on compile |
| 1245 | THSRC=th.c th_lang.c |
| 1246 | ORIGTHSRC=$(foreach sf,$(THSRC),$(SRCDIR)$(sf)) |
| 1247 | THOBJ=$(foreach sf,$(THSRC),$(sf:.c=.obj)) |
| 1248 |
| --- src/makemake.tcl | |
| +++ src/makemake.tcl | |
| @@ -691,10 +691,14 @@ | |
| 691 | endif |
| 692 | |
| 693 | zlib: |
| 694 | $(MAKE) -C $(ZLIBDIR) PREFIX=$(PREFIX) -f win32/Makefile.gcc libz.a |
| 695 | |
| 696 | openssl: zlib |
| 697 | cd $(OPENSSLLIBDIR);./Configure --cross-compile-prefix=$(PREFIX) --with-zlib-lib=$(PWD)/$(ZLIBDIR) --with-zlib-include=$(PWD)/$(ZLIBDIR) zlib mingw |
| 698 | $(MAKE) -C $(OPENSSLLIBDIR) |
| 699 | |
| 700 | $(APPNAME): $(OBJDIR)/headers $(OBJ) $(EXTRAOBJ) $(OBJDIR)/fossil.o zlib |
| 701 | $(TCC) -o $(APPNAME) $(OBJ) $(EXTRAOBJ) $(LIB) $(OBJDIR)/fossil.o |
| 702 | |
| 703 | # This rule prevents make from using its default rules to try build |
| 704 | # an executable named "manifest" out of the file named "manifest.c" |
| @@ -1231,17 +1235,17 @@ | |
| 1235 | |
| 1236 | # define the sqlite files, which need special flags on compile |
| 1237 | SQLITESRC=sqlite3.c |
| 1238 | ORIGSQLITESRC=$(foreach sf,$(SQLITESRC),$(SRCDIR)$(sf)) |
| 1239 | SQLITEOBJ=$(foreach sf,$(SQLITESRC),$(sf:.c=.obj)) |
| 1240 | SQLITEDEFINES=-DSQLITE_OMIT_LOAD_EXTENSION=1 -DSQLITE_THREADSAFE=0 -DSQLITE_DEFAULT_FILE_FORMAT=4 -Dlocaltime=fossil_localtime -DSQLITE_ENABLE_LOCKING_STYLE=0 -DSQLITE_WIN32_NO_ANSI |
| 1241 | |
| 1242 | # define the sqlite shell files, which need special flags on compile |
| 1243 | SQLITESHELLSRC=shell.c |
| 1244 | ORIGSQLITESHELLSRC=$(foreach sf,$(SQLITESHELLSRC),$(SRCDIR)$(sf)) |
| 1245 | SQLITESHELLOBJ=$(foreach sf,$(SQLITESHELLSRC),$(sf:.c=.obj)) |
| 1246 | SQLITESHELLDEFINES=-Dmain=sqlite3_shell -DSQLITE_OMIT_LOAD_EXTENSION=1 -Dsqlite3_strglob=strglob |
| 1247 | |
| 1248 | # define the th scripting files, which need special flags on compile |
| 1249 | THSRC=th.c th_lang.c |
| 1250 | ORIGTHSRC=$(foreach sf,$(THSRC),$(SRCDIR)$(sf)) |
| 1251 | THOBJ=$(foreach sf,$(THSRC),$(sf:.c=.obj)) |
| 1252 |
+4
| --- win/Makefile.mingw | ||
| +++ win/Makefile.mingw | ||
| @@ -658,10 +658,14 @@ | ||
| 658 | 658 | endif |
| 659 | 659 | |
| 660 | 660 | zlib: |
| 661 | 661 | $(MAKE) -C $(ZLIBDIR) PREFIX=$(PREFIX) -f win32/Makefile.gcc libz.a |
| 662 | 662 | |
| 663 | +openssl: zlib | |
| 664 | + cd $(OPENSSLLIBDIR);./Configure --cross-compile-prefix=$(PREFIX) --with-zlib-lib=$(PWD)/$(ZLIBDIR) --with-zlib-include=$(PWD)/$(ZLIBDIR) zlib mingw | |
| 665 | + $(MAKE) -C $(OPENSSLLIBDIR) | |
| 666 | + | |
| 663 | 667 | $(APPNAME): $(OBJDIR)/headers $(OBJ) $(EXTRAOBJ) $(OBJDIR)/fossil.o zlib |
| 664 | 668 | $(TCC) -o $(APPNAME) $(OBJ) $(EXTRAOBJ) $(LIB) $(OBJDIR)/fossil.o |
| 665 | 669 | |
| 666 | 670 | # This rule prevents make from using its default rules to try build |
| 667 | 671 | # an executable named "manifest" out of the file named "manifest.c" |
| 668 | 672 |
| --- win/Makefile.mingw | |
| +++ win/Makefile.mingw | |
| @@ -658,10 +658,14 @@ | |
| 658 | endif |
| 659 | |
| 660 | zlib: |
| 661 | $(MAKE) -C $(ZLIBDIR) PREFIX=$(PREFIX) -f win32/Makefile.gcc libz.a |
| 662 | |
| 663 | $(APPNAME): $(OBJDIR)/headers $(OBJ) $(EXTRAOBJ) $(OBJDIR)/fossil.o zlib |
| 664 | $(TCC) -o $(APPNAME) $(OBJ) $(EXTRAOBJ) $(LIB) $(OBJDIR)/fossil.o |
| 665 | |
| 666 | # This rule prevents make from using its default rules to try build |
| 667 | # an executable named "manifest" out of the file named "manifest.c" |
| 668 |
| --- win/Makefile.mingw | |
| +++ win/Makefile.mingw | |
| @@ -658,10 +658,14 @@ | |
| 658 | endif |
| 659 | |
| 660 | zlib: |
| 661 | $(MAKE) -C $(ZLIBDIR) PREFIX=$(PREFIX) -f win32/Makefile.gcc libz.a |
| 662 | |
| 663 | openssl: zlib |
| 664 | cd $(OPENSSLLIBDIR);./Configure --cross-compile-prefix=$(PREFIX) --with-zlib-lib=$(PWD)/$(ZLIBDIR) --with-zlib-include=$(PWD)/$(ZLIBDIR) zlib mingw |
| 665 | $(MAKE) -C $(OPENSSLLIBDIR) |
| 666 | |
| 667 | $(APPNAME): $(OBJDIR)/headers $(OBJ) $(EXTRAOBJ) $(OBJDIR)/fossil.o zlib |
| 668 | $(TCC) -o $(APPNAME) $(OBJ) $(EXTRAOBJ) $(LIB) $(OBJDIR)/fossil.o |
| 669 | |
| 670 | # This rule prevents make from using its default rules to try build |
| 671 | # an executable named "manifest" out of the file named "manifest.c" |
| 672 |
| --- win/Makefile.mingw.mistachkin | ||
| +++ win/Makefile.mingw.mistachkin | ||
| @@ -658,10 +658,14 @@ | ||
| 658 | 658 | endif |
| 659 | 659 | |
| 660 | 660 | zlib: |
| 661 | 661 | $(MAKE) -C $(ZLIBDIR) PREFIX=$(PREFIX) -f win32/Makefile.gcc libz.a |
| 662 | 662 | |
| 663 | +openssl: zlib | |
| 664 | + cd $(OPENSSLLIBDIR);./Configure --cross-compile-prefix=$(PREFIX) --with-zlib-lib=$(PWD)/$(ZLIBDIR) --with-zlib-include=$(PWD)/$(ZLIBDIR) zlib mingw | |
| 665 | + $(MAKE) -C $(OPENSSLLIBDIR) | |
| 666 | + | |
| 663 | 667 | $(APPNAME): $(OBJDIR)/headers $(OBJ) $(EXTRAOBJ) $(OBJDIR)/fossil.o zlib |
| 664 | 668 | $(TCC) -o $(APPNAME) $(OBJ) $(EXTRAOBJ) $(LIB) $(OBJDIR)/fossil.o |
| 665 | 669 | |
| 666 | 670 | # This rule prevents make from using its default rules to try build |
| 667 | 671 | # an executable named "manifest" out of the file named "manifest.c" |
| 668 | 672 |
| --- win/Makefile.mingw.mistachkin | |
| +++ win/Makefile.mingw.mistachkin | |
| @@ -658,10 +658,14 @@ | |
| 658 | endif |
| 659 | |
| 660 | zlib: |
| 661 | $(MAKE) -C $(ZLIBDIR) PREFIX=$(PREFIX) -f win32/Makefile.gcc libz.a |
| 662 | |
| 663 | $(APPNAME): $(OBJDIR)/headers $(OBJ) $(EXTRAOBJ) $(OBJDIR)/fossil.o zlib |
| 664 | $(TCC) -o $(APPNAME) $(OBJ) $(EXTRAOBJ) $(LIB) $(OBJDIR)/fossil.o |
| 665 | |
| 666 | # This rule prevents make from using its default rules to try build |
| 667 | # an executable named "manifest" out of the file named "manifest.c" |
| 668 |
| --- win/Makefile.mingw.mistachkin | |
| +++ win/Makefile.mingw.mistachkin | |
| @@ -658,10 +658,14 @@ | |
| 658 | endif |
| 659 | |
| 660 | zlib: |
| 661 | $(MAKE) -C $(ZLIBDIR) PREFIX=$(PREFIX) -f win32/Makefile.gcc libz.a |
| 662 | |
| 663 | openssl: zlib |
| 664 | cd $(OPENSSLLIBDIR);./Configure --cross-compile-prefix=$(PREFIX) --with-zlib-lib=$(PWD)/$(ZLIBDIR) --with-zlib-include=$(PWD)/$(ZLIBDIR) zlib mingw |
| 665 | $(MAKE) -C $(OPENSSLLIBDIR) |
| 666 | |
| 667 | $(APPNAME): $(OBJDIR)/headers $(OBJ) $(EXTRAOBJ) $(OBJDIR)/fossil.o zlib |
| 668 | $(TCC) -o $(APPNAME) $(OBJ) $(EXTRAOBJ) $(LIB) $(OBJDIR)/fossil.o |
| 669 | |
| 670 | # This rule prevents make from using its default rules to try build |
| 671 | # an executable named "manifest" out of the file named "manifest.c" |
| 672 |