Fixed|Client|Assimp: Fixed minor build warnings

skyjake · Nov 29, 2015 · a46903c · a46903c
1 parent 8177c98
commit a46903c
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 2 deletions.
diff --git a/doomsday/apps/client/src/audio/s_cache.cpp b/doomsday/apps/client/src/audio/s_cache.cpp
@@ -62,6 +62,8 @@ static dint upsampleFactor(dint rate)
     {
         factor = de::max(1, ::sfxRate / rate);
     }
+#else
+    DENG2_UNUSED(rate);
 #endif
     return factor;
 }
@@ -112,7 +114,7 @@ static void resample(void *dst, dint dstBytesPer, dint dstRate, void const *src,
     if(dstRate == 2 * srcRate)
     {
         if(dstBytesPer == 1)
-        {   
+        {
             // The source has a byte per sample as well.
             duchar const *sp = (duchar const *) src;
             duchar *dp       = (duchar *) dst;
@@ -246,12 +248,15 @@ static void resample(void *dst, dint dstBytesPer, dint dstRate, void const *src,
 void configureSample(sfxsample_t &smp, void const *data, duint size,
     dint numSamples, dint bytesPer, dint rate)
 {
+    DENG2_UNUSED(data);
+    DENG2_UNUSED(size);
+
     zap(smp);
     smp.bytesPer   = bytesPer;
     smp.size       = numSamples * bytesPer;
     smp.rate       = rate;
     smp.numSamples = numSamples;
-        
+
     // Apply the upsample factor.
     dint const rsfactor = upsampleFactor(rate);
     smp.rate       *= rsfactor;

diff --git a/doomsday/sdk/libgui/CMakeLists.txt b/doomsday/sdk/libgui/CMakeLists.txt
@@ -14,9 +14,14 @@ set (ASSIMP_LIB_INSTALL_DIR ${DENG_INSTALL_PLUGIN_DIR}
     CACHE PATH "libassimp install directory" FORCE
 )
 set (BUILD_SHARED_LIBS OFF CACHE BOOL "Assimp: Shared library" FORCE)
+set (CMAKE_AUTOMOC OFF)
+set (oldCFlags ${CMAKE_C_FLAGS})
+set (CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wno-incompatible-pointer-types")
 add_subdirectory (../../external/assimp assimp)
 set_property (TARGET assimp PROPERTY FOLDER Libraries)
+set (CMAKE_C_FLAGS ${oldCFlags})
 
+# Apply Doomsday's configuration.
 include (../../cmake/Config.cmake)
 
 if (APPLE)