From 287fc513a22a6abb319fb564c5ddd113badbbce6 Mon Sep 17 00:00:00 2001 From: Edoardo Prezioso Date: Fri, 16 Dec 2016 21:39:08 +0100 Subject: [PATCH] - Game-Music-Emu: Merge and change commits 9bb5ad7, bc0a473 and 2018c1b. Commit titles: 9bb5ad7 - 'Add filename param to demo app.' bc0a473 - 'Allow building a static library (-DLIBTYPE=STATIC)' 2018c1b - 'Merged in lachs0r/game-music-emu (pull request #1)' Change: ZDoom doesn't need the shared library, so disable it always. --- game-music-emu/CMakeLists.txt | 3 +++ 1 file changed, 3 insertions(+) diff --git a/game-music-emu/CMakeLists.txt b/game-music-emu/CMakeLists.txt index fc6af33df..2e2299456 100644 --- a/game-music-emu/CMakeLists.txt +++ b/game-music-emu/CMakeLists.txt @@ -79,6 +79,9 @@ set( CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${ZD_FASTMATH_FLAG}" ) SET(USE_GME_NSF 1 BOOL "Enable NES NSF music emulation") #endif() +# [ZDoom] Set always to OFF. +set(BUILD_SHARED_LIBS 0 BOOL "Build shared library (set to OFF for static library)") + # Check for GCC "visibility" support. if (CMAKE_COMPILER_IS_GNUCXX) check_cxx_compiler_flag (-fvisibility=hidden __LIBGME_TEST_VISIBILITY)