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

Enhance windows.

Browse Source
This commit is contained in:
Brad Nelson
2023-12-22 15:32:33 -08:00
parent ab6f020bbc
commit e92130391c
2 changed files with 10 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
Makefile
View File

@ -477,19 +477,13 @@ win64_target: $(WINDOWS)/uEf64.exe
$(WINDOWS): $(WINDOWS):
mkdir -p $@ mkdir -p $@
-include $(WINDOWS)/uEf32.obj.dd
$(WINDOWS)/uEf32.obj: \ $(WINDOWS)/uEf32.obj: \
windows/main.c \ windows/main.c \
common/tier0_opcodes.h \
common/tier1_opcodes.h \
common/tier2_opcodes.h \
common/calls.h \
common/calling.h \
common/floats.h \
common/bits.h \
common/core.h \
windows/interp.h \
$(GEN)/windows_boot_extra.h \ $(GEN)/windows_boot_extra.h \
$(GEN)/windows_boot.h | $(WINDOWS) $(GEN)/windows_boot.h | $(WINDOWS)
./tools/importation.py $< $@ --no-out -I . -I $(GEN) --depsout $@.dd
$(CL32) /c /Fo$@ $(WIN_CFLAGS) $< $(CL32) /c /Fo$@ $(WIN_CFLAGS) $<
$(WINDOWS)/uEf32.exe: \ $(WINDOWS)/uEf32.exe: \
@ -497,19 +491,13 @@ $(WINDOWS)/uEf32.exe: \
$(RES)/ueforth_res32.res | $(WINDOWS) $(RES)/ueforth_res32.res | $(WINDOWS)
$(LINK32) /OUT:$@ $(WIN_LFLAGS32) $^ $(LINK32) /OUT:$@ $(WIN_LFLAGS32) $^
-include $(WINDOWS)/uEf64.obj.dd
$(WINDOWS)/uEf64.obj: \ $(WINDOWS)/uEf64.obj: \
windows/main.c \ windows/main.c \
common/tier0_opcodes.h \
common/tier1_opcodes.h \
common/tier2_opcodes.h \
common/calls.h \
common/calling.h \
common/floats.h \
common/bits.h \
common/core.h \
windows/interp.h \
$(GEN)/windows_boot_extra.h \ $(GEN)/windows_boot_extra.h \
$(GEN)/windows_boot.h | $(WINDOWS) $(GEN)/windows_boot.h | $(WINDOWS)
./tools/importation.py $< $@ --no-out -I . -I $(GEN) --depsout $@.dd
$(CL64) /c /Fo$@ $(WIN_CFLAGS) $< $(CL64) /c /Fo$@ $(WIN_CFLAGS) $<
$(WINDOWS)/uEf64.exe: \ $(WINDOWS)/uEf64.exe: \

6
tools/importation.py
View File

@ -13,6 +13,7 @@ parser.add_argument('-I', action='append')
parser.add_argument('--set-version') parser.add_argument('--set-version')
parser.add_argument('--set-revision') parser.add_argument('--set-revision')
parser.add_argument('--depsout') parser.add_argument('--depsout')
parser.add_argument('--no-out', action='store_true')
args = parser.parse_args() args = parser.parse_args()
bases = args.I or [] bases = args.I or []
@ -58,7 +59,8 @@ def Process():
with open(args.depsout, 'w') as fh: with open(args.depsout, 'w') as fh:
fh.write(args.output + ': ' + fh.write(args.output + ': ' +
' '.join([os.path.relpath(i) for i in imported]) + '\n') ' '.join([os.path.relpath(i) for i in imported]) + '\n')
with open(args.output, 'w') as fh: if not args.no_out:
fh.write('\n'.join(results) + '\n') with open(args.output, 'w') as fh:
fh.write('\n'.join(results) + '\n')
Process() Process()