From af807c7c7e06bea2f7d9235a5677cc725672ff47 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jaakko=20Ker=C3=A4nen?= <jaakko.keranen@iki.fi>
Date: Mon, 17 Dec 2018 22:52:39 +0200
Subject: [PATCH] Windows|CMake: Build configuration tweaks

---
 doomsday/apps/client/libs/fluidsynth/CMakeLists.txt | 2 +-
 doomsday/cmake/FindFoundation.cmake                 | 4 +++-
 doomsday/cmake/FindGLBindings.cmake                 | 6 ++++--
 doomsday/libs/core/include/de/libcore.h             | 4 ++++
 4 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/doomsday/apps/client/libs/fluidsynth/CMakeLists.txt b/doomsday/apps/client/libs/fluidsynth/CMakeLists.txt
index 46569a469a..5a10da8104 100644
--- a/doomsday/apps/client/libs/fluidsynth/CMakeLists.txt
+++ b/doomsday/apps/client/libs/fluidsynth/CMakeLists.txt
@@ -8,7 +8,7 @@ include (../ExtensionConfig.cmake)
 set (tgt audio_fluidsynth)
 
 # Make an embedded build by default?
-if (APPLE OR TARGET glib)
+if (APPLE OR MSYS2_LIBS_DIR)
     set (embed ON)
 elseif (UNIX)
     set (embed OFF)
diff --git a/doomsday/cmake/FindFoundation.cmake b/doomsday/cmake/FindFoundation.cmake
index a72ab89c0d..404dbff2f5 100644
--- a/doomsday/cmake/FindFoundation.cmake
+++ b/doomsday/cmake/FindFoundation.cmake
@@ -7,11 +7,13 @@ if (MSYS2_LIBS_DIR)
     )
     target_include_directories (the_Foundation INTERFACE
         ${_tfDir}/include
-    )
+    )    
     file (GLOB _bins ${_tfDir}/lib/*.dll)
     foreach (_bin ${_bins})
         deng_install_library (${_bin})
     endforeach (_bin)
+    install (TARGETS the_Foundation EXPORT the_Foundation)
+    install (EXPORT the_Foundation DESTINATION ${DE_INSTALL_LIB_DIR})
 endif ()
 
 if (NOT TARGET the_Foundation)
diff --git a/doomsday/cmake/FindGLBindings.cmake b/doomsday/cmake/FindGLBindings.cmake
index 9d8036d5a1..89b2a8c38e 100644
--- a/doomsday/cmake/FindGLBindings.cmake
+++ b/doomsday/cmake/FindGLBindings.cmake
@@ -28,9 +28,11 @@ if (NOT TARGET glbinding)
     )
     add_library (glbinding INTERFACE)
     target_include_directories (glbinding INTERFACE
-        ${CMAKE_CURRENT_BINARY_DIR}/glbinding/src/github-glbinding/include
-        ${CMAKE_CURRENT_BINARY_DIR}/glbinding/src/github-glbinding-build/include)
+        $<BUILD_INTERFACE:${CMAKE_CURRENT_BINARY_DIR}/glbinding/src/github-glbinding/include>
+        $<BUILD_INTERFACE:${CMAKE_CURRENT_BINARY_DIR}/glbinding/src/github-glbinding-build/include>)
     target_link_libraries (glbinding INTERFACE
         ${CMAKE_CURRENT_BINARY_DIR}/glbinding/src/github-glbinding-build/code/${glbindingLibName})
+    install (TARGETS glbinding EXPORT glbinding)
+    install (EXPORT glbinding DESTINATION ${DE_INSTALL_LIB_DIR})
     add_dependencies (glbinding github-glbinding)
 endif ()
diff --git a/doomsday/libs/core/include/de/libcore.h b/doomsday/libs/core/include/de/libcore.h
index 32182ba611..92da66dd5b 100644
--- a/doomsday/libs/core/include/de/libcore.h
+++ b/doomsday/libs/core/include/de/libcore.h
@@ -814,7 +814,11 @@ typedef uint64_t duint64;    ///< 64-bit unsigned integer.
 typedef float    dfloat;     ///< 32-bit floating point number.
 typedef double   ddouble;    ///< 64-bit floating point number.
 typedef size_t   dsize;      // Likely unsigned long.
+#if defined (_MSC_VER)
+typedef long long dsigsize;
+#else
 typedef ssize_t  dsigsize;
+#endif
 typedef long     dlong;
 
 class DE_PUBLIC Char