From e210e51edb4a7c1fafa47e629f44560caedec577 Mon Sep 17 00:00:00 2001 From: shuffle2 Date: Wed, 24 Feb 2010 08:19:28 +0000 Subject: [PATCH] remove stub /trunk/dependencies. add source for all dependencies to /dependencies. update vs2008 files accordingly. if this is not a good compromise, just revert it - but try not to break the build this time. dependencies/lpng140/scripts can probably be removed if no one sees a reason for it (some 225KB). git-svn-id: https://svn.code.sf.net/p/vbam/code/trunk@934 a31d4220-a93d-0410-bf67-fe4944624d44 --- dependencies/Dependencies Download.url | 5 ---- dependencies/Dependencies-Readme.txt | 1 - project/vc2008_mfc/VBA2008.sln | 35 +++++++++++++++++++++++++ project/vc2008_mfc/VBA2008.vcproj | 36 +++++++++++++++++++------- project/vc2008_mfc/nasm.rules | 6 ++--- 5 files changed, 64 insertions(+), 19 deletions(-) delete mode 100644 dependencies/Dependencies Download.url delete mode 100644 dependencies/Dependencies-Readme.txt diff --git a/dependencies/Dependencies Download.url b/dependencies/Dependencies Download.url deleted file mode 100644 index 7e0ba3d2..00000000 --- a/dependencies/Dependencies Download.url +++ /dev/null @@ -1,5 +0,0 @@ -[{000214A0-0000-0000-C000-000000000046}] -Prop3=19,11 -[InternetShortcut] -URL=https://sourceforge.net/projects/vbam/files/Dependencies/dependencies.7z/download -IDList= diff --git a/dependencies/Dependencies-Readme.txt b/dependencies/Dependencies-Readme.txt deleted file mode 100644 index 42782c7b..00000000 --- a/dependencies/Dependencies-Readme.txt +++ /dev/null @@ -1 +0,0 @@ -The Dependencies that go in this folder can be obtained from https://sourceforge.net/projects/vbam/files/Dependencies/dependencies.7z \ No newline at end of file diff --git a/project/vc2008_mfc/VBA2008.sln b/project/vc2008_mfc/VBA2008.sln index 2478f6fc..f97d2548 100644 --- a/project/vc2008_mfc/VBA2008.sln +++ b/project/vc2008_mfc/VBA2008.sln @@ -2,10 +2,27 @@ Microsoft Visual Studio Solution File, Format Version 10.00 # Visual Studio 2008 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "VisualBoyAdvance", "VBA2008.vcproj", "{6D4C5EC8-933F-4C05-A1BF-498E658576DF}" ProjectSection(ProjectDependencies) = postProject + {0008960E-E0DD-41A6-8265-00B31DDB4C21} = {0008960E-E0DD-41A6-8265-00B31DDB4C21} + {3E03C179-8251-46E4-81F4-466F114BAC63} = {3E03C179-8251-46E4-81F4-466F114BAC63} + {823DDC98-42D5-4A38-88CF-9DC06C788AE4} = {823DDC98-42D5-4A38-88CF-9DC06C788AE4} {7AEC599C-7C82-4F00-AA60-411E0A359CB0} = {7AEC599C-7C82-4F00-AA60-411E0A359CB0} EndProjectSection EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "File_Extractor", "..\..\..\dependencies\File_Extractor-0.4.3\File_Extractor2008.vcproj", "{7AEC599C-7C82-4F00-AA60-411E0A359CB0}" + ProjectSection(ProjectDependencies) = postProject + {3E03C179-8251-46E4-81F4-466F114BAC63} = {3E03C179-8251-46E4-81F4-466F114BAC63} + EndProjectSection +EndProject +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "dependencies", "dependencies", "{8B814174-883E-43D0-969E-3A17D8EDE080}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "zlib", "..\..\..\dependencies\zlib\zlib.vcproj", "{3E03C179-8251-46E4-81F4-466F114BAC63}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "SFML_Network", "..\..\..\dependencies\SFML\build\vc2008\sfml-network.vcproj", "{823DDC98-42D5-4A38-88CF-9DC06C788AE4}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libpng", "..\..\..\dependencies\lpng140\projects\visualc9\libpng.vcproj", "{0008960E-E0DD-41A6-8265-00B31DDB4C21}" + ProjectSection(ProjectDependencies) = postProject + {3E03C179-8251-46E4-81F4-466F114BAC63} = {3E03C179-8251-46E4-81F4-466F114BAC63} + EndProjectSection EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution @@ -21,8 +38,26 @@ Global {7AEC599C-7C82-4F00-AA60-411E0A359CB0}.Debug|Win32.Build.0 = Debug|Win32 {7AEC599C-7C82-4F00-AA60-411E0A359CB0}.Release|Win32.ActiveCfg = Release|Win32 {7AEC599C-7C82-4F00-AA60-411E0A359CB0}.Release|Win32.Build.0 = Release|Win32 + {3E03C179-8251-46E4-81F4-466F114BAC63}.Debug|Win32.ActiveCfg = Debug|Win32 + {3E03C179-8251-46E4-81F4-466F114BAC63}.Debug|Win32.Build.0 = Debug|Win32 + {3E03C179-8251-46E4-81F4-466F114BAC63}.Release|Win32.ActiveCfg = Release|Win32 + {3E03C179-8251-46E4-81F4-466F114BAC63}.Release|Win32.Build.0 = Release|Win32 + {823DDC98-42D5-4A38-88CF-9DC06C788AE4}.Debug|Win32.ActiveCfg = Debug|Win32 + {823DDC98-42D5-4A38-88CF-9DC06C788AE4}.Debug|Win32.Build.0 = Debug|Win32 + {823DDC98-42D5-4A38-88CF-9DC06C788AE4}.Release|Win32.ActiveCfg = Release|Win32 + {823DDC98-42D5-4A38-88CF-9DC06C788AE4}.Release|Win32.Build.0 = Release|Win32 + {0008960E-E0DD-41A6-8265-00B31DDB4C21}.Debug|Win32.ActiveCfg = LIB Debug|Win32 + {0008960E-E0DD-41A6-8265-00B31DDB4C21}.Debug|Win32.Build.0 = LIB Debug|Win32 + {0008960E-E0DD-41A6-8265-00B31DDB4C21}.Release|Win32.ActiveCfg = LIB Release|Win32 + {0008960E-E0DD-41A6-8265-00B31DDB4C21}.Release|Win32.Build.0 = LIB Release|Win32 EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE EndGlobalSection + GlobalSection(NestedProjects) = preSolution + {7AEC599C-7C82-4F00-AA60-411E0A359CB0} = {8B814174-883E-43D0-969E-3A17D8EDE080} + {3E03C179-8251-46E4-81F4-466F114BAC63} = {8B814174-883E-43D0-969E-3A17D8EDE080} + {823DDC98-42D5-4A38-88CF-9DC06C788AE4} = {8B814174-883E-43D0-969E-3A17D8EDE080} + {0008960E-E0DD-41A6-8265-00B31DDB4C21} = {8B814174-883E-43D0-969E-3A17D8EDE080} + EndGlobalSection EndGlobal diff --git a/project/vc2008_mfc/VBA2008.vcproj b/project/vc2008_mfc/VBA2008.vcproj index 37971682..548da3ad 100644 --- a/project/vc2008_mfc/VBA2008.vcproj +++ b/project/vc2008_mfc/VBA2008.vcproj @@ -1,7 +1,7 @@ + + + + + + + + @@ -2470,7 +2486,7 @@ diff --git a/project/vc2008_mfc/nasm.rules b/project/vc2008_mfc/nasm.rules index 2169b8f2..d69b059c 100644 --- a/project/vc2008_mfc/nasm.rules +++ b/project/vc2008_mfc/nasm.rules @@ -1,4 +1,4 @@ - + - \ No newline at end of file +