Fossil SCM
Add support for compiling with symbols enabled using MSVC.
Commit
44bd9ae243db2c094d30ff95f9415fddac795f68
Parent
043512c578d18cb…
2 files changed
+38
-28
+38
-28
+38
-28
| --- src/makemake.tcl | ||
| +++ src/makemake.tcl | ||
| @@ -974,10 +974,13 @@ | ||
| 974 | 974 | SRCDIR = $B\src |
| 975 | 975 | OBJDIR = . |
| 976 | 976 | OX = . |
| 977 | 977 | O = .obj |
| 978 | 978 | E = .exe |
| 979 | + | |
| 980 | +# Uncomment to enable debug symbols | |
| 981 | +# DEBUG = 1 | |
| 979 | 982 | |
| 980 | 983 | # Uncomment to enable JSON API |
| 981 | 984 | # FOSSIL_ENABLE_JSON = 1 |
| 982 | 985 | |
| 983 | 986 | # Uncomment to enable SSL support |
| @@ -988,37 +991,44 @@ | ||
| 988 | 991 | SSLLIBDIR = $(B)\compat\openssl-1.0.1e\out32 |
| 989 | 992 | SSLLIB = ssleay32.lib libeay32.lib user32.lib gdi32.lib |
| 990 | 993 | !endif |
| 991 | 994 | |
| 992 | 995 | # zlib options |
| 993 | -ZINCDIR = $(B)\compat\zlib | |
| 994 | -ZLIBDIR = $(B)\compat\zlib | |
| 995 | -ZLIB = zlib.lib | |
| 996 | - | |
| 997 | -INCL = -I. -I$(SRCDIR) -I$B\win\include -I$(ZINCDIR) | |
| 998 | - | |
| 999 | -!ifdef FOSSIL_ENABLE_SSL | |
| 1000 | -INCL = $(INCL) -I$(SSLINCDIR) | |
| 1001 | -!endif | |
| 1002 | - | |
| 1003 | -CFLAGS = -nologo -MT -O2 | |
| 1004 | -BCC = $(CC) $(CFLAGS) | |
| 1005 | -TCC = $(CC) -c $(CFLAGS) $(MSCDEF) $(INCL) | |
| 1006 | -RCC = rc -D_WIN32 -D_MSC_VER $(MSCDEF) $(INCL) | |
| 1007 | -LIBS = $(ZLIB) ws2_32.lib advapi32.lib | |
| 1008 | -LIBDIR = -LIBPATH:$(ZLIBDIR) | |
| 1009 | - | |
| 1010 | -!ifdef FOSSIL_ENABLE_JSON | |
| 1011 | -TCC = $(TCC) -DFOSSIL_ENABLE_JSON=1 | |
| 1012 | -RCC = $(RCC) -DFOSSIL_ENABLE_JSON=1 | |
| 1013 | -!endif | |
| 1014 | - | |
| 1015 | -!ifdef FOSSIL_ENABLE_SSL | |
| 1016 | -TCC = $(TCC) -DFOSSIL_ENABLE_SSL=1 | |
| 1017 | -RCC = $(RCC) -DFOSSIL_ENABLE_SSL=1 | |
| 1018 | -LIBS = $(LIBS) $(SSLLIB) | |
| 1019 | -LIBDIR = $(LIBDIR) -LIBPATH:$(SSLLIBDIR) | |
| 996 | +ZINCDIR = $(B)\compat\zlib | |
| 997 | +ZLIBDIR = $(B)\compat\zlib | |
| 998 | +ZLIB = zlib.lib | |
| 999 | + | |
| 1000 | +INCL = -I. -I$(SRCDIR) -I$B\win\include -I$(ZINCDIR) | |
| 1001 | + | |
| 1002 | +!ifdef FOSSIL_ENABLE_SSL | |
| 1003 | +INCL = $(INCL) -I$(SSLINCDIR) | |
| 1004 | +!endif | |
| 1005 | + | |
| 1006 | +CFLAGS = -nologo -MT -O2 | |
| 1007 | +LDFLAGS = /NODEFAULTLIB:msvcrt | |
| 1008 | + | |
| 1009 | +!ifdef DEBUG | |
| 1010 | +CFLAGS = $(CFLAGS) -Zi | |
| 1011 | +LDFLAGS = $(LDFLAGS) /DEBUG | |
| 1012 | +!endif | |
| 1013 | + | |
| 1014 | +BCC = $(CC) $(CFLAGS) | |
| 1015 | +TCC = $(CC) -c $(CFLAGS) $(MSCDEF) $(INCL) | |
| 1016 | +RCC = rc -D_WIN32 -D_MSC_VER $(MSCDEF) $(INCL) | |
| 1017 | +LIBS = $(ZLIB) ws2_32.lib advapi32.lib | |
| 1018 | +LIBDIR = -LIBPATH:$(ZLIBDIR) | |
| 1019 | + | |
| 1020 | +!ifdef FOSSIL_ENABLE_JSON | |
| 1021 | +TCC = $(TCC) -DFOSSIL_ENABLE_JSON=1 | |
| 1022 | +RCC = $(RCC) -DFOSSIL_ENABLE_JSON=1 | |
| 1023 | +!endif | |
| 1024 | + | |
| 1025 | +!ifdef FOSSIL_ENABLE_SSL | |
| 1026 | +TCC = $(TCC) -DFOSSIL_ENABLE_SSL=1 | |
| 1027 | +RCC = $(RCC) -DFOSSIL_ENABLE_SSL=1 | |
| 1028 | +LIBS = $(LIBS) $(SSLLIB) | |
| 1029 | +LIBDIR = $(LIBDIR) -LIBPATH:$(SSLLIBDIR) | |
| 1020 | 1030 | !endif |
| 1021 | 1031 | } |
| 1022 | 1032 | regsub -all {[-]D} $SQLITE_OPTIONS {/D} MSC_SQLITE_OPTIONS |
| 1023 | 1033 | set j " \\\n " |
| 1024 | 1034 | writeln "SQLITE_OPTIONS = [join $MSC_SQLITE_OPTIONS $j]\n" |
| @@ -1053,11 +1063,11 @@ | ||
| 1053 | 1063 | @echo Building zlib from "$(ZLIBDIR)"... |
| 1054 | 1064 | @pushd "$(ZLIBDIR)" && nmake /f win32\Makefile.msc $(ZLIB) && popd |
| 1055 | 1065 | |
| 1056 | 1066 | $(APPNAME) : translate$E mkindex$E headers $(OBJ) $(OX)\linkopts zlib |
| 1057 | 1067 | cd $(OX) |
| 1058 | - link /NODEFAULTLIB:msvcrt -OUT:$@ $(LIBDIR) Wsetargv.obj fossil.res @linkopts | |
| 1068 | + link $(LDFLAGS) -OUT:$@ $(LIBDIR) Wsetargv.obj fossil.res @linkopts | |
| 1059 | 1069 | |
| 1060 | 1070 | $(OX)\linkopts: $B\win\Makefile.msc} |
| 1061 | 1071 | set redir {>} |
| 1062 | 1072 | foreach s [lsort [concat $src $AdditionalObj]] { |
| 1063 | 1073 | writeln "\techo \$(OX)\\$s.obj $redir \$@" |
| 1064 | 1074 |
| --- src/makemake.tcl | |
| +++ src/makemake.tcl | |
| @@ -974,10 +974,13 @@ | |
| 974 | SRCDIR = $B\src |
| 975 | OBJDIR = . |
| 976 | OX = . |
| 977 | O = .obj |
| 978 | E = .exe |
| 979 | |
| 980 | # Uncomment to enable JSON API |
| 981 | # FOSSIL_ENABLE_JSON = 1 |
| 982 | |
| 983 | # Uncomment to enable SSL support |
| @@ -988,37 +991,44 @@ | |
| 988 | SSLLIBDIR = $(B)\compat\openssl-1.0.1e\out32 |
| 989 | SSLLIB = ssleay32.lib libeay32.lib user32.lib gdi32.lib |
| 990 | !endif |
| 991 | |
| 992 | # zlib options |
| 993 | ZINCDIR = $(B)\compat\zlib |
| 994 | ZLIBDIR = $(B)\compat\zlib |
| 995 | ZLIB = zlib.lib |
| 996 | |
| 997 | INCL = -I. -I$(SRCDIR) -I$B\win\include -I$(ZINCDIR) |
| 998 | |
| 999 | !ifdef FOSSIL_ENABLE_SSL |
| 1000 | INCL = $(INCL) -I$(SSLINCDIR) |
| 1001 | !endif |
| 1002 | |
| 1003 | CFLAGS = -nologo -MT -O2 |
| 1004 | BCC = $(CC) $(CFLAGS) |
| 1005 | TCC = $(CC) -c $(CFLAGS) $(MSCDEF) $(INCL) |
| 1006 | RCC = rc -D_WIN32 -D_MSC_VER $(MSCDEF) $(INCL) |
| 1007 | LIBS = $(ZLIB) ws2_32.lib advapi32.lib |
| 1008 | LIBDIR = -LIBPATH:$(ZLIBDIR) |
| 1009 | |
| 1010 | !ifdef FOSSIL_ENABLE_JSON |
| 1011 | TCC = $(TCC) -DFOSSIL_ENABLE_JSON=1 |
| 1012 | RCC = $(RCC) -DFOSSIL_ENABLE_JSON=1 |
| 1013 | !endif |
| 1014 | |
| 1015 | !ifdef FOSSIL_ENABLE_SSL |
| 1016 | TCC = $(TCC) -DFOSSIL_ENABLE_SSL=1 |
| 1017 | RCC = $(RCC) -DFOSSIL_ENABLE_SSL=1 |
| 1018 | LIBS = $(LIBS) $(SSLLIB) |
| 1019 | LIBDIR = $(LIBDIR) -LIBPATH:$(SSLLIBDIR) |
| 1020 | !endif |
| 1021 | } |
| 1022 | regsub -all {[-]D} $SQLITE_OPTIONS {/D} MSC_SQLITE_OPTIONS |
| 1023 | set j " \\\n " |
| 1024 | writeln "SQLITE_OPTIONS = [join $MSC_SQLITE_OPTIONS $j]\n" |
| @@ -1053,11 +1063,11 @@ | |
| 1053 | @echo Building zlib from "$(ZLIBDIR)"... |
| 1054 | @pushd "$(ZLIBDIR)" && nmake /f win32\Makefile.msc $(ZLIB) && popd |
| 1055 | |
| 1056 | $(APPNAME) : translate$E mkindex$E headers $(OBJ) $(OX)\linkopts zlib |
| 1057 | cd $(OX) |
| 1058 | link /NODEFAULTLIB:msvcrt -OUT:$@ $(LIBDIR) Wsetargv.obj fossil.res @linkopts |
| 1059 | |
| 1060 | $(OX)\linkopts: $B\win\Makefile.msc} |
| 1061 | set redir {>} |
| 1062 | foreach s [lsort [concat $src $AdditionalObj]] { |
| 1063 | writeln "\techo \$(OX)\\$s.obj $redir \$@" |
| 1064 |
| --- src/makemake.tcl | |
| +++ src/makemake.tcl | |
| @@ -974,10 +974,13 @@ | |
| 974 | SRCDIR = $B\src |
| 975 | OBJDIR = . |
| 976 | OX = . |
| 977 | O = .obj |
| 978 | E = .exe |
| 979 | |
| 980 | # Uncomment to enable debug symbols |
| 981 | # DEBUG = 1 |
| 982 | |
| 983 | # Uncomment to enable JSON API |
| 984 | # FOSSIL_ENABLE_JSON = 1 |
| 985 | |
| 986 | # Uncomment to enable SSL support |
| @@ -988,37 +991,44 @@ | |
| 991 | SSLLIBDIR = $(B)\compat\openssl-1.0.1e\out32 |
| 992 | SSLLIB = ssleay32.lib libeay32.lib user32.lib gdi32.lib |
| 993 | !endif |
| 994 | |
| 995 | # zlib options |
| 996 | ZINCDIR = $(B)\compat\zlib |
| 997 | ZLIBDIR = $(B)\compat\zlib |
| 998 | ZLIB = zlib.lib |
| 999 | |
| 1000 | INCL = -I. -I$(SRCDIR) -I$B\win\include -I$(ZINCDIR) |
| 1001 | |
| 1002 | !ifdef FOSSIL_ENABLE_SSL |
| 1003 | INCL = $(INCL) -I$(SSLINCDIR) |
| 1004 | !endif |
| 1005 | |
| 1006 | CFLAGS = -nologo -MT -O2 |
| 1007 | LDFLAGS = /NODEFAULTLIB:msvcrt |
| 1008 | |
| 1009 | !ifdef DEBUG |
| 1010 | CFLAGS = $(CFLAGS) -Zi |
| 1011 | LDFLAGS = $(LDFLAGS) /DEBUG |
| 1012 | !endif |
| 1013 | |
| 1014 | BCC = $(CC) $(CFLAGS) |
| 1015 | TCC = $(CC) -c $(CFLAGS) $(MSCDEF) $(INCL) |
| 1016 | RCC = rc -D_WIN32 -D_MSC_VER $(MSCDEF) $(INCL) |
| 1017 | LIBS = $(ZLIB) ws2_32.lib advapi32.lib |
| 1018 | LIBDIR = -LIBPATH:$(ZLIBDIR) |
| 1019 | |
| 1020 | !ifdef FOSSIL_ENABLE_JSON |
| 1021 | TCC = $(TCC) -DFOSSIL_ENABLE_JSON=1 |
| 1022 | RCC = $(RCC) -DFOSSIL_ENABLE_JSON=1 |
| 1023 | !endif |
| 1024 | |
| 1025 | !ifdef FOSSIL_ENABLE_SSL |
| 1026 | TCC = $(TCC) -DFOSSIL_ENABLE_SSL=1 |
| 1027 | RCC = $(RCC) -DFOSSIL_ENABLE_SSL=1 |
| 1028 | LIBS = $(LIBS) $(SSLLIB) |
| 1029 | LIBDIR = $(LIBDIR) -LIBPATH:$(SSLLIBDIR) |
| 1030 | !endif |
| 1031 | } |
| 1032 | regsub -all {[-]D} $SQLITE_OPTIONS {/D} MSC_SQLITE_OPTIONS |
| 1033 | set j " \\\n " |
| 1034 | writeln "SQLITE_OPTIONS = [join $MSC_SQLITE_OPTIONS $j]\n" |
| @@ -1053,11 +1063,11 @@ | |
| 1063 | @echo Building zlib from "$(ZLIBDIR)"... |
| 1064 | @pushd "$(ZLIBDIR)" && nmake /f win32\Makefile.msc $(ZLIB) && popd |
| 1065 | |
| 1066 | $(APPNAME) : translate$E mkindex$E headers $(OBJ) $(OX)\linkopts zlib |
| 1067 | cd $(OX) |
| 1068 | link $(LDFLAGS) -OUT:$@ $(LIBDIR) Wsetargv.obj fossil.res @linkopts |
| 1069 | |
| 1070 | $(OX)\linkopts: $B\win\Makefile.msc} |
| 1071 | set redir {>} |
| 1072 | foreach s [lsort [concat $src $AdditionalObj]] { |
| 1073 | writeln "\techo \$(OX)\\$s.obj $redir \$@" |
| 1074 |
+38
-28
| --- win/Makefile.msc | ||
| +++ win/Makefile.msc | ||
| @@ -11,10 +11,13 @@ | ||
| 11 | 11 | SRCDIR = $B\src |
| 12 | 12 | OBJDIR = . |
| 13 | 13 | OX = . |
| 14 | 14 | O = .obj |
| 15 | 15 | E = .exe |
| 16 | + | |
| 17 | +# Uncomment to enable debug symbols | |
| 18 | +# DEBUG = 1 | |
| 16 | 19 | |
| 17 | 20 | # Uncomment to enable JSON API |
| 18 | 21 | # FOSSIL_ENABLE_JSON = 1 |
| 19 | 22 | |
| 20 | 23 | # Uncomment to enable SSL support |
| @@ -25,37 +28,44 @@ | ||
| 25 | 28 | SSLLIBDIR = $(B)\compat\openssl-1.0.1e\out32 |
| 26 | 29 | SSLLIB = ssleay32.lib libeay32.lib user32.lib gdi32.lib |
| 27 | 30 | !endif |
| 28 | 31 | |
| 29 | 32 | # zlib options |
| 30 | -ZINCDIR = $(B)\compat\zlib | |
| 31 | -ZLIBDIR = $(B)\compat\zlib | |
| 32 | -ZLIB = zlib.lib | |
| 33 | - | |
| 34 | -INCL = -I. -I$(SRCDIR) -I$B\win\include -I$(ZINCDIR) | |
| 35 | - | |
| 36 | -!ifdef FOSSIL_ENABLE_SSL | |
| 37 | -INCL = $(INCL) -I$(SSLINCDIR) | |
| 38 | -!endif | |
| 39 | - | |
| 40 | -CFLAGS = -nologo -MT -O2 | |
| 41 | -BCC = $(CC) $(CFLAGS) | |
| 42 | -TCC = $(CC) -c $(CFLAGS) $(MSCDEF) $(INCL) | |
| 43 | -RCC = rc -D_WIN32 -D_MSC_VER $(MSCDEF) $(INCL) | |
| 44 | -LIBS = $(ZLIB) ws2_32.lib advapi32.lib | |
| 45 | -LIBDIR = -LIBPATH:$(ZLIBDIR) | |
| 46 | - | |
| 47 | -!ifdef FOSSIL_ENABLE_JSON | |
| 48 | -TCC = $(TCC) -DFOSSIL_ENABLE_JSON=1 | |
| 49 | -RCC = $(RCC) -DFOSSIL_ENABLE_JSON=1 | |
| 50 | -!endif | |
| 51 | - | |
| 52 | -!ifdef FOSSIL_ENABLE_SSL | |
| 53 | -TCC = $(TCC) -DFOSSIL_ENABLE_SSL=1 | |
| 54 | -RCC = $(RCC) -DFOSSIL_ENABLE_SSL=1 | |
| 55 | -LIBS = $(LIBS) $(SSLLIB) | |
| 56 | -LIBDIR = $(LIBDIR) -LIBPATH:$(SSLLIBDIR) | |
| 33 | +ZINCDIR = $(B)\compat\zlib | |
| 34 | +ZLIBDIR = $(B)\compat\zlib | |
| 35 | +ZLIB = zlib.lib | |
| 36 | + | |
| 37 | +INCL = -I. -I$(SRCDIR) -I$B\win\include -I$(ZINCDIR) | |
| 38 | + | |
| 39 | +!ifdef FOSSIL_ENABLE_SSL | |
| 40 | +INCL = $(INCL) -I$(SSLINCDIR) | |
| 41 | +!endif | |
| 42 | + | |
| 43 | +CFLAGS = -nologo -MT -O2 | |
| 44 | +LDFLAGS = /NODEFAULTLIB:msvcrt | |
| 45 | + | |
| 46 | +!ifdef DEBUG | |
| 47 | +CFLAGS = $(CFLAGS) -Zi | |
| 48 | +LDFLAGS = $(LDFLAGS) /DEBUG | |
| 49 | +!endif | |
| 50 | + | |
| 51 | +BCC = $(CC) $(CFLAGS) | |
| 52 | +TCC = $(CC) -c $(CFLAGS) $(MSCDEF) $(INCL) | |
| 53 | +RCC = rc -D_WIN32 -D_MSC_VER $(MSCDEF) $(INCL) | |
| 54 | +LIBS = $(ZLIB) ws2_32.lib advapi32.lib | |
| 55 | +LIBDIR = -LIBPATH:$(ZLIBDIR) | |
| 56 | + | |
| 57 | +!ifdef FOSSIL_ENABLE_JSON | |
| 58 | +TCC = $(TCC) -DFOSSIL_ENABLE_JSON=1 | |
| 59 | +RCC = $(RCC) -DFOSSIL_ENABLE_JSON=1 | |
| 60 | +!endif | |
| 61 | + | |
| 62 | +!ifdef FOSSIL_ENABLE_SSL | |
| 63 | +TCC = $(TCC) -DFOSSIL_ENABLE_SSL=1 | |
| 64 | +RCC = $(RCC) -DFOSSIL_ENABLE_SSL=1 | |
| 65 | +LIBS = $(LIBS) $(SSLLIB) | |
| 66 | +LIBDIR = $(LIBDIR) -LIBPATH:$(SSLLIBDIR) | |
| 57 | 67 | !endif |
| 58 | 68 | |
| 59 | 69 | SQLITE_OPTIONS = /DSQLITE_OMIT_LOAD_EXTENSION=1 \ |
| 60 | 70 | /DSQLITE_THREADSAFE=0 \ |
| 61 | 71 | /DSQLITE_DEFAULT_FILE_FORMAT=4 \ |
| @@ -294,11 +304,11 @@ | ||
| 294 | 304 | @echo Building zlib from "$(ZLIBDIR)"... |
| 295 | 305 | @pushd "$(ZLIBDIR)" && nmake /f win32\Makefile.msc $(ZLIB) && popd |
| 296 | 306 | |
| 297 | 307 | $(APPNAME) : translate$E mkindex$E headers $(OBJ) $(OX)\linkopts zlib |
| 298 | 308 | cd $(OX) |
| 299 | - link /NODEFAULTLIB:msvcrt -OUT:$@ $(LIBDIR) Wsetargv.obj fossil.res @linkopts | |
| 309 | + link $(LDFLAGS) -OUT:$@ $(LIBDIR) Wsetargv.obj fossil.res @linkopts | |
| 300 | 310 | |
| 301 | 311 | $(OX)\linkopts: $B\win\Makefile.msc |
| 302 | 312 | echo $(OX)\add.obj > $@ |
| 303 | 313 | echo $(OX)\allrepo.obj >> $@ |
| 304 | 314 | echo $(OX)\attach.obj >> $@ |
| 305 | 315 |
| --- win/Makefile.msc | |
| +++ win/Makefile.msc | |
| @@ -11,10 +11,13 @@ | |
| 11 | SRCDIR = $B\src |
| 12 | OBJDIR = . |
| 13 | OX = . |
| 14 | O = .obj |
| 15 | E = .exe |
| 16 | |
| 17 | # Uncomment to enable JSON API |
| 18 | # FOSSIL_ENABLE_JSON = 1 |
| 19 | |
| 20 | # Uncomment to enable SSL support |
| @@ -25,37 +28,44 @@ | |
| 25 | SSLLIBDIR = $(B)\compat\openssl-1.0.1e\out32 |
| 26 | SSLLIB = ssleay32.lib libeay32.lib user32.lib gdi32.lib |
| 27 | !endif |
| 28 | |
| 29 | # zlib options |
| 30 | ZINCDIR = $(B)\compat\zlib |
| 31 | ZLIBDIR = $(B)\compat\zlib |
| 32 | ZLIB = zlib.lib |
| 33 | |
| 34 | INCL = -I. -I$(SRCDIR) -I$B\win\include -I$(ZINCDIR) |
| 35 | |
| 36 | !ifdef FOSSIL_ENABLE_SSL |
| 37 | INCL = $(INCL) -I$(SSLINCDIR) |
| 38 | !endif |
| 39 | |
| 40 | CFLAGS = -nologo -MT -O2 |
| 41 | BCC = $(CC) $(CFLAGS) |
| 42 | TCC = $(CC) -c $(CFLAGS) $(MSCDEF) $(INCL) |
| 43 | RCC = rc -D_WIN32 -D_MSC_VER $(MSCDEF) $(INCL) |
| 44 | LIBS = $(ZLIB) ws2_32.lib advapi32.lib |
| 45 | LIBDIR = -LIBPATH:$(ZLIBDIR) |
| 46 | |
| 47 | !ifdef FOSSIL_ENABLE_JSON |
| 48 | TCC = $(TCC) -DFOSSIL_ENABLE_JSON=1 |
| 49 | RCC = $(RCC) -DFOSSIL_ENABLE_JSON=1 |
| 50 | !endif |
| 51 | |
| 52 | !ifdef FOSSIL_ENABLE_SSL |
| 53 | TCC = $(TCC) -DFOSSIL_ENABLE_SSL=1 |
| 54 | RCC = $(RCC) -DFOSSIL_ENABLE_SSL=1 |
| 55 | LIBS = $(LIBS) $(SSLLIB) |
| 56 | LIBDIR = $(LIBDIR) -LIBPATH:$(SSLLIBDIR) |
| 57 | !endif |
| 58 | |
| 59 | SQLITE_OPTIONS = /DSQLITE_OMIT_LOAD_EXTENSION=1 \ |
| 60 | /DSQLITE_THREADSAFE=0 \ |
| 61 | /DSQLITE_DEFAULT_FILE_FORMAT=4 \ |
| @@ -294,11 +304,11 @@ | |
| 294 | @echo Building zlib from "$(ZLIBDIR)"... |
| 295 | @pushd "$(ZLIBDIR)" && nmake /f win32\Makefile.msc $(ZLIB) && popd |
| 296 | |
| 297 | $(APPNAME) : translate$E mkindex$E headers $(OBJ) $(OX)\linkopts zlib |
| 298 | cd $(OX) |
| 299 | link /NODEFAULTLIB:msvcrt -OUT:$@ $(LIBDIR) Wsetargv.obj fossil.res @linkopts |
| 300 | |
| 301 | $(OX)\linkopts: $B\win\Makefile.msc |
| 302 | echo $(OX)\add.obj > $@ |
| 303 | echo $(OX)\allrepo.obj >> $@ |
| 304 | echo $(OX)\attach.obj >> $@ |
| 305 |
| --- win/Makefile.msc | |
| +++ win/Makefile.msc | |
| @@ -11,10 +11,13 @@ | |
| 11 | SRCDIR = $B\src |
| 12 | OBJDIR = . |
| 13 | OX = . |
| 14 | O = .obj |
| 15 | E = .exe |
| 16 | |
| 17 | # Uncomment to enable debug symbols |
| 18 | # DEBUG = 1 |
| 19 | |
| 20 | # Uncomment to enable JSON API |
| 21 | # FOSSIL_ENABLE_JSON = 1 |
| 22 | |
| 23 | # Uncomment to enable SSL support |
| @@ -25,37 +28,44 @@ | |
| 28 | SSLLIBDIR = $(B)\compat\openssl-1.0.1e\out32 |
| 29 | SSLLIB = ssleay32.lib libeay32.lib user32.lib gdi32.lib |
| 30 | !endif |
| 31 | |
| 32 | # zlib options |
| 33 | ZINCDIR = $(B)\compat\zlib |
| 34 | ZLIBDIR = $(B)\compat\zlib |
| 35 | ZLIB = zlib.lib |
| 36 | |
| 37 | INCL = -I. -I$(SRCDIR) -I$B\win\include -I$(ZINCDIR) |
| 38 | |
| 39 | !ifdef FOSSIL_ENABLE_SSL |
| 40 | INCL = $(INCL) -I$(SSLINCDIR) |
| 41 | !endif |
| 42 | |
| 43 | CFLAGS = -nologo -MT -O2 |
| 44 | LDFLAGS = /NODEFAULTLIB:msvcrt |
| 45 | |
| 46 | !ifdef DEBUG |
| 47 | CFLAGS = $(CFLAGS) -Zi |
| 48 | LDFLAGS = $(LDFLAGS) /DEBUG |
| 49 | !endif |
| 50 | |
| 51 | BCC = $(CC) $(CFLAGS) |
| 52 | TCC = $(CC) -c $(CFLAGS) $(MSCDEF) $(INCL) |
| 53 | RCC = rc -D_WIN32 -D_MSC_VER $(MSCDEF) $(INCL) |
| 54 | LIBS = $(ZLIB) ws2_32.lib advapi32.lib |
| 55 | LIBDIR = -LIBPATH:$(ZLIBDIR) |
| 56 | |
| 57 | !ifdef FOSSIL_ENABLE_JSON |
| 58 | TCC = $(TCC) -DFOSSIL_ENABLE_JSON=1 |
| 59 | RCC = $(RCC) -DFOSSIL_ENABLE_JSON=1 |
| 60 | !endif |
| 61 | |
| 62 | !ifdef FOSSIL_ENABLE_SSL |
| 63 | TCC = $(TCC) -DFOSSIL_ENABLE_SSL=1 |
| 64 | RCC = $(RCC) -DFOSSIL_ENABLE_SSL=1 |
| 65 | LIBS = $(LIBS) $(SSLLIB) |
| 66 | LIBDIR = $(LIBDIR) -LIBPATH:$(SSLLIBDIR) |
| 67 | !endif |
| 68 | |
| 69 | SQLITE_OPTIONS = /DSQLITE_OMIT_LOAD_EXTENSION=1 \ |
| 70 | /DSQLITE_THREADSAFE=0 \ |
| 71 | /DSQLITE_DEFAULT_FILE_FORMAT=4 \ |
| @@ -294,11 +304,11 @@ | |
| 304 | @echo Building zlib from "$(ZLIBDIR)"... |
| 305 | @pushd "$(ZLIBDIR)" && nmake /f win32\Makefile.msc $(ZLIB) && popd |
| 306 | |
| 307 | $(APPNAME) : translate$E mkindex$E headers $(OBJ) $(OX)\linkopts zlib |
| 308 | cd $(OX) |
| 309 | link $(LDFLAGS) -OUT:$@ $(LIBDIR) Wsetargv.obj fossil.res @linkopts |
| 310 | |
| 311 | $(OX)\linkopts: $B\win\Makefile.msc |
| 312 | echo $(OX)\add.obj > $@ |
| 313 | echo $(OX)\allrepo.obj >> $@ |
| 314 | echo $(OX)\attach.obj >> $@ |
| 315 |