diff --git a/Makefile b/Makefile index 738a00e..f075e14 100644 --- a/Makefile +++ b/Makefile @@ -29,7 +29,7 @@ BIN := $(BINDIR)/orbital_shipping ifeq ($(USE_INTERNAL_ASSIMP), y) $(warning using internal assimp) ASSIMP_DIR := $(LIBDIR)/ext/assimp -CXXFLAGS += -I$(ASSIMP_DIR)/include +CXXFLAGS += -I$(ASSIMP_DIR)/include -I$(ASSIMP_DIR)/build/include ASSIMP_LIB := $(ASSIMP_DIR)/build/code/libassimp.a LDFLAGS := -lSDL2 -lGLEW -lGL endif diff --git a/README b/README index 3a16f44..88389b2 100644 --- a/README +++ b/README @@ -15,8 +15,8 @@ TODO: Building: install dependencies for your environment: Arch) $ sudo pacman -S assimp glew glm sdl2 catch2 gcc make - Fedora) $ sudo dnf install assimp-devel glew-devel glm-devel \ - SDL2-devel catch-devel gcc-c++ make cmake + Fedora) $ sudo dnf install glew-devel glm-devel SDL2-devel \ + catch-devel gcc-c++ make cmake NOTE: fedora (33) see note below about assimp checkout, and initialise submodule dependencies: $ git submodule update --init --recursive diff --git a/ext/tangerine b/ext/tangerine index ee7efd0..7ad3190 160000 --- a/ext/tangerine +++ b/ext/tangerine @@ -1 +1 @@ -Subproject commit ee7efd060ea8f391857cd3254c18663423e4abf2 +Subproject commit 7ad31909e4e23f01221feb12e818c377fc3add03