Update of /cvsroot/audacity/audacity-src/win
In directory sc8-pr-cvs11.sourceforge.net:/tmp/cvs-serv18786/win
Modified Files:
audacity.sln
Log Message:
Replaced allegro with portsmf as part of removing the EXPERIMENTAL_NOTE_TRACK
flag and replacing it with USE_MIDI. Changed ImportMIDI significantly to work
with the new library. Although allegro is no longer used when building
Audacity, it has not yet been removed from CVS and will be removed once it is
determined that portsmf causes no (additional) problems for developers. Built
and tested on Windows XP, untested on OSX and Linux.
Index: audacity.sln
===================================================================
RCS file: /cvsroot/audacity/audacity-src/win/audacity.sln,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -d -r1.34 -r1.35
--- audacity.sln 11 Jul 2008 04:51:50 -0000 1.34
+++ audacity.sln 11 Jul 2008 15:39:25 -0000 1.35
@@ -1,8 +1,7 @@
Microsoft Visual Studio Solution File, Format Version 9.00
-# Visual Studio 2005
+# Visual C++ Express 2005
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Audacity",
"Projects\Audacity\Audacity.vcproj", "{1D64095C-F936-4FCF-B609-56E9DDF941FA}"
ProjectSection(ProjectDependencies) = postProject
- {8A1C2514-85DD-4AE2-9CF3-3183B66C537D} =
{8A1C2514-85DD-4AE2-9CF3-3183B66C537D}
{85774A29-EA2F-4A40-994F-6BE593D847A5} =
{85774A29-EA2F-4A40-994F-6BE593D847A5}
{BEF965EB-6330-4D18-858C-3B9F66CA9F18} =
{BEF965EB-6330-4D18-858C-3B9F66CA9F18}
{7E111491-6A07-4661-90CD-6DEBB83CE755} =
{7E111491-6A07-4661-90CD-6DEBB83CE755}
@@ -29,8 +28,6 @@
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "soundtouch",
"Projects\soundtouch\soundtouch.vcproj",
"{EC3F5835-C486-4970-8A6B-A0700F4B3637}"
EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "allegro",
"Projects\allegro\allegro.vcproj", "{8A1C2514-85DD-4AE2-9CF3-3183B66C537D}"
-EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "expat",
"Projects\expat\expat.vcproj", "{38C2C6B1-FBF8-4C5C-BB90-63F996083F56}"
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libflac",
"Projects\libflac\libflac.vcproj", "{6C7DC635-26FB-419A-B69A-7ECBBB068245}"
@@ -77,6 +74,8 @@
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "slv2",
"Projects\slv2\slv2.vcproj", "{0FEC8848-E24E-4FA5-9ACD-E4582DC4CBBE}"
EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "portsmf",
"..\lib-src\portsmf\portsmf.vcproj", "{D035BCF8-CF15-4456-A4E1-C7E6ACD79346}"
+EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Win32 = Debug|Win32
@@ -101,14 +100,6 @@
{EC3F5835-C486-4970-8A6B-A0700F4B3637}.Unicode
Debug|Win32.Build.0 = Unicode Debug|Win32
{EC3F5835-C486-4970-8A6B-A0700F4B3637}.Unicode
Release|Win32.ActiveCfg = Unicode Release|Win32
{EC3F5835-C486-4970-8A6B-A0700F4B3637}.Unicode
Release|Win32.Build.0 = Unicode Release|Win32
- {8A1C2514-85DD-4AE2-9CF3-3183B66C537D}.Debug|Win32.ActiveCfg =
Debug|Win32
- {8A1C2514-85DD-4AE2-9CF3-3183B66C537D}.Debug|Win32.Build.0 =
Debug|Win32
- {8A1C2514-85DD-4AE2-9CF3-3183B66C537D}.Release|Win32.ActiveCfg
= Release|Win32
- {8A1C2514-85DD-4AE2-9CF3-3183B66C537D}.Release|Win32.Build.0 =
Release|Win32
- {8A1C2514-85DD-4AE2-9CF3-3183B66C537D}.Unicode
Debug|Win32.ActiveCfg = Unicode Debug|Win32
- {8A1C2514-85DD-4AE2-9CF3-3183B66C537D}.Unicode
Debug|Win32.Build.0 = Unicode Debug|Win32
- {8A1C2514-85DD-4AE2-9CF3-3183B66C537D}.Unicode
Release|Win32.ActiveCfg = Unicode Release|Win32
- {8A1C2514-85DD-4AE2-9CF3-3183B66C537D}.Unicode
Release|Win32.Build.0 = Unicode Release|Win32
{38C2C6B1-FBF8-4C5C-BB90-63F996083F56}.Debug|Win32.ActiveCfg =
Debug|Win32
{38C2C6B1-FBF8-4C5C-BB90-63F996083F56}.Release|Win32.ActiveCfg
= Release|Win32
{38C2C6B1-FBF8-4C5C-BB90-63F996083F56}.Unicode
Debug|Win32.ActiveCfg = Unicode Debug|Win32
@@ -281,6 +272,14 @@
{0FEC8848-E24E-4FA5-9ACD-E4582DC4CBBE}.Release|Win32.ActiveCfg
= Release|Win32
{0FEC8848-E24E-4FA5-9ACD-E4582DC4CBBE}.Unicode
Debug|Win32.ActiveCfg = Unicode Debug|Win32
{0FEC8848-E24E-4FA5-9ACD-E4582DC4CBBE}.Unicode
Release|Win32.ActiveCfg = Unicode Release|Win32
+ {D035BCF8-CF15-4456-A4E1-C7E6ACD79346}.Debug|Win32.ActiveCfg =
Debug|Win32
+ {D035BCF8-CF15-4456-A4E1-C7E6ACD79346}.Debug|Win32.Build.0 =
Debug|Win32
+ {D035BCF8-CF15-4456-A4E1-C7E6ACD79346}.Release|Win32.ActiveCfg
= Release|Win32
+ {D035BCF8-CF15-4456-A4E1-C7E6ACD79346}.Release|Win32.Build.0 =
Release|Win32
+ {D035BCF8-CF15-4456-A4E1-C7E6ACD79346}.Unicode
Debug|Win32.ActiveCfg = Debug|Win32
+ {D035BCF8-CF15-4456-A4E1-C7E6ACD79346}.Unicode
Debug|Win32.Build.0 = Debug|Win32
+ {D035BCF8-CF15-4456-A4E1-C7E6ACD79346}.Unicode
Release|Win32.ActiveCfg = Release|Win32
+ {D035BCF8-CF15-4456-A4E1-C7E6ACD79346}.Unicode
Release|Win32.Build.0 = Release|Win32
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
-------------------------------------------------------------------------
Sponsored by: SourceForge.net Community Choice Awards: VOTE NOW!
Studies have shown that voting for your favorite open source project,
along with a healthy diet, reduces your potential for chronic lameness
and boredom. Vote Now at http://www.sourceforge.net/community/cca08
_______________________________________________
Audacity-cvs mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/audacity-cvs
