Commit 7e73d6d7 authored by Camil Staps's avatar Camil Staps 🚀

Merge branch 'rename-src-files' into 'master'

Rename src files included by Clean to avoid conflicts

See merge request !126
parents eb7805ea d52b2463
Pipeline #43590 passed with stages
in 12 minutes and 10 seconds
...@@ -9,18 +9,18 @@ import StdMaybe ...@@ -9,18 +9,18 @@ import StdMaybe
import symbols_in_program import symbols_in_program
import code from "abc_instructions." import code from "abci_abc_instructions."
import code from "bcgen_instructions." import code from "abci_bcgen_instructions."
import code from "bytecode." import code from "abci_bytecode."
import code from "copy_host_to_interpreter." import code from "abci_copy_host_to_interpreter."
import code from "copy_interpreter_to_host." import code from "abci_copy_interpreter_to_host."
import code from "finalizers." import code from "abci_finalizers."
import code from "gc." import code from "abci_gc."
import code from "interface." import code from "abci_interface."
import code from "interpret." import code from "abci_interpret."
import code from "parse." import code from "abci_parse."
import code from "strip." import code from "abci_strip."
import code from "util." import code from "abci_util."
import code from library "msvcrt_library" import code from library "msvcrt_library"
import code from library "kernel32_library" import code from library "kernel32_library"
import code from library "ucrtbase_library" import code from library "ucrtbase_library"
......
...@@ -168,7 +168,8 @@ $(INTERP): $(SRC_INTERPRET) $(DEP_INTERPRET) ...@@ -168,7 +168,8 @@ $(INTERP): $(SRC_INTERPRET) $(DEP_INTERPRET)
$(CC) $(CFLAGS) $(CLIBS) -DINTERPRETER $(SRC_INTERPRET) -o $@ $(CC) $(CFLAGS) $(CLIBS) -DINTERPRETER $(SRC_INTERPRET) -o $@
library: $(OBJ_INTERPRET_LIB) interface.o library: $(OBJ_INTERPRET_LIB) interface.o
cp $^ ../lib/Clean\ System\ Files mkdir -p ../lib/Clean\ System\ Files
for f in $^; do cp $$f ../lib/Clean\ System\ Files/abci_$$f; done
$(OBJ_INTERPRET_LIB): %.o: %.s $(OBJ_INTERPRET_LIB): %.o: %.s
$(AS) $(ASFLAGS) $< -o $@ $(AS) $(ASFLAGS) $< -o $@
......
...@@ -64,17 +64,17 @@ library: .FORCE ...@@ -64,17 +64,17 @@ library: .FORCE
util.c util.c
ml64 /nologo /c /Fo interface.obj interface.windows64.asm ml64 /nologo /c /Fo interface.obj interface.windows64.asm
move abc_instructions.obj "..\lib\Clean System Files" >nul move abc_instructions.obj "..\lib\Clean System Files\abci_abc_instructions.obj" >nul
move bcgen_instructions.obj "..\lib\Clean System Files" >nul move bcgen_instructions.obj "..\lib\Clean System Files\abci_bcgen_instructions.obj" >nul
move bytecode.obj "..\lib\Clean System Files" >nul move bytecode.obj "..\lib\Clean System Files\abci_bytecode.obj" >nul
move copy_host_to_interpreter.obj "..\lib\Clean System Files" >nul move copy_host_to_interpreter.obj "..\lib\Clean System Files\abci_copy_host_to_interpreter.obj" >nul
move copy_interpreter_to_host.obj "..\lib\Clean System Files" >nul move copy_interpreter_to_host.obj "..\lib\Clean System Files\abci_copy_interpreter_to_host.obj" >nul
move finalizers.obj "..\lib\Clean System Files" >nul move finalizers.obj "..\lib\Clean System Files\abci_finalizers.obj" >nul
move gc.obj "..\lib\Clean System Files" >nul move gc.obj "..\lib\Clean System Files\abci_gc.obj" >nul
move interface.obj "..\lib\Clean System Files" >nul move interface.obj "..\lib\Clean System Files\abci_interface.obj" >nul
move interpret.obj "..\lib\Clean System Files" >nul move interpret.obj "..\lib\Clean System Files\abci_interpret.obj" >nul
move parse.obj "..\lib\Clean System Files" >nul move parse.obj "..\lib\Clean System Files\abci_parse.obj" >nul
move strip.obj "..\lib\Clean System Files" >nul move strip.obj "..\lib\Clean System Files\abci_strip.obj" >nul
move util.obj "..\lib\Clean System Files" >nul move util.obj "..\lib\Clean System Files\abci_util.obj" >nul
.FORCE: .FORCE:
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment