mirror of
https://github.com/janet-lang/janet
synced 2024-12-27 00:40:26 +00:00
We don't need to add module/\*headerpath\*.
We can just dump janet.h into the lib folder as well.
This commit is contained in:
parent
7927078b49
commit
dbcbb4466d
2
Makefile
2
Makefile
@ -221,9 +221,9 @@ install: $(JANET_TARGET)
|
|||||||
cp $(JANET_TARGET) $(BINDIR)/janet
|
cp $(JANET_TARGET) $(BINDIR)/janet
|
||||||
mkdir -p $(INCLUDEDIR)
|
mkdir -p $(INCLUDEDIR)
|
||||||
cp $(JANET_HEADERS) $(INCLUDEDIR)
|
cp $(JANET_HEADERS) $(INCLUDEDIR)
|
||||||
# For compatibility
|
|
||||||
mkdir -p $(INCLUDEDIR)/janet
|
mkdir -p $(INCLUDEDIR)/janet
|
||||||
ln -sf $(INCLUDEDIR)/janet.h $(INCLUDEDIR)/janet/janet.h
|
ln -sf $(INCLUDEDIR)/janet.h $(INCLUDEDIR)/janet/janet.h
|
||||||
|
ln -sf $(INCLUDEDIR)/janet.h $(JANET_PATH)/janet.h
|
||||||
mkdir -p $(JANET_PATH)
|
mkdir -p $(JANET_PATH)
|
||||||
cp tools/cook.janet $(JANET_PATH)
|
cp tools/cook.janet $(JANET_PATH)
|
||||||
cp tools/highlight.janet $(JANET_PATH)
|
cp tools/highlight.janet $(JANET_PATH)
|
||||||
|
@ -1605,10 +1605,6 @@ value, one key will be ignored."
|
|||||||
on Windows is C:/Janet/Library."
|
on Windows is C:/Janet/Library."
|
||||||
(or (os/getenv "JANET_PATH") ""))
|
(or (os/getenv "JANET_PATH") ""))
|
||||||
|
|
||||||
(var module/*headerpath*
|
|
||||||
"The path where janet/janet.h is located."
|
|
||||||
(or (os/getenv "JANET_INCLUDEDIR") ""))
|
|
||||||
|
|
||||||
(defn- fexists [path]
|
(defn- fexists [path]
|
||||||
(def f (file/open path))
|
(def f (file/open path))
|
||||||
(if f (do (file/close f) path)))
|
(if f (do (file/close f) path)))
|
||||||
|
@ -96,7 +96,7 @@
|
|||||||
(def LD (if is-win "link" (string CC " -shared")))
|
(def LD (if is-win "link" (string CC " -shared")))
|
||||||
(def CFLAGS (string
|
(def CFLAGS (string
|
||||||
(if is-win "/I" "-I")
|
(if is-win "/I" "-I")
|
||||||
module/*headerpath*
|
module/*syspath*
|
||||||
(if is-win " /O" " -std=c99 -Wall -Wextra -fpic -O")
|
(if is-win " /O" " -std=c99 -Wall -Wextra -fpic -O")
|
||||||
OPTIMIZE))
|
OPTIMIZE))
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user