Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
Windows|CMake: Build configuration tweaks
  • Loading branch information
skyjake committed Sep 1, 2019
1 parent 1b87cce commit af807c7
Show file tree
Hide file tree
Showing 4 changed files with 12 additions and 4 deletions.
2 changes: 1 addition & 1 deletion doomsday/apps/client/libs/fluidsynth/CMakeLists.txt
Expand Up @@ -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)
Expand Down
4 changes: 3 additions & 1 deletion doomsday/cmake/FindFoundation.cmake
Expand Up @@ -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)
Expand Down
6 changes: 4 additions & 2 deletions doomsday/cmake/FindGLBindings.cmake
Expand Up @@ -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 ()
4 changes: 4 additions & 0 deletions doomsday/libs/core/include/de/libcore.h
Expand Up @@ -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
Expand Down

0 comments on commit af807c7

Please sign in to comment.