Browse Source

hopefully fix parallel Makefile dependencies

render_group_fix
cinnaboot 5 years ago
parent
commit
8ddd69a601
  1. 11
      Makefile

11
Makefile

@ -20,17 +20,19 @@ ASSIMP_DIR=ext/assimp
ifeq ($(USE_INTERNAL_ASSIMP), y)
CXXFLAGS += -I$(ASSIMP_DIR)/include -I$(ASSIMP_DIR)/build/include
ASSIMP_LIB := $(ASSIMP_DIR)/build/code/libassimp.a
BUILD_ASSIMP_TARGET := build_assimp
CLEAN_ASSIMP_TARGET := $(MAKE) -C $(ASSIMP_DIR)/build clean
endif
all: mkdirs $(BUILD_ASSIMP_TARGET) $(LIBNAME) examples
all: mkdirs
$(MAKE) $(ASSIMP_LIB)
$(MAKE) $(LIBNAME)
$(MAKE) examples
.PHONY: all
-include $(OBJDIR)/*.d
build_assimp:
$(ASSIMP_LIB):
@if [ ! -d $(ASSIMP_DIR) ]; then \
git clone -n "https://github.com/assimp/assimp" $(ASSIMP_DIR); \
cd $(ASSIMP_DIR); \
@ -44,7 +46,6 @@ build_assimp:
-DASSIMP_BUILD_ALL_IMPORTERS_BY_DEFAULT=OFF \
-DASSIMP_BUILD_GLTF_IMPORTER=ON ./
$(MAKE) -C $(ASSIMP_DIR)/build
.PHONY: build_assimp
mkdirs:
@mkdir -p $(OBJDIR)
@ -56,7 +57,7 @@ $(LIBNAME): $(RENDER_OBJECTS)
$(RENDER_OBJECTS): $(OBJDIR)/%.o : $(SRCDIR)/%.cpp
$(CXX) $(CXXFLAGS) -c -MMD $< -o $@
examples: $(LIBNAME) $(BUILD_ASSIMP_TARGET)
examples:
ASSIMP_DIR=$(ASSIMP_DIR) $(MAKE) -C $(EXAMPLEDIR)
.PHONY: examples

Loading…
Cancel
Save