Commit 4471e87e authored by Steve Lhomme's avatar Steve Lhomme

libebml2/libmatroska2: use CONFIG_EBML2_LIB when ebml2_group is included in a...

libebml2/libmatroska2: use CONFIG_EBML2_LIB when ebml2_group is included in a project that already has Core-C

git-svn-id: https://matroska.svn.sourceforge.net/svnroot/matroska/trunk/foundation_src@352 a6f86f6d-0131-4f8e-9e7b-e335508773d5
parent 7a3ddaf3
......@@ -5,16 +5,21 @@ GROUP ebml2_group
PROJECT_NAME "libebml2"
PROJECT_VERSION 0.9.7
PROJECT_VENDOR "Matroska Foundation"
EXPDEFINE HAVE_EBML2
EXPDEFINE HAS_EBML2
INCLUDE .
EXPINCLUDE .
USE ebml2_project
USE node
USE file
USE date
IF CONFIG_EBML2_LIB
USEINCLUDE node
ELSE
USE node
USE file
USE date
IF COREMAKE_UNICODE
USE parser
ENDIF
ENDIF
IF COREMAKE_UNICODE
USE parser
DEFINE CONFIG_EBML_UNICODE
EXPDEFINE CONFIG_EBML_UNICODE
ENDIF
......
......@@ -9,9 +9,8 @@ PROJECT matroska2
GROUP matroska2_group
{
USE(COREMAKE_STATIC) ebml2_group
USE(!COREMAKE_STATIC) ebml2
EXPDEFINE HAVE_MATROSKA2
USE ebml2
EXPDEFINE HAS_MATROSKA2
USE(CONFIG_CODEC_HELPER) tremor
DEFINE(CONFIG_MATROSKA2_NOGLOBAL) NO_MATROSKA2_GLOBAL
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment