From a2543ff60e82d18283748c47e3533dec658c4c35 Mon Sep 17 00:00:00 2001 From: Vitaliy Kirsanov Date: Fri, 1 Mar 2019 23:34:39 +0300 Subject: [PATCH] Correct config macro for expat lib on MacOS Otherwise build breaks --- cmake-proxies/expat/CMakeLists.txt | 18 +++++++++++------- 1 file changed, 11 insertions(+), 7 deletions(-) diff --git a/cmake-proxies/expat/CMakeLists.txt b/cmake-proxies/expat/CMakeLists.txt index f23d61ba1..7ba072a55 100644 --- a/cmake-proxies/expat/CMakeLists.txt +++ b/cmake-proxies/expat/CMakeLists.txt @@ -3,7 +3,7 @@ set( TARGET expat ) set( TARGET_SOURCE ${LIB_SRC_DIRECTORY}${TARGET} ) project( ${TARGET} ) -set( SOURCES +set( SOURCES #${LIB_SRC_DIRECTORY}expat/amiga/expat_68k.c #${LIB_SRC_DIRECTORY}expat/amiga/expat_68k_handler_stubs.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 ) # This defines the #define on both Windows and Linux. -add_definitions( --D_LIB --DCOMPILED_FROM_DSP -) +add_definitions(-D_LIB) + +if(APPLE) + add_definitions(-DMACOS_CLASSIC) +else() + add_definitions(-DCOMPILED_FROM_DSP) +endif() + add_library( ${TARGET} STATIC ${SOURCES}) -target_include_directories( ${TARGET} PRIVATE +target_include_directories( ${TARGET} PRIVATE ${TARGET_SOURCE}/lib ) -target_link_libraries( ${TARGET} ) \ No newline at end of file +target_link_libraries( ${TARGET} )