ASSIMP linking.

Former-commit-id: 0a770978

osx_actual_build.sh

@@ -6,11 +6,13 @@ OPT=-O0
 
 WIGNORE="-Wno-reserved-id-macro -Wno-deprecated -Wno-format-nonliteral -Wno-int-to-void-pointer-cast -Wno-undef -Wno-missing-variable-declarations -Wno-nested-anon-types -Wno-variadic-macros -Wno-old-style-cast -Wno-sign-conversion -Wno-cast-align -Wno-gnu-anonymous-struct -Wno-extra-semi-stmt -Wno-c++98-compat -Wno-padded -Wdocumentation -Wdocumentation-unknown-command -Wno-double-promotion -Wno-c++98-compat-pedantic -Wno-missing-prototypes -Wno-float-equal -Wno-unused-parameter  -Wno-gnu-zero-variadic-macro-arguments -Wno-writable-strings -Wno-global-constructors -Wno-switch-enum -Wno-char-subscripts -Wno-unused-function"
 
-CommonCompilerFlags="-pthread -isystem ../libs -isystem ../libs/glfw/include -isystem ../libs/glad/include -isystem ../libs/fmod/include -isystem ../libs/libcurl/include -isystem ../libs/gameanalytics/source/gameanalytics"
-CommonLinkerFlags="../libs/glad/osx/glad.o -L/usr/local/lib -L../libs/glfw/osx/ -L../libs/fmod/lib/osx/ -ldl -lc++ -lm -lz -lfmod -lglfw3 -framework Cocoa -framework OpenGL -framework IOKit -framework CoreVideo -o $EXECUTABLE_NAME -rpath @executable_path"
+CommonCompilerFlags="-pthread -isystem ../libs -isystem ../libs/glfw/include -isystem ../libs/glad/include -isystem ../libs/fmod/include -isystem ../libs/libcurl/include -isystem ../libs/assimp/include"
+CommonLinkerFlags="../libs/glad/osx/glad.o -L/usr/local/lib -L../libs/glfw/osx/ -L../libs/fmod/lib/osx/ ../libs/assimp/libs/macos/libassimp.a ../libs/assimp/libs/macos/libIrrXML.a ../libs/assimp/libs/macos/libzlibstatic.a -ldl -lc++ -lm -lz -lfmod -lglfw3 -framework Cocoa -framework OpenGL -framework IOKit -framework CoreVideo -o $EXECUTABLE_NAME -rpath @executable_path"
 
 pushd build
 
 clang --std=c++17 -Weverything $WIGNORE $DEBUG $CommonCompilerFlags -g $OPT ../src/main.cpp ../libs/imgui/imgui*.cpp $CommonLinkerFlags
 
 popd
+
+# ASSIMP version 4.1.0

src/main.cpp

@@ -3,7 +3,7 @@
 #define VC_EXTRA_LEAN
 #endif
 
-//#include "assimp_loader.cpp"
+#include "assimp_loader.cpp"
 
 #include "imgui/imgui.h"
 #include "shared.h"