glenn
/
asteroid
mirror of https://github.com/glenneth1/asteroid.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Resolve merge conflict in build-executable.lisp

This commit is contained in:
Glenn Thompson 2025-09-04 18:32:04 +03:00
parent c95ff2f983 3854fdecac
commit 7f0453207a
2 changed files with 6 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
Makefile
View File

@ -4,13 +4,9 @@ PACKAGEUTILS=asteroid.app-utils
OUT=asteroid OUT=asteroid
ENTRY=-main ENTRY=-main
$(OUT): buildapp *.lisp quicklisp-manifest.txt .PHONY: $(OUT)
./buildapp --manifest-file quicklisp-manifest.txt \ $(OUT): clean
--load-system asdf \ sbcl --load build-executable.lisp
--eval '(push "$(ROOT_DIR)/" asdf:*central-registry*)' \
--load-system $(PACKAGE) \
--eval '($(PACKAGEUTILS)::internal-disable-debugger)' \
--output $(OUT) --entry $(PACKAGE):$(ENTRY)
quicklisp-manifest.txt: *.asd quicklisp-manifest.txt: *.asd
sbcl --non-interactive \ sbcl --non-interactive \
@ -18,8 +14,8 @@ quicklisp-manifest.txt: *.asd
--eval '(ql:quickload "$(PACKAGE)")'\ --eval '(ql:quickload "$(PACKAGE)")'\
--eval '(ql:write-asdf-manifest-file "quicklisp-manifest.txt")' --eval '(ql:write-asdf-manifest-file "quicklisp-manifest.txt")'
buildapp: # buildapp:
sbcl --eval '(ql:quickload "buildapp")' --eval '(buildapp:build-buildapp)' --non-interactive # sbcl --eval '(ql:quickload "buildapp")' --eval '(buildapp:build-buildapp)' --non-interactive
clean: clean:
rm -f *.fasl $(OUT) buildapp quicklisp-manifest.txt rm -f *.fasl $(OUT) buildapp quicklisp-manifest.txt

1
build-executable.lisp
View File

@ -1,6 +1,7 @@
#!/usr/local/bin/sbcl --script #!/usr/local/bin/sbcl --script
;; -*-lisp-*- ;; -*-lisp-*-
;; we require quicklisp to load our transitive dependencies.
(load "~/quicklisp/setup.lisp") (load "~/quicklisp/setup.lisp")
;; Build script for creating asteroid executable using save-lisp-and-die ;; Build script for creating asteroid executable using save-lisp-and-die