1
0
mirror of https://github.com/blawar/GLideN64.git synced 2024-07-07 03:13:49 +00:00

GLideN64 and GLideNHQ are now in one solution

GLideN64 is now dependent on GLideNHQ
This commit is contained in:
purplemarshmallow 2015-06-30 13:39:14 +02:00 committed by Sergey Lipskiy
parent aec07a3151
commit b0ab13b871
3 changed files with 38 additions and 39 deletions

View File

@ -1,17 +1,25 @@

Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio 2013
VisualStudioVersion = 12.0.21005.1
VisualStudioVersion = 12.0.31101.0
MinimumVisualStudioVersion = 10.0.40219.1
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "GLideN64", "GLideN64.vcxproj", "{37D31D7F-C4E7-45B0-AEF6-D6824A243CF7}"
ProjectSection(ProjectDependencies) = postProject
{DA965BCF-2219-47AF-ACE7-EAF76D5D4756} = {DA965BCF-2219-47AF-ACE7-EAF76D5D4756}
EndProjectSection
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libGLideNHQ", "libGLideNHQ.vcxproj", "{DA965BCF-2219-47AF-ACE7-EAF76D5D4756}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug 1964|Win32 = Debug 1964|Win32
Debug_mupenplus|Win32 = Debug_mupenplus|Win32
Debug|Win32 = Debug|Win32
MinSizeRel|Win32 = MinSizeRel|Win32
Release_dll|Win32 = Release_dll|Win32
Release_mupenplus|Win32 = Release_mupenplus|Win32
Release|Win32 = Release|Win32
RelWithDebInfo|Win32 = RelWithDebInfo|Win32
EndGlobalSection
GlobalSection(ProjectConfigurationPlatforms) = postSolution
{37D31D7F-C4E7-45B0-AEF6-D6824A243CF7}.Debug 1964|Win32.ActiveCfg = Debug 1964|Win32
@ -20,10 +28,32 @@ Global
{37D31D7F-C4E7-45B0-AEF6-D6824A243CF7}.Debug_mupenplus|Win32.Build.0 = Debug_mupenplus|Win32
{37D31D7F-C4E7-45B0-AEF6-D6824A243CF7}.Debug|Win32.ActiveCfg = Debug|Win32
{37D31D7F-C4E7-45B0-AEF6-D6824A243CF7}.Debug|Win32.Build.0 = Debug|Win32
{37D31D7F-C4E7-45B0-AEF6-D6824A243CF7}.MinSizeRel|Win32.ActiveCfg = Release|Win32
{37D31D7F-C4E7-45B0-AEF6-D6824A243CF7}.MinSizeRel|Win32.Build.0 = Release|Win32
{37D31D7F-C4E7-45B0-AEF6-D6824A243CF7}.Release_dll|Win32.ActiveCfg = Release|Win32
{37D31D7F-C4E7-45B0-AEF6-D6824A243CF7}.Release_dll|Win32.Build.0 = Release|Win32
{37D31D7F-C4E7-45B0-AEF6-D6824A243CF7}.Release_mupenplus|Win32.ActiveCfg = Release_mupenplus|Win32
{37D31D7F-C4E7-45B0-AEF6-D6824A243CF7}.Release_mupenplus|Win32.Build.0 = Release_mupenplus|Win32
{37D31D7F-C4E7-45B0-AEF6-D6824A243CF7}.Release|Win32.ActiveCfg = Release|Win32
{37D31D7F-C4E7-45B0-AEF6-D6824A243CF7}.Release|Win32.Build.0 = Release|Win32
{37D31D7F-C4E7-45B0-AEF6-D6824A243CF7}.RelWithDebInfo|Win32.ActiveCfg = Release|Win32
{37D31D7F-C4E7-45B0-AEF6-D6824A243CF7}.RelWithDebInfo|Win32.Build.0 = Release|Win32
{DA965BCF-2219-47AF-ACE7-EAF76D5D4756}.Debug 1964|Win32.ActiveCfg = Debug|Win32
{DA965BCF-2219-47AF-ACE7-EAF76D5D4756}.Debug 1964|Win32.Build.0 = Debug|Win32
{DA965BCF-2219-47AF-ACE7-EAF76D5D4756}.Debug_mupenplus|Win32.ActiveCfg = Debug|Win32
{DA965BCF-2219-47AF-ACE7-EAF76D5D4756}.Debug_mupenplus|Win32.Build.0 = Debug|Win32
{DA965BCF-2219-47AF-ACE7-EAF76D5D4756}.Debug|Win32.ActiveCfg = Debug|Win32
{DA965BCF-2219-47AF-ACE7-EAF76D5D4756}.Debug|Win32.Build.0 = Debug|Win32
{DA965BCF-2219-47AF-ACE7-EAF76D5D4756}.MinSizeRel|Win32.ActiveCfg = MinSizeRel|Win32
{DA965BCF-2219-47AF-ACE7-EAF76D5D4756}.MinSizeRel|Win32.Build.0 = MinSizeRel|Win32
{DA965BCF-2219-47AF-ACE7-EAF76D5D4756}.Release_dll|Win32.ActiveCfg = Release_dll|Win32
{DA965BCF-2219-47AF-ACE7-EAF76D5D4756}.Release_dll|Win32.Build.0 = Release_dll|Win32
{DA965BCF-2219-47AF-ACE7-EAF76D5D4756}.Release_mupenplus|Win32.ActiveCfg = Release|Win32
{DA965BCF-2219-47AF-ACE7-EAF76D5D4756}.Release_mupenplus|Win32.Build.0 = Release|Win32
{DA965BCF-2219-47AF-ACE7-EAF76D5D4756}.Release|Win32.ActiveCfg = Release|Win32
{DA965BCF-2219-47AF-ACE7-EAF76D5D4756}.Release|Win32.Build.0 = Release|Win32
{DA965BCF-2219-47AF-ACE7-EAF76D5D4756}.RelWithDebInfo|Win32.ActiveCfg = RelWithDebInfo|Win32
{DA965BCF-2219-47AF-ACE7-EAF76D5D4756}.RelWithDebInfo|Win32.Build.0 = RelWithDebInfo|Win32
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE

View File

@ -1,33 +0,0 @@
Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio 2013
VisualStudioVersion = 12.0.21005.1
MinimumVisualStudioVersion = 10.0.40219.1
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libGLideNHQ", "libGLideNHQ.vcxproj", "{DA965BCF-2219-47AF-ACE7-EAF76D5D4756}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug_Dll|Win32 = Debug_Dll|Win32
Debug|Win32 = Debug|Win32
MinSizeRel|Win32 = MinSizeRel|Win32
Release_dll|Win32 = Release_dll|Win32
Release|Win32 = Release|Win32
RelWithDebInfo|Win32 = RelWithDebInfo|Win32
EndGlobalSection
GlobalSection(ProjectConfigurationPlatforms) = postSolution
{DA965BCF-2219-47AF-ACE7-EAF76D5D4756}.Debug_Dll|Win32.ActiveCfg = Debug|Win32
{DA965BCF-2219-47AF-ACE7-EAF76D5D4756}.Debug_Dll|Win32.Build.0 = Debug|Win32
{DA965BCF-2219-47AF-ACE7-EAF76D5D4756}.Debug|Win32.ActiveCfg = Debug|Win32
{DA965BCF-2219-47AF-ACE7-EAF76D5D4756}.Debug|Win32.Build.0 = Debug|Win32
{DA965BCF-2219-47AF-ACE7-EAF76D5D4756}.MinSizeRel|Win32.ActiveCfg = MinSizeRel|Win32
{DA965BCF-2219-47AF-ACE7-EAF76D5D4756}.MinSizeRel|Win32.Build.0 = MinSizeRel|Win32
{DA965BCF-2219-47AF-ACE7-EAF76D5D4756}.Release_dll|Win32.ActiveCfg = Release_dll|Win32
{DA965BCF-2219-47AF-ACE7-EAF76D5D4756}.Release_dll|Win32.Build.0 = Release_dll|Win32
{DA965BCF-2219-47AF-ACE7-EAF76D5D4756}.Release|Win32.ActiveCfg = Release|Win32
{DA965BCF-2219-47AF-ACE7-EAF76D5D4756}.Release|Win32.Build.0 = Release|Win32
{DA965BCF-2219-47AF-ACE7-EAF76D5D4756}.RelWithDebInfo|Win32.ActiveCfg = RelWithDebInfo|Win32
{DA965BCF-2219-47AF-ACE7-EAF76D5D4756}.RelWithDebInfo|Win32.Build.0 = RelWithDebInfo|Win32
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
EndGlobalSection
EndGlobal

View File

@ -75,22 +75,24 @@
<IntDir Condition="'$(Configuration)|$(Platform)'=='Release_dll|Win32'">libGLideNHQ.dir\Release\</IntDir>
<TargetName Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">libGLideNHQ</TargetName>
<TargetName Condition="'$(Configuration)|$(Platform)'=='Release_dll|Win32'">libGLideNHQ</TargetName>
<OutDir Condition="'$(Configuration)|$(Platform)'=='MinSizeRel|Win32'">C:\Users\Sergey\Glide64\GLideN64\GLideNHQ\build_vs\MinSizeRel\</OutDir>
<OutDir Condition="'$(Configuration)|$(Platform)'=='MinSizeRel|Win32'">$(SolutionDir)GLideNHQ\$(Configuration)\</OutDir>
<IntDir Condition="'$(Configuration)|$(Platform)'=='MinSizeRel|Win32'">libGLideNHQ.dir\MinSizeRel\</IntDir>
<TargetName Condition="'$(Configuration)|$(Platform)'=='MinSizeRel|Win32'">libGLideNHQ</TargetName>
<TargetExt Condition="'$(Configuration)|$(Platform)'=='MinSizeRel|Win32'">.lib</TargetExt>
<OutDir Condition="'$(Configuration)|$(Platform)'=='RelWithDebInfo|Win32'">C:\Users\Sergey\Glide64\GLideN64\GLideNHQ\build_vs\RelWithDebInfo\</OutDir>
<OutDir Condition="'$(Configuration)|$(Platform)'=='RelWithDebInfo|Win32'">$(SolutionDir)GLideNHQ\$(Configuration)\</OutDir>
<IntDir Condition="'$(Configuration)|$(Platform)'=='RelWithDebInfo|Win32'">libGLideNHQ.dir\RelWithDebInfo\</IntDir>
<TargetName Condition="'$(Configuration)|$(Platform)'=='RelWithDebInfo|Win32'">libGLideNHQ</TargetName>
<TargetExt Condition="'$(Configuration)|$(Platform)'=='RelWithDebInfo|Win32'">.lib</TargetExt>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
<TargetExt>.lib</TargetExt>
<OutDir>$(SolutionDir)$(SolutionName)\$(Configuration)\</OutDir>
<OutDir>$(SolutionDir)GLideNHQ\$(Configuration)\</OutDir>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release_dll|Win32'">
<OutDir>$(SolutionDir)GLideNHQ\$(Configuration)\</OutDir>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release_dll|Win32'" />
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
<OutDir>$(SolutionDir)$(SolutionName)\$(Configuration)\</OutDir>
<OutDir>$(SolutionDir)GLideNHQ\$(Configuration)\</OutDir>
</PropertyGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
<ClCompile>