From: Steve Lhomme <slhomme@matroska.org>
Date: Sun, 4 Jul 2010 09:17:57 +0000 (+0000)
Subject: only use a single coremake dir in the tree (from corec/tools/coremake)
X-Git-Tag: release-1.1.0~16
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=9ee55d7c1cfee2a30e90615133dbd50cd8b2483e;p=libmatroska

only use a single coremake dir in the tree (from corec/tools/coremake)
add a coremake solution to build the libmatroska test files via coremake

git-svn-id: https://matroska.svn.sourceforge.net/svnroot/matroska/trunk/libmatroska@383 a6f86f6d-0131-4f8e-9e7b-e335508773d5
---

diff --git a/libmatroska.proj b/libmatroska.proj
index 559a95e..22ea8d7 100644
--- a/libmatroska.proj
+++ b/libmatroska.proj
@@ -1,4 +1,4 @@
-Include "*/*.proj"
+#include "*/*.proj"
 
 LIB matroska
 {
diff --git a/test/ebml/ebml.proj b/test/ebml/ebml.proj
index 94fe5bc..99026d7 100644
--- a/test/ebml/ebml.proj
+++ b/test/ebml/ebml.proj
@@ -2,10 +2,12 @@
 
 CON ebml-test00
 {
+  USE matroska
   SOURCE test00.cpp
 }
 
 CON ebml-test0
 {
+  USE matroska
   SOURCE test0.cpp
 }
diff --git a/test/ebml/test0.cpp b/test/ebml/test0.cpp
index bfdcf9e..ea47ef7 100644
--- a/test/ebml/test0.cpp
+++ b/test/ebml/test0.cpp
@@ -32,7 +32,7 @@
 
 /*!
     \file
-    \version \$Id: test0.cpp 1078 2005-03-03 13:13:04Z robux4 $
+    \version \$Id$
     \author Steve Lhomme     <robux4 @ users.sf.net>
 		Test the EBML write possibilities
 		\see http://www.cl.cam.ac.uk/~mgk25/unicode.html
@@ -41,16 +41,16 @@
 
 #include <stdio.h>
 
-#include "StdIOCallback.hpp"
+#include "ebml/StdIOCallback.h"
 
-#include "EbmlUInteger.hpp"
-#include "EbmlSInteger.hpp"
-#include "EbmlBinary.hpp"
-#include "EbmlString.hpp"
-#include "EbmlUnicodeString.hpp"
-#include "EbmlMaster.hpp"
-#include "EbmlFloat.hpp"
-#include "EbmlStream.hpp"
+#include "ebml/EbmlUInteger.h"
+#include "ebml/EbmlSInteger.h"
+#include "ebml/EbmlBinary.h"
+#include "ebml/EbmlString.h"
+#include "ebml/EbmlUnicodeString.h"
+#include "ebml/EbmlMaster.h"
+#include "ebml/EbmlFloat.h"
+#include "ebml/EbmlStream.h"
 
 using namespace LIBMATROSKA_NAMESPACE;
 
diff --git a/test/ebml/test00.cpp b/test/ebml/test00.cpp
index c82dfbd..aaf2c57 100644
--- a/test/ebml/test00.cpp
+++ b/test/ebml/test00.cpp
@@ -32,7 +32,7 @@
 
 /*!
     \file
-    \version \$Id: test00.cpp 1078 2005-03-03 13:13:04Z robux4 $
+    \version \$Id$
     \author Steve Lhomme     <robux4 @ users.sf.net>
 		Test the writing a basic EBML file
 */
@@ -40,20 +40,20 @@
 #include <stdio.h>
 #include <string>
 
-#include "StdIOCallback.h"
+#include "ebml/StdIOCallback.h"
 
-#include "EbmlHead.h"
-#include "EbmlSubHead.h"
-#include "EbmlStream.h"
-#include "EbmlVoid.h"
-#include "EbmlContexts.h"
-#include "KaxSegment.h"
-#include "KaxAttachments.h"
-#include "KaxAttached.h"
-#include "KaxContexts.h"
+#include "ebml/EbmlHead.h"
+#include "ebml/EbmlSubHead.h"
+#include "ebml/EbmlStream.h"
+#include "ebml/EbmlVoid.h"
+#include "ebml/EbmlContexts.h"
+#include "matroska/KaxSegment.h"
+#include "matroska/KaxAttachments.h"
+#include "matroska/KaxAttached.h"
+#include "matroska/KaxContexts.h"
 
-#include "EbmlVersion.h"
-#include "KaxVersion.h"
+#include "ebml/EbmlVersion.h"
+#include "matroska/KaxVersion.h"
 
 using namespace LIBMATROSKA_NAMESPACE;
 
diff --git a/test/mux/mux.proj b/test/mux/mux.proj
index e46753c..a9270aa 100644
--- a/test/mux/mux.proj
+++ b/test/mux/mux.proj
@@ -2,10 +2,12 @@
 
 CON mux-test6
 {
+  USE matroska
   SOURCE test6.cpp
 }
 
 CON mux-test8
 {
+  USE matroska
   SOURCE test8.cpp
 }
diff --git a/test/test.proj b/test/test.proj
index 8af3a9a..f7744a2 100644
--- a/test/test.proj
+++ b/test/test.proj
@@ -1 +1,9 @@
 #include "*/*.proj"
+
+WORKSPACE tests
+{
+  USE mux-test6
+  USE mux-test8
+  USE ebml-test00
+  USE ebml-test0
+}