diff --git a/Makefile b/Makefile index c0b54a2..ab4b9a0 100644 --- a/Makefile +++ b/Makefile @@ -7,7 +7,9 @@ LIBDIR := ext/tangerine LIB := $(LIBDIR)/build/libTangerine.a CXX := g++ -CXXFLAGS := -std=c++11 -g -ggdb3 -Wall -I$(LIBDIR)/include/ $(shell sdl2-config --cflags) +CXXFLAGS := -std=c++11 -g -ggdb3 -Wall \ + -I$(LIBDIR)/include/ \ + $(shell sdl2-config --cflags) LDFLAGS := $(shell sdl2-config --libs) -lGLEW -lGL -lassimp COMMON_SOURCES := $(SRCDIR)/orbits.cpp @@ -31,16 +33,6 @@ SOURCES := $(SRCDIR)/main.cpp $(SRCDIR)/gooey.cpp OBJECTS := $(patsubst $(SRCDIR)/%.cpp, $(OBJDIR)/%.o, $(SOURCES)) BIN := $(BINDIR)/orbital_shipping -# NOTE: Fixes an issue on Fedora where the default assimp version doesn't -# support glTF2 -ifeq ($(USE_INTERNAL_ASSIMP), y) -$(warning using internal assimp) -ASSIMP_DIR := $(LIBDIR)/ext/assimp -CXXFLAGS += -I$(ASSIMP_DIR)/include -I$(ASSIMP_DIR)/build/include -ASSIMP_LIB := $(ASSIMP_DIR)/build/code/libassimp.a -LDFLAGS := -lSDL2 -lGLEW -lGL -endif - all: mkdirs $(BIN) .PHONY: all @@ -55,7 +47,7 @@ mkdirs: .PHONY: mkdirs $(BIN): $(COMMON_OBJECTS) $(OBJECTS) $(IMGUI_OBJECTS) $(IMGUI_IMP_OBJECTS) $(LIB) - $(CXX) -o $@ $(LDFLAGS) $(COMMON_OBJECTS) $(OBJECTS) $(LIB) $(ASSIMP_LIB) \ + $(CXX) -o $@ $(LDFLAGS) $(COMMON_OBJECTS) $(OBJECTS) $(LIB) \ $(IMGUI_OBJECTS) $(IMGUI_IMP_OBJECTS) $(TEST_BIN): $(TEST_OBJECTS) $(LIB) @@ -77,7 +69,7 @@ $(IMGUI_IMP_OBJECTS): $(OBJDIR)/%.o : $(IMGUI_IMPL_DIR)/%.cpp $(CXX) $(CXXFLAGS) -c -MMD $< -o $@ $(LIB): - USE_INTERNAL_ASSIMP=$(USE_INTERNAL_ASSIMP) $(MAKE) -C $(LIBDIR) + $(MAKE) -C $(LIBDIR) clean: @rm -f $(BIN) $(TEST_BIN) $(OBJDIR)/*