Permalink
Browse files

Adding taglib-sharp back as a submodule.

The goal is to make it easier for other platforms
to get up and building.
  • Loading branch information...
1 parent eaf24a0 commit 8b4554d79986ae2fe62aa2bb806e06761344a6e2 @decriptor decriptor committed Oct 10, 2013
View
@@ -4,3 +4,6 @@
[submodule "external/Hyena"]
path = external/Hyena
url = git://git.gnome.org/hyena
+[submodule "external/taglib-sharp"]
+ path = external/taglib-sharp
+ url = git@github.com:mono/taglib-sharp.git
View
@@ -9,8 +9,6 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "FSpot.Cms", "src\Core\FSpot
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "FSpot.JobScheduler", "src\Core\FSpot.JobScheduler\FSpot.JobScheduler.csproj", "{46049AF4-97E0-4EE5-A5CB-A9D0C9026B25}"
EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "FSpot.Core", "src\Core\FSpot.Core\FSpot.Core.csproj", "{57EDC3BC-E777-4400-B4E7-32A5D8F15A76}"
-EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "FSpot.Platform", "src\Core\FSpot.Platform\FSpot.Platform.csproj", "{2D3B12F7-ABF3-4784-92FE-78A1C775E157}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "FSpot.Query", "src\Core\FSpot.Query\FSpot.Query.csproj", "{D4E4D07E-D323-4CAE-BE04-8EE8EDF7F07E}"
@@ -19,13 +17,9 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "FSpot.Utils", "src\Core\FSp
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "FSpot.Gui", "src\Core\FSpot.Gui\FSpot.Gui.csproj", "{05A7FEC4-974A-40EB-AFB8-14E523EEEFFB}"
EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Libraries", "Libraries", "{6369E0D4-0A68-4D4E-A6A0-EF2EA793002F}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Hyena", "external\Hyena\Hyena\Hyena.csproj", "{95374549-9553-4C1E-9D89-667755F90E12}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Hyena.Data.Sqlite", "external\Hyena\Hyena.Data.Sqlite\Hyena.Data.Sqlite.csproj", "{95374549-9553-4C1E-9D89-667755F90E13}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "FSpot.Core", "src\Core\FSpot.Core\FSpot.Core.csproj", "{57EDC3BC-E777-4400-B4E7-32A5D8F15A76}"
EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Hyena.Gui", "external\Hyena\Hyena.Gui\Hyena.Gui.csproj", "{C856EFD8-E812-4E61-8B76-E3583D94C233}"
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Libraries", "Libraries", "{6369E0D4-0A68-4D4E-A6A0-EF2EA793002F}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Mono.Google", "lib\Mono.Google\Mono.Google.csproj", "{40C7D4EA-FB93-49FE-B18F-700A28C3E670}"
EndProject
@@ -35,10 +29,6 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Mono.Tabblo", "lib\Mono.Tab
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "unique-sharp", "lib\unique-sharp\unique-sharp.csproj", "{5DBBB8C5-7BAF-46DA-B7D2-2486430141E2}"
EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Xwt", "external\xwt\Xwt\Xwt.csproj", "{92494904-35FA-4DC9-BDE9-3A3E87AC49D3}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Xwt.Gtk", "external\xwt\Xwt.Gtk\Xwt.Gtk.csproj", "{C3887A93-B2BD-4097-8E2F-3A063EFF32FD}"
-EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Clients", "Clients", "{9D75644A-DEF1-4362-8553-4B5F09783DC9}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MainApp", "src\Clients\MainApp\MainApp.csproj", "{27EC05FB-0223-4B26-8157-E49AF81D0007}"
@@ -109,14 +99,27 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Core.Tests", "Core.Tests",
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "FSpot.Utils.UnitTest", "src\Core\FSpot.Core.UnitTest\FSpot.Utils.UnitTest.csproj", "{5341C44C-B576-4024-A5AB-045B26F38BDF}"
EndProject
-Project("{F184B08F-C81C-45F6-A57F-5ABD9991F28F}") = "FSpot.Query.UnitTest", "src\Core\FSpot.Query.UnitTest\FSpot.Query.UnitTest.csproj", "{D71751A7-968C-4956-B40C-C6C057220C1F}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "FSpot.Query.UnitTest", "src\Core\FSpot.Query.UnitTest\FSpot.Query.UnitTest.csproj", "{D71751A7-968C-4956-B40C-C6C057220C1F}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "External", "External", "{A6C38ABC-9B2B-4693-A16C-0741E5561B32}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Hyena", "external\Hyena\Hyena\Hyena.csproj", "{95374549-9553-4C1E-9D89-667755F90E12}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Hyena.Data.Sqlite", "external\Hyena\Hyena.Data.Sqlite\Hyena.Data.Sqlite.csproj", "{95374549-9553-4C1E-9D89-667755F90E13}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Hyena.Gui", "external\Hyena\Hyena.Gui\Hyena.Gui.csproj", "{C856EFD8-E812-4E61-8B76-E3583D94C233}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Xwt", "external\xwt\Xwt\Xwt.csproj", "{92494904-35FA-4DC9-BDE9-3A3E87AC49D3}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Xwt.Gtk", "external\xwt\Xwt.Gtk\Xwt.Gtk.csproj", "{C3887A93-B2BD-4097-8E2F-3A063EFF32FD}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "taglib-sharp", "external\taglib-sharp\src\taglib-sharp.csproj", "{6B143A39-C7B2-4743-9917-92262C60E9A6}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Any CPU = Debug|Any CPU
Submodule|Any CPU = Submodule|Any CPU
Release|Any CPU = Release|Any CPU
- Default|Any CPU = Default|Any CPU
EndGlobalSection
GlobalSection(ProjectConfigurationPlatforms) = postSolution
{05A7FEC4-974A-40EB-AFB8-14E523EEEFFB}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
@@ -204,10 +207,7 @@ Global
{4E372D8D-A822-40F2-8C64-25F2296DAC6F}.Submodule|Any CPU.Build.0 = Debug|Any CPU
{5341C44C-B576-4024-A5AB-045B26F38BDF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{5341C44C-B576-4024-A5AB-045B26F38BDF}.Debug|Any CPU.Build.0 = Debug|Any CPU
- {5341C44C-B576-4024-A5AB-045B26F38BDF}.Default|Any CPU.ActiveCfg = Debug|Any CPU
- {5341C44C-B576-4024-A5AB-045B26F38BDF}.Default|Any CPU.Build.0 = Debug|Any CPU
{5341C44C-B576-4024-A5AB-045B26F38BDF}.Release|Any CPU.ActiveCfg = Release|Any CPU
- {5341C44C-B576-4024-A5AB-045B26F38BDF}.Release|Any CPU.Build.0 = Release|Any CPU
{5341C44C-B576-4024-A5AB-045B26F38BDF}.Submodule|Any CPU.ActiveCfg = Debug|Any CPU
{5341C44C-B576-4024-A5AB-045B26F38BDF}.Submodule|Any CPU.Build.0 = Debug|Any CPU
{53DAC12F-0421-4F5E-A746-17A701D2BDDA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
@@ -224,10 +224,12 @@ Global
{55199016-6D69-4F52-AB82-06FC99408E78}.Submodule|Any CPU.Build.0 = Debug|Any CPU
{57EDC3BC-E777-4400-B4E7-32A5D8F15A76}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{57EDC3BC-E777-4400-B4E7-32A5D8F15A76}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {57EDC3BC-E777-4400-B4E7-32A5D8F15A76}.Release|Any CPU.ActiveCfg = Release|Any CPU
+ {57EDC3BC-E777-4400-B4E7-32A5D8F15A76}.Release|Any CPU.Build.0 = Release|Any CPU
+ {57EDC3BC-E777-4400-B4E7-32A5D8F15A76}.Submodule|Any CPU.ActiveCfg = Debug|Any CPU
+ {57EDC3BC-E777-4400-B4E7-32A5D8F15A76}.Submodule|Any CPU.Build.0 = Debug|Any CPU
{5DBBB8C5-7BAF-46DA-B7D2-2486430141E2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{5DBBB8C5-7BAF-46DA-B7D2-2486430141E2}.Debug|Any CPU.Build.0 = Debug|Any CPU
- {5DBBB8C5-7BAF-46DA-B7D2-2486430141E2}.Default|Any CPU.ActiveCfg = Debug|Any CPU
- {5DBBB8C5-7BAF-46DA-B7D2-2486430141E2}.Default|Any CPU.Build.0 = Debug|Any CPU
{5DBBB8C5-7BAF-46DA-B7D2-2486430141E2}.Release|Any CPU.ActiveCfg = Release|Any CPU
{5DBBB8C5-7BAF-46DA-B7D2-2486430141E2}.Release|Any CPU.Build.0 = Release|Any CPU
{5DBBB8C5-7BAF-46DA-B7D2-2486430141E2}.Submodule|Any CPU.ActiveCfg = Debug|Any CPU
@@ -238,6 +240,12 @@ Global
{61DAD6B1-E866-485B-819E-A9E86B793F5E}.Release|Any CPU.Build.0 = Release|Any CPU
{61DAD6B1-E866-485B-819E-A9E86B793F5E}.Submodule|Any CPU.ActiveCfg = Debug|Any CPU
{61DAD6B1-E866-485B-819E-A9E86B793F5E}.Submodule|Any CPU.Build.0 = Debug|Any CPU
+ {6B143A39-C7B2-4743-9917-92262C60E9A6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+ {6B143A39-C7B2-4743-9917-92262C60E9A6}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {6B143A39-C7B2-4743-9917-92262C60E9A6}.Release|Any CPU.ActiveCfg = Release|Any CPU
+ {6B143A39-C7B2-4743-9917-92262C60E9A6}.Release|Any CPU.Build.0 = Release|Any CPU
+ {6B143A39-C7B2-4743-9917-92262C60E9A6}.Submodule|Any CPU.ActiveCfg = Debug|Any CPU
+ {6B143A39-C7B2-4743-9917-92262C60E9A6}.Submodule|Any CPU.Build.0 = Debug|Any CPU
{7004A4E6-12A5-46F1-BB1F-578FA9B63493}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{7004A4E6-12A5-46F1-BB1F-578FA9B63493}.Debug|Any CPU.Build.0 = Debug|Any CPU
{7004A4E6-12A5-46F1-BB1F-578FA9B63493}.Release|Any CPU.ActiveCfg = Release|Any CPU
@@ -276,8 +284,6 @@ Global
{8EB3933F-A089-43A3-B662-617DC71A2173}.Submodule|Any CPU.Build.0 = Debug|Any CPU
{92494904-35FA-4DC9-BDE9-3A3E87AC49D3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{92494904-35FA-4DC9-BDE9-3A3E87AC49D3}.Debug|Any CPU.Build.0 = Debug|Any CPU
- {92494904-35FA-4DC9-BDE9-3A3E87AC49D3}.Default|Any CPU.ActiveCfg = Debug|Any CPU
- {92494904-35FA-4DC9-BDE9-3A3E87AC49D3}.Default|Any CPU.Build.0 = Debug|Any CPU
{92494904-35FA-4DC9-BDE9-3A3E87AC49D3}.Release|Any CPU.ActiveCfg = Release|Any CPU
{92494904-35FA-4DC9-BDE9-3A3E87AC49D3}.Release|Any CPU.Build.0 = Release|Any CPU
{92494904-35FA-4DC9-BDE9-3A3E87AC49D3}.Submodule|Any CPU.ActiveCfg = Debug|Any CPU
@@ -306,10 +312,9 @@ Global
{A19E926A-19C5-428B-8518-8CCC7B255C42}.Release|Any CPU.Build.0 = Release|Any CPU
{A19E926A-19C5-428B-8518-8CCC7B255C42}.Submodule|Any CPU.ActiveCfg = Debug|Any CPU
{A19E926A-19C5-428B-8518-8CCC7B255C42}.Submodule|Any CPU.Build.0 = Debug|Any CPU
- {A2A7E62B-8AE1-44F3-BB1B-B8E2DE7916C4}.Debug|Any CPU.ActiveCfg = DebugTests|Any CPU
+ {A2A7E62B-8AE1-44F3-BB1B-B8E2DE7916C4}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{A2A7E62B-8AE1-44F3-BB1B-B8E2DE7916C4}.Release|Any CPU.ActiveCfg = Release|Any CPU
{A2A7E62B-8AE1-44F3-BB1B-B8E2DE7916C4}.Submodule|Any CPU.ActiveCfg = Debug|Any CPU
- {A2A7E62B-8AE1-44F3-BB1B-B8E2DE7916C4}.Submodule|Any CPU.Build.0 = Debug|Any CPU
{B5CDF05C-278A-40AA-A587-B27A00BD9135}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{B5CDF05C-278A-40AA-A587-B27A00BD9135}.Debug|Any CPU.Build.0 = Debug|Any CPU
{B5CDF05C-278A-40AA-A587-B27A00BD9135}.Release|Any CPU.ActiveCfg = Release|Any CPU
@@ -330,8 +335,6 @@ Global
{BE981FC8-9B41-4336-815C-ECC365AE05D4}.Submodule|Any CPU.Build.0 = Debug|Any CPU
{C3887A93-B2BD-4097-8E2F-3A063EFF32FD}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{C3887A93-B2BD-4097-8E2F-3A063EFF32FD}.Debug|Any CPU.Build.0 = Debug|Any CPU
- {C3887A93-B2BD-4097-8E2F-3A063EFF32FD}.Default|Any CPU.ActiveCfg = Debug|Any CPU
- {C3887A93-B2BD-4097-8E2F-3A063EFF32FD}.Default|Any CPU.Build.0 = Debug|Any CPU
{C3887A93-B2BD-4097-8E2F-3A063EFF32FD}.Release|Any CPU.ActiveCfg = Release|Any CPU
{C3887A93-B2BD-4097-8E2F-3A063EFF32FD}.Release|Any CPU.Build.0 = Release|Any CPU
{C3887A93-B2BD-4097-8E2F-3A063EFF32FD}.Submodule|Any CPU.ActiveCfg = Debug|Any CPU
@@ -362,10 +365,7 @@ Global
{D6004A34-A123-415D-A79C-21FD3F96A1E5}.Submodule|Any CPU.Build.0 = Debug|Any CPU
{D71751A7-968C-4956-B40C-C6C057220C1F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{D71751A7-968C-4956-B40C-C6C057220C1F}.Debug|Any CPU.Build.0 = Debug|Any CPU
- {D71751A7-968C-4956-B40C-C6C057220C1F}.Default|Any CPU.ActiveCfg = Debug|Any CPU
- {D71751A7-968C-4956-B40C-C6C057220C1F}.Default|Any CPU.Build.0 = Debug|Any CPU
{D71751A7-968C-4956-B40C-C6C057220C1F}.Release|Any CPU.ActiveCfg = Release|Any CPU
- {D71751A7-968C-4956-B40C-C6C057220C1F}.Release|Any CPU.Build.0 = Release|Any CPU
{D71751A7-968C-4956-B40C-C6C057220C1F}.Submodule|Any CPU.ActiveCfg = Debug|Any CPU
{D71751A7-968C-4956-B40C-C6C057220C1F}.Submodule|Any CPU.Build.0 = Debug|Any CPU
{E55F73E0-576A-4FE2-9108-E76960820AA3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
@@ -381,10 +381,8 @@ Global
{ECF8996A-DE63-4225-927F-84641E0EB794}.Submodule|Any CPU.ActiveCfg = Debug|Any CPU
{ECF8996A-DE63-4225-927F-84641E0EB794}.Submodule|Any CPU.Build.0 = Debug|Any CPU
{F38C0ADF-29A3-453B-B272-61CC5BF3BB1E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
- {F38C0ADF-29A3-453B-B272-61CC5BF3BB1E}.Default|Any CPU.ActiveCfg = Debug|Any CPU
- {F38C0ADF-29A3-453B-B272-61CC5BF3BB1E}.Default|Any CPU.Build.0 = Debug|Any CPU
+ {F38C0ADF-29A3-453B-B272-61CC5BF3BB1E}.Debug|Any CPU.Build.0 = Debug|Any CPU
{F38C0ADF-29A3-453B-B272-61CC5BF3BB1E}.Release|Any CPU.ActiveCfg = Release|Any CPU
- {F38C0ADF-29A3-453B-B272-61CC5BF3BB1E}.Release|Any CPU.Build.0 = Release|Any CPU
{F38C0ADF-29A3-453B-B272-61CC5BF3BB1E}.Submodule|Any CPU.ActiveCfg = Debug|Any CPU
{F38C0ADF-29A3-453B-B272-61CC5BF3BB1E}.Submodule|Any CPU.Build.0 = Debug|Any CPU
{FBA30EB0-05EB-446D-827D-D41EBF4B81E4}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
@@ -404,20 +402,15 @@ Global
{7281334F-0B1D-4383-9EA2-6740D56ADCDE} = {6DC9A109-EC89-4221-B8CD-9E88B589DBC1}
{9D66BC1B-4390-4B8D-8468-19D5A862EC23} = {6DC9A109-EC89-4221-B8CD-9E88B589DBC1}
{46049AF4-97E0-4EE5-A5CB-A9D0C9026B25} = {6DC9A109-EC89-4221-B8CD-9E88B589DBC1}
- {57EDC3BC-E777-4400-B4E7-32A5D8F15A76} = {6DC9A109-EC89-4221-B8CD-9E88B589DBC1}
{2D3B12F7-ABF3-4784-92FE-78A1C775E157} = {6DC9A109-EC89-4221-B8CD-9E88B589DBC1}
{D4E4D07E-D323-4CAE-BE04-8EE8EDF7F07E} = {6DC9A109-EC89-4221-B8CD-9E88B589DBC1}
{CE160879-1BF0-4711-A18F-FDA2772900FA} = {6DC9A109-EC89-4221-B8CD-9E88B589DBC1}
{05A7FEC4-974A-40EB-AFB8-14E523EEEFFB} = {6DC9A109-EC89-4221-B8CD-9E88B589DBC1}
- {95374549-9553-4C1E-9D89-667755F90E12} = {6369E0D4-0A68-4D4E-A6A0-EF2EA793002F}
- {95374549-9553-4C1E-9D89-667755F90E13} = {6369E0D4-0A68-4D4E-A6A0-EF2EA793002F}
- {C856EFD8-E812-4E61-8B76-E3583D94C233} = {6369E0D4-0A68-4D4E-A6A0-EF2EA793002F}
+ {57EDC3BC-E777-4400-B4E7-32A5D8F15A76} = {6DC9A109-EC89-4221-B8CD-9E88B589DBC1}
{40C7D4EA-FB93-49FE-B18F-700A28C3E670} = {6369E0D4-0A68-4D4E-A6A0-EF2EA793002F}
{FFC3D9B1-B19A-44D8-8AA2-96DDE911320E} = {6369E0D4-0A68-4D4E-A6A0-EF2EA793002F}
{B5CDF05C-278A-40AA-A587-B27A00BD9135} = {6369E0D4-0A68-4D4E-A6A0-EF2EA793002F}
{5DBBB8C5-7BAF-46DA-B7D2-2486430141E2} = {6369E0D4-0A68-4D4E-A6A0-EF2EA793002F}
- {92494904-35FA-4DC9-BDE9-3A3E87AC49D3} = {6369E0D4-0A68-4D4E-A6A0-EF2EA793002F}
- {C3887A93-B2BD-4097-8E2F-3A063EFF32FD} = {6369E0D4-0A68-4D4E-A6A0-EF2EA793002F}
{27EC05FB-0223-4B26-8157-E49AF81D0007} = {9D75644A-DEF1-4362-8553-4B5F09783DC9}
{A2A7E62B-8AE1-44F3-BB1B-B8E2DE7916C4} = {9D75644A-DEF1-4362-8553-4B5F09783DC9}
{416E19A2-9CD9-498F-BE75-20AB74535ACD} = {7D049DAA-F1B0-4697-9BCA-91FC0E1A2B9D}
@@ -451,6 +444,12 @@ Global
{F38C0ADF-29A3-453B-B272-61CC5BF3BB1E} = {C9302C4A-B571-4F8E-8FFA-7B4C7DF8B3E3}
{5341C44C-B576-4024-A5AB-045B26F38BDF} = {76BE7E81-DE04-4CA8-853F-8B14166DC49A}
{D71751A7-968C-4956-B40C-C6C057220C1F} = {76BE7E81-DE04-4CA8-853F-8B14166DC49A}
+ {95374549-9553-4C1E-9D89-667755F90E12} = {A6C38ABC-9B2B-4693-A16C-0741E5561B32}
+ {95374549-9553-4C1E-9D89-667755F90E13} = {A6C38ABC-9B2B-4693-A16C-0741E5561B32}
+ {C856EFD8-E812-4E61-8B76-E3583D94C233} = {A6C38ABC-9B2B-4693-A16C-0741E5561B32}
+ {92494904-35FA-4DC9-BDE9-3A3E87AC49D3} = {A6C38ABC-9B2B-4693-A16C-0741E5561B32}
+ {C3887A93-B2BD-4097-8E2F-3A063EFF32FD} = {A6C38ABC-9B2B-4693-A16C-0741E5561B32}
+ {6B143A39-C7B2-4743-9917-92262C60E9A6} = {A6C38ABC-9B2B-4693-A16C-0741E5561B32}
EndGlobalSection
GlobalSection(MonoDevelopProperties) = preSolution
StartupItem = src\Clients\MainApp\MainApp.csproj
View
@@ -43,10 +43,10 @@ DISTCLEANFILES = \
DISTCHECK_CONFIGURE_FLAGS = --disable-scrollkeeper
if GCONF_SCHEMAS_INSTALL
-install-data-local:
+install-data-local: copy_bin
-GCONF_CONFIG_SOURCE=$(GCONF_SCHEMA_CONFIG_SOURCE) $(GCONFTOOL) --makefile-install-rule $(srcdir)/$(schema_DATA)
else
-install-data-local:
+install-data-local: copy_bin
endif
all: sln_build
@@ -63,8 +63,6 @@ run:
../src/Clients/MainApp/f-spot --uninstalled --debug; \
popd;
-install-data-local: copy_bin
-
copy_bin:
mkdir -p $(DESTDIR)/$(libdir)/f-spot
cp -r bin/* $(DESTDIR)/$(libdir)/f-spot/
View
4 README
@@ -34,8 +34,8 @@ With MonoDevelop:
There are a few steps you have to run before you can open MonoDevelop:
1. sh autogen.sh (on ubuntu you have to do ./autogen.sh)
2. cd build; make
- 3. cd external/Hyena; patch -p1 < ../../hyena.patch
- 4. cd ../../lib/libfspot; make
+ 3. patch -p1 < external.patch
+ 4. cd lib/libfspot; make
5. sudo make install (this will install the libfspot.so files)
The hyena patch is just a temporary fix for now. This will no longer be needed
@@ -1,5 +0,0 @@
-AC_DEFUN([FSPOT_CHECK_TAGLIB_SHARP],
-[
- PKG_CHECK_MODULES(TAGLIB_SHARP, taglib-sharp >= 2.0.4)
- AC_SUBST(TAGLIB_SHARP_LIBS)
-])
View
@@ -1,5 +1,5 @@
XBUILD=xbuild
-XBUILD_ARGS=/verbosity:quiet /nologo /property:CodePage=65001
+XBUILD_ARGS=/verbosity:diagnostic /nologo /property:CodePage=65001
ALL_CSPROJ=$(wildcard *.csproj)
MAIN_SLN=$(top_builddir)/F-Spot.sln
View
@@ -86,7 +86,6 @@ FSPOT_CHECK_FLICKRNET
SHAMROCK_CHECK_NUNIT
FSPOT_CHECK_MONO_ADDINS
FSPOT_CHECK_DBUS_SHARP
-FSPOT_CHECK_TAGLIB_SHARP
FSPOT_CHECK_GNOME_SHARP
@@ -1,33 +1,47 @@
-diff --git a/Hyena.Data.Sqlite/Hyena.Data.Sqlite.csproj b/Hyena.Data.Sqlite/Hyena.Data.Sqlite.csproj
+diff --git a/external/Hyena/Hyena.Data.Sqlite/Hyena.Data.Sqlite.csproj b/external/Hyena/Hyena.Data.Sqlite/Hyena.Data.Sqlite.csproj
index cabce10..21ed285 100644
---- a/Hyena.Data.Sqlite/Hyena.Data.Sqlite.csproj
-+++ b/Hyena.Data.Sqlite/Hyena.Data.Sqlite.csproj
+--- a/external/Hyena/Hyena.Data.Sqlite/Hyena.Data.Sqlite.csproj
++++ b/external/Hyena/Hyena.Data.Sqlite/Hyena.Data.Sqlite.csproj
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="3.5">
+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="4.0">
<PropertyGroup>
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-diff --git a/Hyena.Gui/Hyena.Gui.csproj b/Hyena.Gui/Hyena.Gui.csproj
+diff --git a/external/Hyena/Hyena.Gui/Hyena.Gui.csproj b/external/Hyena/Hyena.Gui/Hyena.Gui.csproj
index 0cf3088..539cfcc 100644
---- a/Hyena.Gui/Hyena.Gui.csproj
-+++ b/Hyena.Gui/Hyena.Gui.csproj
+--- a/external/Hyena/Hyena.Gui/Hyena.Gui.csproj
++++ b/external/Hyena/Hyena.Gui/Hyena.Gui.csproj
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="3.5">
+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="4.0">
<PropertyGroup>
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-diff --git a/Hyena/Hyena.csproj b/Hyena/Hyena.csproj
+diff --git a/external/Hyena/Hyena/Hyena.csproj b/external/Hyena/Hyena/Hyena.csproj
index cc18abc..b7014c2 100644
---- a/Hyena/Hyena.csproj
-+++ b/Hyena/Hyena.csproj
+--- a/external/Hyena/Hyena/Hyena.csproj
++++ b/external/Hyena/Hyena/Hyena.csproj
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="3.5">
+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="4.0">
<PropertyGroup>
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
+diff --git a/external/taglib-sharp/src/taglib-sharp.csproj b/external/taglib-sharp/src/taglib-sharp.csproj
+index 99ee40e..22f511b 100644
+--- a/external/taglib-sharp/src/taglib-sharp.csproj
++++ b/external/taglib-sharp/src/taglib-sharp.csproj
+@@ -10,8 +10,6 @@
+ <RootNamespace>TagLib</RootNamespace>
+ <ApplicationIcon>.</ApplicationIcon>
+ <AssemblyName>taglib-sharp</AssemblyName>
+- <ReleaseVersion>2.0.4.0</ReleaseVersion>
+- <TargetFrameworkVersion>v3.5</TargetFrameworkVersion>
+ </PropertyGroup>
+ <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
+ <DebugSymbols>True</DebugSymbols>
+
Submodule taglib-sharp added at 2006fe
Oops, something went wrong.

0 comments on commit 8b4554d

Please sign in to comment.