Fossil SCM
Mingw makefile changes from Mark Janssen.
Commit
36e3ab4c42dda795e02006cc58e53c5e8187ad55
Parent
e1ff6c0e3520647…
4 files changed
+59
-59
+15
-5
+15
-5
+1
+59
-59
| --- fossil.nsi | ||
| +++ fossil.nsi | ||
| @@ -1,59 +1,59 @@ | ||
| 1 | -; example2.nsi | |
| 2 | -; | |
| 3 | -; This script is based on example1.nsi, but adds uninstall support | |
| 4 | -; and (optionally) start menu shortcuts. | |
| 5 | -; | |
| 6 | -; It will install notepad.exe into a directory that the user selects, | |
| 7 | -; | |
| 8 | - | |
| 9 | -; The name of the installer | |
| 10 | -Name "Fossil" | |
| 11 | - | |
| 12 | -; The file to write | |
| 13 | -OutFile "fossil-setup-7c0bd3ee08.exe" | |
| 14 | - | |
| 15 | -; The default installation directory | |
| 16 | -InstallDir $PROGRAMFILES\Fossil | |
| 17 | -; Registry key to check for directory (so if you install again, it will | |
| 18 | -; overwrite the old one automatically) | |
| 19 | -InstallDirRegKey HKLM SOFTWARE\Fossil "Install_Dir" | |
| 20 | - | |
| 21 | -; The text to prompt the user to enter a directory | |
| 22 | -ComponentText "This will install fossil on your computer." | |
| 23 | -; The text to prompt the user to enter a directory | |
| 24 | -DirText "Choose a directory to install in to:" | |
| 25 | - | |
| 26 | -; The stuff to install | |
| 27 | -Section "Fossil (required)" | |
| 28 | - ; Set output path to the installation directory. | |
| 29 | - SetOutPath $INSTDIR | |
| 30 | - ; Put file there | |
| 31 | - File ".\build\fossil.exe" | |
| 32 | - ; Write the installation path into the registry | |
| 33 | - WriteRegStr HKLM SOFTWARE\Fossil "Install_Dir" "$INSTDIR" | |
| 34 | - ; Write the uninstall keys for Windows | |
| 35 | - WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\Fossil" "DisplayName" "Fossil (remove only)" | |
| 36 | - WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\Fossil" "UninstallString" '"$INSTDIR\uninstall.exe"' | |
| 37 | - WriteUninstaller "uninstall.exe" | |
| 38 | -SectionEnd | |
| 39 | - | |
| 40 | - | |
| 41 | -; uninstall stuff | |
| 42 | - | |
| 43 | -UninstallText "This will uninstall fossil. Hit next to continue." | |
| 44 | - | |
| 45 | -; special uninstall section. | |
| 46 | -Section "Uninstall" | |
| 47 | - ; remove registry keys | |
| 48 | - DeleteRegKey HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\Fossil" | |
| 49 | - DeleteRegKey HKLM SOFTWARE\Fossil | |
| 50 | - ; remove files | |
| 51 | - Delete $INSTDIR\fossil.exe | |
| 52 | - ; MUST REMOVE UNINSTALLER, too | |
| 53 | - Delete $INSTDIR\uninstall.exe | |
| 54 | - ; remove shortcuts, if any. | |
| 55 | - RMDir "$SMPROGRAMS\Fossil" | |
| 56 | - RMDir "$INSTDIR" | |
| 57 | -SectionEnd | |
| 58 | - | |
| 59 | -; eof | |
| 1 | +; example2.nsi | |
| 2 | +; | |
| 3 | +; This script is based on example1.nsi, but adds uninstall support | |
| 4 | +; and (optionally) start menu shortcuts. | |
| 5 | +; | |
| 6 | +; It will install notepad.exe into a directory that the user selects, | |
| 7 | +; | |
| 8 | + | |
| 9 | +; The name of the installer | |
| 10 | +Name "Fossil" | |
| 11 | + | |
| 12 | +; The file to write | |
| 13 | +OutFile "fossil-setup.exe" | |
| 14 | + | |
| 15 | +; The default installation directory | |
| 16 | +InstallDir $PROGRAMFILES\Fossil | |
| 17 | +; Registry key to check for directory (so if you install again, it will | |
| 18 | +; overwrite the old one automatically) | |
| 19 | +InstallDirRegKey HKLM SOFTWARE\Fossil "Install_Dir" | |
| 20 | + | |
| 21 | +; The text to prompt the user to enter a directory | |
| 22 | +ComponentText "This will install fossil on your computer." | |
| 23 | +; The text to prompt the user to enter a directory | |
| 24 | +DirText "Choose a directory to install in to:" | |
| 25 | + | |
| 26 | +; The stuff to install | |
| 27 | +Section "Fossil (required)" | |
| 28 | + ; Set output path to the installation directory. | |
| 29 | + SetOutPath $INSTDIR | |
| 30 | + ; Put file there | |
| 31 | + File ".\fossil.exe" | |
| 32 | + ; Write the installation path into the registry | |
| 33 | + WriteRegStr HKLM SOFTWARE\Fossil "Install_Dir" "$INSTDIR" | |
| 34 | + ; Write the uninstall keys for Windows | |
| 35 | + WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\Fossil" "DisplayName" "Fossil (remove only)" | |
| 36 | + WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\Fossil" "UninstallString" '"$INSTDIR\uninstall.exe"' | |
| 37 | + WriteUninstaller "uninstall.exe" | |
| 38 | +SectionEnd | |
| 39 | + | |
| 40 | + | |
| 41 | +; uninstall stuff | |
| 42 | + | |
| 43 | +UninstallText "This will uninstall fossil. Hit next to continue." | |
| 44 | + | |
| 45 | +; special uninstall section. | |
| 46 | +Section "Uninstall" | |
| 47 | + ; remove registry keys | |
| 48 | + DeleteRegKey HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\Fossil" | |
| 49 | + DeleteRegKey HKLM SOFTWARE\Fossil | |
| 50 | + ; remove files | |
| 51 | + Delete $INSTDIR\fossil.exe | |
| 52 | + ; MUST REMOVE UNINSTALLER, too | |
| 53 | + Delete $INSTDIR\uninstall.exe | |
| 54 | + ; remove shortcuts, if any. | |
| 55 | + RMDir "$SMPROGRAMS\Fossil" | |
| 56 | + RMDir "$INSTDIR" | |
| 57 | +SectionEnd | |
| 58 | + | |
| 59 | +; eof | |
| 60 | 60 |
| --- fossil.nsi | |
| +++ fossil.nsi | |
| @@ -1,59 +1,59 @@ | |
| 1 | ; example2.nsi |
| 2 | ; |
| 3 | ; This script is based on example1.nsi, but adds uninstall support |
| 4 | ; and (optionally) start menu shortcuts. |
| 5 | ; |
| 6 | ; It will install notepad.exe into a directory that the user selects, |
| 7 | ; |
| 8 | |
| 9 | ; The name of the installer |
| 10 | Name "Fossil" |
| 11 | |
| 12 | ; The file to write |
| 13 | OutFile "fossil-setup-7c0bd3ee08.exe" |
| 14 | |
| 15 | ; The default installation directory |
| 16 | InstallDir $PROGRAMFILES\Fossil |
| 17 | ; Registry key to check for directory (so if you install again, it will |
| 18 | ; overwrite the old one automatically) |
| 19 | InstallDirRegKey HKLM SOFTWARE\Fossil "Install_Dir" |
| 20 | |
| 21 | ; The text to prompt the user to enter a directory |
| 22 | ComponentText "This will install fossil on your computer." |
| 23 | ; The text to prompt the user to enter a directory |
| 24 | DirText "Choose a directory to install in to:" |
| 25 | |
| 26 | ; The stuff to install |
| 27 | Section "Fossil (required)" |
| 28 | ; Set output path to the installation directory. |
| 29 | SetOutPath $INSTDIR |
| 30 | ; Put file there |
| 31 | File ".\build\fossil.exe" |
| 32 | ; Write the installation path into the registry |
| 33 | WriteRegStr HKLM SOFTWARE\Fossil "Install_Dir" "$INSTDIR" |
| 34 | ; Write the uninstall keys for Windows |
| 35 | WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\Fossil" "DisplayName" "Fossil (remove only)" |
| 36 | WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\Fossil" "UninstallString" '"$INSTDIR\uninstall.exe"' |
| 37 | WriteUninstaller "uninstall.exe" |
| 38 | SectionEnd |
| 39 | |
| 40 | |
| 41 | ; uninstall stuff |
| 42 | |
| 43 | UninstallText "This will uninstall fossil. Hit next to continue." |
| 44 | |
| 45 | ; special uninstall section. |
| 46 | Section "Uninstall" |
| 47 | ; remove registry keys |
| 48 | DeleteRegKey HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\Fossil" |
| 49 | DeleteRegKey HKLM SOFTWARE\Fossil |
| 50 | ; remove files |
| 51 | Delete $INSTDIR\fossil.exe |
| 52 | ; MUST REMOVE UNINSTALLER, too |
| 53 | Delete $INSTDIR\uninstall.exe |
| 54 | ; remove shortcuts, if any. |
| 55 | RMDir "$SMPROGRAMS\Fossil" |
| 56 | RMDir "$INSTDIR" |
| 57 | SectionEnd |
| 58 | |
| 59 | ; eof |
| 60 |
| --- fossil.nsi | |
| +++ fossil.nsi | |
| @@ -1,59 +1,59 @@ | |
| 1 | ; example2.nsi |
| 2 | ; |
| 3 | ; This script is based on example1.nsi, but adds uninstall support |
| 4 | ; and (optionally) start menu shortcuts. |
| 5 | ; |
| 6 | ; It will install notepad.exe into a directory that the user selects, |
| 7 | ; |
| 8 | |
| 9 | ; The name of the installer |
| 10 | Name "Fossil" |
| 11 | |
| 12 | ; The file to write |
| 13 | OutFile "fossil-setup.exe" |
| 14 | |
| 15 | ; The default installation directory |
| 16 | InstallDir $PROGRAMFILES\Fossil |
| 17 | ; Registry key to check for directory (so if you install again, it will |
| 18 | ; overwrite the old one automatically) |
| 19 | InstallDirRegKey HKLM SOFTWARE\Fossil "Install_Dir" |
| 20 | |
| 21 | ; The text to prompt the user to enter a directory |
| 22 | ComponentText "This will install fossil on your computer." |
| 23 | ; The text to prompt the user to enter a directory |
| 24 | DirText "Choose a directory to install in to:" |
| 25 | |
| 26 | ; The stuff to install |
| 27 | Section "Fossil (required)" |
| 28 | ; Set output path to the installation directory. |
| 29 | SetOutPath $INSTDIR |
| 30 | ; Put file there |
| 31 | File ".\fossil.exe" |
| 32 | ; Write the installation path into the registry |
| 33 | WriteRegStr HKLM SOFTWARE\Fossil "Install_Dir" "$INSTDIR" |
| 34 | ; Write the uninstall keys for Windows |
| 35 | WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\Fossil" "DisplayName" "Fossil (remove only)" |
| 36 | WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\Fossil" "UninstallString" '"$INSTDIR\uninstall.exe"' |
| 37 | WriteUninstaller "uninstall.exe" |
| 38 | SectionEnd |
| 39 | |
| 40 | |
| 41 | ; uninstall stuff |
| 42 | |
| 43 | UninstallText "This will uninstall fossil. Hit next to continue." |
| 44 | |
| 45 | ; special uninstall section. |
| 46 | Section "Uninstall" |
| 47 | ; remove registry keys |
| 48 | DeleteRegKey HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\Fossil" |
| 49 | DeleteRegKey HKLM SOFTWARE\Fossil |
| 50 | ; remove files |
| 51 | Delete $INSTDIR\fossil.exe |
| 52 | ; MUST REMOVE UNINSTALLER, too |
| 53 | Delete $INSTDIR\uninstall.exe |
| 54 | ; remove shortcuts, if any. |
| 55 | RMDir "$SMPROGRAMS\Fossil" |
| 56 | RMDir "$INSTDIR" |
| 57 | SectionEnd |
| 58 | |
| 59 | ; eof |
| 60 |
+15
-5
| --- src/makemake.tcl | ||
| +++ src/makemake.tcl | ||
| @@ -307,31 +307,35 @@ | ||
| 307 | 307 | # |
| 308 | 308 | TCC = gcc -Os -Wall -DFOSSIL_I18N=0 -L$(ZLIBDIR)/lib -I$(ZLIBDIR)/include |
| 309 | 309 | |
| 310 | 310 | # With HTTPS support |
| 311 | 311 | ifdef FOSSIL_ENABLE_SSL |
| 312 | -TCC += -DFOSSIL_ENABLE_SSL=1 | |
| 312 | +TCC += -static -DFOSSIL_ENABLE_SSL=1 | |
| 313 | 313 | endif |
| 314 | 314 | |
| 315 | 315 | #### Extra arguments for linking the finished binary. Fossil needs |
| 316 | 316 | # to link against the Z-Lib compression library. There are no |
| 317 | 317 | # other dependencies. We sometimes add the -static option here |
| 318 | 318 | # so that we can build a static executable that will run in a |
| 319 | 319 | # chroot jail. |
| 320 | 320 | # |
| 321 | 321 | #LIB = -lz -lws2_32 |
| 322 | -LIB = -lmingwex -lz -lws2_32 | |
| 323 | 322 | # OpenSSL: |
| 324 | 323 | ifdef FOSSIL_ENABLE_SSL |
| 325 | -LIB += -lcrypto -lssl | |
| 324 | +LIB += -lssl -lcrypto -lgdi32 | |
| 326 | 325 | endif |
| 326 | +LIB = -lmingwex -lz -lws2_32 | |
| 327 | 327 | |
| 328 | 328 | #### Tcl shell for use in running the fossil testsuite. This is only |
| 329 | 329 | # used for testing. If you do not run |
| 330 | 330 | # |
| 331 | 331 | TCLSH = tclsh |
| 332 | 332 | |
| 333 | +#### Nullsoft installer makensis location | |
| 334 | +# | |
| 335 | +MAKENSIS = "c:\Program Files\NSIS\makensis.exe" | |
| 336 | + | |
| 333 | 337 | #### Include a configuration file that can override any one of these settings. |
| 334 | 338 | # |
| 335 | 339 | -include config.w32 |
| 336 | 340 | |
| 337 | 341 | # STOP HERE |
| @@ -362,10 +366,13 @@ | ||
| 362 | 366 | } |
| 363 | 367 | |
| 364 | 368 | writeln { |
| 365 | 369 | all: $(OBJDIR) $(APPNAME) |
| 366 | 370 | |
| 371 | +$(OBJDIR)/icon.o: $(SRCDIR)/../win/icon.rc | |
| 372 | + cp $(SRCDIR)/../win/icon.rc $(OBJDIR) | |
| 373 | + windres $(OBJDIR)/icon.rc -o $(OBJDIR)/icon.o | |
| 367 | 374 | |
| 368 | 375 | install: $(APPNAME) |
| 369 | 376 | mv $(APPNAME) $(INSTALLDIR) |
| 370 | 377 | |
| 371 | 378 | $(OBJDIR): |
| @@ -396,12 +403,12 @@ | ||
| 396 | 403 | $(OBJDIR)/sqlite3.o \ |
| 397 | 404 | $(OBJDIR)/shell.o \ |
| 398 | 405 | $(OBJDIR)/th.o \ |
| 399 | 406 | $(OBJDIR)/th_lang.o |
| 400 | 407 | |
| 401 | -$(APPNAME): $(OBJDIR)/headers $(OBJ) $(EXTRAOBJ) | |
| 402 | - $(TCC) -o $(APPNAME) $(OBJ) $(EXTRAOBJ) $(LIB) | |
| 408 | +$(APPNAME): $(OBJDIR)/headers $(OBJ) $(EXTRAOBJ) $(OBJDIR)/icon.o | |
| 409 | + $(TCC) -o $(APPNAME) $(OBJ) $(EXTRAOBJ) $(LIB) $(OBJDIR)/icon.o | |
| 403 | 410 | |
| 404 | 411 | # This rule prevents make from using its default rules to try build |
| 405 | 412 | # an executable named "manifest" out of the file named "manifest.c" |
| 406 | 413 | # |
| 407 | 414 | $(SRCDIR)/../manifest: |
| @@ -411,10 +418,13 @@ | ||
| 411 | 418 | # command. "del" will not work here because it is not a separate command |
| 412 | 419 | # but a MSDOS-shell builtin. |
| 413 | 420 | # |
| 414 | 421 | clean: |
| 415 | 422 | rm -rf $(OBJDIR) $(APPNAME) |
| 423 | + | |
| 424 | +setup: $(OBJDIR) $(APPNAME) | |
| 425 | + $(MAKENSIS) ./fossil.nsi | |
| 416 | 426 | |
| 417 | 427 | } |
| 418 | 428 | |
| 419 | 429 | set mhargs {} |
| 420 | 430 | foreach s [lsort $src] { |
| 421 | 431 |
| --- src/makemake.tcl | |
| +++ src/makemake.tcl | |
| @@ -307,31 +307,35 @@ | |
| 307 | # |
| 308 | TCC = gcc -Os -Wall -DFOSSIL_I18N=0 -L$(ZLIBDIR)/lib -I$(ZLIBDIR)/include |
| 309 | |
| 310 | # With HTTPS support |
| 311 | ifdef FOSSIL_ENABLE_SSL |
| 312 | TCC += -DFOSSIL_ENABLE_SSL=1 |
| 313 | endif |
| 314 | |
| 315 | #### Extra arguments for linking the finished binary. Fossil needs |
| 316 | # to link against the Z-Lib compression library. There are no |
| 317 | # other dependencies. We sometimes add the -static option here |
| 318 | # so that we can build a static executable that will run in a |
| 319 | # chroot jail. |
| 320 | # |
| 321 | #LIB = -lz -lws2_32 |
| 322 | LIB = -lmingwex -lz -lws2_32 |
| 323 | # OpenSSL: |
| 324 | ifdef FOSSIL_ENABLE_SSL |
| 325 | LIB += -lcrypto -lssl |
| 326 | endif |
| 327 | |
| 328 | #### Tcl shell for use in running the fossil testsuite. This is only |
| 329 | # used for testing. If you do not run |
| 330 | # |
| 331 | TCLSH = tclsh |
| 332 | |
| 333 | #### Include a configuration file that can override any one of these settings. |
| 334 | # |
| 335 | -include config.w32 |
| 336 | |
| 337 | # STOP HERE |
| @@ -362,10 +366,13 @@ | |
| 362 | } |
| 363 | |
| 364 | writeln { |
| 365 | all: $(OBJDIR) $(APPNAME) |
| 366 | |
| 367 | |
| 368 | install: $(APPNAME) |
| 369 | mv $(APPNAME) $(INSTALLDIR) |
| 370 | |
| 371 | $(OBJDIR): |
| @@ -396,12 +403,12 @@ | |
| 396 | $(OBJDIR)/sqlite3.o \ |
| 397 | $(OBJDIR)/shell.o \ |
| 398 | $(OBJDIR)/th.o \ |
| 399 | $(OBJDIR)/th_lang.o |
| 400 | |
| 401 | $(APPNAME): $(OBJDIR)/headers $(OBJ) $(EXTRAOBJ) |
| 402 | $(TCC) -o $(APPNAME) $(OBJ) $(EXTRAOBJ) $(LIB) |
| 403 | |
| 404 | # This rule prevents make from using its default rules to try build |
| 405 | # an executable named "manifest" out of the file named "manifest.c" |
| 406 | # |
| 407 | $(SRCDIR)/../manifest: |
| @@ -411,10 +418,13 @@ | |
| 411 | # command. "del" will not work here because it is not a separate command |
| 412 | # but a MSDOS-shell builtin. |
| 413 | # |
| 414 | clean: |
| 415 | rm -rf $(OBJDIR) $(APPNAME) |
| 416 | |
| 417 | } |
| 418 | |
| 419 | set mhargs {} |
| 420 | foreach s [lsort $src] { |
| 421 |
| --- src/makemake.tcl | |
| +++ src/makemake.tcl | |
| @@ -307,31 +307,35 @@ | |
| 307 | # |
| 308 | TCC = gcc -Os -Wall -DFOSSIL_I18N=0 -L$(ZLIBDIR)/lib -I$(ZLIBDIR)/include |
| 309 | |
| 310 | # With HTTPS support |
| 311 | ifdef FOSSIL_ENABLE_SSL |
| 312 | TCC += -static -DFOSSIL_ENABLE_SSL=1 |
| 313 | endif |
| 314 | |
| 315 | #### Extra arguments for linking the finished binary. Fossil needs |
| 316 | # to link against the Z-Lib compression library. There are no |
| 317 | # other dependencies. We sometimes add the -static option here |
| 318 | # so that we can build a static executable that will run in a |
| 319 | # chroot jail. |
| 320 | # |
| 321 | #LIB = -lz -lws2_32 |
| 322 | # OpenSSL: |
| 323 | ifdef FOSSIL_ENABLE_SSL |
| 324 | LIB += -lssl -lcrypto -lgdi32 |
| 325 | endif |
| 326 | LIB = -lmingwex -lz -lws2_32 |
| 327 | |
| 328 | #### Tcl shell for use in running the fossil testsuite. This is only |
| 329 | # used for testing. If you do not run |
| 330 | # |
| 331 | TCLSH = tclsh |
| 332 | |
| 333 | #### Nullsoft installer makensis location |
| 334 | # |
| 335 | MAKENSIS = "c:\Program Files\NSIS\makensis.exe" |
| 336 | |
| 337 | #### Include a configuration file that can override any one of these settings. |
| 338 | # |
| 339 | -include config.w32 |
| 340 | |
| 341 | # STOP HERE |
| @@ -362,10 +366,13 @@ | |
| 366 | } |
| 367 | |
| 368 | writeln { |
| 369 | all: $(OBJDIR) $(APPNAME) |
| 370 | |
| 371 | $(OBJDIR)/icon.o: $(SRCDIR)/../win/icon.rc |
| 372 | cp $(SRCDIR)/../win/icon.rc $(OBJDIR) |
| 373 | windres $(OBJDIR)/icon.rc -o $(OBJDIR)/icon.o |
| 374 | |
| 375 | install: $(APPNAME) |
| 376 | mv $(APPNAME) $(INSTALLDIR) |
| 377 | |
| 378 | $(OBJDIR): |
| @@ -396,12 +403,12 @@ | |
| 403 | $(OBJDIR)/sqlite3.o \ |
| 404 | $(OBJDIR)/shell.o \ |
| 405 | $(OBJDIR)/th.o \ |
| 406 | $(OBJDIR)/th_lang.o |
| 407 | |
| 408 | $(APPNAME): $(OBJDIR)/headers $(OBJ) $(EXTRAOBJ) $(OBJDIR)/icon.o |
| 409 | $(TCC) -o $(APPNAME) $(OBJ) $(EXTRAOBJ) $(LIB) $(OBJDIR)/icon.o |
| 410 | |
| 411 | # This rule prevents make from using its default rules to try build |
| 412 | # an executable named "manifest" out of the file named "manifest.c" |
| 413 | # |
| 414 | $(SRCDIR)/../manifest: |
| @@ -411,10 +418,13 @@ | |
| 418 | # command. "del" will not work here because it is not a separate command |
| 419 | # but a MSDOS-shell builtin. |
| 420 | # |
| 421 | clean: |
| 422 | rm -rf $(OBJDIR) $(APPNAME) |
| 423 | |
| 424 | setup: $(OBJDIR) $(APPNAME) |
| 425 | $(MAKENSIS) ./fossil.nsi |
| 426 | |
| 427 | } |
| 428 | |
| 429 | set mhargs {} |
| 430 | foreach s [lsort $src] { |
| 431 |
+15
-5
| --- win/Makefile.mingw | ||
| +++ win/Makefile.mingw | ||
| @@ -37,31 +37,35 @@ | ||
| 37 | 37 | # |
| 38 | 38 | TCC = gcc -Os -Wall -DFOSSIL_I18N=0 -L$(ZLIBDIR)/lib -I$(ZLIBDIR)/include |
| 39 | 39 | |
| 40 | 40 | # With HTTPS support |
| 41 | 41 | ifdef FOSSIL_ENABLE_SSL |
| 42 | -TCC += -DFOSSIL_ENABLE_SSL=1 | |
| 42 | +TCC += -static -DFOSSIL_ENABLE_SSL=1 | |
| 43 | 43 | endif |
| 44 | 44 | |
| 45 | 45 | #### Extra arguments for linking the finished binary. Fossil needs |
| 46 | 46 | # to link against the Z-Lib compression library. There are no |
| 47 | 47 | # other dependencies. We sometimes add the -static option here |
| 48 | 48 | # so that we can build a static executable that will run in a |
| 49 | 49 | # chroot jail. |
| 50 | 50 | # |
| 51 | 51 | #LIB = -lz -lws2_32 |
| 52 | -LIB = -lmingwex -lz -lws2_32 | |
| 53 | 52 | # OpenSSL: |
| 54 | 53 | ifdef FOSSIL_ENABLE_SSL |
| 55 | -LIB += -lcrypto -lssl | |
| 54 | +LIB += -lssl -lcrypto -lgdi32 | |
| 56 | 55 | endif |
| 56 | +LIB = -lmingwex -lz -lws2_32 | |
| 57 | 57 | |
| 58 | 58 | #### Tcl shell for use in running the fossil testsuite. This is only |
| 59 | 59 | # used for testing. If you do not run |
| 60 | 60 | # |
| 61 | 61 | TCLSH = tclsh |
| 62 | 62 | |
| 63 | +#### Nullsoft installer makensis location | |
| 64 | +# | |
| 65 | +MAKENSIS = "c:\Program Files\NSIS\makensis.exe" | |
| 66 | + | |
| 63 | 67 | #### Include a configuration file that can override any one of these settings. |
| 64 | 68 | # |
| 65 | 69 | -include config.w32 |
| 66 | 70 | |
| 67 | 71 | # STOP HERE |
| @@ -316,10 +320,13 @@ | ||
| 316 | 320 | VERSION = $(subst /,\\,$(OBJDIR)/version.exe) |
| 317 | 321 | |
| 318 | 322 | |
| 319 | 323 | all: $(OBJDIR) $(APPNAME) |
| 320 | 324 | |
| 325 | +$(OBJDIR)/icon.o: $(SRCDIR)/../win/icon.rc | |
| 326 | + cp $(SRCDIR)/../win/icon.rc $(OBJDIR) | |
| 327 | + windres $(OBJDIR)/icon.rc -o $(OBJDIR)/icon.o | |
| 321 | 328 | |
| 322 | 329 | install: $(APPNAME) |
| 323 | 330 | mv $(APPNAME) $(INSTALLDIR) |
| 324 | 331 | |
| 325 | 332 | $(OBJDIR): |
| @@ -346,12 +353,12 @@ | ||
| 346 | 353 | $(OBJDIR)/VERSION.h: $(SRCDIR)/../manifest.uuid $(SRCDIR)/../manifest $(VERSION) |
| 347 | 354 | $(VERSION) $(SRCDIR)/../manifest.uuid $(SRCDIR)/../manifest >$(OBJDIR)/VERSION.h |
| 348 | 355 | |
| 349 | 356 | EXTRAOBJ = $(OBJDIR)/sqlite3.o $(OBJDIR)/shell.o $(OBJDIR)/th.o $(OBJDIR)/th_lang.o |
| 350 | 357 | |
| 351 | -$(APPNAME): $(OBJDIR)/headers $(OBJ) $(EXTRAOBJ) | |
| 352 | - $(TCC) -o $(APPNAME) $(OBJ) $(EXTRAOBJ) $(LIB) | |
| 358 | +$(APPNAME): $(OBJDIR)/headers $(OBJ) $(EXTRAOBJ) $(OBJDIR)/icon.o | |
| 359 | + $(TCC) -o $(APPNAME) $(OBJ) $(EXTRAOBJ) $(LIB) $(OBJDIR)/icon.o | |
| 353 | 360 | |
| 354 | 361 | # This rule prevents make from using its default rules to try build |
| 355 | 362 | # an executable named "manifest" out of the file named "manifest.c" |
| 356 | 363 | # |
| 357 | 364 | $(SRCDIR)/../manifest: |
| @@ -361,10 +368,13 @@ | ||
| 361 | 368 | # command. "del" will not work here because it is not a separate command |
| 362 | 369 | # but a MSDOS-shell builtin. |
| 363 | 370 | # |
| 364 | 371 | clean: |
| 365 | 372 | rm -rf $(OBJDIR) $(APPNAME) |
| 373 | + | |
| 374 | +setup: $(OBJDIR) $(APPNAME) | |
| 375 | + $(MAKENSIS) ./fossil.nsi | |
| 366 | 376 | |
| 367 | 377 | |
| 368 | 378 | $(OBJDIR)/page_index.h: $(TRANS_SRC) $(OBJDIR)/mkindex |
| 369 | 379 | $(MKINDEX) $(TRANS_SRC) >$@ |
| 370 | 380 | $(OBJDIR)/headers: $(OBJDIR)/page_index.h $(OBJDIR)/makeheaders $(OBJDIR)/VERSION.h |
| 371 | 381 | |
| 372 | 382 | ADDED win/icon.rc |
| --- win/Makefile.mingw | |
| +++ win/Makefile.mingw | |
| @@ -37,31 +37,35 @@ | |
| 37 | # |
| 38 | TCC = gcc -Os -Wall -DFOSSIL_I18N=0 -L$(ZLIBDIR)/lib -I$(ZLIBDIR)/include |
| 39 | |
| 40 | # With HTTPS support |
| 41 | ifdef FOSSIL_ENABLE_SSL |
| 42 | TCC += -DFOSSIL_ENABLE_SSL=1 |
| 43 | endif |
| 44 | |
| 45 | #### Extra arguments for linking the finished binary. Fossil needs |
| 46 | # to link against the Z-Lib compression library. There are no |
| 47 | # other dependencies. We sometimes add the -static option here |
| 48 | # so that we can build a static executable that will run in a |
| 49 | # chroot jail. |
| 50 | # |
| 51 | #LIB = -lz -lws2_32 |
| 52 | LIB = -lmingwex -lz -lws2_32 |
| 53 | # OpenSSL: |
| 54 | ifdef FOSSIL_ENABLE_SSL |
| 55 | LIB += -lcrypto -lssl |
| 56 | endif |
| 57 | |
| 58 | #### Tcl shell for use in running the fossil testsuite. This is only |
| 59 | # used for testing. If you do not run |
| 60 | # |
| 61 | TCLSH = tclsh |
| 62 | |
| 63 | #### Include a configuration file that can override any one of these settings. |
| 64 | # |
| 65 | -include config.w32 |
| 66 | |
| 67 | # STOP HERE |
| @@ -316,10 +320,13 @@ | |
| 316 | VERSION = $(subst /,\\,$(OBJDIR)/version.exe) |
| 317 | |
| 318 | |
| 319 | all: $(OBJDIR) $(APPNAME) |
| 320 | |
| 321 | |
| 322 | install: $(APPNAME) |
| 323 | mv $(APPNAME) $(INSTALLDIR) |
| 324 | |
| 325 | $(OBJDIR): |
| @@ -346,12 +353,12 @@ | |
| 346 | $(OBJDIR)/VERSION.h: $(SRCDIR)/../manifest.uuid $(SRCDIR)/../manifest $(VERSION) |
| 347 | $(VERSION) $(SRCDIR)/../manifest.uuid $(SRCDIR)/../manifest >$(OBJDIR)/VERSION.h |
| 348 | |
| 349 | EXTRAOBJ = $(OBJDIR)/sqlite3.o $(OBJDIR)/shell.o $(OBJDIR)/th.o $(OBJDIR)/th_lang.o |
| 350 | |
| 351 | $(APPNAME): $(OBJDIR)/headers $(OBJ) $(EXTRAOBJ) |
| 352 | $(TCC) -o $(APPNAME) $(OBJ) $(EXTRAOBJ) $(LIB) |
| 353 | |
| 354 | # This rule prevents make from using its default rules to try build |
| 355 | # an executable named "manifest" out of the file named "manifest.c" |
| 356 | # |
| 357 | $(SRCDIR)/../manifest: |
| @@ -361,10 +368,13 @@ | |
| 361 | # command. "del" will not work here because it is not a separate command |
| 362 | # but a MSDOS-shell builtin. |
| 363 | # |
| 364 | clean: |
| 365 | rm -rf $(OBJDIR) $(APPNAME) |
| 366 | |
| 367 | |
| 368 | $(OBJDIR)/page_index.h: $(TRANS_SRC) $(OBJDIR)/mkindex |
| 369 | $(MKINDEX) $(TRANS_SRC) >$@ |
| 370 | $(OBJDIR)/headers: $(OBJDIR)/page_index.h $(OBJDIR)/makeheaders $(OBJDIR)/VERSION.h |
| 371 | |
| 372 | DDED win/icon.rc |
| --- win/Makefile.mingw | |
| +++ win/Makefile.mingw | |
| @@ -37,31 +37,35 @@ | |
| 37 | # |
| 38 | TCC = gcc -Os -Wall -DFOSSIL_I18N=0 -L$(ZLIBDIR)/lib -I$(ZLIBDIR)/include |
| 39 | |
| 40 | # With HTTPS support |
| 41 | ifdef FOSSIL_ENABLE_SSL |
| 42 | TCC += -static -DFOSSIL_ENABLE_SSL=1 |
| 43 | endif |
| 44 | |
| 45 | #### Extra arguments for linking the finished binary. Fossil needs |
| 46 | # to link against the Z-Lib compression library. There are no |
| 47 | # other dependencies. We sometimes add the -static option here |
| 48 | # so that we can build a static executable that will run in a |
| 49 | # chroot jail. |
| 50 | # |
| 51 | #LIB = -lz -lws2_32 |
| 52 | # OpenSSL: |
| 53 | ifdef FOSSIL_ENABLE_SSL |
| 54 | LIB += -lssl -lcrypto -lgdi32 |
| 55 | endif |
| 56 | LIB = -lmingwex -lz -lws2_32 |
| 57 | |
| 58 | #### Tcl shell for use in running the fossil testsuite. This is only |
| 59 | # used for testing. If you do not run |
| 60 | # |
| 61 | TCLSH = tclsh |
| 62 | |
| 63 | #### Nullsoft installer makensis location |
| 64 | # |
| 65 | MAKENSIS = "c:\Program Files\NSIS\makensis.exe" |
| 66 | |
| 67 | #### Include a configuration file that can override any one of these settings. |
| 68 | # |
| 69 | -include config.w32 |
| 70 | |
| 71 | # STOP HERE |
| @@ -316,10 +320,13 @@ | |
| 320 | VERSION = $(subst /,\\,$(OBJDIR)/version.exe) |
| 321 | |
| 322 | |
| 323 | all: $(OBJDIR) $(APPNAME) |
| 324 | |
| 325 | $(OBJDIR)/icon.o: $(SRCDIR)/../win/icon.rc |
| 326 | cp $(SRCDIR)/../win/icon.rc $(OBJDIR) |
| 327 | windres $(OBJDIR)/icon.rc -o $(OBJDIR)/icon.o |
| 328 | |
| 329 | install: $(APPNAME) |
| 330 | mv $(APPNAME) $(INSTALLDIR) |
| 331 | |
| 332 | $(OBJDIR): |
| @@ -346,12 +353,12 @@ | |
| 353 | $(OBJDIR)/VERSION.h: $(SRCDIR)/../manifest.uuid $(SRCDIR)/../manifest $(VERSION) |
| 354 | $(VERSION) $(SRCDIR)/../manifest.uuid $(SRCDIR)/../manifest >$(OBJDIR)/VERSION.h |
| 355 | |
| 356 | EXTRAOBJ = $(OBJDIR)/sqlite3.o $(OBJDIR)/shell.o $(OBJDIR)/th.o $(OBJDIR)/th_lang.o |
| 357 | |
| 358 | $(APPNAME): $(OBJDIR)/headers $(OBJ) $(EXTRAOBJ) $(OBJDIR)/icon.o |
| 359 | $(TCC) -o $(APPNAME) $(OBJ) $(EXTRAOBJ) $(LIB) $(OBJDIR)/icon.o |
| 360 | |
| 361 | # This rule prevents make from using its default rules to try build |
| 362 | # an executable named "manifest" out of the file named "manifest.c" |
| 363 | # |
| 364 | $(SRCDIR)/../manifest: |
| @@ -361,10 +368,13 @@ | |
| 368 | # command. "del" will not work here because it is not a separate command |
| 369 | # but a MSDOS-shell builtin. |
| 370 | # |
| 371 | clean: |
| 372 | rm -rf $(OBJDIR) $(APPNAME) |
| 373 | |
| 374 | setup: $(OBJDIR) $(APPNAME) |
| 375 | $(MAKENSIS) ./fossil.nsi |
| 376 | |
| 377 | |
| 378 | $(OBJDIR)/page_index.h: $(TRANS_SRC) $(OBJDIR)/mkindex |
| 379 | $(MKINDEX) $(TRANS_SRC) >$@ |
| 380 | $(OBJDIR)/headers: $(OBJDIR)/page_index.h $(OBJDIR)/makeheaders $(OBJDIR)/VERSION.h |
| 381 | |
| 382 | DDED win/icon.rc |
+1
| --- a/win/icon.rc | ||
| +++ b/win/icon.rc | ||
| @@ -0,0 +1 @@ | ||
| 1 | +ID ICON "../win/fossil.ico" |
| --- a/win/icon.rc | |
| +++ b/win/icon.rc | |
| @@ -0,0 +1 @@ | |
| --- a/win/icon.rc | |
| +++ b/win/icon.rc | |
| @@ -0,0 +1 @@ | |
| 1 | ID ICON "../win/fossil.ico" |