diff options
| author | Yann Collet <cyan@fb.com> | 2016-11-09 17:04:09 (GMT) |
|---|---|---|
| committer | Yann Collet <cyan@fb.com> | 2016-11-09 17:04:09 (GMT) |
| commit | 0c5e2e4d1bf7a4abed98913fd526779976214ea7 (patch) | |
| tree | 678ce87b856c2e027e196b6d4228cd8095cc33a8 /visual/VS2010/lz4.sln | |
| parent | fafba397343dbce6d30ba459d9d9f9f98cfbdd2d (diff) | |
| parent | 2987eb41792d3ae7a38096651a7d689a0bb783ab (diff) | |
| download | lz4-0c5e2e4d1bf7a4abed98913fd526779976214ea7.zip lz4-0c5e2e4d1bf7a4abed98913fd526779976214ea7.tar.gz lz4-0c5e2e4d1bf7a4abed98913fd526779976214ea7.tar.bz2 | |
Merge branch 'dev' of github.com:Cyan4973/lz4 into dev
Diffstat (limited to 'visual/VS2010/lz4.sln')
| -rw-r--r-- | visual/VS2010/lz4.sln | 16 |
1 files changed, 14 insertions, 2 deletions
diff --git a/visual/VS2010/lz4.sln b/visual/VS2010/lz4.sln index c9872a1..d3725ae 100644 --- a/visual/VS2010/lz4.sln +++ b/visual/VS2010/lz4.sln @@ -1,9 +1,8 @@ - Microsoft Visual Studio Solution File, Format Version 12.00 # Visual Studio Express 2012 for Windows Desktop Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "lz4", "lz4\lz4.vcxproj", "{E30329AC-0057-4FE0-8FDA-7F650D398C4C}" EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "lz4-dll", "lz4-dll\lz4-dll.vcxproj", "{9800039D-4AAA-43A4-BB78-FEF6F4836927}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "liblz4-dll", "liblz4-dll\lz4-dll.vcxproj", "{9800039D-4AAA-43A4-BB78-FEF6F4836927}" EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "liblz4", "liblz4\liblz4.vcxproj", "{9092C5CC-3E71-41B3-BF68-4A7BDD8A5476}" EndProject @@ -15,6 +14,11 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "frametest", "frametest\fram EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "datagen", "datagen\datagen.vcxproj", "{D745AE2F-596A-403A-9B91-81A8C6779243}" EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "fullbench-dll", "fullbench-dll\fullbench-dll.vcxproj", "{13992FD2-077E-4954-B065-A428198201A9}" + ProjectSection(ProjectDependencies) = postProject + {9800039D-4AAA-43A4-BB78-FEF6F4836927} = {9800039D-4AAA-43A4-BB78-FEF6F4836927} + EndProjectSection +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Win32 = Debug|Win32 @@ -79,6 +83,14 @@ Global {D745AE2F-596A-403A-9B91-81A8C6779243}.Release|Win32.Build.0 = Release|Win32 {D745AE2F-596A-403A-9B91-81A8C6779243}.Release|x64.ActiveCfg = Release|x64 {D745AE2F-596A-403A-9B91-81A8C6779243}.Release|x64.Build.0 = Release|x64 + {13992FD2-077E-4954-B065-A428198201A9}.Debug|Win32.ActiveCfg = Debug|Win32 + {13992FD2-077E-4954-B065-A428198201A9}.Debug|Win32.Build.0 = Debug|Win32 + {13992FD2-077E-4954-B065-A428198201A9}.Debug|x64.ActiveCfg = Debug|x64 + {13992FD2-077E-4954-B065-A428198201A9}.Debug|x64.Build.0 = Debug|x64 + {13992FD2-077E-4954-B065-A428198201A9}.Release|Win32.ActiveCfg = Release|Win32 + {13992FD2-077E-4954-B065-A428198201A9}.Release|Win32.Build.0 = Release|Win32 + {13992FD2-077E-4954-B065-A428198201A9}.Release|x64.ActiveCfg = Release|x64 + {13992FD2-077E-4954-B065-A428198201A9}.Release|x64.Build.0 = Release|x64 EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE |