mirror of
https://github.com/ZDoom/fluidsynth.git
synced 2025-03-02 07:21:58 +00:00
Merge pull request #942 from Ghabry/emscripten
Emscripten: Fix CMake issues
This commit is contained in:
commit
1511b5a575
1 changed files with 3 additions and 3 deletions
|
@ -30,7 +30,7 @@ if(POLICY CMP0091)
|
||||||
endif()
|
endif()
|
||||||
|
|
||||||
project ( FluidSynth C CXX )
|
project ( FluidSynth C CXX )
|
||||||
set ( CMAKE_MODULE_PATH ${CMAKE_SOURCE_DIR}/cmake_admin )
|
list( APPEND CMAKE_MODULE_PATH ${CMAKE_SOURCE_DIR}/cmake_admin )
|
||||||
|
|
||||||
# FluidSynth package name
|
# FluidSynth package name
|
||||||
set ( PACKAGE "fluidsynth" )
|
set ( PACKAGE "fluidsynth" )
|
||||||
|
@ -200,12 +200,12 @@ unset ( FLUID_LIBS CACHE )
|
||||||
unset ( ENABLE_UBSAN CACHE )
|
unset ( ENABLE_UBSAN CACHE )
|
||||||
|
|
||||||
if ( CMAKE_COMPILER_IS_GNUCC OR CMAKE_C_COMPILER_ID MATCHES "Clang" OR CMAKE_C_COMPILER_ID STREQUAL "Intel" )
|
if ( CMAKE_COMPILER_IS_GNUCC OR CMAKE_C_COMPILER_ID MATCHES "Clang" OR CMAKE_C_COMPILER_ID STREQUAL "Intel" )
|
||||||
if ( NOT APPLE AND NOT OS2 )
|
if ( NOT APPLE AND NOT OS2 AND NOT EMSCRIPTEN )
|
||||||
set ( CMAKE_EXE_LINKER_FLAGS
|
set ( CMAKE_EXE_LINKER_FLAGS
|
||||||
"${CMAKE_EXE_LINKER_FLAGS} -Wl,--as-needed" )
|
"${CMAKE_EXE_LINKER_FLAGS} -Wl,--as-needed" )
|
||||||
set ( CMAKE_SHARED_LINKER_FLAGS
|
set ( CMAKE_SHARED_LINKER_FLAGS
|
||||||
"${CMAKE_SHARED_LINKER_FLAGS} -Wl,--no-undefined" )
|
"${CMAKE_SHARED_LINKER_FLAGS} -Wl,--no-undefined" )
|
||||||
endif ( NOT APPLE AND NOT OS2 )
|
endif ( NOT APPLE AND NOT OS2 AND NOT EMSCRIPTEN )
|
||||||
|
|
||||||
# define some warning flags
|
# define some warning flags
|
||||||
set ( CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wall -W -Wpointer-arith -Wcast-qual -Wstrict-prototypes -Wno-unused-parameter -Wdeclaration-after-statement -Werror=implicit-function-declaration" )
|
set ( CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wall -W -Wpointer-arith -Wcast-qual -Wstrict-prototypes -Wno-unused-parameter -Wdeclaration-after-statement -Werror=implicit-function-declaration" )
|
||||||
|
|
Loading…
Reference in a new issue