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

remove makefile dependency on tinycdb makefile

Browse source
This commit is contained in:
John Alanbrook 2024-03-09 15:20:08 -06:00
parent 77b20ae9c2
commit d6aee3887b
1 changed files with 14 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

26
Makefile
View file

@ -92,6 +92,8 @@ endif
CPPFLAGS += -DHAVE_CEIL -DCP_USE_CGTYPES=0 -DCP_USE_DOUBLES=0 -DHAVE_FLOOR -DHAVE_FMOD -DHAVE_LRINT -DHAVE_LRINTF $(includeflag) -MD $(WARNING_FLAGS) -I. -DVER=\"$(VER)\" -DCOM=\"$(COM)\" -DINFO=\"$(INFO)\" #-DENABLE_SINC_MEDIUM_CONVERTER -DENABLE_SINC_FAST_CONVERTER -DCP_COLLISION_TYPE_TYPE=uintptr_t -DCP_BITMASK_TYPE=uintptr_t CPPFLAGS += -DHAVE_CEIL -DCP_USE_CGTYPES=0 -DCP_USE_DOUBLES=0 -DHAVE_FLOOR -DHAVE_FMOD -DHAVE_LRINT -DHAVE_LRINTF $(includeflag) -MD $(WARNING_FLAGS) -I. -DVER=\"$(VER)\" -DCOM=\"$(COM)\" -DINFO=\"$(INFO)\" #-DENABLE_SINC_MEDIUM_CONVERTER -DENABLE_SINC_FAST_CONVERTER -DCP_COLLISION_TYPE_TYPE=uintptr_t -DCP_BITMASK_TYPE=uintptr_t
CPPFLAGS += -D_FILE_OFFSET_BITS=64 # for tinycdb
# ENABLE_SINC_[BEST|FAST|MEDIUM]_CONVERTER # ENABLE_SINC_[BEST|FAST|MEDIUM]_CONVERTER
# default, fast and medium available in game at runtime; best available in editor # default, fast and medium available in game at runtime; best available in editor
@ -223,15 +225,15 @@ $(DISTDIR)/$(DIST): $(BIN)/$(NAME)
$(BIN)/libengine.a: $(OBJS) $(BIN)/libengine.a: $(OBJS)
@$(AR) rcs $@ $(OBJS) @$(AR) rcs $@ $(OBJS)
$(BIN)/libcdb.a: CDB_C != find $(CDB) -name *.c
CDB_O := $(patsubst %.c, %.o, $(CDB_C))
$(CDB)/libcdb.a: $(CDB_O)
mkdir -p $(BIN) mkdir -p $(BIN)
rm -f $(CDB)/libcdb.a rm -f $(CDB)/libcdb.a
make -C $(CDB) CC=$(CC) AR=$(AR) libcdb.a ar rv $@ $^
cp $(CDB)/libcdb.a $(BIN)
tools/libcdb.a: $(CDB)/libcdb.a
tools/libcdb.a: cp $(CDB)/libcdb.a tools
make -C $(CDB) libcdb.a
mv $(CDB)/libcdb.a tools
DOCOS = Sound gameobject Game Window physics Profile Time Player Mouse IO Log ColorMap sprite SpriteAnim Render Geometry DOCOS = Sound gameobject Game Window physics Profile Time Player Mouse IO Log ColorMap sprite SpriteAnim Render Geometry
DOCHTML := $(addsuffix .api.html, $(DOCOS)) DOCHTML := $(addsuffix .api.html, $(DOCOS))
@ -269,7 +271,7 @@ $(OBJDIR)/%.o: %.c source/engine/core.cdb.h $(SHADERS)
$(OBJDIR)/%.o: %.cpp $(OBJDIR)/%.o: %.cpp
@mkdir -p $(@D) @mkdir -p $(@D)
@echo Making C++ object $@ with $(CXX) @echo Making C++ object $@
@$(CXX) $(CPPFLAGS) $(CXXFLAGS) -c $< -o $@ @$(CXX) $(CPPFLAGS) $(CXXFLAGS) -c $< -o $@
$(OBJDIR)/%.o: %.m $(OBJDIR)/%.o: %.m
@ -300,7 +302,7 @@ core.cdb: packer $(CORE)
chmod 644 out.cdb chmod 644 out.cdb
mv out.cdb core.cdb mv out.cdb core.cdb
CDB_C != find $(CDB) -name *.c
packer: tools/packer.c tools/libcdb.a packer: tools/packer.c tools/libcdb.a
cc $^ -I$(CDB) -o packer cc $^ -I$(CDB) -o packer
@ -327,9 +329,9 @@ crossmac:
clean: 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 rm -f shaders/*.sglsl.h shaders/*.metal core.cdb jso cdb packer TAGS source/engine/core.cdb.h tools/libcdb.a
@rm source/engine/core.cdb.h rm $(CDB)/*.o
@make -C quickjs clean @make -C quickjs clean
docs: doc/prosperon.org docs: doc/prosperon.org