Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix solution build for VS2022 #54

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Fix solution build for VS2022 #54

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
dee4c98
Fix solution build for VS2022.
ShawnCZek Apr 22, 2024
b075650
Remove the GUI project.
ShawnCZek Apr 22, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
119 changes: 49 additions & 70 deletions src/ConverterPIX.sln
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,70 +1,49 @@

Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio 14
VisualStudioVersion = 14.0.25420.1
MinimumVisualStudioVersion = 10.0.40219.1
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "zlib", "libs\zlib\zlib.vcxproj", "{33134F61-C1AD-4B6F-9CEA-503A9F140C52}"
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Core", "Core.vcxproj", "{7AF227E8-E1B1-4364-A66F-3752D1B23713}"
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ConverterPIX", "cmd\ConverterPIX.vcxproj", "{8ACF1ABB-2B42-492B-A403-BD98A61FC110}"
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "GUI ConverterPIX", "gui\GUIConverterPIX.vcxproj", "{07E5351D-840D-48D6-B242-D4C4501DFF2E}"
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "cityhash", "libs\cityhash\cityhash.vcxproj", "{75A85A1A-359C-4C0F-9440-024C62F43C50}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Libraries", "Libraries", "{D86FC0C4-1146-4480-BD0D-E1764B35C39E}"
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
{33134F61-C1AD-4B6F-9CEA-503A9F140C52}.Debug|Win32.ActiveCfg = Debug|Win32
{33134F61-C1AD-4B6F-9CEA-503A9F140C52}.Debug|Win32.Build.0 = Debug|Win32
{33134F61-C1AD-4B6F-9CEA-503A9F140C52}.Debug|x64.ActiveCfg = Debug|x64
{33134F61-C1AD-4B6F-9CEA-503A9F140C52}.Debug|x64.Build.0 = Debug|x64
{33134F61-C1AD-4B6F-9CEA-503A9F140C52}.Release|Win32.ActiveCfg = Release|Win32
{33134F61-C1AD-4B6F-9CEA-503A9F140C52}.Release|Win32.Build.0 = Release|Win32
{33134F61-C1AD-4B6F-9CEA-503A9F140C52}.Release|x64.ActiveCfg = Release|x64
{33134F61-C1AD-4B6F-9CEA-503A9F140C52}.Release|x64.Build.0 = Release|x64
{7AF227E8-E1B1-4364-A66F-3752D1B23713}.Debug|Win32.ActiveCfg = Debug|Win32
{7AF227E8-E1B1-4364-A66F-3752D1B23713}.Debug|Win32.Build.0 = Debug|Win32
{7AF227E8-E1B1-4364-A66F-3752D1B23713}.Debug|x64.ActiveCfg = Debug|Win32
{7AF227E8-E1B1-4364-A66F-3752D1B23713}.Release|Win32.ActiveCfg = Release|Win32
{7AF227E8-E1B1-4364-A66F-3752D1B23713}.Release|Win32.Build.0 = Release|Win32
{7AF227E8-E1B1-4364-A66F-3752D1B23713}.Release|x64.ActiveCfg = Release|Win32
{8ACF1ABB-2B42-492B-A403-BD98A61FC110}.Debug|Win32.ActiveCfg = Debug|Win32
{8ACF1ABB-2B42-492B-A403-BD98A61FC110}.Debug|Win32.Build.0 = Debug|Win32
{8ACF1ABB-2B42-492B-A403-BD98A61FC110}.Debug|x64.ActiveCfg = Debug|Win32
{8ACF1ABB-2B42-492B-A403-BD98A61FC110}.Release|Win32.ActiveCfg = Release|Win32
{8ACF1ABB-2B42-492B-A403-BD98A61FC110}.Release|Win32.Build.0 = Release|Win32
{8ACF1ABB-2B42-492B-A403-BD98A61FC110}.Release|x64.ActiveCfg = Release|Win32
{07E5351D-840D-48D6-B242-D4C4501DFF2E}.Debug|Win32.ActiveCfg = Debug|Win32
{07E5351D-840D-48D6-B242-D4C4501DFF2E}.Debug|Win32.Build.0 = Debug|Win32
{07E5351D-840D-48D6-B242-D4C4501DFF2E}.Debug|x64.ActiveCfg = Debug|x64
{07E5351D-840D-48D6-B242-D4C4501DFF2E}.Debug|x64.Build.0 = Debug|x64
{07E5351D-840D-48D6-B242-D4C4501DFF2E}.Release|Win32.ActiveCfg = Release|Win32
{07E5351D-840D-48D6-B242-D4C4501DFF2E}.Release|Win32.Build.0 = Release|Win32
{07E5351D-840D-48D6-B242-D4C4501DFF2E}.Release|x64.ActiveCfg = Release|x64
{07E5351D-840D-48D6-B242-D4C4501DFF2E}.Release|x64.Build.0 = Release|x64
{75A85A1A-359C-4C0F-9440-024C62F43C50}.Debug|Win32.ActiveCfg = Debug|Win32
{75A85A1A-359C-4C0F-9440-024C62F43C50}.Debug|Win32.Build.0 = Debug|Win32
{75A85A1A-359C-4C0F-9440-024C62F43C50}.Debug|x64.ActiveCfg = Debug|x64
{75A85A1A-359C-4C0F-9440-024C62F43C50}.Debug|x64.Build.0 = Debug|x64
{75A85A1A-359C-4C0F-9440-024C62F43C50}.Release|Win32.ActiveCfg = Release|Win32
{75A85A1A-359C-4C0F-9440-024C62F43C50}.Release|Win32.Build.0 = Release|Win32
{75A85A1A-359C-4C0F-9440-024C62F43C50}.Release|x64.ActiveCfg = Release|x64
{75A85A1A-359C-4C0F-9440-024C62F43C50}.Release|x64.Build.0 = Release|x64
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
EndGlobalSection
GlobalSection(NestedProjects) = preSolution
{33134F61-C1AD-4B6F-9CEA-503A9F140C52} = {D86FC0C4-1146-4480-BD0D-E1764B35C39E}
{75A85A1A-359C-4C0F-9440-024C62F43C50} = {D86FC0C4-1146-4480-BD0D-E1764B35C39E}
EndGlobalSection
EndGlobal

Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio Version 17
VisualStudioVersion = 17.9.34723.18
MinimumVisualStudioVersion = 10.0.40219.1
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "zlib", "libs\zlib\zlib.vcxproj", "{33134F61-C1AD-4B6F-9CEA-503A9F140C52}"
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Core", "Core.vcxproj", "{7AF227E8-E1B1-4364-A66F-3752D1B23713}"
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ConverterPIX", "cmd\ConverterPIX.vcxproj", "{8ACF1ABB-2B42-492B-A403-BD98A61FC110}"
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "cityhash", "libs\cityhash\cityhash.vcxproj", "{75A85A1A-359C-4C0F-9440-024C62F43C50}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Libraries", "Libraries", "{D86FC0C4-1146-4480-BD0D-E1764B35C39E}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Win32 = Debug|Win32
Release|Win32 = Release|Win32
EndGlobalSection
GlobalSection(ProjectConfigurationPlatforms) = postSolution
{33134F61-C1AD-4B6F-9CEA-503A9F140C52}.Debug|Win32.ActiveCfg = Debug|Win32
{33134F61-C1AD-4B6F-9CEA-503A9F140C52}.Debug|Win32.Build.0 = Debug|Win32
{33134F61-C1AD-4B6F-9CEA-503A9F140C52}.Release|Win32.ActiveCfg = Release|Win32
{33134F61-C1AD-4B6F-9CEA-503A9F140C52}.Release|Win32.Build.0 = Release|Win32
{7AF227E8-E1B1-4364-A66F-3752D1B23713}.Debug|Win32.ActiveCfg = Debug|Win32
{7AF227E8-E1B1-4364-A66F-3752D1B23713}.Debug|Win32.Build.0 = Debug|Win32
{7AF227E8-E1B1-4364-A66F-3752D1B23713}.Release|Win32.ActiveCfg = Release|Win32
{7AF227E8-E1B1-4364-A66F-3752D1B23713}.Release|Win32.Build.0 = Release|Win32
{8ACF1ABB-2B42-492B-A403-BD98A61FC110}.Debug|Win32.ActiveCfg = Debug|Win32
{8ACF1ABB-2B42-492B-A403-BD98A61FC110}.Debug|Win32.Build.0 = Debug|Win32
{8ACF1ABB-2B42-492B-A403-BD98A61FC110}.Release|Win32.ActiveCfg = Release|Win32
{8ACF1ABB-2B42-492B-A403-BD98A61FC110}.Release|Win32.Build.0 = Release|Win32
{75A85A1A-359C-4C0F-9440-024C62F43C50}.Debug|Win32.ActiveCfg = Debug|Win32
{75A85A1A-359C-4C0F-9440-024C62F43C50}.Debug|Win32.Build.0 = Debug|Win32
{75A85A1A-359C-4C0F-9440-024C62F43C50}.Release|Win32.ActiveCfg = Release|Win32
{75A85A1A-359C-4C0F-9440-024C62F43C50}.Release|Win32.Build.0 = Release|Win32
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
EndGlobalSection
GlobalSection(NestedProjects) = preSolution
{33134F61-C1AD-4B6F-9CEA-503A9F140C52} = {D86FC0C4-1146-4480-BD0D-E1764B35C39E}
{75A85A1A-359C-4C0F-9440-024C62F43C50} = {D86FC0C4-1146-4480-BD0D-E1764B35C39E}
EndGlobalSection
GlobalSection(ExtensibilityGlobals) = postSolution
SolutionGuid = {ED05F301-0B4A-45C0-8BA6-3B48B47D37BD}
EndGlobalSection
EndGlobal
12 changes: 7 additions & 5 deletions src/Core.vcxproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -133,20 +133,20 @@
<ProjectGuid>{7AF227E8-E1B1-4364-A66F-3752D1B23713}</ProjectGuid>
<Keyword>Win32Proj</Keyword>
<RootNamespace>Core</RootNamespace>
<WindowsTargetPlatformVersion>8.1</WindowsTargetPlatformVersion>
<WindowsTargetPlatformVersion>10.0</WindowsTargetPlatformVersion>
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
<ConfigurationType>StaticLibrary</ConfigurationType>
<UseDebugLibraries>true</UseDebugLibraries>
<PlatformToolset>v141_xp</PlatformToolset>
<PlatformToolset>v143</PlatformToolset>
<CharacterSet>NotSet</CharacterSet>
<WholeProgramOptimization>false</WholeProgramOptimization>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
<ConfigurationType>StaticLibrary</ConfigurationType>
<UseDebugLibraries>false</UseDebugLibraries>
<PlatformToolset>v141_xp</PlatformToolset>
<PlatformToolset>v143</PlatformToolset>
<WholeProgramOptimization>true</WholeProgramOptimization>
<CharacterSet>NotSet</CharacterSet>
</PropertyGroup>
Expand All @@ -164,12 +164,12 @@
<PropertyGroup Label="UserMacros" />
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
<OutDir>..\bin\win_x86\</OutDir>
<IntDir>..\obj\release\win_x86\$(ProjectName)\</IntDir>
<IntDir>..\obj\$(Configuration)\win_x86\$(ProjectName)\</IntDir>
<TargetName>core</TargetName>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
<OutDir>..\bin\win_x86\</OutDir>
<IntDir>..\obj\release\win_x86\$(ProjectName)\</IntDir>
<IntDir>..\obj\$(Configuration)\win_x86\$(ProjectName)\</IntDir>
<TargetName>core_d</TargetName>
</PropertyGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
Expand All @@ -184,6 +184,7 @@
<RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
<DisableSpecificWarnings>4996;%(DisableSpecificWarnings)</DisableSpecificWarnings>
<LanguageStandard>stdcpp17</LanguageStandard>
<MultiProcessorCompilation>true</MultiProcessorCompilation>
</ClCompile>
<Link>
<SubSystem>Windows</SubSystem>
Expand All @@ -203,6 +204,7 @@
<DisableSpecificWarnings>4996;%(DisableSpecificWarnings)</DisableSpecificWarnings>
<PrecompiledHeaderFile>prerequisites.h</PrecompiledHeaderFile>
<LanguageStandard>stdcpp17</LanguageStandard>
<MultiProcessorCompilation>true</MultiProcessorCompilation>
</ClCompile>
<Link>
<SubSystem>Windows</SubSystem>
Expand Down
10 changes: 5 additions & 5 deletions src/cmd/ConverterPIX.vcxproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,19 +13,19 @@
<PropertyGroup Label="Globals">
<ProjectGuid>{8ACF1ABB-2B42-492B-A403-BD98A61FC110}</ProjectGuid>
<RootNamespace>ConverterPIX</RootNamespace>
<WindowsTargetPlatformVersion>8.1</WindowsTargetPlatformVersion>
<WindowsTargetPlatformVersion>10.0</WindowsTargetPlatformVersion>
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
<ConfigurationType>Application</ConfigurationType>
<UseDebugLibraries>true</UseDebugLibraries>
<PlatformToolset>v141_xp</PlatformToolset>
<PlatformToolset>v143</PlatformToolset>
<CharacterSet>NotSet</CharacterSet>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
<ConfigurationType>Application</ConfigurationType>
<UseDebugLibraries>false</UseDebugLibraries>
<PlatformToolset>v141_xp</PlatformToolset>
<PlatformToolset>v143</PlatformToolset>
<WholeProgramOptimization>true</WholeProgramOptimization>
<CharacterSet>NotSet</CharacterSet>
</PropertyGroup>
Expand All @@ -42,11 +42,11 @@
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
<OutDir>..\..\bin\win_x86\</OutDir>
<TargetName>converter_pix_d</TargetName>
<IntDir>..\..\obj\release\win_x86\$(ProjectName)\</IntDir>
<IntDir>..\..\obj\$(Configuration)\win_x86\$(ProjectName)\</IntDir>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
<OutDir>..\..\bin\win_x86\</OutDir>
<IntDir>..\..\obj\release\win_x86\$(ProjectName)\</IntDir>
<IntDir>..\..\obj\$(Configuration)\win_x86\$(ProjectName)\</IntDir>
<TargetName>converter_pix</TargetName>
<IncludePath>$(ProjectDir)/;$(IncludePath)</IncludePath>
</PropertyGroup>
Expand Down
Loading