1
0
mirror of https://github.com/cookiengineer/audacity synced 2025-08-02 08:59:28 +02:00

Merge remote-tracking branch 'upstream/pr/333'

This commit is contained in:
James Crook 2019-03-14 11:10:35 +00:00
commit 487f600702

View File

@ -3,7 +3,7 @@ set( TARGET lv2 )
set( TARGET_SOURCE ${LIB_SRC_DIRECTORY}${TARGET} ) set( TARGET_SOURCE ${LIB_SRC_DIRECTORY}${TARGET} )
project( ${TARGET} ) project( ${TARGET} )
set( SOURCES set( SOURCES
#${LIB_SRC_DIRECTORY}lv2/sord/src/sordmm_test.cpp #${LIB_SRC_DIRECTORY}lv2/sord/src/sordmm_test.cpp
#${LIB_SRC_DIRECTORY}lv2/suil/src/gtk2_in_qt4.cpp #${LIB_SRC_DIRECTORY}lv2/suil/src/gtk2_in_qt4.cpp
#${LIB_SRC_DIRECTORY}lv2/suil/src/qt4_in_gtk2.cpp #${LIB_SRC_DIRECTORY}lv2/suil/src/qt4_in_gtk2.cpp
@ -67,17 +67,19 @@ ${LIB_SRC_DIRECTORY}lv2/suil/src/suil_instance.c
) )
# This defines the #define on both Windows and Linux. # This defines the #define on both Windows and Linux.
add_definitions( add_definitions(
-D_LIB -D_LIB
-Dsnprintf=_snprintf
-Dinline=__inline # Not needed in non CMake version. -Dinline=__inline # Not needed in non CMake version.
-DHAVE_FMAX -DHAVE_FMAX
-DLILV_INTERNAL -DLILV_INTERNAL
-D_DEBUG -D_DEBUG
) )
if( NOT MSVC OR MSVC_VERSION LESS 1900 )
add_definitions(-Dsnprintf=_snprintf)
endif()
add_library( ${TARGET} STATIC ${SOURCES}) add_library( ${TARGET} STATIC ${SOURCES})
add_compile_options(/TP) add_compile_options(/TP)
target_include_directories( ${TARGET} PRIVATE target_include_directories( ${TARGET} PRIVATE
${TARGET_SOURCE}/windows ${TARGET_SOURCE}/windows
${TARGET_SOURCE}/sord/src ${TARGET_SOURCE}/sord/src
${TARGET_SOURCE}/lilv ${TARGET_SOURCE}/lilv
@ -88,4 +90,4 @@ ${TARGET_SOURCE}/sratom
${TARGET_SOURCE}/suil ${TARGET_SOURCE}/suil
) )
target_link_libraries( ${TARGET} ) target_link_libraries( ${TARGET} )