Fcalva/cyclone
1
0
Fork 0
mirror of https://github.com/justinethier/cyclone.git synced 2025-07-12 15:27:36 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Adding optional arg to Cyc-installation-dir

Browse source
This commit is contained in:
Justin Ethier 2015-07-17 22:20:51 -04:00
parent 021d1bee0f
commit ac524f3d9a
1 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
cyclone.scm
View file

@ -18,7 +18,9 @@
(cond-expand (cond-expand
(chicken (chicken
(define (Cyc-installation-dir) "/home/justin/Documents/cyclone") (define (Cyc-installation-dir . opt)
;; Ignore opt and always assume current dir for chicken, since it is just dev
"/home/justin/Documents/cyclone")
(require-extension extras) ;; pretty-print (require-extension extras) ;; pretty-print
(require-extension chicken-syntax) ;; when (require-extension chicken-syntax) ;; when
(require-extension srfi-1) ;; every (require-extension srfi-1) ;; every
@ -253,8 +255,6 @@
(result (create-c-file in-prog))) (result (create-c-file in-prog)))
;; Compile the generated C file ;; Compile the generated C file
(define (Cyc-installation-lib-dir) "") ; /lib/cyclone
(define (Cyc-installation-inc-dir) "") ; /inc/cyclone
;; TODO: -I is a hack, real answer is to use 'make install' to place .h file ;; TODO: -I is a hack, real answer is to use 'make install' to place .h file
;; TODO: real answer is to get rid of -I and -L below, and assume header and libs are ;; TODO: real answer is to get rid of -I and -L below, and assume header and libs are
;; already installed on the system. this is OK since we are going to have a place ;; already installed on the system. this is OK since we are going to have a place
@ -269,9 +269,9 @@
(string-append " " (lib:import->filename i ".o") " ")) (string-append " " (lib:import->filename i ".o") " "))
lib-deps))) lib-deps)))
(comp-prog-cmd (comp-prog-cmd
(string-append "gcc " src-file " -I" (Cyc-installation-dir) (Cyc-installation-inc-dir) " -g -c -o " exec-file ".o")) (string-append "gcc " src-file " -I" (Cyc-installation-dir 'inc) " -g -c -o " exec-file ".o"))
(comp-objs-cmd (comp-objs-cmd
(string-append "gcc " exec-file ".o " objs-str " -L" (Cyc-installation-dir) (Cyc-installation-lib-dir) " -lcyclone -lm -I" (Cyc-installation-dir) (Cyc-installation-inc-dir) " -g -o " exec-file))) (string-append "gcc " exec-file ".o " objs-str " -L" (Cyc-installation-dir 'lib) " -lcyclone -lm -I" (Cyc-installation-dir 'inc) " -g -o " exec-file)))
;(write `(DEBUG all imports ,lib-deps objs ,objs-str)) ;(write `(DEBUG all imports ,lib-deps objs ,objs-str))
;(write `(DEBUG ,(lib:get-all-import-deps (cdar in-prog)))) ;(write `(DEBUG ,(lib:get-all-import-deps (cdar in-prog))))
(cond (cond
@ -283,7 +283,7 @@
(write comp-objs-cmd))))) (write comp-objs-cmd)))))
(else (else
(let ((comp-lib-cmd (let ((comp-lib-cmd
(string-append "gcc " src-file " -I" (Cyc-installation-dir) (Cyc-installation-inc-dir) " -g -c -o " exec-file ".o"))) (string-append "gcc " src-file " -I" (Cyc-installation-dir 'inc) " -g -c -o " exec-file ".o")))
(cond (cond
(cc? (cc?
(system comp-lib-cmd)) (system comp-lib-cmd))