Browse Source

add assimp target as depndency for examples

render_group_fix
cinnaboot 5 years ago
parent
commit
ee7efd060e
  1. 4
      Makefile

4
Makefile

@ -21,6 +21,7 @@ ifeq ($(USE_INTERNAL_ASSIMP), y)
CXXFLAGS += -I$(ASSIMP_DIR)/include CXXFLAGS += -I$(ASSIMP_DIR)/include
ASSIMP_LIB := $(ASSIMP_DIR)/build/code/libassimp.a ASSIMP_LIB := $(ASSIMP_DIR)/build/code/libassimp.a
BUILD_ASSIMP_TARGET := build_assimp BUILD_ASSIMP_TARGET := build_assimp
CLEAN_ASSIMP_TARGET := $(MAKE) -C $(ASSIMP_DIR)/build clean
endif endif
@ -55,11 +56,12 @@ $(LIBNAME): $(RENDER_OBJECTS)
$(RENDER_OBJECTS): $(OBJDIR)/%.o : $(SRCDIR)/%.cpp $(RENDER_OBJECTS): $(OBJDIR)/%.o : $(SRCDIR)/%.cpp
$(CXX) $(CXXFLAGS) -c -MMD $< -o $@ $(CXX) $(CXXFLAGS) -c -MMD $< -o $@
examples: $(LIBNAME) examples: $(LIBNAME) $(BUILD_ASSIMP_TARGET)
ASSIMP_DIR=$(ASSIMP_DIR) $(MAKE) -C $(EXAMPLEDIR) ASSIMP_DIR=$(ASSIMP_DIR) $(MAKE) -C $(EXAMPLEDIR)
.PHONY: examples .PHONY: examples
clean: clean:
rm -rf $(OBJDIR)/* rm -rf $(OBJDIR)/*
$(MAKE) clean -C $(EXAMPLEDIR) $(MAKE) clean -C $(EXAMPLEDIR)
$(CLEAN_ASSIMP_TARGET)
.PHONY: clean .PHONY: clean

Loading…
Cancel
Save