From 6de2f69b77d054b5d5cc0fb25aa146e81f36fb7f Mon Sep 17 00:00:00 2001 From: Beman Date: Mon, 15 Dec 2014 20:20:16 -0500 Subject: [PATCH] Get MSVC 64-builds working under Visual Studio. --- .../associated-files/associated-files.vcxproj | 51 ++++++++++++++ test/msvc/benchmark/benchmark.vcxproj | 2 + test/msvc/buffer_test/buffer_test.vcxproj | 69 +++++++++++++++++++ .../conversion_use_case.vcxproj | 69 +++++++++++++++++++ .../converter_test/converter_test.vcxproj | 2 + test/msvc/endian.sln | 20 ++++-- .../endian_example/endian_example.vcxproj | 6 ++ .../endian_in_union_test.vcxproj | 7 +- .../endian_operations_test.vcxproj | 8 ++- test/msvc/endian_test/endian_test.vcxproj | 7 +- .../loop_time_test/loop_time_test.vcxproj | 2 + .../scoped_enum_emulation_test.vcxproj | 6 ++ test/msvc/speed_test/speed_test.vcxproj | 2 + .../udt_conversion_example.vcxproj | 2 + test/msvc/uses_cases/uses_cases.vcxproj | 69 +++++++++++++++++++ 15 files changed, 311 insertions(+), 11 deletions(-) diff --git a/test/msvc/associated-files/associated-files.vcxproj b/test/msvc/associated-files/associated-files.vcxproj index b1bb3df..b93d787 100644 --- a/test/msvc/associated-files/associated-files.vcxproj +++ b/test/msvc/associated-files/associated-files.vcxproj @@ -5,10 +5,18 @@ Debug Win32 + + Debug + x64 + Release Win32 + + Release + x64 + {D9C80FE0-20A6-4711-A3F4-676019BD5A06} @@ -21,6 +29,12 @@ v140 MultiByte + + Application + true + v140 + MultiByte + Application false @@ -28,15 +42,28 @@ true MultiByte + + Application + false + v140 + true + MultiByte + + + + + + + @@ -49,6 +76,16 @@ true + + + Level3 + Disabled + true + + + true + + Level3 @@ -63,6 +100,20 @@ true + + + Level3 + MaxSpeed + true + true + true + + + true + true + true + + diff --git a/test/msvc/benchmark/benchmark.vcxproj b/test/msvc/benchmark/benchmark.vcxproj index 8275139..ce4c26f 100644 --- a/test/msvc/benchmark/benchmark.vcxproj +++ b/test/msvc/benchmark/benchmark.vcxproj @@ -77,6 +77,7 @@ true + ..\..\..\..\..\stage\lib;$(VC_ExecutablePath_x64);$(WindowsSDK_ExecutablePath);$(VS_ExecutablePath);$(MSBuild_ExecutablePath);$(SystemRoot)\SysWow64;$(FxCopDir);$(PATH); false @@ -85,6 +86,7 @@ false + ..\..\..\..\..\stage\lib;$(VC_ExecutablePath_x64);$(WindowsSDK_ExecutablePath);$(VS_ExecutablePath);$(MSBuild_ExecutablePath);$(SystemRoot)\SysWow64;$(FxCopDir);$(PATH); diff --git a/test/msvc/buffer_test/buffer_test.vcxproj b/test/msvc/buffer_test/buffer_test.vcxproj index 5505bfe..401449f 100644 --- a/test/msvc/buffer_test/buffer_test.vcxproj +++ b/test/msvc/buffer_test/buffer_test.vcxproj @@ -5,10 +5,18 @@ Debug Win32 + + Debug + x64 + Release Win32 + + Release + x64 + {BFB68CF4-EB92-4E5C-9694-A939496C5CDE} @@ -22,6 +30,12 @@ v140 Unicode + + Application + true + v140 + Unicode + Application false @@ -29,6 +43,13 @@ true Unicode + + Application + false + v140 + true + Unicode + @@ -36,17 +57,33 @@ + + + + + + + + true + + true + ..\..\..\..\..\stage\lib;$(VC_ExecutablePath_x64);$(WindowsSDK_ExecutablePath);$(VS_ExecutablePath);$(MSBuild_ExecutablePath);$(SystemRoot)\SysWow64;$(FxCopDir);$(PATH); + false + + false + ..\..\..\..\..\stage\lib;$(VC_ExecutablePath_x64);$(WindowsSDK_ExecutablePath);$(VS_ExecutablePath);$(MSBuild_ExecutablePath);$(SystemRoot)\SysWow64;$(FxCopDir);$(PATH); + @@ -61,6 +98,20 @@ true + + + + + Level3 + Disabled + WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) + true + + + Console + true + + Level3 @@ -79,6 +130,24 @@ true + + + Level3 + + + MaxSpeed + true + true + WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) + true + + + Console + true + true + true + + diff --git a/test/msvc/conversion_use_case/conversion_use_case.vcxproj b/test/msvc/conversion_use_case/conversion_use_case.vcxproj index d7d8cea..8407ab8 100644 --- a/test/msvc/conversion_use_case/conversion_use_case.vcxproj +++ b/test/msvc/conversion_use_case/conversion_use_case.vcxproj @@ -5,10 +5,18 @@ Debug Win32 + + Debug + x64 + Release Win32 + + Release + x64 + {1139E765-DE0F-497A-A7D9-EB2683521DF1} @@ -22,6 +30,12 @@ v140 Unicode + + Application + true + v140 + Unicode + Application false @@ -29,6 +43,13 @@ true Unicode + + Application + false + v140 + true + Unicode + @@ -36,17 +57,33 @@ + + + + + + + + true + + true + ..\..\..\..\..\stage\lib;$(VC_ExecutablePath_x64);$(WindowsSDK_ExecutablePath);$(VS_ExecutablePath);$(MSBuild_ExecutablePath);$(SystemRoot)\SysWow64;$(FxCopDir);$(PATH); + false + + false + ..\..\..\..\..\stage\lib;$(VC_ExecutablePath_x64);$(WindowsSDK_ExecutablePath);$(VS_ExecutablePath);$(MSBuild_ExecutablePath);$(SystemRoot)\SysWow64;$(FxCopDir);$(PATH); + @@ -61,6 +98,20 @@ true + + + + + Level3 + Disabled + WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) + true + + + Console + true + + Level3 @@ -79,6 +130,24 @@ true + + + Level3 + + + MaxSpeed + true + true + WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) + true + + + Console + true + true + true + + diff --git a/test/msvc/converter_test/converter_test.vcxproj b/test/msvc/converter_test/converter_test.vcxproj index a6d7f64..3fa0723 100644 --- a/test/msvc/converter_test/converter_test.vcxproj +++ b/test/msvc/converter_test/converter_test.vcxproj @@ -80,6 +80,7 @@ true + ..\..\..\..\..\stage\lib;$(VC_ExecutablePath_x64);$(WindowsSDK_ExecutablePath);$(VS_ExecutablePath);$(MSBuild_ExecutablePath);$(SystemRoot)\SysWow64;$(FxCopDir);$(PATH); false @@ -88,6 +89,7 @@ false + ..\..\..\..\..\stage\lib;$(VC_ExecutablePath_x64);$(WindowsSDK_ExecutablePath);$(VS_ExecutablePath);$(MSBuild_ExecutablePath);$(SystemRoot)\SysWow64;$(FxCopDir);$(PATH); diff --git a/test/msvc/endian.sln b/test/msvc/endian.sln index 4b921a9..b36444c 100644 --- a/test/msvc/endian.sln +++ b/test/msvc/endian.sln @@ -117,27 +117,33 @@ Global {541A2D06-B34E-4592-BE47-F87DF47E73D8}.Release|x64.Build.0 = Release|x64 {BFB68CF4-EB92-4E5C-9694-A939496C5CDE}.Debug|Win32.ActiveCfg = Debug|Win32 {BFB68CF4-EB92-4E5C-9694-A939496C5CDE}.Debug|Win32.Build.0 = Debug|Win32 - {BFB68CF4-EB92-4E5C-9694-A939496C5CDE}.Debug|x64.ActiveCfg = Debug|Win32 + {BFB68CF4-EB92-4E5C-9694-A939496C5CDE}.Debug|x64.ActiveCfg = Debug|x64 + {BFB68CF4-EB92-4E5C-9694-A939496C5CDE}.Debug|x64.Build.0 = Debug|x64 {BFB68CF4-EB92-4E5C-9694-A939496C5CDE}.Release|Win32.ActiveCfg = Release|Win32 {BFB68CF4-EB92-4E5C-9694-A939496C5CDE}.Release|Win32.Build.0 = Release|Win32 - {BFB68CF4-EB92-4E5C-9694-A939496C5CDE}.Release|x64.ActiveCfg = Release|Win32 + {BFB68CF4-EB92-4E5C-9694-A939496C5CDE}.Release|x64.ActiveCfg = Release|x64 + {BFB68CF4-EB92-4E5C-9694-A939496C5CDE}.Release|x64.Build.0 = Release|x64 {36BF451A-EAEF-4140-92E4-6EA461A26107}.Debug|Win32.ActiveCfg = Debug|Win32 - {36BF451A-EAEF-4140-92E4-6EA461A26107}.Debug|x64.ActiveCfg = Debug|Win32 + {36BF451A-EAEF-4140-92E4-6EA461A26107}.Debug|x64.ActiveCfg = Debug|x64 {36BF451A-EAEF-4140-92E4-6EA461A26107}.Release|Win32.ActiveCfg = Release|Win32 {36BF451A-EAEF-4140-92E4-6EA461A26107}.Release|Win32.Build.0 = Release|Win32 {36BF451A-EAEF-4140-92E4-6EA461A26107}.Release|x64.ActiveCfg = Release|Win32 {1139E765-DE0F-497A-A7D9-EB2683521DF1}.Debug|Win32.ActiveCfg = Debug|Win32 {1139E765-DE0F-497A-A7D9-EB2683521DF1}.Debug|Win32.Build.0 = Debug|Win32 - {1139E765-DE0F-497A-A7D9-EB2683521DF1}.Debug|x64.ActiveCfg = Debug|Win32 + {1139E765-DE0F-497A-A7D9-EB2683521DF1}.Debug|x64.ActiveCfg = Debug|x64 + {1139E765-DE0F-497A-A7D9-EB2683521DF1}.Debug|x64.Build.0 = Debug|x64 {1139E765-DE0F-497A-A7D9-EB2683521DF1}.Release|Win32.ActiveCfg = Release|Win32 {1139E765-DE0F-497A-A7D9-EB2683521DF1}.Release|Win32.Build.0 = Release|Win32 - {1139E765-DE0F-497A-A7D9-EB2683521DF1}.Release|x64.ActiveCfg = Release|Win32 + {1139E765-DE0F-497A-A7D9-EB2683521DF1}.Release|x64.ActiveCfg = Release|x64 + {1139E765-DE0F-497A-A7D9-EB2683521DF1}.Release|x64.Build.0 = Release|x64 {D9C80FE0-20A6-4711-A3F4-676019BD5A06}.Debug|Win32.ActiveCfg = Debug|Win32 {D9C80FE0-20A6-4711-A3F4-676019BD5A06}.Debug|Win32.Build.0 = Debug|Win32 - {D9C80FE0-20A6-4711-A3F4-676019BD5A06}.Debug|x64.ActiveCfg = Debug|Win32 + {D9C80FE0-20A6-4711-A3F4-676019BD5A06}.Debug|x64.ActiveCfg = Debug|x64 + {D9C80FE0-20A6-4711-A3F4-676019BD5A06}.Debug|x64.Build.0 = Debug|x64 {D9C80FE0-20A6-4711-A3F4-676019BD5A06}.Release|Win32.ActiveCfg = Release|Win32 {D9C80FE0-20A6-4711-A3F4-676019BD5A06}.Release|Win32.Build.0 = Release|Win32 - {D9C80FE0-20A6-4711-A3F4-676019BD5A06}.Release|x64.ActiveCfg = Release|Win32 + {D9C80FE0-20A6-4711-A3F4-676019BD5A06}.Release|x64.ActiveCfg = Release|x64 + {D9C80FE0-20A6-4711-A3F4-676019BD5A06}.Release|x64.Build.0 = Release|x64 EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE diff --git a/test/msvc/endian_example/endian_example.vcxproj b/test/msvc/endian_example/endian_example.vcxproj index 0cd738b..6227f65 100644 --- a/test/msvc/endian_example/endian_example.vcxproj +++ b/test/msvc/endian_example/endian_example.vcxproj @@ -77,6 +77,12 @@ false false + + ..\..\..\..\..\stage\lib;$(VC_ExecutablePath_x64);$(WindowsSDK_ExecutablePath);$(VS_ExecutablePath);$(MSBuild_ExecutablePath);$(SystemRoot)\SysWow64;$(FxCopDir);$(PATH); + + + ..\..\..\..\..\stage\lib;$(VC_ExecutablePath_x64);$(WindowsSDK_ExecutablePath);$(VS_ExecutablePath);$(MSBuild_ExecutablePath);$(SystemRoot)\SysWow64;$(FxCopDir);$(PATH); + Disabled diff --git a/test/msvc/endian_in_union_test/endian_in_union_test.vcxproj b/test/msvc/endian_in_union_test/endian_in_union_test.vcxproj index 9fb63b5..8a1fb42 100644 --- a/test/msvc/endian_in_union_test/endian_in_union_test.vcxproj +++ b/test/msvc/endian_in_union_test/endian_in_union_test.vcxproj @@ -79,7 +79,12 @@ $(SolutionDir)$(Configuration)\ $(Configuration)\ - + + ..\..\..\..\..\stage\lib;$(VC_ExecutablePath_x64);$(WindowsSDK_ExecutablePath);$(VS_ExecutablePath);$(MSBuild_ExecutablePath);$(SystemRoot)\SysWow64;$(FxCopDir);$(PATH); + + + ..\..\..\..\..\stage\lib;$(VC_ExecutablePath_x64);$(WindowsSDK_ExecutablePath);$(VS_ExecutablePath);$(MSBuild_ExecutablePath);$(SystemRoot)\SysWow64;$(FxCopDir);$(PATH); + Disabled diff --git a/test/msvc/endian_operations_test/endian_operations_test.vcxproj b/test/msvc/endian_operations_test/endian_operations_test.vcxproj index fe0841e..b12158c 100644 --- a/test/msvc/endian_operations_test/endian_operations_test.vcxproj +++ b/test/msvc/endian_operations_test/endian_operations_test.vcxproj @@ -77,12 +77,16 @@ $(SolutionDir)$(Configuration)\ $(Configuration)\ - + + ..\..\..\..\..\stage\lib;$(VC_ExecutablePath_x64);$(WindowsSDK_ExecutablePath);$(VS_ExecutablePath);$(MSBuild_ExecutablePath);$(SystemRoot)\SysWow64;$(FxCopDir);$(PATH); + $(SolutionDir)$(Configuration)\ $(Configuration)\ - + + ..\..\..\..\..\stage\lib;$(VC_ExecutablePath_x64);$(WindowsSDK_ExecutablePath);$(VS_ExecutablePath);$(MSBuild_ExecutablePath);$(SystemRoot)\SysWow64;$(FxCopDir);$(PATH); + Disabled diff --git a/test/msvc/endian_test/endian_test.vcxproj b/test/msvc/endian_test/endian_test.vcxproj index c4ad018..c8e2975 100644 --- a/test/msvc/endian_test/endian_test.vcxproj +++ b/test/msvc/endian_test/endian_test.vcxproj @@ -79,7 +79,12 @@ $(SolutionDir)$(Configuration)\ $(Configuration)\ - + + ..\..\..\..\..\stage\lib;$(VC_ExecutablePath_x64);$(WindowsSDK_ExecutablePath);$(VS_ExecutablePath);$(MSBuild_ExecutablePath);$(SystemRoot)\SysWow64;$(FxCopDir);$(PATH); + + + ..\..\..\..\..\stage\lib;$(VC_ExecutablePath_x64);$(WindowsSDK_ExecutablePath);$(VS_ExecutablePath);$(MSBuild_ExecutablePath);$(SystemRoot)\SysWow64;$(FxCopDir);$(PATH); + Disabled diff --git a/test/msvc/loop_time_test/loop_time_test.vcxproj b/test/msvc/loop_time_test/loop_time_test.vcxproj index d742dc2..b738984 100644 --- a/test/msvc/loop_time_test/loop_time_test.vcxproj +++ b/test/msvc/loop_time_test/loop_time_test.vcxproj @@ -75,12 +75,14 @@ true + ..\..\..\..\..\stage\lib;$(VC_ExecutablePath_x64);$(WindowsSDK_ExecutablePath);$(VS_ExecutablePath);$(MSBuild_ExecutablePath);$(SystemRoot)\SysWow64;$(FxCopDir);$(PATH); false false + ..\..\..\..\..\stage\lib;$(VC_ExecutablePath_x64);$(WindowsSDK_ExecutablePath);$(VS_ExecutablePath);$(MSBuild_ExecutablePath);$(SystemRoot)\SysWow64;$(FxCopDir);$(PATH); diff --git a/test/msvc/scoped_enum_emulation_test/scoped_enum_emulation_test.vcxproj b/test/msvc/scoped_enum_emulation_test/scoped_enum_emulation_test.vcxproj index 85a4484..0c03ad5 100644 --- a/test/msvc/scoped_enum_emulation_test/scoped_enum_emulation_test.vcxproj +++ b/test/msvc/scoped_enum_emulation_test/scoped_enum_emulation_test.vcxproj @@ -77,6 +77,12 @@ false false + + ..\..\..\..\..\stage\lib;$(VC_ExecutablePath_x64);$(WindowsSDK_ExecutablePath);$(VS_ExecutablePath);$(MSBuild_ExecutablePath);$(SystemRoot)\SysWow64;$(FxCopDir);$(PATH); + + + ..\..\..\..\..\stage\lib;$(VC_ExecutablePath_x64);$(WindowsSDK_ExecutablePath);$(VS_ExecutablePath);$(MSBuild_ExecutablePath);$(SystemRoot)\SysWow64;$(FxCopDir);$(PATH); + Disabled diff --git a/test/msvc/speed_test/speed_test.vcxproj b/test/msvc/speed_test/speed_test.vcxproj index acbbe0c..f46ee7b 100644 --- a/test/msvc/speed_test/speed_test.vcxproj +++ b/test/msvc/speed_test/speed_test.vcxproj @@ -75,12 +75,14 @@ true + ..\..\..\..\..\stage\lib;$(VC_ExecutablePath_x64);$(WindowsSDK_ExecutablePath);$(VS_ExecutablePath);$(MSBuild_ExecutablePath);$(SystemRoot)\SysWow64;$(FxCopDir);$(PATH); false false + ..\..\..\..\..\stage\lib;$(VC_ExecutablePath_x64);$(WindowsSDK_ExecutablePath);$(VS_ExecutablePath);$(MSBuild_ExecutablePath);$(SystemRoot)\SysWow64;$(FxCopDir);$(PATH); diff --git a/test/msvc/udt_conversion_example/udt_conversion_example.vcxproj b/test/msvc/udt_conversion_example/udt_conversion_example.vcxproj index 830952f..5515abe 100644 --- a/test/msvc/udt_conversion_example/udt_conversion_example.vcxproj +++ b/test/msvc/udt_conversion_example/udt_conversion_example.vcxproj @@ -75,12 +75,14 @@ true + ..\..\..\..\..\stage\lib;$(VC_ExecutablePath_x64);$(WindowsSDK_ExecutablePath);$(VS_ExecutablePath);$(MSBuild_ExecutablePath);$(SystemRoot)\SysWow64;$(FxCopDir);$(PATH); false false + ..\..\..\..\..\stage\lib;$(VC_ExecutablePath_x64);$(WindowsSDK_ExecutablePath);$(VS_ExecutablePath);$(MSBuild_ExecutablePath);$(SystemRoot)\SysWow64;$(FxCopDir);$(PATH); diff --git a/test/msvc/uses_cases/uses_cases.vcxproj b/test/msvc/uses_cases/uses_cases.vcxproj index 3d56680..b775b12 100644 --- a/test/msvc/uses_cases/uses_cases.vcxproj +++ b/test/msvc/uses_cases/uses_cases.vcxproj @@ -5,10 +5,18 @@ Debug Win32 + + Debug + x64 + Release Win32 + + Release + x64 + {36BF451A-EAEF-4140-92E4-6EA461A26107} @@ -22,6 +30,12 @@ v140 Unicode + + Application + true + v140 + Unicode + Application false @@ -29,6 +43,13 @@ true Unicode + + Application + false + v140 + true + Unicode + @@ -36,16 +57,32 @@ + + + + + + + + true + ..\..\..\..\..\stage\lib;$(VC_ExecutablePath_x64);$(WindowsSDK_ExecutablePath);$(VS_ExecutablePath);$(MSBuild_ExecutablePath);$(SystemRoot)\SysWow64;$(FxCopDir);$(PATH); + + + true false + ..\..\..\..\..\stage\lib;$(VC_ExecutablePath_x64);$(WindowsSDK_ExecutablePath);$(VS_ExecutablePath);$(MSBuild_ExecutablePath);$(SystemRoot)\SysWow64;$(FxCopDir);$(PATH); + + + false @@ -61,6 +98,20 @@ true + + + + + Level3 + Disabled + WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) + true + + + Console + true + + Level3 @@ -79,6 +130,24 @@ true + + + Level3 + + + MaxSpeed + true + true + WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) + true + + + Console + true + true + true + +