alx/ueforth
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fixing up order.

Browse Source
This commit is contained in:
Brad Nelson
2022-01-30 16:15:52 -08:00
parent 8f4cec682d
commit 1274ab7bb7
8 changed files with 11 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
ueforth/Makefile
View File

@ -162,11 +162,11 @@ COMMON_PHASE1 = common/boot.fs common/conditionals.fs common/vocabulary.fs \
COMMON_DESKTOP = common/hide_calls.fs common/ansi.fs common/desktop.fs COMMON_DESKTOP = common/hide_calls.fs common/ansi.fs common/desktop.fs
COMMON_PHASE2 = common/tasks.fs common/utils.fs common/locals.fs \ COMMON_PHASE2 = common/tasks.fs common/utils.fs common/locals.fs \
common/filetools.fs common/highlevel.fs \ common/filetools.fs common/including.fs \
common/streams.fs common/blocks.fs common/streams.fs common/blocks.fs
POSIX_BOOT = $(COMMON_PHASE1) \ POSIX_BOOT = $(COMMON_PHASE1) \
posix/posix.fs posix/posix_highlevel.fs posix/termios.fs \ posix/posix.fs posix/allocation.fs posix/termios.fs \
$(COMMON_PHASE2) $(COMMON_DESKTOP) \ $(COMMON_PHASE2) $(COMMON_DESKTOP) \
posix/sockets.fs posix/telnetd.fs posix/httpd.fs posix/web_interface.fs \ posix/sockets.fs posix/telnetd.fs posix/httpd.fs posix/web_interface.fs \
posix/autoboot.fs \ posix/autoboot.fs \
@ -175,7 +175,7 @@ $(GEN)/posix_boot.h: common/source_to_string.js $(POSIX_BOOT) | $(GEN)
$< boot $(VERSION) $(REVISION) $(POSIX_BOOT) >$@ $< boot $(VERSION) $(REVISION) $(POSIX_BOOT) >$@
WINDOWS_BOOT = $(COMMON_PHASE1) \ WINDOWS_BOOT = $(COMMON_PHASE1) \
windows/windows.fs windows/windows_highlevel.fs \ windows/windows.fs windows/allocation.fs \
$(COMMON_PHASE2) $(COMMON_DESKTOP) \ $(COMMON_PHASE2) $(COMMON_DESKTOP) \
posix/autoboot.fs \ posix/autoboot.fs \
common/fini.fs common/fini.fs
@ -183,9 +183,9 @@ $(GEN)/windows_boot.h: common/source_to_string.js $(WINDOWS_BOOT) | $(GEN)
$< -win boot $(VERSION) $(REVISION) $(WINDOWS_BOOT) >$@ $< -win boot $(VERSION) $(REVISION) $(WINDOWS_BOOT) >$@
ESP32_BOOT = $(COMMON_PHASE1) \ ESP32_BOOT = $(COMMON_PHASE1) \
esp32/highlevel.fs esp32/bindings.fs \ esp32/allocation.fs \
$(COMMON_PHASE2) \ $(COMMON_PHASE2) \
esp32/platform.fs \ esp32/platform.fs esp32/bindings.fs \
posix/httpd.fs posix/web_interface.fs esp32/web_interface.fs \ posix/httpd.fs posix/web_interface.fs esp32/web_interface.fs \
esp32/registers.fs esp32/timers.fs \ esp32/registers.fs esp32/timers.fs \
esp32/bterm.fs posix/telnetd.fs \ esp32/bterm.fs posix/telnetd.fs \
@ -256,7 +256,7 @@ $(POSIX):
mkdir -p $@ mkdir -p $@
$(POSIX)/ueforth: \ $(POSIX)/ueforth: \
posix/posix_main.c \ posix/main.c \
common/opcodes.h \ common/opcodes.h \
common/calls.h \ common/calls.h \
common/floats.h \ common/floats.h \
@ -272,12 +272,12 @@ $(WINDOWS):
mkdir -p $@ mkdir -p $@
$(WINDOWS)/uEf32.obj: \ $(WINDOWS)/uEf32.obj: \
windows/windows_main.c \ windows/main.c \
common/opcodes.h \ common/opcodes.h \
common/calls.h \ common/calls.h \
common/floats.h \ common/floats.h \
common/core.h \ common/core.h \
windows/windows_interp.h \ windows/interp.h \
$(GEN)/windows_boot.h | $(WINDOWS) $(GEN)/windows_boot.h | $(WINDOWS)
$(CL32) /c /Fo$@ $(WIN_CFLAGS) $< $(CL32) /c /Fo$@ $(WIN_CFLAGS) $<
@ -287,12 +287,12 @@ $(WINDOWS)/uEf32.exe: \
$(LINK32) /OUT:$@ $(WIN_LFLAGS32) $^ $(LINK32) /OUT:$@ $(WIN_LFLAGS32) $^
$(WINDOWS)/uEf64.obj: \ $(WINDOWS)/uEf64.obj: \
windows/windows_main.c \ windows/main.c \
common/opcodes.h \ common/opcodes.h \
common/calls.h \ common/calls.h \
common/floats.h \ common/floats.h \
common/core.h \ common/core.h \
windows/windows_interp.h \ windows/interp.h \
$(GEN)/windows_boot.h | $(WINDOWS) $(GEN)/windows_boot.h | $(WINDOWS)
$(CL64) /c /Fo$@ $(WIN_CFLAGS) $< $(CL64) /c /Fo$@ $(WIN_CFLAGS) $<

0
ueforth/common/highlevel.fs → ueforth/common/including.fs
View File

0
ueforth/esp32/highlevel.fs → ueforth/esp32/allocation.fs
View File

0
ueforth/posix/posix_highlevel.fs → ueforth/posix/allocation.fs
View File

0
ueforth/posix/posix_main.c → ueforth/posix/main.c
View File

0
ueforth/windows/windows_highlevel.fs → ueforth/windows/allocation.fs
View File

0
ueforth/windows/windows_interp.h → ueforth/windows/interp.h
View File

2
ueforth/windows/windows_main.c → ueforth/windows/main.c
View File

@ -44,7 +44,7 @@
CALLING_OPCODE_LIST \ CALLING_OPCODE_LIST \
#include "common/core.h" #include "common/core.h"
#include "windows/windows_interp.h" #include "windows/interp.h"
#include "gen/windows_boot.h" #include "gen/windows_boot.h"