1
0
mirror of https://github.com/cookiengineer/audacity synced 2025-06-30 15:18:42 +02:00

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

This commit is contained in:
James Crook 2019-03-14 11:11:17 +00:00
commit ddba48ca5a

@ -3,7 +3,7 @@ set( TARGET expat )
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}expat/amiga/expat_68k.c #${LIB_SRC_DIRECTORY}expat/amiga/expat_68k.c
#${LIB_SRC_DIRECTORY}expat/amiga/expat_68k_handler_stubs.c #${LIB_SRC_DIRECTORY}expat/amiga/expat_68k_handler_stubs.c
#${LIB_SRC_DIRECTORY}expat/amiga/expat_lib.c #${LIB_SRC_DIRECTORY}expat/amiga/expat_lib.c
@ -34,14 +34,18 @@ ${LIB_SRC_DIRECTORY}expat/lib/xmltok_ns.c
#${LIB_SRC_DIRECTORY}expat/tests/runtestspp.cpp #${LIB_SRC_DIRECTORY}expat/tests/runtestspp.cpp
) )
# 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
-DCOMPILED_FROM_DSP if(APPLE)
) add_definitions(-DMACOS_CLASSIC)
else()
add_definitions(-DCOMPILED_FROM_DSP)
endif()
add_library( ${TARGET} STATIC ${SOURCES}) add_library( ${TARGET} STATIC ${SOURCES})
target_include_directories( ${TARGET} PRIVATE target_include_directories( ${TARGET} PRIVATE
${TARGET_SOURCE}/lib ${TARGET_SOURCE}/lib
) )
target_link_libraries( ${TARGET} ) target_link_libraries( ${TARGET} )