Skip to content

Commit 3e9b428

Browse files
committed
Include the vm module in the necessary build steps
1 parent 2a1995c commit 3e9b428

File tree

3 files changed

+4
-5
lines changed

3 files changed

+4
-5
lines changed

Makefile

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@ requirements-dev:
1717
rsync -av utilities/ /usr/local/include/chaos/utilities/
1818
rsync -av lexer/ /usr/local/include/chaos/lexer/
1919
rsync -av parser/ /usr/local/include/chaos/parser/
20+
rsync -av vm/ /usr/local/include/chaos/vm/
2021
rsync -av interpreter/ /usr/local/include/chaos/interpreter/
2122
rsync -av compiler/ /usr/local/include/chaos/compiler/
2223
rsync -av ast/ /usr/local/include/chaos/ast/
@@ -101,7 +102,7 @@ chaos: lex.yy.c parser.tab.c parser.tab.h
101102
ifeq ($(UNAME_S), Darwin)
102103
export CHAOS_STACK_SIZE=-Wl,-stack_size,0x100000000
103104
endif
104-
${CHAOS_COMPILER} -Werror -Wall -pedantic -fcommon ${CHAOS_STACK_SIZE} -DCHAOS_INTERPRETER -o chaos parser.tab.c lex.yy.c parser/*.c utilities/*.c ast/*.c interpreter/*.c compiler/*.c vm/*.c Chaos.c -lreadline -L/usr/local/opt/readline/lib -I/usr/local/opt/readline/include -ldl ${CHAOS_EXTRA_FLAGS}
105+
${CHAOS_COMPILER} -Werror -Wall -pedantic -fcommon ${CHAOS_STACK_SIZE} -DCHAOS_INTERPRETER -o chaos parser.tab.c lex.yy.c parser/*.c utilities/*.c ast/*.c vm/*.c interpreter/*.c compiler/*.c Chaos.c -lreadline -L/usr/local/opt/readline/lib -I/usr/local/opt/readline/include -ldl ${CHAOS_EXTRA_FLAGS}
105106

106107
clean:
107108
rm -rf chaos parser.tab.c lex.yy.c parser.tab.h
@@ -192,9 +193,6 @@ memcheck:
192193
memcheck-compiler:
193194
./tests/memcheck_compiler.sh
194195

195-
compile-dev:
196-
gcc -DCHAOS_COMPILER -o build/main build/main.c /usr/local/include/chaos/utilities/helpers.c /usr/local/include/chaos/ast/ast.c /usr/local/include/chaos/interpreter/errors.c /usr/local/include/chaos/interpreter/extension.c /usr/local/include/chaos/interpreter/function.c /usr/local/include/chaos/interpreter/module.c /usr/local/include/chaos/interpreter/symbol.c /usr/local/include/chaos/compiler/compiler.c /usr/local/include/chaos/compiler/lib/alternative.c /usr/local/include/chaos/Chaos.c -lreadline -L/usr/local/opt/readline/lib -ldl -I/usr/local/include/chaos/ -Og -ggdb
197-
198196
rosetta-install:
199197
./tests/rosetta/install.sh
200198

coverage.sh

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@ llvm-cov show /usr/local/bin/chaos -instr-profile=chaos.profdata \
2121
./Chaos.c \
2222
./ast/*.c \
2323
./compiler/*.c \
24+
./vm/*.c \
2425
./interpreter/*.c \
2526
./lexer/*.c \
2627
./parser/*.c \

make.bat

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -169,7 +169,7 @@ win_bison -d parser\parser.y
169169
IF errorlevel 1 (
170170
EXIT /B 1
171171
)
172-
%compiler% -fcommon -DCHAOS_INTERPRETER -o chaos.exe parser.tab.c lex.yy.c parser/*.c utilities/*.c utilities/windows/*.c ast/*.c interpreter/*.c compiler/*.c Chaos.c -lshell32 -lole32 %extra_flags%
172+
%compiler% -fcommon -DCHAOS_INTERPRETER -o chaos.exe parser.tab.c lex.yy.c parser/*.c utilities/*.c utilities/windows/*.c ast/*.c vm/*.c interpreter/*.c compiler/*.c Chaos.c -lshell32 -lole32 %extra_flags%
173173
IF errorlevel 1 (
174174
EXIT /B 1
175175
)

0 commit comments

Comments
 (0)