Update of /cvsroot/audacity/lib-src/twolame/winproj
In directory
sc8-pr-cvs11.sourceforge.net:/tmp/cvs-serv6849/lib-src/twolame/winproj
Modified Files:
libtwolame_static.sln libtwolame_static.vcproj
Log Message:
Add unicode builds to libtwolame
Fix linker warnings for wxtiff and wxjpeg
Fix build warning about missing environment variables
Index: libtwolame_static.sln
===================================================================
RCS file: /cvsroot/audacity/lib-src/twolame/winproj/libtwolame_static.sln,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- libtwolame_static.sln 19 Oct 2006 09:44:45 -0000 1.1
+++ libtwolame_static.sln 22 Oct 2006 05:55:11 -0000 1.2
@@ -1,18 +1,24 @@

Microsoft Visual Studio Solution File, Format Version 9.00
-# Visual C++ Express 2005
+# Visual Studio 2005
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libtwolame_static",
"libtwolame_static.vcproj", "{8C69F7B6-684F-48D9-9057-8912CA3DAA8B}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Win32 = Debug|Win32
Release|Win32 = Release|Win32
+ Unicode_Debug|Win32 = Unicode_Debug|Win32
+ Unicode_Release|Win32 = Unicode_Release|Win32
EndGlobalSection
GlobalSection(ProjectConfigurationPlatforms) = postSolution
{8C69F7B6-684F-48D9-9057-8912CA3DAA8B}.Debug|Win32.ActiveCfg =
Debug|Win32
{8C69F7B6-684F-48D9-9057-8912CA3DAA8B}.Debug|Win32.Build.0 =
Debug|Win32
{8C69F7B6-684F-48D9-9057-8912CA3DAA8B}.Release|Win32.ActiveCfg
= Release|Win32
{8C69F7B6-684F-48D9-9057-8912CA3DAA8B}.Release|Win32.Build.0 =
Release|Win32
+
{8C69F7B6-684F-48D9-9057-8912CA3DAA8B}.Unicode_Debug|Win32.ActiveCfg =
Unicode_Debug|Win32
+
{8C69F7B6-684F-48D9-9057-8912CA3DAA8B}.Unicode_Debug|Win32.Build.0 =
Unicode_Debug|Win32
+
{8C69F7B6-684F-48D9-9057-8912CA3DAA8B}.Unicode_Release|Win32.ActiveCfg =
Unicode_Release|Win32
+
{8C69F7B6-684F-48D9-9057-8912CA3DAA8B}.Unicode_Release|Win32.Build.0 =
Unicode_Release|Win32
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
Index: libtwolame_static.vcproj
===================================================================
RCS file: /cvsroot/audacity/lib-src/twolame/winproj/libtwolame_static.vcproj,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- libtwolame_static.vcproj 19 Oct 2006 09:44:45 -0000 1.1
+++ libtwolame_static.vcproj 22 Oct 2006 05:55:11 -0000 1.2
@@ -1,9 +1,10 @@
<?xml version="1.0" encoding="Windows-1252"?>
<VisualStudioProject
ProjectType="Visual C++"
- Version="8,00"
+ Version="8.00"
Name="libtwolame_static"
ProjectGUID="{8C69F7B6-684F-48D9-9057-8912CA3DAA8B}"
+ RootNamespace="libtwolame_static"
Keyword="Win32Proj"
>
<Platforms>
@@ -16,8 +17,8 @@
<Configurations>
<Configuration
Name="Debug|Win32"
- OutputDirectory="lib"
- IntermediateDirectory="temp\static\Debug"
+ OutputDirectory="$(SolutionDir)$(ConfigurationName)"
+ IntermediateDirectory="$(ConfigurationName)"
ConfigurationType="4"
>
<Tool
@@ -58,7 +59,6 @@
/>
<Tool
Name="VCLibrarianTool"
- OutputFile="$(OutDir)\twolame_staticD.lib"
/>
<Tool
Name="VCALinkTool"
@@ -78,8 +78,127 @@
</Configuration>
<Configuration
Name="Release|Win32"
- OutputDirectory="lib"
- IntermediateDirectory="temp\static\Release"
+ OutputDirectory="$(SolutionDir)$(ConfigurationName)"
+ IntermediateDirectory="$(ConfigurationName)"
+ ConfigurationType="4"
+ >
+ <Tool
+ Name="VCPreBuildEventTool"
+ />
+ <Tool
+ Name="VCCustomBuildTool"
+ />
+ <Tool
+ Name="VCXMLDataGeneratorTool"
+ />
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"
+ />
+ <Tool
+ Name="VCMIDLTool"
+ />
+ <Tool
+ Name="VCCLCompilerTool"
+
PreprocessorDefinitions="WIN32;NDEBUG;_LIB;LIBTWOLAME_STATIC"
+ RuntimeLibrary="0"
+ UsePrecompiledHeader="0"
+ WarningLevel="3"
+ Detect64BitPortabilityProblems="true"
+ DebugInformationFormat="3"
+ />
+ <Tool
+ Name="VCManagedResourceCompilerTool"
+ />
+ <Tool
+ Name="VCResourceCompilerTool"
+ />
+ <Tool
+ Name="VCPreLinkEventTool"
+ />
+ <Tool
+ Name="VCLibrarianTool"
+ />
+ <Tool
+ Name="VCALinkTool"
+ />
+ <Tool
+ Name="VCXDCMakeTool"
+ />
+ <Tool
+ Name="VCBscMakeTool"
+ />
+ <Tool
+ Name="VCFxCopTool"
+ />
+ <Tool
+ Name="VCPostBuildEventTool"
+ />
+ </Configuration>
+ <Configuration
+ Name="Unicode_Debug|Win32"
+ OutputDirectory="$(SolutionDir)$(ConfigurationName)"
+ IntermediateDirectory="$(ConfigurationName)"
+ ConfigurationType="4"
+ >
+ <Tool
+ Name="VCPreBuildEventTool"
+ />
+ <Tool
+ Name="VCCustomBuildTool"
+ />
+ <Tool
+ Name="VCXMLDataGeneratorTool"
+ />
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"
+ />
+ <Tool
+ Name="VCMIDLTool"
+ />
+ <Tool
+ Name="VCCLCompilerTool"
+ Optimization="0"
+
PreprocessorDefinitions="WIN32;_DEBUG;_LIB;LIBTWOLAME_STATIC"
+ MinimalRebuild="true"
+ BasicRuntimeChecks="3"
+ RuntimeLibrary="1"
+ UsePrecompiledHeader="0"
+ WarningLevel="3"
+ Detect64BitPortabilityProblems="true"
+ DebugInformationFormat="4"
+ />
+ <Tool
+ Name="VCManagedResourceCompilerTool"
+ />
+ <Tool
+ Name="VCResourceCompilerTool"
+ />
+ <Tool
+ Name="VCPreLinkEventTool"
+ />
+ <Tool
+ Name="VCLibrarianTool"
+ />
+ <Tool
+ Name="VCALinkTool"
+ />
+ <Tool
+ Name="VCXDCMakeTool"
+ />
+ <Tool
+ Name="VCBscMakeTool"
+ />
+ <Tool
+ Name="VCFxCopTool"
+ />
+ <Tool
+ Name="VCPostBuildEventTool"
+ />
+ </Configuration>
+ <Configuration
+ Name="Unicode_Release|Win32"
+ OutputDirectory="$(SolutionDir)$(ConfigurationName)"
+ IntermediateDirectory="$(ConfigurationName)"
ConfigurationType="4"
>
<Tool
@@ -117,7 +236,6 @@
/>
<Tool
Name="VCLibrarianTool"
- OutputFile="$(OutDir)\twolame_static.lib"
/>
<Tool
Name="VCALinkTool"
-------------------------------------------------------------------------
Using Tomcat but need to do more? Need to support web services, security?
Get stuff done quickly with pre-integrated technology to make your job easier
Download IBM WebSphere Application Server v.1.0.1 based on Apache Geronimo
http://sel.as-us.falkag.net/sel?cmd=lnk&kid=120709&bid=263057&dat=121642
_______________________________________________
Audacity-cvs mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/audacity-cvs
