From c51c944139b707388438aab1bc6f20fd5d9f4a4e Mon Sep 17 00:00:00 2001 From: Patrick Thomas Date: Sun, 11 Dec 2016 00:56:21 -0600 Subject: Enabled 64-bit builds Enabled 64-bit builds for those who desire a 64-bit command line Pandora client, like myself. --- blowfish/blowfish.vcxproj | 85 +++++++++++++++++++++++++++++++++++ json-c/json-c.vcxproj | 99 +++++++++++++++++++++++++++++++++++++++++ pianobar.sln | 20 ++++++++- pianobar/pianobar.vcxproj | 110 ++++++++++++++++++++++++++++++++++++++++++++-- vtparse/vtparse.vcxproj | 87 ++++++++++++++++++++++++++++++++++++ 5 files changed, 396 insertions(+), 5 deletions(-) diff --git a/blowfish/blowfish.vcxproj b/blowfish/blowfish.vcxproj index 90e631d..b115660 100644 --- a/blowfish/blowfish.vcxproj +++ b/blowfish/blowfish.vcxproj @@ -5,10 +5,18 @@ Debug Win32 + + Debug + x64 + Release Win32 + + Release + x64 + {F0B7D905-BD81-4998-8386-333389BE15DE} @@ -22,20 +30,37 @@ true v140_xp + + StaticLibrary + NotSet + true + v140_xp + StaticLibrary NotSet v140_xp + + StaticLibrary + NotSet + v140_xp + + + + + + + <_ProjectFileVersion>10.0.40219.1 @@ -43,14 +68,26 @@ $(SolutionDir)build\temp\obj\$(ProjectName)\$(Configuration)\ $(SolutionDir)build\temp\lib\ $(SolutionDir)build\temp\obj\$(ProjectName)\$(Configuration)\ + $(SolutionDir)build\temp\lib\ + $(SolutionDir)build\temp\obj\$(ProjectName)\$(Configuration)\ + $(SolutionDir)build\temp\lib\ + $(SolutionDir)build\temp\obj\$(ProjectName)\$(Configuration)\ AllRules.ruleset + AllRules.ruleset + + AllRules.ruleset + AllRules.ruleset + + $(ProjectName)-mt-debug + $(ProjectName)-mt-debug $(ProjectName)-mt + $(ProjectName)-mt @@ -72,6 +109,28 @@ xcopy "$(ProjectDir)blowfish.h" "$(SolutionDir)build\temp\include\" /I /Y /D + + + + + + Disabled + false + $(SolutionDir)compatibility;%(AdditionalIncludeDirectories) + _WIN32_WINNT=0x0501;WINVER=0x0501;NTDDI_VERSION=0x0501;WIN32;_DEBUG;_LIB;HAVE_PTW32_CONFIG_H;PTW32_BUILD_INLINED;PTW32_STATIC_LIB;%(PreprocessorDefinitions) + false + + + Default + MultiThreadedDebug + + + Level3 + OldStyle + + + + xcopy "$(ProjectDir)blowfish.h" "$(SolutionDir)build\temp\include\" /I /Y /D @@ -99,6 +158,32 @@ xcopy "$(ProjectDir)blowfish.h" "$(SolutionDir)build\temp\include\" /I /Y /D + + + + + + MaxSpeed + AnySuitable + false + false + $(SolutionDir)compatibility;%(AdditionalIncludeDirectories) + _WIN32_WINNT=0x0501;WINVER=0x0501;NTDDI_VERSION=0x0501;WIN32;NDEBUG;_LIB;HAVE_PTW32_CONFIG_H;PTW32_BUILD_INLINED;PTW32_STATIC_LIB;%(PreprocessorDefinitions) + false + + + Default + MultiThreaded + true + + + Level3 + + + + + + xcopy "$(ProjectDir)blowfish.h" "$(SolutionDir)build\temp\include\" /I /Y /D diff --git a/json-c/json-c.vcxproj b/json-c/json-c.vcxproj index 7ebd0d3..15f97b2 100644 --- a/json-c/json-c.vcxproj +++ b/json-c/json-c.vcxproj @@ -5,10 +5,18 @@ Debug Win32 + + Debug + x64 + Release Win32 + + Release + x64 + {65AB4E50-81EF-4BC4-BBA4-8EC4315ADA3F} @@ -22,20 +30,37 @@ true v140_xp + + StaticLibrary + NotSet + true + v140_xp + StaticLibrary NotSet v140_xp + + StaticLibrary + NotSet + v140_xp + + + + + + + <_ProjectFileVersion>10.0.40219.1 @@ -43,14 +68,26 @@ $(SolutionDir)build\temp\obj\$(ProjectName)\$(Configuration)\ $(SolutionDir)build\temp\lib\ $(SolutionDir)build\temp\obj\$(ProjectName)\$(Configuration)\ + $(SolutionDir)build\temp\lib\ + $(SolutionDir)build\temp\obj\$(ProjectName)\$(Configuration)\ + $(SolutionDir)build\temp\lib\ + $(SolutionDir)build\temp\obj\$(ProjectName)\$(Configuration)\ AllRules.ruleset + AllRules.ruleset + + AllRules.ruleset + AllRules.ruleset + + $(ProjectName)-mt-debug + $(ProjectName)-mt-debug $(ProjectName)-mt + $(ProjectName)-mt @@ -78,6 +115,35 @@ for %%a in ("%json_headers:,=" "%") do ( xcopy "$(ProjectDir)src\%%a" "$(SolutionDir)build\temp\include\json\" /I /Y /D ) +xcopy "$(ProjectDir)configured\json_config.h" "$(SolutionDir)build\temp\include\json\" /I /Y /D + + + + + + Disabled + false + $(SolutionDir)compatibility;$(ProjectDir)configured;%(AdditionalIncludeDirectories) + _WIN32_WINNT=0x0501;WINVER=0x0501;NTDDI_VERSION=0x0501;WIN32;_DEBUG;_LIB;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) + false + + + Default + MultiThreadedDebug + + + Level3 + OldStyle + + + + @echo off +set json_headers=arraylist.h,bits.h,debug.h,json.h,json_config.h,json_c_version.h,json_inttypes.h,json_object.h,json_object_iterator.h,json_object_private.h,json_tokener.h,json_util.h,linkhash.h,printbuf.h,random_seed.h + +for %%a in ("%json_headers:,=" "%") do ( + xcopy "$(ProjectDir)src\%%a" "$(SolutionDir)build\temp\include\json\" /I /Y /D +) + xcopy "$(ProjectDir)configured\json_config.h" "$(SolutionDir)build\temp\include\json\" /I /Y /D @@ -112,6 +178,39 @@ for %%a in ("%json_headers:,=" "%") do ( xcopy "$(ProjectDir)src\%%a" "$(SolutionDir)build\temp\include\json\" /I /Y /D ) +xcopy "$(ProjectDir)configured\json_config.h" "$(SolutionDir)build\temp\include\json\" /I /Y /D + + + + + + MaxSpeed + AnySuitable + false + false + $(SolutionDir)compatibility;$(ProjectDir)configured;%(AdditionalIncludeDirectories) + _WIN32_WINNT=0x0501;WINVER=0x0501;NTDDI_VERSION=0x0501;WIN32;NDEBUG;_LIB;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) + false + + + Default + MultiThreaded + true + + + Level3 + + + + + + @echo off +set json_headers=arraylist.h,bits.h,debug.h,json.h,json_config.h,json_c_version.h,json_inttypes.h,json_object.h,json_object_iterator.h,json_object_private.h,json_tokener.h,json_util.h,linkhash.h,printbuf.h,random_seed.h + +for %%a in ("%json_headers:,=" "%") do ( + xcopy "$(ProjectDir)src\%%a" "$(SolutionDir)build\temp\include\json\" /I /Y /D +) + xcopy "$(ProjectDir)configured\json_config.h" "$(SolutionDir)build\temp\include\json\" /I /Y /D diff --git a/pianobar.sln b/pianobar.sln index 01dbcf9..ab2ef2c 100644 --- a/pianobar.sln +++ b/pianobar.sln @@ -1,7 +1,7 @@  Microsoft Visual Studio Solution File, Format Version 12.00 # Visual Studio 14 -VisualStudioVersion = 14.0.23107.0 +VisualStudioVersion = 14.0.25420.1 MinimumVisualStudioVersion = 10.0.40219.1 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "pianobar", "pianobar\pianobar.vcxproj", "{D3B44180-848B-4A1F-9176-9891A87876BF}" ProjectSection(ProjectDependencies) = postProject @@ -17,25 +17,43 @@ EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Win32 = Debug|Win32 + Debug|x64 = Debug|x64 Release|Win32 = Release|Win32 + Release|x64 = Release|x64 EndGlobalSection GlobalSection(ProjectConfigurationPlatforms) = postSolution {D3B44180-848B-4A1F-9176-9891A87876BF}.Debug|Win32.ActiveCfg = Debug|Win32 {D3B44180-848B-4A1F-9176-9891A87876BF}.Debug|Win32.Build.0 = Debug|Win32 + {D3B44180-848B-4A1F-9176-9891A87876BF}.Debug|x64.ActiveCfg = Debug|x64 + {D3B44180-848B-4A1F-9176-9891A87876BF}.Debug|x64.Build.0 = Debug|x64 {D3B44180-848B-4A1F-9176-9891A87876BF}.Release|Win32.ActiveCfg = Release|Win32 {D3B44180-848B-4A1F-9176-9891A87876BF}.Release|Win32.Build.0 = Release|Win32 + {D3B44180-848B-4A1F-9176-9891A87876BF}.Release|x64.ActiveCfg = Release|x64 + {D3B44180-848B-4A1F-9176-9891A87876BF}.Release|x64.Build.0 = Release|x64 {F0B7D905-BD81-4998-8386-333389BE15DE}.Debug|Win32.ActiveCfg = Debug|Win32 {F0B7D905-BD81-4998-8386-333389BE15DE}.Debug|Win32.Build.0 = Debug|Win32 + {F0B7D905-BD81-4998-8386-333389BE15DE}.Debug|x64.ActiveCfg = Debug|x64 + {F0B7D905-BD81-4998-8386-333389BE15DE}.Debug|x64.Build.0 = Debug|x64 {F0B7D905-BD81-4998-8386-333389BE15DE}.Release|Win32.ActiveCfg = Release|Win32 {F0B7D905-BD81-4998-8386-333389BE15DE}.Release|Win32.Build.0 = Release|Win32 + {F0B7D905-BD81-4998-8386-333389BE15DE}.Release|x64.ActiveCfg = Release|x64 + {F0B7D905-BD81-4998-8386-333389BE15DE}.Release|x64.Build.0 = Release|x64 {65AB4E50-81EF-4BC4-BBA4-8EC4315ADA3F}.Debug|Win32.ActiveCfg = Debug|Win32 {65AB4E50-81EF-4BC4-BBA4-8EC4315ADA3F}.Debug|Win32.Build.0 = Debug|Win32 + {65AB4E50-81EF-4BC4-BBA4-8EC4315ADA3F}.Debug|x64.ActiveCfg = Debug|x64 + {65AB4E50-81EF-4BC4-BBA4-8EC4315ADA3F}.Debug|x64.Build.0 = Debug|x64 {65AB4E50-81EF-4BC4-BBA4-8EC4315ADA3F}.Release|Win32.ActiveCfg = Release|Win32 {65AB4E50-81EF-4BC4-BBA4-8EC4315ADA3F}.Release|Win32.Build.0 = Release|Win32 + {65AB4E50-81EF-4BC4-BBA4-8EC4315ADA3F}.Release|x64.ActiveCfg = Release|x64 + {65AB4E50-81EF-4BC4-BBA4-8EC4315ADA3F}.Release|x64.Build.0 = Release|x64 {F0F2B96C-1A36-487F-9A79-9F5BC7D0B829}.Debug|Win32.ActiveCfg = Debug|Win32 {F0F2B96C-1A36-487F-9A79-9F5BC7D0B829}.Debug|Win32.Build.0 = Debug|Win32 + {F0F2B96C-1A36-487F-9A79-9F5BC7D0B829}.Debug|x64.ActiveCfg = Debug|x64 + {F0F2B96C-1A36-487F-9A79-9F5BC7D0B829}.Debug|x64.Build.0 = Debug|x64 {F0F2B96C-1A36-487F-9A79-9F5BC7D0B829}.Release|Win32.ActiveCfg = Release|Win32 {F0F2B96C-1A36-487F-9A79-9F5BC7D0B829}.Release|Win32.Build.0 = Release|Win32 + {F0F2B96C-1A36-487F-9A79-9F5BC7D0B829}.Release|x64.ActiveCfg = Release|x64 + {F0F2B96C-1A36-487F-9A79-9F5BC7D0B829}.Release|x64.Build.0 = Release|x64 EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE diff --git a/pianobar/pianobar.vcxproj b/pianobar/pianobar.vcxproj index 5a8ec75..02f5ee8 100644 --- a/pianobar/pianobar.vcxproj +++ b/pianobar/pianobar.vcxproj @@ -5,10 +5,18 @@ Debug Win32 + + Debug + x64 + Release Win32 + + Release + x64 + {D3B44180-848B-4A1F-9176-9891A87876BF} @@ -22,34 +30,62 @@ true v140_xp + + Application + Unicode + true + v140_xp + Application Unicode v140_xp + + Application + Unicode + v140_xp + + + + + + + <_ProjectFileVersion>10.0.40219.1 - $(SolutionDir)build\ - $(SolutionDir)build\temp\obj\$(ProjectName)\$(Configuration)\ - $(SolutionDir)build\ - $(SolutionDir)build\temp\obj\$(ProjectName)\$(Configuration)\ + $(SolutionDir)build\32\ + $(SolutionDir)build\32\temp\obj\$(ProjectName)\$(Configuration)\ + $(SolutionDir)build\32\ + $(SolutionDir)build\32\temp\obj\$(ProjectName)\$(Configuration)\ + $(SolutionDir)build\ + $(SolutionDir)build\temp\obj\$(ProjectName)\$(Configuration)\ + $(SolutionDir)build\ + $(SolutionDir)build\temp\obj\$(ProjectName)\$(Configuration)\ AllRules.ruleset + AllRules.ruleset + + AllRules.ruleset + AllRules.ruleset + + $(ProjectName)-debug + $(ProjectName)-debug @@ -85,6 +121,39 @@ true + + + Disabled + $(SolutionDir)compatibility\;$(SolutionDir)build\temp\include\;$(ProjectDir)src\src\libezxml\;$(ProjectDir)src\src\;$(ProjectDir)src\src\libpiano\;%(AdditionalIncludeDirectories) + _WIN32_WINNT=0x0501;WINVER=0x0501;NTDDI_VERSION=0x0501;WIN32;_HAS_EXCEPTIONS=0;_DEBUG;_CONSOLE;ENABLE_FAAD;ENABLE_MAD;PTW32_STATIC_LIB;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;%(PreprocessorDefinitions) + false + + + EnableFastChecks + MultiThreadedDebug + + + $(IntDir)vc90.pdb + Level3 + OldStyle + + + _UNICODE;UNICODE;_DEBUG;%(PreprocessorDefinitions) + + + winmm.lib;ws2_32.lib;%(AdditionalDependencies) + $(SolutionDir)build\temp\lib\;%(AdditionalLibraryDirectories) + true + Console + + + + + + + true + + MaxSpeed @@ -119,6 +188,39 @@ true + + + MaxSpeed + true + $(SolutionDir)compatibility\;$(SolutionDir)build\temp\include\;$(ProjectDir)src\src\libezxml\;$(ProjectDir)src\src\;$(ProjectDir)src\src\libpiano\;%(AdditionalIncludeDirectories) + _WIN32_WINNT=0x0501;WINVER=0x0501;NTDDI_VERSION=0x0501;WIN32;_HAS_EXCEPTIONS=0;NDEBUG;_CONSOLE;ENABLE_FAAD;ENABLE_MAD;PTW32_STATIC_LIB;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;%(PreprocessorDefinitions) + + + MultiThreaded + true + + + $(IntDir)vc90.pdb + Level3 + + + + + _UNICODE;UNICODE;NDEBUG;%(PreprocessorDefinitions) + + + winmm.lib;ws2_32.lib;%(AdditionalDependencies) + $(SolutionDir)build\temp\lib\;%(AdditionalLibraryDirectories) + Console + + + + + + + true + + {f0b7d905-bd81-4998-8386-333389be15de} diff --git a/vtparse/vtparse.vcxproj b/vtparse/vtparse.vcxproj index 3d1c88b..9e88ad1 100644 --- a/vtparse/vtparse.vcxproj +++ b/vtparse/vtparse.vcxproj @@ -5,10 +5,18 @@ Debug Win32 + + Debug + x64 + Release Win32 + + Release + x64 + @@ -30,20 +38,37 @@ true v140_xp + + StaticLibrary + NotSet + true + v140_xp + StaticLibrary NotSet v140_xp + + StaticLibrary + NotSet + v140_xp + + + + + + + <_ProjectFileVersion>10.0.40219.1 @@ -51,14 +76,26 @@ $(SolutionDir)build\temp\obj\$(ProjectName)\$(Configuration)\ $(SolutionDir)build\temp\lib\ $(SolutionDir)build\temp\obj\$(ProjectName)\$(Configuration)\ + $(SolutionDir)build\temp\lib\ + $(SolutionDir)build\temp\obj\$(ProjectName)\$(Configuration)\ + $(SolutionDir)build\temp\lib\ + $(SolutionDir)build\temp\obj\$(ProjectName)\$(Configuration)\ AllRules.ruleset + AllRules.ruleset + + AllRules.ruleset + AllRules.ruleset + + $(ProjectName)-mt-debug + $(ProjectName)-mt-debug $(ProjectName)-mt + $(ProjectName)-mt @@ -81,6 +118,29 @@ xcopy "$(ProjectDir)src\vtparse.h" "$(SolutionDir)build\temp\include\vtparse\" /I /Y /D xcopy "$(ProjectDir)src\vtparse_table.h" "$(SolutionDir)build\temp\include\vtparse\" /I /Y /D + + + + + + Disabled + false + $(SolutionDir)compatibility;%(AdditionalIncludeDirectories) + _WIN32_WINNT=0x0501;WINVER=0x0501;NTDDI_VERSION=0x0501;WIN32;_DEBUG;_LIB;HAVE_PTW32_CONFIG_H;PTW32_BUILD_INLINED;PTW32_STATIC_LIB;%(PreprocessorDefinitions) + false + + + Default + MultiThreadedDebug + + + Level3 + OldStyle + + + + xcopy "$(ProjectDir)src\vtparse.h" "$(SolutionDir)build\temp\include\vtparse\" /I /Y /D +xcopy "$(ProjectDir)src\vtparse_table.h" "$(SolutionDir)build\temp\include\vtparse\" /I /Y /D @@ -109,6 +169,33 @@ xcopy "$(ProjectDir)src\vtparse_table.h" "$(SolutionDir)build\temp\include\vtpar xcopy "$(ProjectDir)src\vtparse.h" "$(SolutionDir)build\temp\include\vtparse\" /I /Y /D xcopy "$(ProjectDir)src\vtparse_table.h" "$(SolutionDir)build\temp\include\vtparse\" /I /Y /D + + + + + + MaxSpeed + AnySuitable + false + false + $(SolutionDir)compatibility;%(AdditionalIncludeDirectories) + _WIN32_WINNT=0x0501;WINVER=0x0501;NTDDI_VERSION=0x0501;WIN32;NDEBUG;_LIB;HAVE_PTW32_CONFIG_H;PTW32_BUILD_INLINED;PTW32_STATIC_LIB;%(PreprocessorDefinitions) + false + + + Default + MultiThreaded + true + + + Level3 + + + + + + xcopy "$(ProjectDir)src\vtparse.h" "$(SolutionDir)build\temp\include\vtparse\" /I /Y /D +xcopy "$(ProjectDir)src\vtparse_table.h" "$(SolutionDir)build\temp\include\vtparse\" /I /Y /D -- cgit v1.2.3