Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/fbc-1.10' into master
Browse files Browse the repository at this point in the history
  • Loading branch information
jayrm committed Dec 25, 2023
2 parents 287ea64 + 14dbf15 commit bd64367
Show file tree
Hide file tree
Showing 10 changed files with 406 additions and 1 deletion.
1 change: 1 addition & 0 deletions contrib/manifest/FreeBASIC-dos.lst
Expand Up @@ -6,6 +6,7 @@ bin/dos/gprof.exe
bin/dos/ld.exe
changelog.txt
doc/fbc.1
doc/fdl-1.2.txt
doc/gpl.txt
doc/lgpl.txt
examples/DOS/gfxsleep.bas
Expand Down
1 change: 1 addition & 0 deletions contrib/manifest/FreeBASIC-linux-aarch64.lst
@@ -1,6 +1,7 @@
bin/fbc
changelog.txt
doc/fbc.1
doc/fdl-1.2.txt
doc/gpl.txt
doc/lgpl.txt
examples/DOS/gfxsleep.bas
Expand Down
1 change: 1 addition & 0 deletions contrib/manifest/FreeBASIC-linux-arm.lst
@@ -1,6 +1,7 @@
bin/fbc
changelog.txt
doc/fbc.1
doc/fdl-1.2.txt
doc/gpl.txt
doc/lgpl.txt
examples/DOS/gfxsleep.bas
Expand Down
1 change: 1 addition & 0 deletions contrib/manifest/FreeBASIC-linux-x86.lst
@@ -1,6 +1,7 @@
bin/fbc
changelog.txt
doc/fbc.1
doc/fdl-1.2.txt
doc/gpl.txt
doc/lgpl.txt
examples/DOS/gfxsleep.bas
Expand Down
1 change: 1 addition & 0 deletions contrib/manifest/FreeBASIC-linux-x86_64.lst
@@ -1,6 +1,7 @@
bin/fbc
changelog.txt
doc/fbc.1
doc/fdl-1.2.txt
doc/gpl.txt
doc/lgpl.txt
examples/DOS/gfxsleep.bas
Expand Down
1 change: 1 addition & 0 deletions contrib/manifest/FreeBASIC-win32-mingworg.lst
Expand Up @@ -11,6 +11,7 @@ bin/win32/zlib1.dll
changelog.txt
doc/GoRC.txt
doc/fbc.1
doc/fdl-1.2.txt
doc/gpl.txt
doc/lgpl.txt
doc/libffi-license.txt
Expand Down
1 change: 1 addition & 0 deletions contrib/manifest/FreeBASIC-win32.lst
Expand Up @@ -26,6 +26,7 @@ bin/win32/zlib1.dll
changelog.txt
doc/GoRC.txt
doc/fbc.1
doc/fdl-1.2.txt
doc/gpl.txt
doc/lgpl.txt
doc/libffi-license.txt
Expand Down
1 change: 1 addition & 0 deletions contrib/manifest/FreeBASIC-win64.lst
Expand Up @@ -26,6 +26,7 @@ bin/win64/zlib1.dll
changelog.txt
doc/GoRC.txt
doc/fbc.1
doc/fdl-1.2.txt
doc/gpl.txt
doc/lgpl.txt
doc/libffi-license.txt
Expand Down
397 changes: 397 additions & 0 deletions doc/fdl-1.2.txt

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion makefile
Expand Up @@ -1190,7 +1190,7 @@ bindist:
# Docs
cp $(rootdir)changelog.txt $(rootdir)readme.txt $(FBPACKAGE)
mkdir $(FBPACKAGE)/doc
cp $(rootdir)doc/fbc.1 $(rootdir)doc/gpl.txt $(rootdir)doc/lgpl.txt $(FBPACKAGE)/doc
cp $(rootdir)doc/fbc.1 $(rootdir)doc/gpl.txt $(rootdir)doc/lgpl.txt $(rootdir)doc/fdl-1.2.txt $(FBPACKAGE)/doc
ifneq ($(filter win32 win64,$(TARGET_OS)),)
ifdef ENABLE_STANDALONE
cp $(rootdir)doc/GoRC.txt $(rootdir)doc/libffi-license.txt $(FBPACKAGE)/doc
Expand Down

0 comments on commit bd64367

Please sign in to comment.