[JEU] Zandronum sans son sous Raspbian 10 Buster
1/ Dépôt « Zandronum pour Raspberry Pi » :
https://bitbucket.org/ptitSeb/zandronum
Commit : 461f6a9
Du : 2018-04-29
2/ Fichier diff « zandronum_nosound.diff » :
diff -r 461f6a973924 src/CMakeLists.txt --- a/src/CMakeLists.txt Sun Apr 29 16:39:35 2018 +0200 +++ b/src/CMakeLists.txt Sat Oct 19 10:41:15 2019 +0200 @@ -305,9 +305,7 @@ add_definitions( -DNO_SERVER_GUI=1 ) # [BB] Turning off sound needs special handling in the code, activated with the define NO_SOUND. - if( NO_SOUND ) - add_definitions( -DNO_SOUND=1 ) - endif( NO_SOUND ) + add_definitions( -DNO_SOUND=1 ) # [BB] Turning off OpenGL needs special handling in the code, activated with the define NO_GL. if( NO_GL ) @@ -333,83 +331,16 @@ include_directories( ${OPENGL_INCLUDE_DIR} ) endif( NOT NO_GL ) -if( NOT NO_FMOD ) - # Search for FMOD include files - if( NOT WIN32 ) - find_path( FMOD_INCLUDE_DIR fmod.hpp - PATHS ${FMOD_LOCAL_INC_DIRS} ) - endif( NOT WIN32 ) - - if( NOT FMOD_INCLUDE_DIR ) - find_path( FMOD_INCLUDE_DIR fmod.hpp - PATHS ${FMOD_SEARCH_PATHS} - ${FMOD_INC_PATH_SUFFIXES} ) - endif( NOT FMOD_INCLUDE_DIR ) - - if( FMOD_INCLUDE_DIR ) - message( STATUS "FMOD include files found at ${FMOD_INCLUDE_DIR}" ) - include_directories( "${FMOD_INCLUDE_DIR}" ) - else( FMOD_INCLUDE_DIR ) - message( STATUS "Could not find FMOD include files" ) - set( NO_FMOD ON ) - endif( FMOD_INCLUDE_DIR ) -endif( NOT NO_FMOD ) - -if( NOT NO_FMOD ) - # Decide on the name of the FMOD library we want to use. - if( NOT FMOD_LIB_NAME AND MSVC ) - set( FMOD_LIB_NAME fmodex${X64}_vc ) - endif( NOT FMOD_LIB_NAME AND MSVC ) - - if( NOT FMOD_LIB_NAME AND BORLAND ) - set( FMOD_LIB_NAME fmodex${X64}_bc ) - endif( NOT FMOD_LIB_NAME AND BORLAND ) - - if( NOT FMOD_LIB_NAME ) - set( FMOD_LIB_NAME fmodex${X64} ) - endif( NOT FMOD_LIB_NAME ) - - # Search for FMOD library - if( WIN32 OR APPLE ) - find_library( FMOD_LIBRARY ${FMOD_LIB_NAME} - PATHS ${FMOD_SEARCH_PATHS} - ${FMOD_LIB_PATH_SUFFIXES} ) - else( WIN32 OR APPLE ) - find_library( FMOD_LIBRARY - NAMES ${FMOD_VERSIONS} - PATHS ${FMOD_LOCAL_LIB_DIRS} ) - endif( WIN32 OR APPLE ) - - if( FMOD_LIBRARY ) - message( STATUS "FMOD library found at ${FMOD_LIBRARY}" ) - set( ZDOOM_LIBS ${ZDOOM_LIBS} "${FMOD_LIBRARY}" ) - else( FMOD_LIBRARY ) - message( STATUS "Could not find FMOD library" ) - set( NO_FMOD ON ) - endif( FMOD_LIBRARY ) -endif( NOT NO_FMOD ) - -if( NO_FMOD ) - add_definitions( -DNO_FMOD=1 ) -endif( NO_FMOD ) -if( NO_OPENAL ) - add_definitions( -DNO_OPENAL=1 ) -elseif( WITH_GSTREAMER ) - add_definitions( -DWITH_GSTREAMER=1 ) -endif( NO_OPENAL ) +add_definitions( -DNO_FMOD=1 ) +add_definitions( -DNO_OPENAL=1 ) +add_definitions( -DWITH_GSTREAMER=1 ) # Search for libSndFile -find_package( SndFile ) - # Search for libmpg123 -find_package( MPG123 ) - # Search for FluidSynth -find_package( FluidSynth ) - # Search for NASM if( NOT NO_ASM ) @@ -716,38 +647,13 @@ message( STATUS "Fluid synth libs: ${FLUIDSYNTH_LIBRARIES}" ) set( ZDOOM_LIBS ${ZDOOM_LIBS} "${ZLIB_LIBRARIES}" "${JPEG_LIBRARIES}" "${BZIP2_LIBRARIES}" "${GME_LIBRARIES}" ) # [BB] Without sound, we don't need FMOD. -if ( NOT NO_SOUND ) - set( ZDOOM_LIBS ${ZDOOM_LIBS} ) - if( NOT NO_FMOD ) - set( ZDOOM_LIBS ${ZDOOM_LIBS} "${FMOD_LIBRARY}" ) - endif( NOT NO_FMOD ) - include_directories( "${ZLIB_INCLUDE_DIR}" "${BZIP2_INCLUDE_DIR}" "${LZMA_INCLUDE_DIR}" "${JPEG_INCLUDE_DIR}" "${GME_INCLUDE_DIR}" ) -else ( NOT NO_SOUND ) - include_directories( "${ZLIB_INCLUDE_DIR}" "${BZIP2_INCLUDE_DIR}" "${LZMA_INCLUDE_DIR}" "${JPEG_INCLUDE_DIR}" "${GME_INCLUDE_DIR}" ) -endif ( NOT NO_SOUND ) +include_directories( "${ZLIB_INCLUDE_DIR}" "${BZIP2_INCLUDE_DIR}" "${LZMA_INCLUDE_DIR}" "${JPEG_INCLUDE_DIR}" "${GME_INCLUDE_DIR}" ) # [BB] We need OpenSSL for csrp. FIND_PACKAGE ( OpenSSL REQUIRED ) include_directories( ${OPENSSL_INCLUDE_DIR} ) set ( ZDOOM_LIBS ${ZDOOM_LIBS} ${OPENSSL_LIBRARIES} ) -if( SNDFILE_FOUND ) - set( ZDOOM_LIBS ${ZDOOM_LIBS} "${SNDFILE_LIBRARIES}" ) - include_directories( "${SNDFILE_INCLUDE_DIRS}" ) -endif( SNDFILE_FOUND ) -if( MPG123_FOUND ) - set( ZDOOM_LIBS ${ZDOOM_LIBS} "${MPG123_LIBRARIES}" ) - include_directories( "${MPG123_INCLUDE_DIR}" ) -endif( MPG123_FOUND ) -if( NOT DYN_FLUIDSYNTH) - if( FLUIDSYNTH_FOUND ) - set( ZDOOM_LIBS ${ZDOOM_LIBS} "${FLUIDSYNTH_LIBRARIES}" ) - include_directories( "${FLUIDSYNTH_INCLUDE_DIR}" ) - endif( FLUIDSYNTH_FOUND ) -else( NOT DYN_FLUIDSYNTH ) - set( ZDOOM_LIBS ${ZDOOM_LIBS} ${CMAKE_DL_LIBS} ) -endif( NOT DYN_FLUIDSYNTH ) - # OpenGL on OS X: GLEW include directory if( APPLE ) @@ -886,18 +792,6 @@ set( X86_SOURCES ) endif( SSE_MATTERS ) -if( SNDFILE_FOUND ) - add_definitions( -DHAVE_SNDFILE ) -endif( SNDFILE_FOUND ) -if( MPG123_FOUND ) - add_definitions( -DHAVE_MPG123 ) -endif( MPG123_FOUND ) -if( DYN_FLUIDSYNTH ) - add_definitions( -DHAVE_FLUIDSYNTH -DDYN_FLUIDSYNTH ) -elseif( FLUIDSYNTH_FOUND ) - add_definitions( -DHAVE_FLUIDSYNTH ) -endif( DYN_FLUIDSYNTH ) - # [BB] Only complile the gl sources, if we want GL support. if( NOT NO_GL ) set( GL_SOURCES
Comments are closed, but trackbacks and pingbacks are open.