[xiph-commits] r7311 - in trunk/oggdsf: sln/oggdsf_all

illiminable at dactyl.lonelymoon.com illiminable
Sat Jul 24 03:46:16 PDT 2004


src/lib/core/ogg/libVorbisCommentDotNET
Message-ID: <20040724104616.97FD09AAAB at dactyl.lonelymoon.com>

Author: illiminable
Date: Sat Jul 24 03:46:16 2004
New Revision: 7311

Modified:
trunk/oggdsf/sln/oggdsf_all/oggdsf_all.sln
trunk/oggdsf/src/lib/core/ogg/libVorbisCommentDotNET/DNFileComments.h
trunk/oggdsf/src/lib/core/ogg/libVorbisCommentDotNET/DNStreamCommentInfo.h
trunk/oggdsf/src/lib/core/ogg/libVorbisCommentDotNET/DNVorbisComments.h
trunk/oggdsf/src/lib/core/ogg/libVorbisCommentDotNET/Stdafx.h
trunk/oggdsf/src/lib/core/ogg/libVorbisCommentDotNET/libVorbisCommentDotNET.vcproj
Log:
* .NET comment library builds again.

Modified: trunk/oggdsf/sln/oggdsf_all/oggdsf_all.sln
===================================================================
--- trunk/oggdsf/sln/oggdsf_all/oggdsf_all.sln	2004-07-24 09:59:55 UTC (rev 7310)
+++ trunk/oggdsf/sln/oggdsf_all/oggdsf_all.sln	2004-07-24 10:46:15 UTC (rev 7311)
@@ -1041,9 +1041,8 @@
{A0004AEB-B47C-4A0A-8FE7-4F65B5FD48FA} = {A0004AEB-B47C-4A0A-8FE7-4F65B5FD48FA}
EndProjectSection
EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libVorbisCommentDotNET", "..\..\src\lib\core\ogg\libVorbisCommentDotNET\libVorbisCommentDotNET.vcproj", "{9599D980-84D8-4470-B7E2-1F7B52C781E7}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libVorbisCommentDotNET", "..\..\src\lib\core\ogg\libVorbisCommentDotNET\libVorbisCommentDotNET.vcproj", "{CD8398F5-6FF7-4BDA-9E48-ADF6C64A4747}"
ProjectSection(ProjectDependencies) = postProject
-		{223ACC19-608E-4E1B-A054-067F0CACB272} = {223ACC19-608E-4E1B-A054-067F0CACB272}
{FCFE729D-EADE-45BA-9506-7E82A46403F7} = {FCFE729D-EADE-45BA-9506-7E82A46403F7}
{DC4D86E2-72C1-4995-8FB1-0F08655E620A} = {DC4D86E2-72C1-4995-8FB1-0F08655E620A}
EndProjectSection
@@ -1487,16 +1486,16 @@
{7143478E-0C1A-4C8B-B12C-4BFEF591F36F}.Release.Build.0 = Release|Win32
{7143478E-0C1A-4C8B-B12C-4BFEF591F36F}.Release Unicode.ActiveCfg = Release|Win32
{7143478E-0C1A-4C8B-B12C-4BFEF591F36F}.Release Unicode.Build.0 = Release|Win32
-		{9599D980-84D8-4470-B7E2-1F7B52C781E7}.Debug.ActiveCfg = Debug|Win32
-		{9599D980-84D8-4470-B7E2-1F7B52C781E7}.Debug.Build.0 = Debug|Win32
-		{9599D980-84D8-4470-B7E2-1F7B52C781E7}.Debug Unicode.ActiveCfg = Debug|Win32
-		{9599D980-84D8-4470-B7E2-1F7B52C781E7}.Debug Unicode.Build.0 = Debug|Win32
-		{9599D980-84D8-4470-B7E2-1F7B52C781E7}.MakeFile.ActiveCfg = Release|Win32
-		{9599D980-84D8-4470-B7E2-1F7B52C781E7}.MakeFile.Build.0 = Release|Win32
-		{9599D980-84D8-4470-B7E2-1F7B52C781E7}.Release.ActiveCfg = Release|Win32
-		{9599D980-84D8-4470-B7E2-1F7B52C781E7}.Release.Build.0 = Release|Win32
-		{9599D980-84D8-4470-B7E2-1F7B52C781E7}.Release Unicode.ActiveCfg = Release|Win32
-		{9599D980-84D8-4470-B7E2-1F7B52C781E7}.Release Unicode.Build.0 = Release|Win32
+		{CD8398F5-6FF7-4BDA-9E48-ADF6C64A4747}.Debug.ActiveCfg = Debug|Win32
+		{CD8398F5-6FF7-4BDA-9E48-ADF6C64A4747}.Debug.Build.0 = Debug|Win32
+		{CD8398F5-6FF7-4BDA-9E48-ADF6C64A4747}.Debug Unicode.ActiveCfg = Debug|Win32
+		{CD8398F5-6FF7-4BDA-9E48-ADF6C64A4747}.Debug Unicode.Build.0 = Debug|Win32
+		{CD8398F5-6FF7-4BDA-9E48-ADF6C64A4747}.MakeFile.ActiveCfg = Release|Win32
+		{CD8398F5-6FF7-4BDA-9E48-ADF6C64A4747}.MakeFile.Build.0 = Release|Win32
+		{CD8398F5-6FF7-4BDA-9E48-ADF6C64A4747}.Release.ActiveCfg = Release|Win32
+		{CD8398F5-6FF7-4BDA-9E48-ADF6C64A4747}.Release.Build.0 = Release|Win32
+		{CD8398F5-6FF7-4BDA-9E48-ADF6C64A4747}.Release Unicode.ActiveCfg = Release|Win32
+		{CD8398F5-6FF7-4BDA-9E48-ADF6C64A4747}.Release Unicode.Build.0 = Release|Win32
EndGlobalSection
GlobalSection(SolutionItems) = postSolution
EndGlobalSection

Modified: trunk/oggdsf/src/lib/core/ogg/libVorbisCommentDotNET/DNFileComments.h
===================================================================
--- trunk/oggdsf/src/lib/core/ogg/libVorbisCommentDotNET/DNFileComments.h	2004-07-24 09:59:55 UTC (rev 7310)
+++ trunk/oggdsf/src/lib/core/ogg/libVorbisCommentDotNET/DNFileComments.h	2004-07-24 10:46:15 UTC (rev 7311)
@@ -4,6 +4,7 @@
#include "libVorbisComment/FileComments.h"

#pragma managed
+#include "DNStreamCommentInfo.h"
using namespace System;
using namespace illiminable::libiWrapper;
namespace illiminable {
@@ -56,7 +57,7 @@
bool writeOutAll();
bool writeOutStream(Int64 inIndex);

-	bool addStreamComment(DNStreamCommentInfo* inStreamComment);
+	//bool addStreamComment(DNStreamCommentInfo* inStreamComment);
DNStreamCommentInfo* getStreamComment(Int64 inIndex);

Int64 streamCount();

Modified: trunk/oggdsf/src/lib/core/ogg/libVorbisCommentDotNET/DNStreamCommentInfo.h
===================================================================
--- trunk/oggdsf/src/lib/core/ogg/libVorbisCommentDotNET/DNStreamCommentInfo.h	2004-07-24 09:59:55 UTC (rev 7310)
+++ trunk/oggdsf/src/lib/core/ogg/libVorbisCommentDotNET/DNStreamCommentInfo.h	2004-07-24 10:46:15 UTC (rev 7311)
@@ -6,6 +6,7 @@
#include "libVorbisComment/StreamCommentInfo.h"

#pragma managed
+#include "DNVorbisComments.h"
using namespace System;
using namespace illiminable::libiWrapper;
namespace illiminable {

Modified: trunk/oggdsf/src/lib/core/ogg/libVorbisCommentDotNET/DNVorbisComments.h
===================================================================
--- trunk/oggdsf/src/lib/core/ogg/libVorbisCommentDotNET/DNVorbisComments.h	2004-07-24 09:59:55 UTC (rev 7310)
+++ trunk/oggdsf/src/lib/core/ogg/libVorbisCommentDotNET/DNVorbisComments.h	2004-07-24 10:46:15 UTC (rev 7311)
@@ -4,6 +4,7 @@
#include "libVorbisComment/VorbisComments.h"

#pragma managed
+#include "DNSingleVorbisComment.h"
using namespace System;
using namespace illiminable::libiWrapper;
namespace illiminable {
@@ -56,7 +57,7 @@

//vector<SingleVorbisComment> getCommentsByKey(String* inKey);

-	bool addComment(SingleVorbisComment* inComment);
+	//bool addComment(SingleVorbisComment* inComment);
bool addComment(String* inKey, String* inValue);

//bool parseOggPacket(OggPacket* inPacket, unsigned long inStartOffset);

Modified: trunk/oggdsf/src/lib/core/ogg/libVorbisCommentDotNET/Stdafx.h
===================================================================
--- trunk/oggdsf/src/lib/core/ogg/libVorbisCommentDotNET/Stdafx.h	2004-07-24 09:59:55 UTC (rev 7310)
+++ trunk/oggdsf/src/lib/core/ogg/libVorbisCommentDotNET/Stdafx.h	2004-07-24 10:46:15 UTC (rev 7311)
@@ -4,4 +4,5 @@

#pragma once

+#using <mscorlib.dll>
#using "libiWrapper.dll"
\ No newline at end of file

Modified: trunk/oggdsf/src/lib/core/ogg/libVorbisCommentDotNET/libVorbisCommentDotNET.vcproj
===================================================================
--- trunk/oggdsf/src/lib/core/ogg/libVorbisCommentDotNET/libVorbisCommentDotNET.vcproj	2004-07-24 09:59:55 UTC (rev 7310)
+++ trunk/oggdsf/src/lib/core/ogg/libVorbisCommentDotNET/libVorbisCommentDotNET.vcproj	2004-07-24 10:46:15 UTC (rev 7311)
@@ -3,7 +3,7 @@
ProjectType="Visual C++"
Version="7.10"
Name="libVorbisCommentDotNET"
-	ProjectGUID="{9599D980-84D8-4470-B7E2-1F7B52C781E7}"
+	ProjectGUID="{CD8398F5-6FF7-4BDA-9E48-ADF6C64A4747}"
RootNamespace="libVorbisCommentDotNET"
Keyword="ManagedCProj">
<Platforms>
@@ -37,7 +37,7 @@
<Tool
Name="VCLinkerTool"
AdditionalOptions="/noentry"
-				AdditionalDependencies="nochkclr.obj mscoree.lib"
+				AdditionalDependencies="nochkclr.obj mscoree.lib msvcrtd.lib"
OutputFile="$(OutDir)\$(ProjectName).dll"
LinkIncremental="2"
GenerateDebugInformation="TRUE"



More information about the commits mailing list