Merge branch 'master' of ssh://git.code.sf.net/p/deng/code

skyjake · Apr 28, 2014 · 08ba4df · 08ba4df
2 parents 2109d72 + 50f7fd8
commit 08ba4df
Show file tree

Hide file tree

Showing 2 changed files with 22 additions and 3 deletions.
diff --git a/doomsday/config.pri b/doomsday/config.pri
@@ -14,6 +14,7 @@
 # - deng_aptstable              Include the stable apt repository .list
 # - deng_aptunstable            Include the unstable apt repository .list
 # - deng_ccache                 (Unix|Mac) Use ccache when compiling
+# - deng_extassimp              (Unix) Get assimp from external/assimp/
 # - deng_fluidsynth             Build the FluidSynth sound driver
 # - deng_fmod                   Build the FMOD Ex sound driver
 # - deng_nativesdk              (Mac) Use current OS's SDK for non-distrib use

diff --git a/doomsday/dep_assimp.pri b/doomsday/dep_assimp.pri
@@ -3,13 +3,31 @@ aiOpts   = ""
 aiIncDir = ""
 aiLibs   = ""
 
+deng_extassimp {
+    ASSIMP_DIR = $$PWD/external/assimp
+}
+
 !isEmpty(ASSIMP_DIR) {
     !win32 {
         aiIncDir = $$ASSIMP_DIR/include
         aiLibs   = -L$$ASSIMP_DIR/lib -lassimp
-        *-g*|*-clang* {
-            # Inform the dynamic linker about a custom location.
-            QMAKE_LFLAGS += -Wl,-rpath,$$ASSIMP_DIR/lib
+
+        deng_extassimp {
+            *-g*|*-clang* {
+                # Inform the dynamic linker about a custom location.
+                QMAKE_LFLAGS += -Wl,-rpath,$$DENG_PLUGIN_LIB_DIR
+            }
+
+            # Install the custom-build external Assimp.
+            INSTALLS += assimplib
+            assimplib.files = $$ASSIMP_DIR/lib/libassimp.so.3
+            assimplib.path  = $$DENG_PLUGIN_LIB_DIR
+        }
+        else {
+            *-g*|*-clang* {
+                # Inform the dynamic linker about a custom location.
+                QMAKE_LFLAGS += -Wl,-rpath,$$ASSIMP_DIR/lib
+            }
         }
     }
     else {