- 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.
This commit is contained in:
Edoardo Prezioso 2016-12-16 21:39:08 +01:00 committed by Christoph Oelckers
parent 05e77303bf
commit 287fc513a2

View file

@ -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") SET(USE_GME_NSF 1 BOOL "Enable NES NSF music emulation")
#endif() #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. # Check for GCC "visibility" support.
if (CMAKE_COMPILER_IS_GNUCXX) if (CMAKE_COMPILER_IS_GNUCXX)
check_cxx_compiler_flag (-fvisibility=hidden __LIBGME_TEST_VISIBILITY) check_cxx_compiler_flag (-fvisibility=hidden __LIBGME_TEST_VISIBILITY)