[asterisk-scf-commits] asterisk-scf/release/matroska.git branch "master" updated.

[Commits to the Asterisk SCF project code repositories]

branch "master" has been updated
       via  90cf921561954910694d89424306cec5eca1dba8 (commit)
      from  3625a9e93e949fa7735e7c8d65ba41e73d76f492 (commit)

Summary of changes:
 libmatroska/matroska/KaxBlock.h     |    2 +-
 libmatroska/test/mux/CMakeLists.txt |   10 ++++++++--
 2 files changed, 9 insertions(+), 3 deletions(-)


- Log -----------------------------------------------------------------
commit 90cf921561954910694d89424306cec5eca1dba8
Author: Brent Eagles <beagles at digium.com>
Date:   Mon Aug 8 14:27:37 2011 -0230

    Fix some windows build issues.

diff --git a/libmatroska/matroska/KaxBlock.h b/libmatroska/matroska/KaxBlock.h
index bf33e90..69da58c 100644
--- a/libmatroska/matroska/KaxBlock.h
+++ b/libmatroska/matroska/KaxBlock.h
@@ -205,7 +205,7 @@ DECLARE_MKX_MASTER(KaxBlockGroup)
 		const KaxTrackEntry * ParentTrack;
 };
 
-class KaxInternalBlock : public EbmlBinary {
+class MATROSKA_DLL_API KaxInternalBlock : public EbmlBinary {
 	public:
 		KaxInternalBlock(EBML_DEF_CONS EBML_DEF_SEP bool bSimple EBML_DEF_SEP EBML_EXTRA_PARAM) :EBML_DEF_BINARY_INIT EBML_DEF_SEP bLocalTimecodeUsed(false), mLacing(LACING_AUTO), mInvisible(false)
 			,ParentCluster(NULL), bIsSimple(bSimple), bIsKeyframe(true), bIsDiscardable(false)
diff --git a/libmatroska/test/mux/CMakeLists.txt b/libmatroska/test/mux/CMakeLists.txt
index eebf9d8..d8753d5 100644
--- a/libmatroska/test/mux/CMakeLists.txt
+++ b/libmatroska/test/mux/CMakeLists.txt
@@ -2,13 +2,19 @@ include_directories(../../src)
 include_directories(../..)
 include_directories(../../../libebml)
 
+if(WIN32)
+    add_definitions(-DEBML_DLL)	
+    add_definitions(-DMATROSKA_DLL)	
+    add_definitions(-DWIN32)	
+endif()
+
 astscf_component_init(mux1_matroska_test)
 astscf_component_add_files(mux1_matroska_test
 	"test6.cpp"
 )
 
 astscf_component_build_standalone(mux1_matroska_test)
-target_link_libraries(mux1_matroska_test astscf-matroska)
+target_link_libraries(mux1_matroska_test astscf-matroska astscf-ebml)
 
 astscf_component_init(mux2_matroska_test)
 astscf_component_add_files(mux2_matroska_test
@@ -16,4 +22,4 @@ astscf_component_add_files(mux2_matroska_test
 )
 
 astscf_component_build_standalone(mux2_matroska_test)
-target_link_libraries(mux2_matroska_test astscf-matroska)
+target_link_libraries(mux2_matroska_test astscf-matroska astscf-ebml)

-----------------------------------------------------------------------


-- 
asterisk-scf/release/matroska.git