From 177df33d25d9fa1d76fba8eef6e408e6bdcdb175 Mon Sep 17 00:00:00 2001
From: Tom Finegan <tomfinegan@google.com>
Date: Wed, 30 May 2012 13:52:44 -0400
Subject: [PATCH] Move the muxer sample source file and project.

They now reside in the same place as the parser sample.

Change-Id: Idb4471ea81a3d91eeeaf1b36053187203de9a21f
---
 Makefile                                                    | 6 +++---
 libwebm_2008.sln                                            | 2 +-
 sample_muxer/sample_muxer.cpp => sample_muxer.cpp           | 0
 .../sample_muxer_2008.vcproj => sample_muxer_2008.vcproj    | 4 ++--
 4 files changed, 6 insertions(+), 6 deletions(-)
 rename sample_muxer/sample_muxer.cpp => sample_muxer.cpp (100%)
 rename sample_muxer/sample_muxer_2008.vcproj => sample_muxer_2008.vcproj (97%)

diff --git a/Makefile b/Makefile
index 24c88ab..1f0425b 100644
--- a/Makefile
+++ b/Makefile
@@ -2,8 +2,8 @@ CXX      := g++
 CXXFLAGS := -W -Wall -g
 LIBWEBM  := libwebm.a
 WEBMOBJS := mkvparser.o mkvreader.o mkvmuxer.o mkvmuxerutil.o mkvwriter.o
-OBJECTS1 := $(PARSEOBJ) sample.o
-OBJECTS2 := $(PARSEOBJ) $(MUXEROBJ) sample_muxer/sample_muxer.o
+OBJECTS1 := sample.o
+OBJECTS2 := sample_muxer.o
 INCLUDES := -I.
 EXES     := samplemuxer sample
 
@@ -12,7 +12,7 @@ all: $(EXES)
 sample: sample.o $(LIBWEBM)
 	$(CXX) $^ -o $@
 
-samplemuxer: sample_muxer/sample_muxer.o $(LIBWEBM)
+samplemuxer: sample_muxer.o $(LIBWEBM)
 	$(CXX) $^ -o $@
 
 libwebm.a: $(WEBMOBJS)
diff --git a/libwebm_2008.sln b/libwebm_2008.sln
index 80c8612..e2f8c0e 100644
--- a/libwebm_2008.sln
+++ b/libwebm_2008.sln
@@ -8,7 +8,7 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "sample", "sample_2008.vcpro
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libwebm", "libwebm_2008.vcproj", "{7B1F12CA-0724-430B-B61A-1D357C912CBA}"
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "sample_muxer", "sample_muxer\sample_muxer_2008.vcproj", "{B407561F-1F5E-4798-B9C2-81AB09CFBC16}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "sample_muxer", "sample_muxer_2008.vcproj", "{B407561F-1F5E-4798-B9C2-81AB09CFBC16}"
 	ProjectSection(ProjectDependencies) = postProject
 		{7B1F12CA-0724-430B-B61A-1D357C912CBA} = {7B1F12CA-0724-430B-B61A-1D357C912CBA}
 	EndProjectSection
diff --git a/sample_muxer/sample_muxer.cpp b/sample_muxer.cpp
similarity index 100%
rename from sample_muxer/sample_muxer.cpp
rename to sample_muxer.cpp
diff --git a/sample_muxer/sample_muxer_2008.vcproj b/sample_muxer_2008.vcproj
similarity index 97%
rename from sample_muxer/sample_muxer_2008.vcproj
rename to sample_muxer_2008.vcproj
index 52f8f0f..4d755a0 100644
--- a/sample_muxer/sample_muxer_2008.vcproj
+++ b/sample_muxer_2008.vcproj
@@ -61,7 +61,7 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalDependencies="..\Debug\libwebm.lib"
+				AdditionalDependencies=".\Debug\libwebm.lib"
 				LinkIncremental="2"
 				GenerateDebugInformation="true"
 				SubSystem="1"
@@ -135,7 +135,7 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalDependencies="..\Release\libwebm.lib"
+				AdditionalDependencies=".\Release\libwebm.lib"
 				LinkIncremental="1"
 				GenerateDebugInformation="true"
 				SubSystem="1"