Windows|Fixed: Build errors

skyjake · May 11, 2017 · 0bdaf3d · 0bdaf3d
1 parent aa8143c
commit 0bdaf3d
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 9 deletions.
diff --git a/doomsday/apps/client/src/gl/dgl_common.cpp b/doomsday/apps/client/src/gl/dgl_common.cpp
@@ -898,6 +898,7 @@ static gl::Wrapping DGL_ToGLWrapCap(DGLint cap)
         DENG2_ASSERT(!"DGL_ToGLWrapCap: Unknown cap value");
         break;
     }
+    return gl::ClampToEdge;
 }
 
 #undef DGL_SetMaterialUI

diff --git a/doomsday/apps/plugins/fmod/api/audio_fmod.def b/doomsday/apps/plugins/fmod/api/audio_fmod.def
@@ -39,10 +39,10 @@ DM_Music_Play
 DM_Music_PlayFile
 
 ; CD audio interface
-DM_CDAudio_Init
-DM_CDAudio_Update
-DM_CDAudio_Set
-DM_CDAudio_Get
-DM_CDAudio_Pause
-DM_CDAudio_Stop
-DM_CDAudio_Play
+;DM_CDAudio_Init
+;DM_CDAudio_Update
+;DM_CDAudio_Set
+;DM_CDAudio_Get
+;DM_CDAudio_Pause
+;DM_CDAudio_Stop
+;DM_CDAudio_Play
diff --git a/doomsday/cmake/FindFMOD.cmake b/doomsday/cmake/FindFMOD.cmake
@@ -43,10 +43,10 @@ if (FMOD_FMOD_H AND NOT TARGET fmodex)
     elseif (MSVC)
         if (ARCH_BITS EQUAL 64)
             set (fmodLib "${fmodApi}/lib/fmod64_vc.lib")
-            set (fmodInstLib "${fmodApi}/fmod64.dll")
+            set (fmodInstLib "${fmodApi}/lib/fmod64.dll")
         else ()
             set (fmodLib "${fmodApi}/lib/fmod_vc.lib")
-            set (fmodInstLib "${fmodApi}/fmod.dll")
+            set (fmodInstLib "${fmodApi}/lib/fmod.dll")
         endif ()
     elseif (UNIX)
         if (ARCH_BITS EQUAL 64)

diff --git a/doomsday/sdk/libcore/src/core/library.cpp b/doomsday/sdk/libcore/src/core/library.cpp
@@ -22,6 +22,10 @@
 #include "de/Log"
 #include "de/LogBuffer"
 
+#if !defined (DENG_STATIC_LINK)
+#  include <QLibrary>
+#endif
+
 #include <array>
 
 namespace de {