[xiph-commits] r14566 - in trunk/vorbis-tools/win32/VS2005: . oggdec oggenc ogginfo vorbiscomment

sping at svn.xiph.org sping at svn.xiph.org
Mon Mar 10 07:42:07 PDT 2008


Author: sping
Date: 2008-03-10 07:42:06 -0700 (Mon, 10 Mar 2008)
New Revision: 14566

Added:
   trunk/vorbis-tools/win32/VS2005/config.h
   trunk/vorbis-tools/win32/VS2005/copy_libraries.cmd
   trunk/vorbis-tools/win32/VS2005/vorbis-tools.sln
Modified:
   trunk/vorbis-tools/win32/VS2005/oggdec/oggdec.vcproj
   trunk/vorbis-tools/win32/VS2005/oggenc/oggenc.vcproj
   trunk/vorbis-tools/win32/VS2005/ogginfo/ogginfo.vcproj
   trunk/vorbis-tools/win32/VS2005/vorbiscomment/vorbiscomment.vcproj
Log:
Windows binaries through Visual Studio 2005:
- Make it build
- Add Flac support
- Add config.h for Windows
- Add solution file


Added: trunk/vorbis-tools/win32/VS2005/config.h
===================================================================
--- trunk/vorbis-tools/win32/VS2005/config.h	                        (rev 0)
+++ trunk/vorbis-tools/win32/VS2005/config.h	2008-03-10 14:42:06 UTC (rev 14566)
@@ -0,0 +1,7 @@
+#ifndef CONFIG_H
+#define CONFIG_H 1
+
+#define PACKAGE "vorbis-tools"
+#define VERSION "1.2.0"
+
+#endif /* CONFIG_H */

Added: trunk/vorbis-tools/win32/VS2005/copy_libraries.cmd
===================================================================
--- trunk/vorbis-tools/win32/VS2005/copy_libraries.cmd	                        (rev 0)
+++ trunk/vorbis-tools/win32/VS2005/copy_libraries.cmd	2008-03-10 14:42:06 UTC (rev 14566)
@@ -0,0 +1,17 @@
+ at ECHO OFF
+SET VORBIS_DIR=..\..\..\libvorbis\win32\VS2005
+SET VORBIS_DEBUG=%VORBIS_DIR%\debug
+SET VORBIS_RELEASE=%VORBIS_DIR%\release
+
+SET FLAC_DEBUG=..\..\..\flac\obj\debug\lib
+SET FLAC_RELEASE=..\..\..\flac\obj\debug\lib
+
+
+COPY %VORBIS_DEBUG%\libvorbis.dll debug\
+COPY %VORBIS_RELEASE%\libvorbis.dll release\
+
+COPY %VORBIS_DEBUG%\libvorbisfile.dll debug\
+COPY %VORBIS_RELEASE%\libvorbisfile.dll release\
+
+COPY %FLAC_DEBUG%\libFLAC_dynamic.dll debug\
+COPY %FLAC_RELEASE%\libFLAC_dynamic.dll release\

Modified: trunk/vorbis-tools/win32/VS2005/oggdec/oggdec.vcproj
===================================================================
--- trunk/vorbis-tools/win32/VS2005/oggdec/oggdec.vcproj	2008-03-10 13:12:47 UTC (rev 14565)
+++ trunk/vorbis-tools/win32/VS2005/oggdec/oggdec.vcproj	2008-03-10 14:42:06 UTC (rev 14566)
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="Windows-1252"?>
 <VisualStudioProject
 	ProjectType="Visual C++"
-	Version="8.00"
+	Version="8,00"
 	Name="oggdec"
 	ProjectGUID="{D01454C5-2C94-45E1-917C-1C5CBC6990A0}"
 	RootNamespace="oggdec"
@@ -41,8 +41,8 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories="..\..\..\..\libogg\include;..\..\..\include;..\..\..\..\libvorbis\include"
-				PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE"
+				AdditionalIncludeDirectories="..\..\..\..\libogg\include;..\..\..\include;..\..\..\..\libvorbis\include;..\"
+				PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;HAVE_CONFIG_H"
 				MinimalRebuild="true"
 				BasicRuntimeChecks="3"
 				RuntimeLibrary="1"
@@ -62,8 +62,10 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
+				AdditionalDependencies="libogg.lib libvorbisfile.lib"
 				OutputFile="$(OutDir)/oggdec.exe"
 				LinkIncremental="2"
+				AdditionalLibraryDirectories="../../../../libogg/win32/VS2005/debug;../../../../libvorbis/win32/VS2005/debug"
 				GenerateDebugInformation="true"
 				ProgramDatabaseFile="$(OutDir)/oggdec.pdb"
 				SubSystem="1"
@@ -124,8 +126,8 @@
 				InlineFunctionExpansion="2"
 				EnableIntrinsicFunctions="true"
 				FavorSizeOrSpeed="1"
-				AdditionalIncludeDirectories="..\..\..\..\libogg\include;..\..\..\include;..\..\..\..\libvorbis\include"
-				PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE"
+				AdditionalIncludeDirectories="..\..\..\..\libogg\include;..\..\..\include;..\..\..\..\libvorbis\include;..\"
+				PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE;HAVE_CONFIG_H"
 				RuntimeLibrary="0"
 				UsePrecompiledHeader="0"
 				WarningLevel="3"
@@ -143,9 +145,11 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
+				AdditionalDependencies="libogg.lib libvorbisfile.lib"
 				OutputFile="$(OutDir)/oggdec.exe"
 				LinkIncremental="1"
-				GenerateDebugInformation="true"
+				AdditionalLibraryDirectories="../../../../libogg/win32/VS2005/release;../../../../libvorbis/win32/VS2005/release"
+				GenerateDebugInformation="false"
 				SubSystem="1"
 				OptimizeReferences="2"
 				EnableCOMDATFolding="2"

Modified: trunk/vorbis-tools/win32/VS2005/oggenc/oggenc.vcproj
===================================================================
--- trunk/vorbis-tools/win32/VS2005/oggenc/oggenc.vcproj	2008-03-10 13:12:47 UTC (rev 14565)
+++ trunk/vorbis-tools/win32/VS2005/oggenc/oggenc.vcproj	2008-03-10 14:42:06 UTC (rev 14566)
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="Windows-1252"?>
 <VisualStudioProject
 	ProjectType="Visual C++"
-	Version="8.00"
+	Version="8,00"
 	Name="oggenc"
 	ProjectGUID="{10DA267E-7738-4E7E-9C31-9D0DF49A0B96}"
 	RootNamespace="oggenc"
@@ -41,7 +41,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories="..\..\..\include;..\..\..\..\libvorbis\include;..\..\..\..\libogg\include;."
+				AdditionalIncludeDirectories="..\..\..\include;..\..\..\..\libvorbis\include;..\..\..\..\libogg\include;..\..\..\..\flac\include;."
 				PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;HAVE_CONFIG_H"
 				MinimalRebuild="true"
 				BasicRuntimeChecks="3"
@@ -62,8 +62,10 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
+				AdditionalDependencies="libogg.lib libvorbis.lib libFLAC_dynamic.lib"
 				OutputFile="$(OutDir)/oggenc.exe"
 				LinkIncremental="2"
+				AdditionalLibraryDirectories="../../../../libogg/win32/VS2005/debug;../../../../libvorbis/win32/VS2005/debug;../../../../flac/obj/debug/lib"
 				GenerateDebugInformation="true"
 				ProgramDatabaseFile="$(OutDir)/oggenc.pdb"
 				SubSystem="1"
@@ -123,7 +125,7 @@
 				Optimization="3"
 				InlineFunctionExpansion="2"
 				FavorSizeOrSpeed="1"
-				AdditionalIncludeDirectories="..\..\..\include;..\..\..\..\libvorbis\include;..\..\..\..\libogg\include;."
+				AdditionalIncludeDirectories="..\..\..\include;..\..\..\..\libvorbis\include;..\..\..\..\libogg\include;..\..\..\..\flac\include;."
 				PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE;HAVE_CONFIG_H"
 				RuntimeLibrary="0"
 				UsePrecompiledHeader="0"
@@ -142,9 +144,11 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
+				AdditionalDependencies="libogg.lib libvorbis.lib libFLAC_dynamic.lib"
 				OutputFile="$(OutDir)/oggenc.exe"
 				LinkIncremental="1"
-				GenerateDebugInformation="true"
+				AdditionalLibraryDirectories="../../../../libogg/win32/VS2005/release;../../../../libvorbis/win32/VS2005/release;../../../../flac/obj/release/lib"
+				GenerateDebugInformation="false"
 				SubSystem="1"
 				OptimizeReferences="2"
 				EnableCOMDATFolding="2"
@@ -190,10 +194,18 @@
 				>
 			</File>
 			<File
+				RelativePath="..\..\..\oggenc\easyflac.c"
+				>
+			</File>
+			<File
 				RelativePath="..\..\..\oggenc\encode.c"
 				>
 			</File>
 			<File
+				RelativePath="..\..\..\oggenc\flac.c"
+				>
+			</File>
+			<File
 				RelativePath="..\..\..\share\getopt.c"
 				>
 			</File>
@@ -214,6 +226,10 @@
 				>
 			</File>
 			<File
+				RelativePath="..\..\..\oggenc\skeleton.c"
+				>
+			</File>
+			<File
 				RelativePath="..\..\..\share\utf8.c"
 				>
 			</File>
@@ -247,6 +263,10 @@
 				RelativePath="..\..\..\oggenc\resample.h"
 				>
 			</File>
+			<File
+				RelativePath="..\..\..\oggenc\skeleton.h"
+				>
+			</File>
 		</Filter>
 		<Filter
 			Name="Resource Files"

Modified: trunk/vorbis-tools/win32/VS2005/ogginfo/ogginfo.vcproj
===================================================================
--- trunk/vorbis-tools/win32/VS2005/ogginfo/ogginfo.vcproj	2008-03-10 13:12:47 UTC (rev 14565)
+++ trunk/vorbis-tools/win32/VS2005/ogginfo/ogginfo.vcproj	2008-03-10 14:42:06 UTC (rev 14566)
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="Windows-1252"?>
 <VisualStudioProject
 	ProjectType="Visual C++"
-	Version="8.00"
+	Version="8,00"
 	Name="ogginfo"
 	ProjectGUID="{D60948A2-4781-435B-9609-786C0B564DBD}"
 	RootNamespace="ogginfo"
@@ -41,8 +41,8 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories="..\..\..\..\libogg\include;..\..\..\include;..\..\..\..\libvorbis\include"
-				PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE"
+				AdditionalIncludeDirectories="..\..\..\..\libogg\include;..\..\..\include;..\..\..\..\libvorbis\include;..\"
+				PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;HAVE_CONFIG_H"
 				MinimalRebuild="true"
 				BasicRuntimeChecks="3"
 				RuntimeLibrary="1"
@@ -62,8 +62,10 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
+				AdditionalDependencies="libogg.lib libvorbis.lib"
 				OutputFile="$(OutDir)/ogginfo.exe"
 				LinkIncremental="2"
+				AdditionalLibraryDirectories="../../../../libogg/win32/VS2005/debug;../../../../libvorbis/win32/VS2005/debug"
 				GenerateDebugInformation="true"
 				ProgramDatabaseFile="$(OutDir)/ogginfo.pdb"
 				SubSystem="1"
@@ -124,8 +126,8 @@
 				InlineFunctionExpansion="2"
 				EnableIntrinsicFunctions="false"
 				FavorSizeOrSpeed="1"
-				AdditionalIncludeDirectories="..\..\..\..\libogg\include;..\..\..\include;..\..\..\..\libvorbis\include"
-				PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE"
+				AdditionalIncludeDirectories="..\..\..\..\libogg\include;..\..\..\include;..\..\..\..\libvorbis\include;..\"
+				PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE;HAVE_CONFIG_H"
 				RuntimeLibrary="0"
 				UsePrecompiledHeader="0"
 				WarningLevel="3"
@@ -143,9 +145,11 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
+				AdditionalDependencies="libogg.lib libvorbis.lib"
 				OutputFile="$(OutDir)/ogginfo.exe"
 				LinkIncremental="1"
-				GenerateDebugInformation="true"
+				AdditionalLibraryDirectories="../../../../libogg/win32/VS2005/release;../../../../libvorbis/win32/VS2005/release"
+				GenerateDebugInformation="false"
 				SubSystem="1"
 				OptimizeReferences="2"
 				EnableCOMDATFolding="2"

Added: trunk/vorbis-tools/win32/VS2005/vorbis-tools.sln
===================================================================
--- trunk/vorbis-tools/win32/VS2005/vorbis-tools.sln	                        (rev 0)
+++ trunk/vorbis-tools/win32/VS2005/vorbis-tools.sln	2008-03-10 14:42:06 UTC (rev 14566)
@@ -0,0 +1,37 @@
+Microsoft Visual Studio Solution File, Format Version 9.00
+# Visual Studio 2005
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "oggdec", "oggdec\oggdec.vcproj", "{D01454C5-2C94-45E1-917C-1C5CBC6990A0}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "oggenc", "oggenc\oggenc.vcproj", "{10DA267E-7738-4E7E-9C31-9D0DF49A0B96}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ogginfo", "ogginfo\ogginfo.vcproj", "{D60948A2-4781-435B-9609-786C0B564DBD}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "vorbiscomment", "vorbiscomment\vorbiscomment.vcproj", "{851A5E6A-C2D8-44C4-A7AC-A5F7E2001FA9}"
+EndProject
+Global
+	GlobalSection(SolutionConfigurationPlatforms) = preSolution
+		Debug|Win32 = Debug|Win32
+		Release|Win32 = Release|Win32
+	EndGlobalSection
+	GlobalSection(ProjectConfigurationPlatforms) = postSolution
+		{D01454C5-2C94-45E1-917C-1C5CBC6990A0}.Debug|Win32.ActiveCfg = Debug|Win32
+		{D01454C5-2C94-45E1-917C-1C5CBC6990A0}.Debug|Win32.Build.0 = Debug|Win32
+		{D01454C5-2C94-45E1-917C-1C5CBC6990A0}.Release|Win32.ActiveCfg = Release|Win32
+		{D01454C5-2C94-45E1-917C-1C5CBC6990A0}.Release|Win32.Build.0 = Release|Win32
+		{10DA267E-7738-4E7E-9C31-9D0DF49A0B96}.Debug|Win32.ActiveCfg = Debug|Win32
+		{10DA267E-7738-4E7E-9C31-9D0DF49A0B96}.Debug|Win32.Build.0 = Debug|Win32
+		{10DA267E-7738-4E7E-9C31-9D0DF49A0B96}.Release|Win32.ActiveCfg = Release|Win32
+		{10DA267E-7738-4E7E-9C31-9D0DF49A0B96}.Release|Win32.Build.0 = Release|Win32
+		{D60948A2-4781-435B-9609-786C0B564DBD}.Debug|Win32.ActiveCfg = Debug|Win32
+		{D60948A2-4781-435B-9609-786C0B564DBD}.Debug|Win32.Build.0 = Debug|Win32
+		{D60948A2-4781-435B-9609-786C0B564DBD}.Release|Win32.ActiveCfg = Release|Win32
+		{D60948A2-4781-435B-9609-786C0B564DBD}.Release|Win32.Build.0 = Release|Win32
+		{851A5E6A-C2D8-44C4-A7AC-A5F7E2001FA9}.Debug|Win32.ActiveCfg = Debug|Win32
+		{851A5E6A-C2D8-44C4-A7AC-A5F7E2001FA9}.Debug|Win32.Build.0 = Debug|Win32
+		{851A5E6A-C2D8-44C4-A7AC-A5F7E2001FA9}.Release|Win32.ActiveCfg = Release|Win32
+		{851A5E6A-C2D8-44C4-A7AC-A5F7E2001FA9}.Release|Win32.Build.0 = Release|Win32
+	EndGlobalSection
+	GlobalSection(SolutionProperties) = preSolution
+		HideSolutionNode = FALSE
+	EndGlobalSection
+EndGlobal

Modified: trunk/vorbis-tools/win32/VS2005/vorbiscomment/vorbiscomment.vcproj
===================================================================
--- trunk/vorbis-tools/win32/VS2005/vorbiscomment/vorbiscomment.vcproj	2008-03-10 13:12:47 UTC (rev 14565)
+++ trunk/vorbis-tools/win32/VS2005/vorbiscomment/vorbiscomment.vcproj	2008-03-10 14:42:06 UTC (rev 14566)
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="Windows-1252"?>
 <VisualStudioProject
 	ProjectType="Visual C++"
-	Version="8.00"
+	Version="8,00"
 	Name="vorbiscomment"
 	ProjectGUID="{851A5E6A-C2D8-44C4-A7AC-A5F7E2001FA9}"
 	Keyword="Win32Proj"
@@ -40,7 +40,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories="..\..\..\..\libogg\include;..\..\..\include;..\..\..\..\libvorbis\include;."
+				AdditionalIncludeDirectories="..\..\..\..\libogg\include;..\..\..\include;..\..\..\..\libvorbis\include;..\;."
 				PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;HAVE_CONFIG_H"
 				MinimalRebuild="true"
 				BasicRuntimeChecks="3"
@@ -61,8 +61,10 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
+				AdditionalDependencies="libogg.lib libvorbis.lib"
 				OutputFile="$(OutDir)/vorbiscomment.exe"
 				LinkIncremental="2"
+				AdditionalLibraryDirectories="../../../../libogg/win32/VS2005/debug;../../../../libvorbis/win32/VS2005/debug"
 				GenerateDebugInformation="true"
 				ProgramDatabaseFile="$(OutDir)/vorbiscomment.pdb"
 				SubSystem="1"
@@ -121,7 +123,7 @@
 				Name="VCCLCompilerTool"
 				Optimization="3"
 				FavorSizeOrSpeed="1"
-				AdditionalIncludeDirectories="..\..\..\..\libogg\include;..\..\..\include;..\..\..\..\libvorbis\include;."
+				AdditionalIncludeDirectories="..\..\..\..\libogg\include;..\..\..\include;..\..\..\..\libvorbis\include;..\;."
 				PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE;HAVE_CONFIG_H"
 				RuntimeLibrary="0"
 				UsePrecompiledHeader="0"
@@ -140,9 +142,11 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
+				AdditionalDependencies="libogg.lib libvorbis.lib"
 				OutputFile="$(OutDir)/vorbiscomment.exe"
 				LinkIncremental="1"
-				GenerateDebugInformation="true"
+				AdditionalLibraryDirectories="../../../../libogg/win32/VS2005/release;../../../../libvorbis/win32/VS2005/release"
+				GenerateDebugInformation="false"
 				SubSystem="1"
 				OptimizeReferences="2"
 				EnableCOMDATFolding="2"



More information about the commits mailing list