Merge branch 'patch-90'

This commit is contained in:
Sebastian Pipping 2016-03-14 19:12:52 +01:00
commit 75a1473981

View File

@ -50,14 +50,16 @@ set(expat_SRCS
lib/xmltok_ns.c lib/xmltok_ns.c
) )
if(WIN32 AND BUILD_shared)
set(expat_SRCS ${expat_SRCS} lib/libexpat.def)
endif(WIN32 AND BUILD_shared)
if(BUILD_shared) if(BUILD_shared)
set(_SHARED SHARED) set(_SHARED SHARED)
if(WIN32)
set(expat_SRCS ${expat_SRCS} lib/libexpat.def)
endif(WIN32)
else(BUILD_shared) else(BUILD_shared)
set(_SHARED STATIC) set(_SHARED STATIC)
if(WIN32)
add_definitions(-DXML_STATIC)
endif(WIN32)
endif(BUILD_shared) endif(BUILD_shared)
add_library(expat ${_SHARED} ${expat_SRCS}) add_library(expat ${_SHARED} ${expat_SRCS})