zdoom/fluidsynth
0
0
Fork 0
mirror of https://github.com/ZDoom/fluidsynth.git synced 2024-11-14 00:20:41 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #393 from FluidSynth/cmake-flags

Browse source 
Avoid bypassing visibility control
This commit is contained in:
Tom M 2018-06-03 06:42:37 +02:00 committed by GitHub
commit 698682d4e2
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 20 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

33
CMakeLists.txt
View file

@ -107,6 +107,15 @@ mark_as_advanced ( LIB_SUFFIX )
# the default C standard to use for all targets # the default C standard to use for all targets
set(CMAKE_C_STANDARD 90) set(CMAKE_C_STANDARD 90)
# the default global visibility level for all target
# no visibility support on OS2
if ( NOT OS2 )
set ( CMAKE_C_VISIBILITY_PRESET hidden )
endif ( NOT OS2 )
# enforce visibility control for all types of cmake targets
cmake_policy ( SET CMP0063 NEW )
# Default install directory names # Default install directory names
include ( DefaultDirs ) include ( DefaultDirs )
@ -157,24 +166,18 @@ if ( CMAKE_COMPILER_IS_GNUCC OR CMAKE_C_COMPILER_ID STREQUAL "Clang" OR CMAKE_C_
endif ( NOT APPLE AND NOT OS2 ) endif ( NOT APPLE AND NOT OS2 )
# define some warning flags # define some warning flags
set ( ADDITIONAL_FLAGS "-Wall -W -Wpointer-arith -Wno-cast-qual -Wstrict-prototypes -Wno-unused-parameter -Wdeclaration-after-statement" ) set ( CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wall -W -Wpointer-arith -Wno-cast-qual -Wstrict-prototypes -Wno-unused-parameter -Wdeclaration-after-statement" )
# no visibility support on OS2
if ( NOT OS2 )
set ( ADDITIONAL_FLAGS "${ADDITIONAL_FLAGS} -fvisibility=hidden" )
endif ( NOT OS2 )
if ( CMAKE_C_COMPILER_ID STREQUAL "Intel" ) if ( CMAKE_C_COMPILER_ID STREQUAL "Intel" )
# icc needs the restrict flag to recognize C99 restrict pointers # icc needs the restrict flag to recognize C99 restrict pointers
set ( ADDITIONAL_FLAGS "${ADDITIONAL_FLAGS} -restrict" ) set ( CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -restrict" )
else () # not intel else () # not intel
# gcc and clang support bad function cast and alignment warnings; add them as well. # gcc and clang support bad function cast and alignment warnings; add them as well.
set ( ADDITIONAL_FLAGS "${ADDITIONAL_FLAGS} -Wbad-function-cast -Wcast-align" ) set ( CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wbad-function-cast -Wcast-align" )
endif (CMAKE_C_COMPILER_ID STREQUAL "Intel" ) endif (CMAKE_C_COMPILER_ID STREQUAL "Intel" )
set ( CMAKE_C_FLAGS_DEBUG "-g ${ADDITIONAL_FLAGS} -DDEBUG -fsanitize=undefined ${CMAKE_C_FLAGS_DEBUG}" ) # prepend to build type specific flags, to allow users to override
set ( CMAKE_C_FLAGS_RELEASE "-O2 -fomit-frame-pointer -finline-functions ${ADDITIONAL_FLAGS} -DNDEBUG ${CMAKE_C_FLAGS_RELEASE}" ) set ( CMAKE_C_FLAGS_DEBUG "-g -DDEBUG -fsanitize=undefined ${CMAKE_C_FLAGS_DEBUG}" )
set ( CMAKE_C_FLAGS_RELWITHDEBINFO "-O2 -g -fomit-frame-pointer -finline-functions ${ADDITIONAL_FLAGS} -DNDEBUG ${CMAKE_C_FLAGS_RELWITHDEBINFO}" )
endif ( CMAKE_COMPILER_IS_GNUCC OR CMAKE_C_COMPILER_ID STREQUAL "Clang" OR CMAKE_C_COMPILER_ID STREQUAL "Intel" ) endif ( CMAKE_COMPILER_IS_GNUCC OR CMAKE_C_COMPILER_ID STREQUAL "Clang" OR CMAKE_C_COMPILER_ID STREQUAL "Intel" )
@ -288,9 +291,7 @@ if ( enable-profiling )
set ( OPT_FLAGS "" ) set ( OPT_FLAGS "" )
endif ( ) endif ( )
set ( CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG} ${OPT_FLAGS}" ) set ( CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${OPT_FLAGS}" )
set ( CMAKE_C_FLAGS_RELEASE "${CMAKE_C_FLAGS_RELEASE} ${OPT_FLAGS}" )
set ( CMAKE_C_FLAGS_RELWITHDEBINFO "${CMAKE_C_FLAGS_RELWITHDEBINFO} ${OPT_FLAGS}" )
endif ( enable-profiling ) endif ( enable-profiling )
unset ( ENABLE_TRAPONFPE CACHE ) unset ( ENABLE_TRAPONFPE CACHE )
@ -309,12 +310,12 @@ endif ( enable-fpe-check )
if ( enable-debug ) if ( enable-debug )
set ( CMAKE_BUILD_TYPE "Debug" CACHE STRING set ( CMAKE_BUILD_TYPE "Debug" CACHE STRING
"Choose the build type, options: Debug Release RelWithDebInfo" FORCE ) "Choose the build type, options: Debug Release RelWithDebInfo MinSizeRel" FORCE )
endif ( enable-debug ) endif ( enable-debug )
if ( NOT CMAKE_BUILD_TYPE ) if ( NOT CMAKE_BUILD_TYPE )
set ( CMAKE_BUILD_TYPE "RelWithDebInfo" CACHE STRING set ( CMAKE_BUILD_TYPE "RelWithDebInfo" CACHE STRING
"Choose the build type, options: Debug Release RelWithDebInfo" FORCE ) "Choose the build type, options: Debug Release RelWithDebInfo MinSizeRel" FORCE )
endif ( NOT CMAKE_BUILD_TYPE ) endif ( NOT CMAKE_BUILD_TYPE )
unset ( ENABLE_DEBUG CACHE ) unset ( ENABLE_DEBUG CACHE )

6
src/utils/fluidsynth_priv.h
View file

@ -335,10 +335,10 @@ do { strncpy(_dst,_src,_n); \
#define M_LN10 2.3025850929940456840179914546844 #define M_LN10 2.3025850929940456840179914546844
#endif #endif
#ifdef NDEBUG #ifdef DEBUG
#define FLUID_ASSERT(a)
#else
#define FLUID_ASSERT(a) g_assert(a) #define FLUID_ASSERT(a) g_assert(a)
#else
#define FLUID_ASSERT(a)
#endif #endif
#define FLUID_LIKELY G_LIKELY #define FLUID_LIKELY G_LIKELY