john/prosperon
1
0
Fork 0
Code Issues Pull requests Actions Releases Activity

Remove make -C directives from makefile; simplify quickjs.a

Browse source
This commit is contained in:
John Alanbrook 2024-03-09 15:41:17 -06:00
parent d6aee3887b
commit fca85c7c3a
2 changed files with 9 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
.gitignore vendored
View file

@ -4,6 +4,7 @@ bin/
build/ build/
*.o *.o
*.a *.a
*.d
tags tags
Jenkinsfile Jenkinsfile
*~ *~
@ -18,3 +19,4 @@ source/shaders/*.h
core.cdb core.cdb
primum.exe primum.exe
core.cdb.h core.cdb.h
jsc

14
Makefile
View file

@ -258,9 +258,9 @@ input.md: $(INPUTMD)
@echo Printing api for $* @echo Printing api for $*
@./primum -d $* > $@ @./primum -d $* > $@
$(BIN)/libquickjs.a: $(QUICKJS_O) $(BIN)/libquickjs.a:
make -C quickjs clean cd quickjs && make clean
make -C quickjs SYSRT=$(SYSRT) TTARGET=$(TTARGET) ARCH=$(ARCH) DBG=$(DBG) OPT=$(OPT) AR=$(AR) OS=$(OS) libquickjs.a HOST_CC=$(CC) LEAK=$(LEAK) cd quickjs && make SYSRT=$(SYSRT) TTARGET=$(TTARGET) ARCH=$(ARCH) DBG=$(DBG) OPT=$(OPT) AR=$(AR) OS=$(OS) libquickjs.a HOST_CC=$(CC) LEAK=$(LEAK)
@mkdir -p $(BIN) @mkdir -p $(BIN)
cp -rf quickjs/libquickjs.* $(BIN) cp -rf quickjs/libquickjs.* $(BIN)
@ -309,10 +309,8 @@ packer: tools/packer.c tools/libcdb.a
jsc: tools/jso.c tools/libquickjs.a jsc: tools/jso.c tools/libquickjs.a
$(CC) $^ -lm -Iquickjs -o $@ $(CC) $^ -lm -Iquickjs -o $@
tools/libquickjs.a: tools/libquickjs.a: $(BIN)/libquickjs.a
make -C quickjs clean cp -f $(BIN)/libquickjs.a tools
make -C quickjs OPT=$(OPT) AR=$(AR) libquickjs.a
cp -f quickjs/libquickjs.a tools
WINCC = x86_64-w64-mingw32-gcc WINCC = x86_64-w64-mingw32-gcc
#WINCC = i686-w64-mingw32-g++ #WINCC = i686-w64-mingw32-g++
@ -331,7 +329,7 @@ clean:
@echo Cleaning project @echo Cleaning project
rm -rf bin dist rm -rf bin dist
rm -f shaders/*.sglsl.h shaders/*.metal core.cdb jso cdb packer TAGS source/engine/core.cdb.h tools/libcdb.a rm -f shaders/*.sglsl.h shaders/*.metal core.cdb jso cdb packer TAGS source/engine/core.cdb.h tools/libcdb.a
rm $(CDB)/*.o rm -f $(CDB)/*.o
@make -C quickjs clean @make -C quickjs clean
docs: doc/prosperon.org docs: doc/prosperon.org