Update of /cvsroot/audacity/audacity-src/win
In directory sc8-pr-cvs11.sourceforge.net:/tmp/cvs-serv20309
Modified Files:
audacity.sln audacity.vcproj compile.txt configwin.h
Log Message:
Add MP2 export
Index: configwin.h
===================================================================
RCS file: /cvsroot/audacity/audacity-src/win/configwin.h,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -d -r1.21 -r1.22
--- configwin.h 30 Jul 2006 08:51:21 -0000 1.21
+++ configwin.h 19 Oct 2006 10:45:52 -0000 1.22
@@ -11,6 +11,7 @@
#define USE_NYQUIST 1
#define USE_PORTMIXER 1
#define USE_SOUNDTOUCH 1
+#define USE_LIBTWOLAME 1
#undef USE_VST
#define INSTALL_PREFIX "."
Index: compile.txt
===================================================================
RCS file: /cvsroot/audacity/audacity-src/win/compile.txt,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -d -r1.36 -r1.37
--- compile.txt 16 Oct 2006 22:51:57 -0000 1.36
+++ compile.txt 19 Oct 2006 10:45:51 -0000 1.37
@@ -119,8 +119,14 @@
set WXWIN=C:\wxWidgets-2.6.3
-Note that you don't want a trailing backslash on that. In the
-Audacity project file, there are declarations like
+Note that you don't want a trailing backslash on that.
+
+On newer version of Windows, the settings for environment
+variables can be found in the system control panel. Click
+the "System" option, then tab "Extended", then "Environment
+variables".
+
+In the Audacity project file, there are declarations like
$(WXWIN)\include
@@ -129,6 +135,18 @@
Once you have set the WXWIN environment variable correctly,
the Audacity project file's declarations will do the rest.
+Similarily, you will need to set the following environment
+variables:
+
+ASIOSDK_DIR = <Location of the ASIO SDK>
+DXSDK_DIR = <Location of the DirectX SDK>
+
+If you don't have the ASIO-SDK oder the DirectX SDK, you
+still have to set those variables. Just set them to something
+like "c:\" or so.
+
+Note that you have to restart the IDE so it picks up changes
+in the environment variables.
-----------------------
MSVC++ STEP 5: Build Audacity
Index: audacity.sln
===================================================================
RCS file: /cvsroot/audacity/audacity-src/win/audacity.sln,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- audacity.sln 21 Sep 2006 21:46:10 -0000 1.9
+++ audacity.sln 19 Oct 2006 10:45:50 -0000 1.10
@@ -1,24 +1,25 @@
Microsoft Visual Studio Solution File, Format Version 9.00
-# Visual Studio 2005
+# Visual C++ Express 2005
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Audacity",
"audacity.vcproj", "{1D64095C-F936-4FCF-B609-56E9DDF941FA}"
ProjectSection(ProjectDependencies) = postProject
{8A1C2514-85DD-4AE2-9CF3-3183B66C537D} =
{8A1C2514-85DD-4AE2-9CF3-3183B66C537D}
- {7452B123-3207-4194-BD92-56E8CA6BC80F} =
{7452B123-3207-4194-BD92-56E8CA6BC80F}
- {EC3F5835-C486-4970-8A6B-A0700F4B3637} =
{EC3F5835-C486-4970-8A6B-A0700F4B3637}
- {6C7DC635-26FB-419A-B69A-7ECBBB068245} =
{6C7DC635-26FB-419A-B69A-7ECBBB068245}
- {B28C9F3F-FF0E-4FEC-844C-685390B8AC06} =
{B28C9F3F-FF0E-4FEC-844C-685390B8AC06}
- {F4B4A272-4ED3-4951-A6EE-B7BAAC1C4952} =
{F4B4A272-4ED3-4951-A6EE-B7BAAC1C4952}
- {727D6675-67EE-4D0B-9DC1-177A0AF741F0} =
{727D6675-67EE-4D0B-9DC1-177A0AF741F0}
- {7ABA0F80-94AE-4E82-AB89-2E1258212D59} =
{7ABA0F80-94AE-4E82-AB89-2E1258212D59}
- {3A76129B-55AB-4D54-BAA7-08F63ED52569} =
{3A76129B-55AB-4D54-BAA7-08F63ED52569}
- {84957C9E-66F6-443C-90F6-EC815A89CD0E} =
{84957C9E-66F6-443C-90F6-EC815A89CD0E}
- {A52BBEA5-8B02-4147-8734-5D9BBF4D1177} =
{A52BBEA5-8B02-4147-8734-5D9BBF4D1177}
- {3DDDCAA9-276D-4FC3-A15C-485F7B9B24CC} =
{3DDDCAA9-276D-4FC3-A15C-485F7B9B24CC}
- {38C2C6B1-FBF8-4C5C-BB90-63F996083F56} =
{38C2C6B1-FBF8-4C5C-BB90-63F996083F56}
- {D96C7BE1-E3F1-4767-BBBB-320E082CE425} =
{D96C7BE1-E3F1-4767-BBBB-320E082CE425}
- {7AA41BED-41B0-427A-9148-DEA40549D158} =
{7AA41BED-41B0-427A-9148-DEA40549D158}
- {F00717F2-67C8-44E1-AF00-541DFA9CB7F2} =
{F00717F2-67C8-44E1-AF00-541DFA9CB7F2}
+ {8C69F7B6-684F-48D9-9057-8912CA3DAA8B} =
{8C69F7B6-684F-48D9-9057-8912CA3DAA8B}
{A939AAF8-44F1-4CE7-9DD0-7A6E99814857} =
{A939AAF8-44F1-4CE7-9DD0-7A6E99814857}
+ {F00717F2-67C8-44E1-AF00-541DFA9CB7F2} =
{F00717F2-67C8-44E1-AF00-541DFA9CB7F2}
+ {7AA41BED-41B0-427A-9148-DEA40549D158} =
{7AA41BED-41B0-427A-9148-DEA40549D158}
+ {D96C7BE1-E3F1-4767-BBBB-320E082CE425} =
{D96C7BE1-E3F1-4767-BBBB-320E082CE425}
+ {38C2C6B1-FBF8-4C5C-BB90-63F996083F56} =
{38C2C6B1-FBF8-4C5C-BB90-63F996083F56}
+ {3DDDCAA9-276D-4FC3-A15C-485F7B9B24CC} =
{3DDDCAA9-276D-4FC3-A15C-485F7B9B24CC}
+ {A52BBEA5-8B02-4147-8734-5D9BBF4D1177} =
{A52BBEA5-8B02-4147-8734-5D9BBF4D1177}
+ {84957C9E-66F6-443C-90F6-EC815A89CD0E} =
{84957C9E-66F6-443C-90F6-EC815A89CD0E}
+ {3A76129B-55AB-4D54-BAA7-08F63ED52569} =
{3A76129B-55AB-4D54-BAA7-08F63ED52569}
+ {7ABA0F80-94AE-4E82-AB89-2E1258212D59} =
{7ABA0F80-94AE-4E82-AB89-2E1258212D59}
+ {727D6675-67EE-4D0B-9DC1-177A0AF741F0} =
{727D6675-67EE-4D0B-9DC1-177A0AF741F0}
+ {F4B4A272-4ED3-4951-A6EE-B7BAAC1C4952} =
{F4B4A272-4ED3-4951-A6EE-B7BAAC1C4952}
+ {B28C9F3F-FF0E-4FEC-844C-685390B8AC06} =
{B28C9F3F-FF0E-4FEC-844C-685390B8AC06}
+ {6C7DC635-26FB-419A-B69A-7ECBBB068245} =
{6C7DC635-26FB-419A-B69A-7ECBBB068245}
+ {EC3F5835-C486-4970-8A6B-A0700F4B3637} =
{EC3F5835-C486-4970-8A6B-A0700F4B3637}
+ {7452B123-3207-4194-BD92-56E8CA6BC80F} =
{7452B123-3207-4194-BD92-56E8CA6BC80F}
EndProjectSection
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "PAStaticWMME",
"..\lib-src\portaudio\winproj\PAStaticWMME\PAStaticWMME.vcproj",
"{7452B123-3207-4194-BD92-56E8CA6BC80F}"
@@ -59,6 +60,8 @@
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "help", "help.vcproj",
"{823FA47D-2234-4590-99EC-BBEFA5FDF87F}"
EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libtwolame_static",
"..\lib-src\twolame\winproj\libtwolame_static.vcproj",
"{8C69F7B6-684F-48D9-9057-8912CA3DAA8B}"
+EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Win32 = Debug|Win32
@@ -219,6 +222,14 @@
{823FA47D-2234-4590-99EC-BBEFA5FDF87F}.Release|Win32.ActiveCfg
= Release|Win32
{823FA47D-2234-4590-99EC-BBEFA5FDF87F}.Unicode_Debug|Win32.ActiveCfg =
Unicode_Debug|Win32
{823FA47D-2234-4590-99EC-BBEFA5FDF87F}.Unicode_Release|Win32.ActiveCfg =
Unicode_Release|Win32
+ {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 =
Debug|Win32
+
{8C69F7B6-684F-48D9-9057-8912CA3DAA8B}.Unicode_Debug|Win32.Build.0 = Debug|Win32
+
{8C69F7B6-684F-48D9-9057-8912CA3DAA8B}.Unicode_Release|Win32.ActiveCfg =
Release|Win32
+
{8C69F7B6-684F-48D9-9057-8912CA3DAA8B}.Unicode_Release|Win32.Build.0 =
Release|Win32
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
Index: audacity.vcproj
===================================================================
RCS file: /cvsroot/audacity/audacity-src/win/audacity.vcproj,v
retrieving revision 1.52
retrieving revision 1.53
diff -u -d -r1.52 -r1.53
--- audacity.vcproj 16 Oct 2006 22:16:20 -0000 1.52
+++ audacity.vcproj 19 Oct 2006 10:45:51 -0000 1.53
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="Windows-1252"?>
<VisualStudioProject
ProjectType="Visual C++"
- Version="8.00"
+ Version="8,00"
Name="Audacity"
ProjectGUID="{1D64095C-F936-4FCF-B609-56E9DDF941FA}"
RootNamespace="Audacity"
@@ -47,7 +47,7 @@
<Tool
Name="VCCLCompilerTool"
Optimization="0"
-
AdditionalIncludeDirectories=""$(WXWIN)\lib\vc_lib\mswd";.;"$(WXWIN)\include";..\src\include;..\src\include\win32;"..\lib-src\allegro";"..\lib-src\expat";"..\lib-src\libid3tag";"..\lib-src\portaudio-v19\include";"..\lib-src\portaudio\pa_common";"..\lib-src\libsndfile\Win32";"..\lib-src\libsndfile\src";"..\lib-src\libmad";"..\lib-src\libogg\include";"..\lib-src\libvorbis\include";"..\lib-src\libnyquist\nyx";"..\lib-src\portmixer\px_common";"..\lib-src\libsamplerate\src";"..\lib-src\libflac\include";"..\lib-src\soundtouch\include";"..\lib-src\libresample\include""
+
AdditionalIncludeDirectories=""$(WXWIN)\lib\vc_lib\mswd";.;"$(WXWIN)\include";..\src\include;..\src\include\win32;"..\lib-src\allegro";"..\lib-src\expat";"..\lib-src\libid3tag";"..\lib-src\portaudio-v19\include";"..\lib-src\portaudio\pa_common";"..\lib-src\libsndfile\Win32";"..\lib-src\libsndfile\src";"..\lib-src\libmad";"..\lib-src\libogg\include";"..\lib-src\libvorbis\include";"..\lib-src\libnyquist\nyx";"..\lib-src\portmixer\px_common";"..\lib-src\libsamplerate\src";"..\lib-src\libflac\include";"..\lib-src\soundtouch\include";"..\lib-src\libresample\include";"..\lib-src\twolame\libtwolame""
PreprocessorDefinitions="_DEBUG;DEBUG=1;__WXDEBUG__;__WX__;WIN32;_WINDOWS;__WINDOWS__;__WXMSW__;__WIN95__;__WIN32__;WINVER=0x0400;STRICT;FLAC__NO_DLL"
RuntimeLibrary="1"
UsePrecompiledHeader="2"
@@ -79,12 +79,12 @@
Name="VCLinkerTool"
LinkLibraryDependencies="false"
AdditionalOptions="/IGNORE:4049"
- AdditionalDependencies="allegrod.lib
libresampled.lib soundtouchd.lib libsamplerated.lib portmixerd.lib
libnyquistd.lib libid3tagd.lib expatd.lib madd.lib sndfiled.lib wxbase26d.lib
wxbase26d_net.lib wxmsw26d_adv.lib wxmsw26d_core.lib wxmsw26d_html.lib
ogg_static_d.lib vorbis_static_d.lib vorbisfile_static_d.lib wxpngd.lib
wxzlibd.lib wxjpegd.lib wxtiffd.lib libFLAC++d.lib libFLACd.lib comctl32.lib
rpcrt4.lib wsock32.lib winmm.lib oleacc.lib kernel32.lib user32.lib gdi32.lib
winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib
uuid.lib"
+ AdditionalDependencies="twolame_staticD.lib
allegrod.lib libresampled.lib soundtouchd.lib libsamplerated.lib portmixerd.lib
libnyquistd.lib libid3tagd.lib expatd.lib madd.lib sndfiled.lib wxbase26d.lib
wxbase26d_net.lib wxmsw26d_adv.lib wxmsw26d_core.lib wxmsw26d_html.lib
ogg_static_d.lib vorbis_static_d.lib vorbisfile_static_d.lib wxpngd.lib
wxzlibd.lib wxjpegd.lib wxtiffd.lib libFLAC++d.lib libFLACd.lib comctl32.lib
rpcrt4.lib wsock32.lib winmm.lib oleacc.lib kernel32.lib user32.lib gdi32.lib
winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib
uuid.lib"
ShowProgress="0"
OutputFile=".\$(ConfigurationName)/audacity.exe"
LinkIncremental="2"
SuppressStartupBanner="true"
-
AdditionalLibraryDirectories=""$(IntDir)";"..\lib-src\libogg\win32\static_$(ConfigurationName)";"..\lib-src\libvorbis\win32\vorbis_static_$(ConfigurationName)";"..\lib-src\libvorbis\win32\vorbisfile_static_$(ConfigurationName)";"$(WXWIN)\lib\vc_lib";"..\lib-src\libid3tag";"..\lib-src\expat";"..\lib-src\libmad";"..\lib-src\libsndfile\Win32";"..\lib-src\portaudio\winproj\lib";"..\lib-src\allegro";"..\lib-src\libnyquist";"..\lib-src\portmixer\winproj";"..\lib-src\libsamplerate\Win32";"..\lib-src\libflac\obj\lib";"..\lib-src\soundtouch\source\SoundTouch\$(ConfigurationName)";"..\lib-src\libresample\win";"$(DXSDK_DIR)lib\x86";"$(ASIOSDK_DIR)""
+
AdditionalLibraryDirectories=""$(IntDir)";"..\lib-src\libogg\win32\static_$(ConfigurationName)";"..\lib-src\libvorbis\win32\vorbis_static_$(ConfigurationName)";"..\lib-src\libvorbis\win32\vorbisfile_static_$(ConfigurationName)";"$(WXWIN)\lib\vc_lib";"..\lib-src\libid3tag";"..\lib-src\expat";"..\lib-src\libmad";"..\lib-src\libsndfile\Win32";"..\lib-src\portaudio\winproj\lib";"..\lib-src\allegro";"..\lib-src\libnyquist";"..\lib-src\portmixer\winproj";"..\lib-src\libsamplerate\Win32";"..\lib-src\libflac\obj\lib";"..\lib-src\soundtouch\source\SoundTouch\$(ConfigurationName)";"..\lib-src\libresample\win";"../lib-src/twolame/winproj/lib";"$(DXSDK_DIR)lib\x86";"$(ASIOSDK_DIR)""
GenerateDebugInformation="true"
ProgramDatabaseFile=".\$(ConfigurationName)/audacity.pdb"
SubSystem="2"
@@ -151,7 +151,7 @@
AdditionalOptions="/O2 /GA /GL"
Optimization="2"
InlineFunctionExpansion="2"
-
AdditionalIncludeDirectories=""$(WXWIN)\lib\vc_lib\msw";.;"$(WXWIN)\include";..\src\include;..\src\include\win32;"..\lib-src\allegro";"..\lib-src\expat";"..\lib-src\libid3tag";"..\lib-src\portaudio-v19\include";"..\lib-src\portaudio\pa_common";"..\lib-src\libsndfile\Win32";"..\lib-src\libsndfile\src";"..\lib-src\libmad";"..\lib-src\libogg\include";"..\lib-src\libvorbis\include";"..\lib-src\libnyquist\nyx";"..\lib-src\portmixer\px_common";"..\lib-src\libsamplerate\src";"..\lib-src\libflac\include";"..\lib-src\soundtouch\include";"..\lib-src\libresample\include""
+
AdditionalIncludeDirectories=""$(WXWIN)\lib\vc_lib\msw";.;"$(WXWIN)\include";..\src\include;..\src\include\win32;"..\lib-src\allegro";"..\lib-src\expat";"..\lib-src\libid3tag";"..\lib-src\portaudio-v19\include";"..\lib-src\portaudio\pa_common";"..\lib-src\libsndfile\Win32";"..\lib-src\libsndfile\src";"..\lib-src\libmad";"..\lib-src\libogg\include";"..\lib-src\libvorbis\include";"..\lib-src\libnyquist\nyx";"..\lib-src\portmixer\px_common";"..\lib-src\libsamplerate\src";"..\lib-src\libflac\include";"..\lib-src\soundtouch\include";"..\lib-src\libresample\include";"..\lib-src\twolame\libtwolame""
PreprocessorDefinitions="NDEBUG;__WX__;WIN32;_WINDOWS;__WINDOWS__;__WXMSW__;__WIN95__;__WIN32__;WINVER=0x0400;STRICT;FLAC__NO_DLL"
StringPooling="true"
RuntimeLibrary="0"
@@ -180,12 +180,12 @@
<Tool
Name="VCLinkerTool"
LinkLibraryDependencies="false"
- AdditionalDependencies="allegro.lib
libresample.lib soundtouch.lib libsamplerate.lib portmixer.lib libnyquist.lib
libid3tag.lib expat.lib mad.lib sndfile.lib wxbase26.lib wxbase26_net.lib
wxmsw26_adv.lib wxmsw26_core.lib wxmsw26_html.lib ogg_static.lib
vorbis_static.lib vorbisfile_static.lib wxpng.lib wxzlib.lib wxjpeg.lib
wxtiff.lib libFLAC++.lib libFLAC.lib comctl32.lib rpcrt4.lib wsock32.lib
winmm.lib oleacc.lib kernel32.lib user32.lib gdi32.lib winspool.lib
comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib"
+ AdditionalDependencies="twolame_static.lib
allegro.lib libresample.lib soundtouch.lib libsamplerate.lib portmixer.lib
libnyquist.lib libid3tag.lib expat.lib mad.lib sndfile.lib wxbase26.lib
wxbase26_net.lib wxmsw26_adv.lib wxmsw26_core.lib wxmsw26_html.lib
ogg_static.lib vorbis_static.lib vorbisfile_static.lib wxpng.lib wxzlib.lib
wxjpeg.lib wxtiff.lib libFLAC++.lib libFLAC.lib comctl32.lib rpcrt4.lib
wsock32.lib winmm.lib oleacc.lib kernel32.lib user32.lib gdi32.lib winspool.lib
comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib"
ShowProgress="0"
OutputFile=".\$(ConfigurationName)/audacity.exe"
LinkIncremental="0"
SuppressStartupBanner="true"
-
AdditionalLibraryDirectories=""$(IntDir)";"..\lib-src\libogg\win32\static_$(ConfigurationName)";"..\lib-src\libvorbis\win32\vorbis_static_$(ConfigurationName)";"..\lib-src\libvorbis\win32\vorbisfile_static_$(ConfigurationName)";"$(WXWIN)\lib\vc_lib";"..\lib-src\libid3tag";"..\lib-src\expat";"..\lib-src\libmad";"..\lib-src\libsndfile\Win32";"..\lib-src\allegro";"..\lib-src\libnyquist";"..\lib-src\portmixer\winproj";"..\lib-src\libsamplerate\Win32";"..\lib-src\libflac\obj\lib";"..\lib-src\soundtouch\source\SoundTouch\$(ConfigurationName)";"..\lib-src\libresample\win";"$(DXSDK_DIR)lib\x86";"$(ASIOSDK_DIR)""
+
AdditionalLibraryDirectories=""$(IntDir)";"..\lib-src\libogg\win32\static_$(ConfigurationName)";"..\lib-src\libvorbis\win32\vorbis_static_$(ConfigurationName)";"..\lib-src\libvorbis\win32\vorbisfile_static_$(ConfigurationName)";"$(WXWIN)\lib\vc_lib";"..\lib-src\libid3tag";"..\lib-src\expat";"..\lib-src\libmad";"..\lib-src\libsndfile\Win32";"..\lib-src\allegro";"..\lib-src\libnyquist";"..\lib-src\portmixer\winproj";"..\lib-src\libsamplerate\Win32";"..\lib-src\libflac\obj\lib";"..\lib-src\soundtouch\source\SoundTouch\$(ConfigurationName)";"..\lib-src\libresample\win";"../lib-src/twolame/winproj/lib";"$(DXSDK_DIR)lib\x86";"$(ASIOSDK_DIR)""
IgnoreDefaultLibraryNames=""
GenerateDebugInformation="true"
ProgramDatabaseFile=".\$(ConfigurationName)/audacity.pdb"
@@ -4075,6 +4075,14 @@
>
</File>
<File
+ RelativePath="..\src\export\ExportMP2.cpp"
+ >
+ </File>
+ <File
+ RelativePath="..\src\export\ExportMP2.h"
+ >
+ </File>
+ <File
RelativePath="..\src\export\ExportMP3.cpp"
>
<FileConfiguration
-------------------------------------------------------------------------
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
