From 752fbee43f8c1b8ce8ae39b829d82693b2f17c97 Mon Sep 17 00:00:00 2001
From: cinnaboot <cinnaboot@protonmail.com>
Date: Sun, 7 Mar 2021 16:42:34 -0500
Subject: [PATCH] update Makefile README and libTangerine ref

---
 Makefile      |  8 ++++----
 README        | 18 ++----------------
 ext/tangerine |  2 +-
 3 files changed, 7 insertions(+), 21 deletions(-)

diff --git a/Makefile b/Makefile
index b78b032..738a00e 100644
--- a/Makefile
+++ b/Makefile
@@ -30,7 +30,8 @@ ifeq ($(USE_INTERNAL_ASSIMP), y)
 $(warning using internal assimp)
 ASSIMP_DIR := $(LIBDIR)/ext/assimp
 CXXFLAGS += -I$(ASSIMP_DIR)/include
-LDFLAGS := -lSDL2 -lGLEW -lGL -L$(ASSIMP_DIR)/lib -lassimp
+ASSIMP_LIB := $(ASSIMP_DIR)/build/code/libassimp.a
+LDFLAGS := -lSDL2 -lGLEW -lGL
 endif
 
 
@@ -44,7 +45,7 @@ mkdirs:
 .PHONY: mkdirs
 
 $(BIN): $(COMMON_OBJECTS) $(OBJECTS) $(LIB)
-	$(CXX) -o $(BIN) $(LDFLAGS) $(COMMON_OBJECTS) $(OBJECTS) $(LIB)
+	$(CXX) -o $(BIN) $(LDFLAGS) $(COMMON_OBJECTS) $(OBJECTS) $(LIB) $(ASSIMP_LIB)
 
 $(TEST_BIN): $(TEST_OBJECTS) $(TEST_MAIN_OBJ)
 	$(CXX) -o $(TEST_BIN) $(LDFLAGS) $(TEST_OBJECTS) $(TEST_MAIN_OBJ) $(LIB)
@@ -62,8 +63,7 @@ $(TEST_MAIN_OBJ): $(TEST_MAIN_SOURCE)
 	$(CXX) $(CXXFLAGS) -c -MMD $(TESTDIR)/tests_main.cpp -o $(OBJDIR)/tests_main.o
 
 $(LIB):
-	USE_INTERNAL_ASSIMP=$(USE_INTERNAL_ASSIMP) $(MAKE) -C $(LIBDIR) build_assimp
-	$(MAKE) -C $(LIBDIR)
+	USE_INTERNAL_ASSIMP=$(USE_INTERNAL_ASSIMP) $(MAKE) -C $(LIBDIR)
 
 clean:
 	rm -rf $(OBJDIR)/* $(BIN) bin/test_orbit
diff --git a/README b/README
index 420736b..3a16f44 100644
--- a/README
+++ b/README
@@ -16,7 +16,8 @@ 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
+			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
 	build:
@@ -29,18 +30,3 @@ Building:
 
 		$ USE_INTERNAL_ASSIMP=y make
 
-		then, to run the demo,
-
-		$ cd bin
-		$ LD_LIBRARY_PATH=../ext/tangerine/ext/assimp/lib ./orbital_shipping
-
-
-# TODO:
-#	(libTangerine) fold in build_assimp to make dependency
-#	turn off unused default features of internal assimp
-#	compile assimp as static lib into libTangerine if built internal
-#		(can remove LD_LIBRARY_PATH requirement)
-#	(orbital_shipping) update makefile $(LIB) target
-#	make sure git submodule hashes are updated
-#
-
diff --git a/ext/tangerine b/ext/tangerine
index 7676be8..ee7efd0 160000
--- a/ext/tangerine
+++ b/ext/tangerine
@@ -1 +1 @@
-Subproject commit 7676be82d4ea31e94dee2b105a9fa37518dc53cd
+Subproject commit ee7efd060ea8f391857cd3254c18663423e4abf2