diff --git a/contrib/extractor/.gitignore b/contrib/extractor/.gitignore index 7b922ae1e..c99344752 100644 --- a/contrib/extractor/.gitignore +++ b/contrib/extractor/.gitignore @@ -16,3 +16,4 @@ debug release *.ilk ad_debug.exe +ad.exe diff --git a/contrib/extractor/VC120_AD.sln b/contrib/extractor/VC120_AD.sln index db647bcbe..6503a2f77 100644 --- a/contrib/extractor/VC120_AD.sln +++ b/contrib/extractor/VC120_AD.sln @@ -1,6 +1,6 @@ Microsoft Visual Studio Solution File, Format Version 12.00 # Visual Studio 2012 -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ad", "VC110_ad.vcxproj", "{D7552D4F-408F-4F8E-859B-366659150CF4}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ad", "VC120_ad.vcxproj", "{D7552D4F-408F-4F8E-859B-366659150CF4}" ProjectSection(ProjectDependencies) = postProject {78424708-1F6E-4D4B-920C-FB6D26847055} = {78424708-1F6E-4D4B-920C-FB6D26847055} EndProjectSection diff --git a/contrib/extractor_binary/vmap_assembler.exe b/contrib/extractor_binary/vmap_assembler.exe index a353b8ebd..cbeee9bf9 100644 Binary files a/contrib/extractor_binary/vmap_assembler.exe and b/contrib/extractor_binary/vmap_assembler.exe differ diff --git a/contrib/vmap_assembler/VC120/vmap_assembler.vcxproj b/contrib/vmap_assembler/VC120/vmap_assembler.vcxproj index e13b0150a..e9a974473 100644 --- a/contrib/vmap_assembler/VC120/vmap_assembler.vcxproj +++ b/contrib/vmap_assembler/VC120/vmap_assembler.vcxproj @@ -203,11 +203,11 @@ - + {8072769e-cf10-48bf-b9e1-12752a5dac6e} false - + {8f1dea42-6a5b-4b62-839d-c141a7bfacf2} false diff --git a/contrib/vmap_assembler/vmap_assemblerVC120.sln b/contrib/vmap_assembler/vmap_assemblerVC120.sln index fe5609f6a..ef9f6442c 100644 --- a/contrib/vmap_assembler/vmap_assemblerVC120.sln +++ b/contrib/vmap_assembler/vmap_assemblerVC120.sln @@ -1,10 +1,10 @@ Microsoft Visual Studio Solution File, Format Version 12.00 # Visual Studio 2012 -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "vmap_assembler", "VC110\vmap_assembler.vcxproj", "{572FFF74-480C-4472-8ABF-81733BB4049D}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "vmap_assembler", "VC120\vmap_assembler.vcxproj", "{572FFF74-480C-4472-8ABF-81733BB4049D}" EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "zlib", "..\..\win\VC110\zlib.vcxproj", "{8F1DEA42-6A5B-4B62-839D-C141A7BFACF2}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "zlib", "..\..\win\VC120\zlib.vcxproj", "{8F1DEA42-6A5B-4B62-839D-C141A7BFACF2}" EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "g3dlite", "..\..\win\VC110\g3dlite.vcxproj", "{8072769E-CF10-48BF-B9E1-12752A5DAC6E}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "g3dlite", "..\..\win\VC120\g3dlite.vcxproj", "{8072769E-CF10-48BF-B9E1-12752A5DAC6E}" EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution diff --git a/contrib/vmap_extractor/win/vmapExtractor_VC120.sln b/contrib/vmap_extractor/win/vmapExtractor_VC120.sln index a36da935d..5cf6075a9 100644 --- a/contrib/vmap_extractor/win/vmapExtractor_VC120.sln +++ b/contrib/vmap_extractor/win/vmapExtractor_VC120.sln @@ -1,17 +1,17 @@ Microsoft Visual Studio Solution File, Format Version 12.00 # Visual Studio 2012 -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "vmapExtractor", "VC110\vmapExtractor.vcxproj", "{D4624B20-AC1E-4EE9-8C9C-0FB65EEE3393}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "vmapExtractor", "VC120\vmapExtractor.vcxproj", "{D4624B20-AC1E-4EE9-8C9C-0FB65EEE3393}" ProjectSection(ProjectDependencies) = postProject {78424708-1F6E-4D4B-920C-FB6D26847055} = {78424708-1F6E-4D4B-920C-FB6D26847055} {B96F612A-C91D-43B3-A4C3-D4294817EC6C} = {B96F612A-C91D-43B3-A4C3-D4294817EC6C} {8F1DEA42-6A5B-4B62-839D-C141A7BFACF2} = {8F1DEA42-6A5B-4B62-839D-C141A7BFACF2} EndProjectSection EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "zlib", "..\..\..\win\VC110\zlib.vcxproj", "{8F1DEA42-6A5B-4B62-839D-C141A7BFACF2}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "zlib", "..\..\..\win\VC120\zlib.vcxproj", "{8F1DEA42-6A5B-4B62-839D-C141A7BFACF2}" EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "bzip2", "..\..\..\win\VC110\bzip2.vcxproj", "{B96F612A-C91D-43B3-A4C3-D4294817EC6C}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "bzip2", "..\..\..\win\VC120\bzip2.vcxproj", "{B96F612A-C91D-43B3-A4C3-D4294817EC6C}" EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "StormLib", "..\..\..\dep\StormLib\StormLib_vc110.vcxproj", "{78424708-1F6E-4D4B-920C-FB6D26847055}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "StormLib", "..\..\..\dep\StormLib\StormLib_vc120.vcxproj", "{78424708-1F6E-4D4B-920C-FB6D26847055}" EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution