github.com/Interlisp.maiko
1
0
Fork 0
mirror of https://github.com/Interlisp/maiko.git synced 2026-01-13 07:09:58 +00:00
Code Issues Projects Releases Wiki Activity

Backing out LD/CC change in makefile-tail. Adding comment in makefile-emscripten

Browse Source
This commit is contained in:
Frank Halasz 2024-02-16 01:25:04 -08:00
parent a1dff20adb
commit 163d5db50f
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
bin/makefile-emscripten.wasm-wasm
View File

@ -10,6 +10,7 @@ XFLAGS = -DSDL -sUSE_SDL=2
OPTFLAGS = -O2 OPTFLAGS = -O2
DFLAGS = $(XFLAGS) -DRELEASE=351 -DMAIKO_OS_EMSCRIPTEN -DMAIKO_ENABLE_NETHUB DFLAGS = $(XFLAGS) -DRELEASE=351 -DMAIKO_OS_EMSCRIPTEN -DMAIKO_ENABLE_NETHUB
# LD not really used - but keeping it here just in case
LD = emcc LD = emcc
LDFLAGS = -sUSE_SDL=2 -sASYNCIFY -sALLOW_MEMORY_GROWTH -sEXIT_RUNTIME=1 -sFORCE_FILESYSTEM -sLZ4 LDFLAGS = -sUSE_SDL=2 -sASYNCIFY -sALLOW_MEMORY_GROWTH -sEXIT_RUNTIME=1 -sFORCE_FILESYSTEM -sLZ4
UPFRONT_LDFLAGS = -lidbfs.js UPFRONT_LDFLAGS = -lidbfs.js

11
bin/makefile-tail
View File

@ -35,7 +35,6 @@
REQUIRED-INCS = $(INCDIR)version.h $(INCDIR)maiko/platform.h REQUIRED-INCS = $(INCDIR)version.h $(INCDIR)maiko/platform.h
LD ?= $(CC)
CFLAGS = $(OPTFLAGS) $(DFLAGS) CFLAGS = $(OPTFLAGS) $(DFLAGS)
RFLAGS = -c $(CFLAGS) -I$(INCDIR) -I$(INCLUDEDIR) RFLAGS = -c $(CFLAGS) -I$(INCDIR) -I$(INCLUDEDIR)
@ -146,21 +145,21 @@ EXTFILES = $(OBJECTDIR)usrsubr.o
################################################################################ ################################################################################
$(OSARCHDIR)lde: $(OBJECTDIR)ldeboot.o $(OBJECTDIR)unixfork.o $(OSARCHDIR)lde: $(OBJECTDIR)ldeboot.o $(OBJECTDIR)unixfork.o
$(LD) $(OBJECTDIR)ldeboot.o $(OBJECTDIR)unixfork.o $(LDELDFLAGS) -o $(OSARCHDIR)lde $(CC) $(OBJECTDIR)ldeboot.o $(OBJECTDIR)unixfork.o $(LDELDFLAGS) -o $(OSARCHDIR)lde
$(OSARCHDIR)$(LDENAME): $(LIBFILES) $(EXTFILES) $(OBJECTDIR)vdate.o $(OSARCHDIR)$(LDENAME): $(LIBFILES) $(EXTFILES) $(OBJECTDIR)vdate.o
$(LD) $(UPFRONT_LDFLAGS) $(LIBFILES) $(EXTFILES) $(OBJECTDIR)vdate.o $(LDFLAGS) -o $(OSARCHDIR)$(LDENAME) $(CC) $(UPFRONT_LDFLAGS) $(LIBFILES) $(EXTFILES) $(OBJECTDIR)vdate.o $(LDFLAGS) -o $(OSARCHDIR)$(LDENAME)
@ echo "" @ echo ""
@ echo "Executable is now named '$(OSARCHDIR)$(LDENAME)'" @ echo "Executable is now named '$(OSARCHDIR)$(LDENAME)'"
$(OSARCHDIR)ldeether: $(OBJECTDIR)ldeether.o $(DLPIFILES) $(OSARCHDIR)ldeether: $(OBJECTDIR)ldeether.o $(DLPIFILES)
$(LD) $(OBJECTDIR)ldeether.o $(DLPIFILES) $(LDEETHERLDFLAGS) -o $(OSARCHDIR)ldeether $(CC) $(OBJECTDIR)ldeether.o $(DLPIFILES) $(LDEETHERLDFLAGS) -o $(OSARCHDIR)ldeether
$(OSARCHDIR)tstsout: $(OBJECTDIR)tstsout.o $(BYTESWAPFILES) $(REQUIRED-INCS) $(OSARCHDIR)tstsout: $(OBJECTDIR)tstsout.o $(BYTESWAPFILES) $(REQUIRED-INCS)
$(LD) $(OBJECTDIR)tstsout.o $(BYTESWAPFILES) $(LDFLAGS) -lc -lm -o $(OSARCHDIR)tstsout $(CC) $(OBJECTDIR)tstsout.o $(BYTESWAPFILES) $(LDFLAGS) -lc -lm -o $(OSARCHDIR)tstsout
$(OSARCHDIR)setsout: $(OBJECTDIR)setsout.o $(REQUIRED-INCS) $(OSARCHDIR)setsout: $(OBJECTDIR)setsout.o $(REQUIRED-INCS)
$(LD) $(OBJECTDIR)setsout.o $(BYTESWAPFILES) $(LDFLAGS) -lc -lm -o $(OSARCHDIR)setsout $(CC) $(OBJECTDIR)setsout.o $(BYTESWAPFILES) $(LDFLAGS) -lc -lm -o $(OSARCHDIR)setsout
#### Component files ###################################################### #### Component files ######################################################