diff --git a/projects/msvc/GLideN64.sln b/projects/msvc/GLideN64.sln
index dee72972..7f1cf866 100644
--- a/projects/msvc/GLideN64.sln
+++ b/projects/msvc/GLideN64.sln
@@ -1,6 +1,7 @@
-Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio 14
-VisualStudioVersion = 14.0.25420.1
+
+Microsoft Visual Studio Solution File, Format Version 12.00
+# Visual Studio Version 16
+VisualStudioVersion = 16.0.30413.136
MinimumVisualStudioVersion = 10.0.40219.1
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "GLideN64", "GLideN64.vcxproj", "{37D31D7F-C4E7-45B0-AEF6-D6824A243CF7}"
ProjectSection(ProjectDependencies) = postProject
@@ -12,172 +13,44 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libGLideNHQ", "libGLideNHQ.
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "osal", "osal.vcxproj", "{7BF6F100-31DB-44AE-A2A5-5DDEED9A909C}"
EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "GLideNUI", "GLideNUI.vcxproj", "{37CAB375-A7A6-3CAB-BD56-0E954D3FD2FE}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "GLideNUI-wtl", "GLideNUI-wtl.vcxproj", "{9E05B70F-A294-44A9-A151-B2CC95AA884E}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ticpp", "ticpp.vcxproj", "{4F28B56B-F4B0-41B0-A785-597F6EF0163A}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ts2lang", "ts2lang.vcxproj", "{5480BC17-9C40-4E41-8AD4-AE12316D4CA4}"
-EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug_mupenplus|Win32 = Debug_mupenplus|Win32
Debug_mupenplus|x64 = Debug_mupenplus|x64
- Debug_qt|Win32 = Debug_qt|Win32
- Debug_qt|x64 = Debug_qt|x64
- Debug_wtl|Win32 = Debug_wtl|Win32
- Debug_wtl|x64 = Debug_wtl|x64
Release_mupenplus|Win32 = Release_mupenplus|Win32
Release_mupenplus|x64 = Release_mupenplus|x64
- Release_qt|Win32 = Release_qt|Win32
- Release_qt|x64 = Release_qt|x64
- Release_wtl|Win32 = Release_wtl|Win32
- Release_wtl|x64 = Release_wtl|x64
EndGlobalSection
GlobalSection(ProjectConfigurationPlatforms) = postSolution
{37D31D7F-C4E7-45B0-AEF6-D6824A243CF7}.Debug_mupenplus|Win32.ActiveCfg = Debug_mupenplus|Win32
{37D31D7F-C4E7-45B0-AEF6-D6824A243CF7}.Debug_mupenplus|Win32.Build.0 = Debug_mupenplus|Win32
{37D31D7F-C4E7-45B0-AEF6-D6824A243CF7}.Debug_mupenplus|x64.ActiveCfg = Debug_mupenplus|x64
{37D31D7F-C4E7-45B0-AEF6-D6824A243CF7}.Debug_mupenplus|x64.Build.0 = Debug_mupenplus|x64
- {37D31D7F-C4E7-45B0-AEF6-D6824A243CF7}.Debug_qt|Win32.ActiveCfg = Debug_qt|Win32
- {37D31D7F-C4E7-45B0-AEF6-D6824A243CF7}.Debug_qt|Win32.Build.0 = Debug_qt|Win32
- {37D31D7F-C4E7-45B0-AEF6-D6824A243CF7}.Debug_qt|x64.ActiveCfg = Debug_qt|x64
- {37D31D7F-C4E7-45B0-AEF6-D6824A243CF7}.Debug_qt|x64.Build.0 = Debug_qt|x64
- {37D31D7F-C4E7-45B0-AEF6-D6824A243CF7}.Debug_wtl|Win32.ActiveCfg = Debug_wtl|Win32
- {37D31D7F-C4E7-45B0-AEF6-D6824A243CF7}.Debug_wtl|Win32.Build.0 = Debug_wtl|Win32
- {37D31D7F-C4E7-45B0-AEF6-D6824A243CF7}.Debug_wtl|x64.ActiveCfg = Debug_wtl|x64
- {37D31D7F-C4E7-45B0-AEF6-D6824A243CF7}.Debug_wtl|x64.Build.0 = Debug_wtl|x64
{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_mupenplus|x64.ActiveCfg = Release_mupenplus|x64
{37D31D7F-C4E7-45B0-AEF6-D6824A243CF7}.Release_mupenplus|x64.Build.0 = Release_mupenplus|x64
- {37D31D7F-C4E7-45B0-AEF6-D6824A243CF7}.Release_qt|Win32.ActiveCfg = Release_qt|Win32
- {37D31D7F-C4E7-45B0-AEF6-D6824A243CF7}.Release_qt|Win32.Build.0 = Release_qt|Win32
- {37D31D7F-C4E7-45B0-AEF6-D6824A243CF7}.Release_qt|x64.ActiveCfg = Release_qt|x64
- {37D31D7F-C4E7-45B0-AEF6-D6824A243CF7}.Release_qt|x64.Build.0 = Release_qt|x64
- {37D31D7F-C4E7-45B0-AEF6-D6824A243CF7}.Release_wtl|Win32.ActiveCfg = Release_wtl|Win32
- {37D31D7F-C4E7-45B0-AEF6-D6824A243CF7}.Release_wtl|Win32.Build.0 = Release_wtl|Win32
- {37D31D7F-C4E7-45B0-AEF6-D6824A243CF7}.Release_wtl|x64.ActiveCfg = Release_wtl|x64
- {37D31D7F-C4E7-45B0-AEF6-D6824A243CF7}.Release_wtl|x64.Build.0 = Release_wtl|x64
{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_mupenplus|x64.ActiveCfg = Debug|x64
{DA965BCF-2219-47AF-ACE7-EAF76D5D4756}.Debug_mupenplus|x64.Build.0 = Debug|x64
- {DA965BCF-2219-47AF-ACE7-EAF76D5D4756}.Debug_qt|Win32.ActiveCfg = Debug|Win32
- {DA965BCF-2219-47AF-ACE7-EAF76D5D4756}.Debug_qt|Win32.Build.0 = Debug|Win32
- {DA965BCF-2219-47AF-ACE7-EAF76D5D4756}.Debug_qt|x64.ActiveCfg = Debug|x64
- {DA965BCF-2219-47AF-ACE7-EAF76D5D4756}.Debug_qt|x64.Build.0 = Debug|x64
- {DA965BCF-2219-47AF-ACE7-EAF76D5D4756}.Debug_wtl|Win32.ActiveCfg = Debug|Win32
- {DA965BCF-2219-47AF-ACE7-EAF76D5D4756}.Debug_wtl|Win32.Build.0 = Debug|Win32
- {DA965BCF-2219-47AF-ACE7-EAF76D5D4756}.Debug_wtl|x64.ActiveCfg = Debug|x64
- {DA965BCF-2219-47AF-ACE7-EAF76D5D4756}.Debug_wtl|x64.Build.0 = Debug|x64
{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_mupenplus|x64.ActiveCfg = Release|x64
{DA965BCF-2219-47AF-ACE7-EAF76D5D4756}.Release_mupenplus|x64.Build.0 = Release|x64
- {DA965BCF-2219-47AF-ACE7-EAF76D5D4756}.Release_qt|Win32.ActiveCfg = Release|Win32
- {DA965BCF-2219-47AF-ACE7-EAF76D5D4756}.Release_qt|Win32.Build.0 = Release|Win32
- {DA965BCF-2219-47AF-ACE7-EAF76D5D4756}.Release_qt|x64.ActiveCfg = Release|x64
- {DA965BCF-2219-47AF-ACE7-EAF76D5D4756}.Release_qt|x64.Build.0 = Release|x64
- {DA965BCF-2219-47AF-ACE7-EAF76D5D4756}.Release_wtl|Win32.ActiveCfg = Release|Win32
- {DA965BCF-2219-47AF-ACE7-EAF76D5D4756}.Release_wtl|Win32.Build.0 = Release|Win32
- {DA965BCF-2219-47AF-ACE7-EAF76D5D4756}.Release_wtl|x64.ActiveCfg = Release|x64
- {DA965BCF-2219-47AF-ACE7-EAF76D5D4756}.Release_wtl|x64.Build.0 = Release|x64
{7BF6F100-31DB-44AE-A2A5-5DDEED9A909C}.Debug_mupenplus|Win32.ActiveCfg = Debug|Win32
{7BF6F100-31DB-44AE-A2A5-5DDEED9A909C}.Debug_mupenplus|Win32.Build.0 = Debug|Win32
{7BF6F100-31DB-44AE-A2A5-5DDEED9A909C}.Debug_mupenplus|x64.ActiveCfg = Debug|x64
{7BF6F100-31DB-44AE-A2A5-5DDEED9A909C}.Debug_mupenplus|x64.Build.0 = Debug|x64
- {7BF6F100-31DB-44AE-A2A5-5DDEED9A909C}.Debug_qt|Win32.ActiveCfg = Debug|Win32
- {7BF6F100-31DB-44AE-A2A5-5DDEED9A909C}.Debug_qt|Win32.Build.0 = Debug|Win32
- {7BF6F100-31DB-44AE-A2A5-5DDEED9A909C}.Debug_qt|x64.ActiveCfg = Debug|x64
- {7BF6F100-31DB-44AE-A2A5-5DDEED9A909C}.Debug_qt|x64.Build.0 = Debug|x64
- {7BF6F100-31DB-44AE-A2A5-5DDEED9A909C}.Debug_wtl|Win32.ActiveCfg = Debug|Win32
- {7BF6F100-31DB-44AE-A2A5-5DDEED9A909C}.Debug_wtl|Win32.Build.0 = Debug|Win32
- {7BF6F100-31DB-44AE-A2A5-5DDEED9A909C}.Debug_wtl|x64.ActiveCfg = Debug|x64
- {7BF6F100-31DB-44AE-A2A5-5DDEED9A909C}.Debug_wtl|x64.Build.0 = Debug|x64
{7BF6F100-31DB-44AE-A2A5-5DDEED9A909C}.Release_mupenplus|Win32.ActiveCfg = Release|Win32
{7BF6F100-31DB-44AE-A2A5-5DDEED9A909C}.Release_mupenplus|Win32.Build.0 = Release|Win32
{7BF6F100-31DB-44AE-A2A5-5DDEED9A909C}.Release_mupenplus|x64.ActiveCfg = Release|x64
{7BF6F100-31DB-44AE-A2A5-5DDEED9A909C}.Release_mupenplus|x64.Build.0 = Release|x64
- {7BF6F100-31DB-44AE-A2A5-5DDEED9A909C}.Release_qt|Win32.ActiveCfg = Release|Win32
- {7BF6F100-31DB-44AE-A2A5-5DDEED9A909C}.Release_qt|Win32.Build.0 = Release|Win32
- {7BF6F100-31DB-44AE-A2A5-5DDEED9A909C}.Release_qt|x64.ActiveCfg = Release|x64
- {7BF6F100-31DB-44AE-A2A5-5DDEED9A909C}.Release_qt|x64.Build.0 = Release|x64
- {7BF6F100-31DB-44AE-A2A5-5DDEED9A909C}.Release_wtl|Win32.ActiveCfg = Release|Win32
- {7BF6F100-31DB-44AE-A2A5-5DDEED9A909C}.Release_wtl|Win32.Build.0 = Release|Win32
- {7BF6F100-31DB-44AE-A2A5-5DDEED9A909C}.Release_wtl|x64.ActiveCfg = Release|x64
- {7BF6F100-31DB-44AE-A2A5-5DDEED9A909C}.Release_wtl|x64.Build.0 = Release|x64
- {37CAB375-A7A6-3CAB-BD56-0E954D3FD2FE}.Debug_mupenplus|Win32.ActiveCfg = Debug|Win32
- {37CAB375-A7A6-3CAB-BD56-0E954D3FD2FE}.Debug_mupenplus|x64.ActiveCfg = Debug|x64
- {37CAB375-A7A6-3CAB-BD56-0E954D3FD2FE}.Debug_qt|Win32.ActiveCfg = Debug|Win32
- {37CAB375-A7A6-3CAB-BD56-0E954D3FD2FE}.Debug_qt|Win32.Build.0 = Debug|Win32
- {37CAB375-A7A6-3CAB-BD56-0E954D3FD2FE}.Debug_qt|x64.ActiveCfg = Debug|x64
- {37CAB375-A7A6-3CAB-BD56-0E954D3FD2FE}.Debug_qt|x64.Build.0 = Debug|x64
- {37CAB375-A7A6-3CAB-BD56-0E954D3FD2FE}.Debug_wtl|Win32.ActiveCfg = Debug|Win32
- {37CAB375-A7A6-3CAB-BD56-0E954D3FD2FE}.Debug_wtl|x64.ActiveCfg = Debug|x64
- {37CAB375-A7A6-3CAB-BD56-0E954D3FD2FE}.Release_mupenplus|Win32.ActiveCfg = Release|Win32
- {37CAB375-A7A6-3CAB-BD56-0E954D3FD2FE}.Release_mupenplus|x64.ActiveCfg = Release|x64
- {37CAB375-A7A6-3CAB-BD56-0E954D3FD2FE}.Release_qt|Win32.ActiveCfg = Release|Win32
- {37CAB375-A7A6-3CAB-BD56-0E954D3FD2FE}.Release_qt|Win32.Build.0 = Release|Win32
- {37CAB375-A7A6-3CAB-BD56-0E954D3FD2FE}.Release_qt|x64.ActiveCfg = Release|x64
- {37CAB375-A7A6-3CAB-BD56-0E954D3FD2FE}.Release_qt|x64.Build.0 = Release|x64
- {37CAB375-A7A6-3CAB-BD56-0E954D3FD2FE}.Release_wtl|Win32.ActiveCfg = Release|Win32
- {37CAB375-A7A6-3CAB-BD56-0E954D3FD2FE}.Release_wtl|x64.ActiveCfg = Release|x64
- {9E05B70F-A294-44A9-A151-B2CC95AA884E}.Debug_mupenplus|Win32.ActiveCfg = Debug|Win32
- {9E05B70F-A294-44A9-A151-B2CC95AA884E}.Debug_mupenplus|x64.ActiveCfg = Debug|x64
- {9E05B70F-A294-44A9-A151-B2CC95AA884E}.Debug_qt|Win32.ActiveCfg = Debug|Win32
- {9E05B70F-A294-44A9-A151-B2CC95AA884E}.Debug_qt|x64.ActiveCfg = Debug|x64
- {9E05B70F-A294-44A9-A151-B2CC95AA884E}.Debug_wtl|Win32.ActiveCfg = Debug|Win32
- {9E05B70F-A294-44A9-A151-B2CC95AA884E}.Debug_wtl|Win32.Build.0 = Debug|Win32
- {9E05B70F-A294-44A9-A151-B2CC95AA884E}.Debug_wtl|x64.ActiveCfg = Debug|x64
- {9E05B70F-A294-44A9-A151-B2CC95AA884E}.Debug_wtl|x64.Build.0 = Debug|x64
- {9E05B70F-A294-44A9-A151-B2CC95AA884E}.Release_mupenplus|Win32.ActiveCfg = Release|Win32
- {9E05B70F-A294-44A9-A151-B2CC95AA884E}.Release_mupenplus|x64.ActiveCfg = Release|x64
- {9E05B70F-A294-44A9-A151-B2CC95AA884E}.Release_qt|Win32.ActiveCfg = Release|Win32
- {9E05B70F-A294-44A9-A151-B2CC95AA884E}.Release_qt|x64.ActiveCfg = Release|x64
- {9E05B70F-A294-44A9-A151-B2CC95AA884E}.Release_wtl|Win32.ActiveCfg = Release|Win32
- {9E05B70F-A294-44A9-A151-B2CC95AA884E}.Release_wtl|Win32.Build.0 = Release|Win32
- {9E05B70F-A294-44A9-A151-B2CC95AA884E}.Release_wtl|x64.ActiveCfg = Release|x64
- {9E05B70F-A294-44A9-A151-B2CC95AA884E}.Release_wtl|x64.Build.0 = Release|x64
- {4F28B56B-F4B0-41B0-A785-597F6EF0163A}.Debug_mupenplus|Win32.ActiveCfg = Debug|Win32
- {4F28B56B-F4B0-41B0-A785-597F6EF0163A}.Debug_mupenplus|x64.ActiveCfg = Debug|x64
- {4F28B56B-F4B0-41B0-A785-597F6EF0163A}.Debug_qt|Win32.ActiveCfg = Debug|Win32
- {4F28B56B-F4B0-41B0-A785-597F6EF0163A}.Debug_qt|x64.ActiveCfg = Debug|x64
- {4F28B56B-F4B0-41B0-A785-597F6EF0163A}.Debug_wtl|Win32.ActiveCfg = Debug|Win32
- {4F28B56B-F4B0-41B0-A785-597F6EF0163A}.Debug_wtl|Win32.Build.0 = Debug|Win32
- {4F28B56B-F4B0-41B0-A785-597F6EF0163A}.Debug_wtl|x64.ActiveCfg = Debug|x64
- {4F28B56B-F4B0-41B0-A785-597F6EF0163A}.Debug_wtl|x64.Build.0 = Debug|x64
- {4F28B56B-F4B0-41B0-A785-597F6EF0163A}.Release_mupenplus|Win32.ActiveCfg = Release|Win32
- {4F28B56B-F4B0-41B0-A785-597F6EF0163A}.Release_mupenplus|x64.ActiveCfg = Release|x64
- {4F28B56B-F4B0-41B0-A785-597F6EF0163A}.Release_qt|Win32.ActiveCfg = Release|Win32
- {4F28B56B-F4B0-41B0-A785-597F6EF0163A}.Release_qt|x64.ActiveCfg = Release|x64
- {4F28B56B-F4B0-41B0-A785-597F6EF0163A}.Release_wtl|Win32.ActiveCfg = Release|Win32
- {4F28B56B-F4B0-41B0-A785-597F6EF0163A}.Release_wtl|Win32.Build.0 = Release|Win32
- {4F28B56B-F4B0-41B0-A785-597F6EF0163A}.Release_wtl|x64.ActiveCfg = Release|x64
- {4F28B56B-F4B0-41B0-A785-597F6EF0163A}.Release_wtl|x64.Build.0 = Release|x64
- {5480BC17-9C40-4E41-8AD4-AE12316D4CA4}.Debug_mupenplus|Win32.ActiveCfg = Debug|Win32
- {5480BC17-9C40-4E41-8AD4-AE12316D4CA4}.Debug_mupenplus|x64.ActiveCfg = Debug|x64
- {5480BC17-9C40-4E41-8AD4-AE12316D4CA4}.Debug_qt|Win32.ActiveCfg = Debug|Win32
- {5480BC17-9C40-4E41-8AD4-AE12316D4CA4}.Debug_qt|x64.ActiveCfg = Debug|x64
- {5480BC17-9C40-4E41-8AD4-AE12316D4CA4}.Debug_wtl|Win32.ActiveCfg = Debug|Win32
- {5480BC17-9C40-4E41-8AD4-AE12316D4CA4}.Debug_wtl|Win32.Build.0 = Debug|Win32
- {5480BC17-9C40-4E41-8AD4-AE12316D4CA4}.Debug_wtl|x64.ActiveCfg = Debug|x64
- {5480BC17-9C40-4E41-8AD4-AE12316D4CA4}.Debug_wtl|x64.Build.0 = Debug|x64
- {5480BC17-9C40-4E41-8AD4-AE12316D4CA4}.Release_mupenplus|Win32.ActiveCfg = Release|Win32
- {5480BC17-9C40-4E41-8AD4-AE12316D4CA4}.Release_mupenplus|x64.ActiveCfg = Release|x64
- {5480BC17-9C40-4E41-8AD4-AE12316D4CA4}.Release_qt|Win32.ActiveCfg = Release|Win32
- {5480BC17-9C40-4E41-8AD4-AE12316D4CA4}.Release_qt|x64.ActiveCfg = Release|x64
- {5480BC17-9C40-4E41-8AD4-AE12316D4CA4}.Release_wtl|Win32.ActiveCfg = Release|Win32
- {5480BC17-9C40-4E41-8AD4-AE12316D4CA4}.Release_wtl|Win32.Build.0 = Release|Win32
- {5480BC17-9C40-4E41-8AD4-AE12316D4CA4}.Release_wtl|x64.ActiveCfg = Release|x64
- {5480BC17-9C40-4E41-8AD4-AE12316D4CA4}.Release_wtl|x64.Build.0 = Release|x64
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
EndGlobalSection
GlobalSection(ExtensibilityGlobals) = postSolution
- Qt5Version = $(DefaultQtVersion)
SolutionGuid = {D7155823-2893-4425-94B4-BA469E774A27}
+ Qt5Version = $(DefaultQtVersion)
EndGlobalSection
EndGlobal
diff --git a/projects/msvc/GLideN64.vcxproj b/projects/msvc/GLideN64.vcxproj
index 9a885e1f..a3690940 100644
--- a/projects/msvc/GLideN64.vcxproj
+++ b/projects/msvc/GLideN64.vcxproj
@@ -9,22 +9,6 @@
Debug_mupenplus
x64
-
- Debug_qt
- Win32
-
-
- Debug_qt
- x64
-
-
- Debug_wtl
- Win32
-
-
- Debug_wtl
- x64
-
Release_mupenplus
Win32
@@ -33,22 +17,6 @@
Release_mupenplus
x64
-
- Release_qt
- Win32
-
-
- Release_qt
- x64
-
-
- Release_wtl
- Win32
-
-
- Release_wtl
- x64
-
{37D31D7F-C4E7-45B0-AEF6-D6824A243CF7}
@@ -81,15 +49,14 @@
$(SolutionDir)..\..\..\external\$(Platform)\
$(SolutionDir)build\$(Platform)\$(Configuration)\$(ProjectName)\
-
+
+ GLideN64d
true
-
+
+ GLideN64
false
-
- mupen64plus-video-GLideN64
-
../../src;../../src/inc;../../src/osal;%(AdditionalIncludeDirectories)
@@ -111,20 +78,7 @@
call ..\..\src\getRevision.bat
-
-
- GL_DEBUG;DEBUG_DUMP;%(PreprocessorDefinitions)
- Disabled
- EnableFastChecks
- EditAndContinue
- MultiThreadedDebugDLL
-
-
- true
- freetype253MT_D.lib;%(AdditionalDependencies)
-
-
-
+
Full
ProgramDatabase
@@ -217,7 +171,7 @@ copy /Y "$(OutDir)$(TargetName).*" "$(PJ64PluginsDirWTL_x64)")
- MUPENPLUSAPI;NATIVE;%(PreprocessorDefinitions)
+ NATIVE;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)
Copy result to plugins folder
@@ -227,54 +181,18 @@ copy /Y "$(OutDir)$(TargetName).*" "$(Mupen64PluginsDir)")
copy /Y "$(OutDir)$(TargetName).*" "$(Mupen64PluginsDir_x64)")
-
-
- bin\$(Platform)\Debug\lib\GLideNUI.lib;%(AdditionalDependencies)
-
-
-
-
- bin\$(Platform)\Debug\lib\GLideNUI-wtl.lib;%(AdditionalDependencies)
-
-
-
-
- bin\$(Platform)\Release\lib\GLideNUI.lib;%(AdditionalDependencies)
- /LTCG %(AdditionalOptions)
-
-
-
-
- bin\$(Platform)\Release\lib\GLideNUI-wtl.lib;%(AdditionalDependencies)
-
-
../../src/inc/freetype/include;%(AdditionalIncludeDirectories)
true
stdcpp17
- true
- stdcpp17
- true
- stdcpp17
true
stdcpp17
- true
- stdcpp17
- true
- stdcpp17
true
stdcpp17
- true
- stdcpp17
- true
- stdcpp17
true
stdcpp17
- true
- stdcpp17
- true
- stdcpp17
+ MultiThreadedDebug
@@ -321,9 +239,6 @@ copy /Y "$(OutDir)$(TargetName).*" "$(Mupen64PluginsDir_x64)")
-
- true
-
@@ -344,33 +259,26 @@ copy /Y "$(OutDir)$(TargetName).*" "$(Mupen64PluginsDir_x64)")
true
+ false
+ false
true
+ false
+ false
true
-
- true
- true
-
-
- true
-
-
- true
-
-
- true
-
-
- true
-
-
+
+
+
+
+
+
@@ -381,12 +289,7 @@ copy /Y "$(OutDir)$(TargetName).*" "$(Mupen64PluginsDir_x64)")
true
false
- false
-
-
- true
- true
- true
+ false
@@ -419,28 +322,10 @@ copy /Y "$(OutDir)$(TargetName).*" "$(Mupen64PluginsDir_x64)")
-
- true
-
-
- true
-
-
- true
-
-
- true
-
-
- true
-
-
- true
-
-
- true
- true
-
+
+
+
+
diff --git a/projects/msvc/GLideN64.vcxproj.filters b/projects/msvc/GLideN64.vcxproj.filters
index 522ab0d2..b750e3bf 100644
--- a/projects/msvc/GLideN64.vcxproj.filters
+++ b/projects/msvc/GLideN64.vcxproj.filters
@@ -66,9 +66,6 @@
{e8b5c80f-51ec-45c2-bcdb-5e18868073df}
-
- {77259791-9942-4601-a63f-5a0468e69e49}
-
{09919f83-2933-4b48-a4c7-f7bf6e790304}
@@ -78,6 +75,12 @@
{afe20b4b-eb13-4282-bf72-47335887c770}
+
+ {1b0ca6a9-2d38-4c4f-948a-adb40a8021c6}
+
+
+ {3fbbb3f7-f454-4682-8933-5ca84cb40d6f}
+
@@ -119,42 +122,12 @@
Source Files
-
- Source Files
-
Source Files
-
- Source Files
-
Source Files\common
-
- Source Files\mupenplus
-
-
- Source Files\mupenplus
-
-
- Source Files\windows
-
-
- Source Files\windows
-
-
- Source Files\windows
-
-
- Source Files\windows
-
-
- Source Files\windows
-
-
- Source Files\mupenplus
-
Source Files
@@ -278,9 +251,6 @@
Source Files\Graphics\OpenGL\windows
-
- Source Files\Graphics\OpenGL\mupen64plus
-
Source Files\Graphics\OpenGL
@@ -308,9 +278,6 @@
Source Files\Graphics
-
- Source Files
-
Source Files
@@ -407,12 +374,6 @@
Source Files\Graphics\OpenGL\GLSL
-
- Source Files\windows
-
-
- Source Files\mupenplus
-
Source Files\Graphics\OpenGL\ThreadedOpenGL
@@ -443,8 +404,35 @@
Source Files\Graphics\OpenGL\GLSL
-
- Source Files
+
+ Source Files\windows
+
+
+ Source Files\windows
+
+
+ Source Files\windows
+
+
+ Source Files\windows
+
+
+ Source Files\native
+
+
+ Source Files\native
+
+
+ Source Files\native
+
+
+ Source Files\native\util
+
+
+ Source Files\native
+
+
+ Source Files\native
diff --git a/projects/msvc/GLideNUI-wtl.vcxproj b/projects/msvc/GLideNUI-wtl.vcxproj
deleted file mode 100644
index 22a11c76..00000000
--- a/projects/msvc/GLideNUI-wtl.vcxproj
+++ /dev/null
@@ -1,196 +0,0 @@
-
-
-
-
- Debug
- x64
-
-
- Release
- Win32
-
-
- Debug
- Win32
-
-
- Release
- x64
-
-
-
- {9E05B70F-A294-44A9-A151-B2CC95AA884E}
- GLideNUIwtl
-
-
- $([Microsoft.Build.Utilities.ToolLocationHelper]::GetLatestSDKTargetPlatformVersion('Windows', '10.0'))
- $(LatestTargetPlatformVersion)
- $(WindowsTargetPlatformVersion)
-
-
-
- $(DefaultPlatformToolset)
- false
- NotSet
- StaticLibrary
- GLideNUI-wtl
-
-
-
-
-
-
-
-
- $(SolutionDir)..\..\..\external\$(Platform)\
- $(SolutionDir)build\$(Platform)\$(Configuration)\$(ProjectName)\
- $(ProjectName)
- true
-
-
-
- _WINDOWS;UNICODE;WIN32;%(PreprocessorDefinitions)
- %(AdditionalIncludeDirectories)
- -Zm200 -w34100 -w34189 %(AdditionalOptions)
- $(IntDir)
- false
- Sync
- $(IntDir)
- false
- $(IntDir)vc$(VisualStudioVersion).pdb
- true
- true
- true
- Level3
- $(OutDir)\GLideNUI-wtl.lib
-
-
- imm32.lib;Ws2_32.lib;%(AdditionalDependencies)
-
-
-
-
- DEBUG_DUMP;_DEBUG;%(PreprocessorDefinitions)
- ProgramDatabase
- Disabled
- MultiThreadedDebugDLL
- true
- stdcpp17
- stdcpp17
-
-
-
-
- None
- MaxSpeed
- MultiThreaded
- false
- stdcpp17
- stdcpp17
-
-
- true
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/projects/msvc/GLideNUI-wtl.vcxproj.filters b/projects/msvc/GLideNUI-wtl.vcxproj.filters
deleted file mode 100644
index bd56d47e..00000000
--- a/projects/msvc/GLideNUI-wtl.vcxproj.filters
+++ /dev/null
@@ -1,295 +0,0 @@
-
-
-
-
- {4FC737F1-C7A5-4376-A066-2A32D752A2FF}
- cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx
-
-
- {93995380-89BD-4b04-88EB-625FBE52EBFB}
- h;hh;hpp;hxx;hm;inl;inc;xsd
-
-
- {67DA6AB6-F800-4c08-8B7A-83BB121AAD01}
- rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav;mfcribbon-ms
-
-
- {b0c2b4e8-31f7-46e5-9b96-cfe8b94db5cf}
-
-
-
-
- Source Files
-
-
- Source Files
-
-
- Source Files
-
-
- Source Files
-
-
- Source Files
-
-
- Source Files
-
-
- Source Files
-
-
- Source Files
-
-
- Source Files
-
-
- Source Files
-
-
- Source Files
-
-
- Source Files
-
-
- Source Files
-
-
- Source Files
-
-
- Source Files
-
-
- Source Files
-
-
- Source Files
-
-
- Source Files
-
-
- Source Files
-
-
- Source Files
-
-
- Source Files
-
-
- Source Files
-
-
- Source Files
-
-
- Source Files
-
-
- Source Files
-
-
-
-
- Header Files
-
-
- Header Files
-
-
- Header Files
-
-
- Header Files
-
-
- Header Files
-
-
- Header Files
-
-
- Header Files
-
-
- Header Files
-
-
- Header Files
-
-
- Header Files
-
-
- Header Files
-
-
- Header Files
-
-
- Header Files
-
-
- Header Files
-
-
- Header Files
-
-
- Header Files
-
-
- Header Files
-
-
- Header Files
-
-
- Header Files
-
-
- Header Files
-
-
- Header Files
-
-
- Header Files
-
-
- Header Files
-
-
- Header Files
-
-
- Header Files
-
-
- Header Files\WTL
-
-
- Header Files\WTL
-
-
- Header Files\WTL
-
-
- Header Files\WTL
-
-
- Header Files\WTL
-
-
- Header Files\WTL
-
-
- Header Files\WTL
-
-
- Header Files\WTL
-
-
- Header Files\WTL
-
-
- Header Files\WTL
-
-
- Header Files\WTL
-
-
- Header Files\WTL
-
-
- Header Files\WTL
-
-
- Header Files\WTL
-
-
- Header Files\WTL
-
-
- Header Files\WTL
-
-
- Header Files\WTL
-
-
- Header Files\WTL
-
-
- Header Files\WTL
-
-
- Header Files\WTL
-
-
- Header Files\WTL
-
-
- Header Files\WTL
-
-
- Header Files
-
-
- Header Files
-
-
- Header Files
-
-
- Header Files
-
-
-
-
- Resource Files
-
-
- Resource Files
-
-
- Resource Files
-
-
- Resource Files
-
-
- Resource Files
-
-
- Resource Files
-
-
- Resource Files
-
-
- Resource Files
-
-
- Resource Files
-
-
- Resource Files
-
-
- Resource Files
-
-
- Resource Files
-
-
-
-
- Resource Files
-
-
-
\ No newline at end of file
diff --git a/projects/msvc/GLideNUI.pro b/projects/msvc/GLideNUI.pro
deleted file mode 100644
index 8329544d..00000000
--- a/projects/msvc/GLideNUI.pro
+++ /dev/null
@@ -1,48 +0,0 @@
-#-------------------------------------------------
-#
-# Project created by QtCreator 2015-01-26T21:59:49
-#
-#-------------------------------------------------
-
-QT += core gui
-QTPLUGIN += qico
-
-greaterThan(QT_MAJOR_VERSION, 4): QT += widgets
-
-TARGET = GLideNUI
-TEMPLATE = lib
-CONFIG += staticlib
-CONFIG += c++11
-
-VPATH += ./../../src/GLideNUI/
-SOURCES += \
- ConfigDialog.cpp \
- GLideNUI.cpp \
- FullscreenResolutions_windows.cpp \
- Settings.cpp \
- ScreenShot.cpp \
- AboutDialog.cpp
-
-HEADERS += \
- ConfigDialog.h \
- GLideNUI.h \
- FullscreenResolutions.h \
- Settings.h \
- AboutDialog.h
-
-RESOURCES += \
- icon.qrc
-
-FORMS += \
- configDialog.ui \
- AboutDialog.ui
-
-TRANSLATIONS = gliden64_fr.ts \
- gliden64_de.ts \
- gliden64_it.ts \
- gliden64_es.ts \
- gliden64_pl.ts \
- gliden64_pt_BR.ts \
- gliden64_ja.ts
-
-DISTFILES +=
diff --git a/projects/msvc/GLideNUI.vcxproj b/projects/msvc/GLideNUI.vcxproj
deleted file mode 100644
index d7ff5c26..00000000
--- a/projects/msvc/GLideNUI.vcxproj
+++ /dev/null
@@ -1,202 +0,0 @@
-
-
-
-
- Debug
- x64
-
-
- Release
- Win32
-
-
- Debug
- Win32
-
-
- Release
- x64
-
-
-
- {37CAB375-A7A6-3CAB-BD56-0E954D3FD2FE}
- GLideNUI
- Qt4VSv1.0
-
-
- $([Microsoft.Build.Utilities.ToolLocationHelper]::GetLatestSDKTargetPlatformVersion('Windows', '10.0'))
- $(LatestTargetPlatformVersion)
- $(WindowsTargetPlatformVersion)
-
-
-
- $(DefaultPlatformToolset)
- false
- NotSet
- StaticLibrary
- GLideNUI
-
-
-
-
-
-
-
-
- $(SolutionDir)bin\$(Platform)\$(Configuration)\lib\
- $(SolutionDir)build\$(Platform)\$(Configuration)\$(ProjectName)\
- $(ProjectName)
- true
-
-
-
- _WINDOWS;UNICODE;WIN32;QT_STATICPLUGIN;QT_WIDGETS_LIB;QT_GUI_LIB;QT_CORE_LIB;QT_UITOOLS_LIB;QT_WINEXTRAS_LIB;%(PreprocessorDefinitions)
- $(QTDIR)\include;$(QTDIR)\include\QtWidgets;$(QTDIR)\include\QtGui;$(QTDIR)\include\QtCore;release;.;$(QTDIR)\mkspecs\win32-msvc2013;.\GeneratedFiles;$(QTDIR)\include\QtUiTools;$(QTDIR)\include\QtWinExtras;$(ProjectDir)..\..\src\osal;%(AdditionalIncludeDirectories)
- -Zm200 -w34100 -w34189 %(AdditionalOptions)
- $(IntDir)
- false
- Sync
- $(IntDir)
- OS_WINDOWS;%(PreprocessorDefinitions)
- false
- $(IntDir)vc$(VisualStudioVersion).pdb
- true
- true
- true
- Level3
- $(OutDir)\GLideNUI.lib
-
-
- $(QTDIR)\lib;$(QTDIR)\plugins\styles;$(QTDIR)\plugins\platforms;$(QTDIR)\plugins\imageformats
- imm32.lib;Ws2_32.lib;%(AdditionalDependencies)
-
-
-
-
- DEBUG_DUMP;_DEBUG;%(PreprocessorDefinitions)
- ProgramDatabase
- Disabled
- MultiThreadedDebugDLL
- true
- true
- stdcpp17
- true
- stdcpp17
-
-
- qtpcre2d.lib;qtmaind.lib;qwindowsd.lib;qicod.lib;Qt5Cored.lib;Qt5Guid.lib;Qt5Widgetsd.lib;UxTheme.lib;qwindowsvistastyled.lib;Qt5WindowsUiAutomationSupportd.lib;Qt5FontDatabaseSupportd.lib;Qt5EventDispatcherSupportd.lib;Qt5FontDatabaseSupportd.lib;Qt5ThemeSupportd.lib;qtharfbuzzd.lib;Ws2_32.lib;Netapi32.lib;Userenv.lib;Ws2_32.lib;Wtsapi32.lib;Imm32.lib;WinMM.lib;Version.lib;Netapi32.lib;Dwmapi.lib;%(AdditionalDependencies)
-
-
- Qt5UiToolsd.lib;Qt5WinExtrasd.lib;%(AdditionalDependencies)
-
-
-
-
- QT_NO_DEBUG;NDEBUG;%(PreprocessorDefinitions)
- None
- MaxSpeed
- MultiThreaded
- false
- true
- stdcpp17
- true
- stdcpp17
-
-
- qtpcre2.lib;qtmain.lib;qwindows.lib;qico.lib;Qt5Core.lib;Qt5Gui.lib;Qt5Widgets.lib;UxTheme.lib;qwindowsvistastyle.lib;Qt5WindowsUiAutomationSupport.lib;Qt5FontDatabaseSupport.lib;Qt5EventDispatcherSupport.lib;Qt5FontDatabaseSupport.lib;Qt5ThemeSupport.lib;qtharfbuzz.lib;Ws2_32.lib;Netapi32.lib;Userenv.lib;Ws2_32.lib;Wtsapi32.lib;Imm32.lib;WinMM.lib;Version.lib;Netapi32.lib;Dwmapi.lib;%(AdditionalDependencies)
-
-
- Qt5UiTools.lib;Qt5WinExtras.lib;%(AdditionalDependencies)
-
-
- true
-
-
-
-
-
-
-
-
- true
-
-
- true
-
-
-
-
-
-
-
-
- true
-
-
- true
-
-
-
-
-
- setlocal
-if errorlevel 1 goto VCEnd
-if errorlevel 1 goto VCEnd
-endlocal
-"$(QTDIR)\bin\moc.exe" "%(FullPath)" -o "$(ConfigurationName)\moc_%(Filename).cpp" -D_WINDOWS -DUNICODE -DWIN32 -DQT_STATICPLUGIN -DQT_NO_DEBUG -DQT_WIDGETS_LIB -DQT_GUI_LIB -DQT_CORE_LIB -DNDEBUG -DQT_UITOOLS_LIB -DQT_WINEXTRAS_LIB "-I$(QTDIR)\include" "-I$(QTDIR)\include\QtWidgets" "-I$(QTDIR)\include\QtGui" "-I$(QTDIR)\include\QtCore" "-I.\release" "-I." "-I$(QTDIR)\mkspecs\win32-msvc2013" "-I.\GeneratedFiles" "-I$(QTDIR)\include\QtUiTools" "-I$(QTDIR)\include\QtWinExtras"
- Moc%27ing AboutDialog.h...
- $(ConfigurationName)\moc_%(Filename).cpp
- $(QTDIR)\bin\moc.exe;%(FullPath)
-
-
- setlocal
-if errorlevel 1 goto VCEnd
-if errorlevel 1 goto VCEnd
-endlocal
-"$(QTDIR)\bin\moc.exe" "%(FullPath)" -o "$(ConfigurationName)\moc_%(Filename).cpp" -D_WINDOWS -DUNICODE -DWIN32 -DQT_STATICPLUGIN -DQT_NO_DEBUG -DQT_WIDGETS_LIB -DQT_GUI_LIB -DQT_CORE_LIB -DNDEBUG -DQT_UITOOLS_LIB -DQT_WINEXTRAS_LIB "-I$(QTDIR)\include" "-I$(QTDIR)\include\QtWidgets" "-I$(QTDIR)\include\QtGui" "-I$(QTDIR)\include\QtCore" "-I.\release" "-I." "-I$(QTDIR)\mkspecs\win32-msvc2013" "-I.\GeneratedFiles" "-I$(QTDIR)\include\QtUiTools" "-I$(QTDIR)\include\QtWinExtras"
- Moc%27ing ConfigDialog.h...
- $(ConfigurationName)\moc_%(Filename).cpp
- $(QTDIR)\bin\moc.exe;%(FullPath)
-
-
-
-
-
-
-
-
-
- Document
- $(QTDIR)\bin\uic.exe;%(AdditionalInputs)
- "$(QTDIR)\bin\uic.exe" -o ".\GeneratedFiles\ui_%(Filename).h" "%(FullPath)"
- Uic%27ing %(Identity)...
- .\GeneratedFiles\ui_%(Filename).h;%(Outputs)
-
-
- Document
- $(QTDIR)\bin\uic.exe;%(AdditionalInputs)
- "$(QTDIR)\bin\uic.exe" -o ".\GeneratedFiles\ui_%(Filename).h" "%(FullPath)"
- Uic%27ing %(Identity)...
- .\GeneratedFiles\ui_%(Filename).h;%(Outputs)
-
-
-
-
- true
-
-
- Document
- %(FullPath);.\Icon.ico;%(AdditionalInputs)
- "$(QTDIR)\bin\rcc.exe" -name "%(Filename)" -no-compress "%(FullPath)" -o .\GeneratedFiles\qrc_%(Filename).cpp
- Rcc%27ing %(Identity)...
- .\GeneratedFiles\qrc_%(Filename).cpp;%(Outputs)
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/projects/msvc/GLideNUI.vcxproj.filters b/projects/msvc/GLideNUI.vcxproj.filters
deleted file mode 100644
index 5692efed..00000000
--- a/projects/msvc/GLideNUI.vcxproj.filters
+++ /dev/null
@@ -1,138 +0,0 @@
-
-
-
-
- {99349809-55BA-4b9d-BF79-8FDBB0286EB3}
- ui
- false
-
-
- {99349809-55BA-4b9d-BF79-8FDBB0286EB3}
- ui
- false
-
-
- {71ED8ED8-ACB9-4CE9-BBE1-E00B30144E11}
- cpp;c;cxx;moc;h;def;odl;idl;res;
-
-
- {71ED8ED8-ACB9-4CE9-BBE1-E00B30144E11}
- cpp;c;cxx;moc;h;def;odl;idl;res;
-
-
- {93995380-89BD-4b04-88EB-625FBE52EBFB}
- h;hpp;hxx;hm;inl;inc;xsd
-
-
- {93995380-89BD-4b04-88EB-625FBE52EBFB}
- h;hpp;hxx;hm;inl;inc;xsd
-
-
- {D9D6E242-F8AF-46E4-B9FD-80ECBC20BA3E}
- qrc;*
- false
-
-
- {D9D6E242-F8AF-46E4-B9FD-80ECBC20BA3E}
- qrc;*
- false
-
-
- {4FC737F1-C7A5-4376-A066-2A32D752A2FF}
- cpp;c;cxx;def;odl;idl;hpj;bat;asm;asmx
-
-
- {4FC737F1-C7A5-4376-A066-2A32D752A2FF}
- cpp;c;cxx;def;odl;idl;hpj;bat;asm;asmx
-
-
- {81db5148-64bc-4cdf-b666-47488b3cb857}
- cpp;moc
- False
-
-
- {2d0855ca-d6fc-413c-8d8f-93865ecb277b}
- cpp;moc
- False
-
-
-
-
- Source Files
-
-
- Source Files
-
-
- Source Files
-
-
- Source Files
-
-
- Source Files
-
-
- Generated Files\Debug
-
-
- Generated Files\Release
-
-
- Generated Files\Debug
-
-
- Generated Files\Release
-
-
- Generated Files
-
-
- Source Files
-
-
- Generated Files\Debug
-
-
-
-
- Header Files
-
-
- Header Files
-
-
- Header Files
-
-
- Header Files
-
-
- Header Files
-
-
-
-
- Form Files
-
-
- Form Files
-
-
-
-
- Resource Files
-
-
- Resource Files
-
-
-
-
- Generated Files
-
-
- Generated Files
-
-
-
\ No newline at end of file
diff --git a/projects/msvc/libGLideNHQ.vcxproj b/projects/msvc/libGLideNHQ.vcxproj
index 1a79d9ed..10b1a3d1 100644
--- a/projects/msvc/libGLideNHQ.vcxproj
+++ b/projects/msvc/libGLideNHQ.vcxproj
@@ -46,7 +46,7 @@
$(SolutionDir)build\$(Platform)\$(Configuration)\$(ProjectName)\
libGLideNHQ
.lib
- $(SolutionDir)bin\$(Platform)\$(Configuration)\lib\
+ $(SolutionDir)..\..\..\external\$(Platform)\
@@ -66,6 +66,12 @@
%(PreprocessorDefinitions)
+
+ libGLideNHQ
+
+
+ libGLideNHQd
+
Debug/
@@ -73,8 +79,8 @@
ProgramDatabase
Disabled
Disabled
- MultiThreadedDebugDLL
- _DEBUG;DEBUG;%(PreprocessorDefinitions)
+ MultiThreadedDebug
+ DEBUG;%(PreprocessorDefinitions)
libpngd.lib;zlibd.lib;
@@ -111,7 +117,7 @@
AnySuitable
MaxSpeed
MultiThreaded
- NDEBUG;%(PreprocessorDefinitions)
+ _CRT_SECURE_NO_WARNINGS;NDEBUG;%(PreprocessorDefinitions)
libpng.lib;zlib.lib;
diff --git a/projects/msvc/osal.vcxproj b/projects/msvc/osal.vcxproj
index ba539033..7f56ce24 100644
--- a/projects/msvc/osal.vcxproj
+++ b/projects/msvc/osal.vcxproj
@@ -50,6 +50,9 @@
$(SolutionDir)..\..\..\external\$(Platform)\
$(SolutionDir)build\$(Platform)\$(Configuration)\$(ProjectName)\
+
+ .lib
+
Level3
@@ -63,7 +66,7 @@
Disabled
- MultiThreadedDebugDLL
+ MultiThreadedDebug
true
stdcpp17
true
@@ -98,4 +101,10 @@
+
+ osal
+
+
+ osald
+
\ No newline at end of file
diff --git a/projects/msvc/ticpp.vcxproj b/projects/msvc/ticpp.vcxproj
deleted file mode 100644
index 1c7311db..00000000
--- a/projects/msvc/ticpp.vcxproj
+++ /dev/null
@@ -1,127 +0,0 @@
-
-
-
-
- Debug
- Win32
-
-
- Release
- Win32
-
-
- Debug
- x64
-
-
- Release
- x64
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- {4F28B56B-F4B0-41B0-A785-597F6EF0163A}
- ticpp
-
-
- $([Microsoft.Build.Utilities.ToolLocationHelper]::GetLatestSDKTargetPlatformVersion('Windows', '10.0'))
- $(LatestTargetPlatformVersion)
- $(WindowsTargetPlatformVersion)
-
-
-
- StaticLibrary
- $(DefaultPlatformToolset)
- MultiByte
-
-
- true
-
-
- false
-
-
-
-
-
-
-
-
-
- $(SolutionDir)bin\$(Platform)\$(Configuration)\lib\
- $(SolutionDir)build\$(Platform)\$(Configuration)\$(ProjectName)\
-
-
-
- Level3
- Disabled
- TIXML_USE_TICPP;_WINDOWS;WIN32;_DEBUG;_LIB;TIXML_USE_TICPP;%(PreprocessorDefinitions)
- true
- stdcpp17
- MultiThreadedDebugDLL
-
-
- Windows
-
-
-
-
- Level3
- Disabled
- TIXML_USE_TICPP;_WINDOWS;WIN32;_DEBUG;_LIB;TIXML_USE_TICPP;%(PreprocessorDefinitions)
- true
- stdcpp17
-
-
- Windows
-
-
-
-
- Level3
- MaxSpeed
- true
- true
- TIXML_USE_TICPP;_WINDOWS;WIN32;NDEBUG;_LIB;TIXML_USE_TICPP;%(PreprocessorDefinitions)
- true
- stdcpp17
-
-
- Windows
- true
- true
-
-
-
-
- Level3
- MaxSpeed
- true
- true
- TIXML_USE_TICPP;_WINDOWS;WIN32;NDEBUG;_LIB;TIXML_USE_TICPP;%(PreprocessorDefinitions)
- true
- stdcpp17
-
-
- Windows
- true
- true
-
-
-
-
-
-
\ No newline at end of file
diff --git a/projects/msvc/ticpp.vcxproj.filters b/projects/msvc/ticpp.vcxproj.filters
deleted file mode 100644
index e0dab5f2..00000000
--- a/projects/msvc/ticpp.vcxproj.filters
+++ /dev/null
@@ -1,51 +0,0 @@
-
-
-
-
- {4FC737F1-C7A5-4376-A066-2A32D752A2FF}
- cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx
-
-
- {93995380-89BD-4b04-88EB-625FBE52EBFB}
- h;hh;hpp;hxx;hm;inl;inc;xsd
-
-
- {67DA6AB6-F800-4c08-8B7A-83BB121AAD01}
- rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav;mfcribbon-ms
-
-
-
-
- Source Files
-
-
- Source Files
-
-
- Source Files
-
-
- Source Files
-
-
- Source Files
-
-
-
-
- Header Files
-
-
- Header Files
-
-
- Header Files
-
-
- Header Files
-
-
- Header Files
-
-
-
\ No newline at end of file
diff --git a/projects/msvc/ts2lang.vcxproj b/projects/msvc/ts2lang.vcxproj
deleted file mode 100644
index f81045da..00000000
--- a/projects/msvc/ts2lang.vcxproj
+++ /dev/null
@@ -1,138 +0,0 @@
-
-
-
-
- Debug
- Win32
-
-
- Release
- Win32
-
-
- Debug
- x64
-
-
- Release
- x64
-
-
-
- {5480BC17-9C40-4E41-8AD4-AE12316D4CA4}
- ts2lang
-
-
- $([Microsoft.Build.Utilities.ToolLocationHelper]::GetLatestSDKTargetPlatformVersion('Windows', '10.0'))
- $(LatestTargetPlatformVersion)
- $(WindowsTargetPlatformVersion)
-
-
-
- Application
- $(DefaultPlatformToolset)
- MultiByte
-
-
- true
-
-
- true
-
-
-
-
-
-
-
-
-
- $(SolutionDir)bin\$(Platform)\$(Configuration)\
- $(SolutionDir)build\$(Platform)\$(Configuration)\$(ProjectName)\
- true
-
-
-
- if not exist "../../translations/wtl" mkdir "../../translations/wtl"
-"$(TargetDir)ts2lang.exe" "../../translations" "../../translations/wtl"
- Converting .ts translations to .Lang...
-
-
-
-
- Level3
- Disabled
- _CRT_SECURE_NO_WARNINGS;WIN32;_DEBUG;%(PreprocessorDefinitions)
- true
- stdcpp17
- MultiThreadedDebugDLL
-
-
- true
-
-
-
-
- Level3
- Disabled
- _CRT_SECURE_NO_WARNINGS;_DEBUG;%(PreprocessorDefinitions)
- true
- stdcpp17
-
-
- true
-
-
-
-
- Level3
- MaxSpeed
- true
- true
- _CRT_SECURE_NO_WARNINGS;WIN32;NDEBUG;%(PreprocessorDefinitions)
- true
- stdcpp17
-
-
- true
- true
-
-
-
-
- Level3
- MaxSpeed
- true
- true
- _CRT_SECURE_NO_WARNINGS;NDEBUG;%(PreprocessorDefinitions)
- true
- stdcpp17
-
-
- true
- true
-
-
-
-
-
-
-
-
-
-
-
- {4f28b56b-f4b0-41b0-a785-597f6ef0163a}
- true
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/projects/msvc/ts2lang.vcxproj.filters b/projects/msvc/ts2lang.vcxproj.filters
deleted file mode 100644
index 80221d63..00000000
--- a/projects/msvc/ts2lang.vcxproj.filters
+++ /dev/null
@@ -1,42 +0,0 @@
-
-
-
-
- Source Files
-
-
- Source Files
-
-
- Source Files
-
-
- Source Files
-
-
- Source Files
-
-
-
-
- Header Files
-
-
- Header Files
-
-
- Header Files
-
-
- Header Files
-
-
-
-
- {3f27dc7e-8d4f-4179-815f-f9af8ff8d7c3}
-
-
- {243e9857-b78f-490f-8b77-f3a387040f09}
-
-
-
\ No newline at end of file
diff --git a/src/Config.cpp b/src/Config.cpp
index 2999d605..88eda388 100644
--- a/src/Config.cpp
+++ b/src/Config.cpp
@@ -36,7 +36,7 @@ void Config::resetToDefaults()
texture.anisotropy = 0;
texture.maxAnisotropy = 0;
- texture.bilinearMode = BILINEAR_STANDARD;
+ texture.bilinearMode = BILINEAR_3POINT;
texture.enableHalosRemoval = 0;
generalEmulation.enableLOD = 1;
@@ -74,7 +74,7 @@ void Config::resetToDefaults()
frameBufferEmulation.copyToRDRAM = ctDoubleBuffer;
frameBufferEmulation.N64DepthCompare = dcDisable;
frameBufferEmulation.forceDepthBufferClear = 0;
- frameBufferEmulation.aspect = a43;
+ frameBufferEmulation.aspect = aAdjust;
frameBufferEmulation.bufferSwapMode = bsOnVerticalInterrupt;
frameBufferEmulation.nativeResFactor = 0;
frameBufferEmulation.fbInfoReadColorChunk = 0;
@@ -101,8 +101,8 @@ void Config::resetToDefaults()
textureFilter.txCacheCompression = 1;
textureFilter.txSaveCache = 1;
- textureFilter.txEnhancedTextureFileStorage = 0;
- textureFilter.txHiresTextureFileStorage = 0;
+ textureFilter.txEnhancedTextureFileStorage = 1;
+ textureFilter.txHiresTextureFileStorage = 1;
textureFilter.txNoTextureFileStorage = 0;
textureFilter.txHiresVramLimit = 0u;
diff --git a/src/GLideNUI-wtl/About.cpp b/src/GLideNUI-wtl/About.cpp
deleted file mode 100644
index b2b7ef43..00000000
--- a/src/GLideNUI-wtl/About.cpp
+++ /dev/null
@@ -1,403 +0,0 @@
-#include "About.h"
-#include "resource.h"
-#include "Language.h"
-
-extern HINSTANCE hInstance;
-
-class CAboutContributersTab :
- public CAboutTab
-{
-public:
- BEGIN_MSG_MAP(CAboutContributersTab)
- MSG_WM_INITDIALOG(OnInitDialog)
- MESSAGE_HANDLER(WM_CTLCOLORDLG, OnColorStatic)
- MESSAGE_HANDLER(WM_CTLCOLORSTATIC, OnColorStatic)
- END_MSG_MAP()
-
- CAboutContributersTab() :
- CAboutTab(IDD_TAB_CONTRIBUTORS)
- {
- }
-
- BOOL OnInitDialog(CWindow /*wndFocus*/, LPARAM /*lInitParam*/)
- {
- const TCHAR Contributors[] =
- {
- L"Logan McNaughton\r\n\r\n"
- L"Francisco Zurita\r\n\r\n"
- L"gizmo98\r\n\r\n"
- L"purplemarshmallow\r\n\r\n"
- L"zilmar\r\n\r\n"
- L"matthewharvey\r\n\r\n"
- L"lioncash\r\n\r\n"
- L"Predator82Germany\r\n\r\n"
- L"AmbientMalice\r\n\r\n"
- L"baptiste0602\r\n\r\n"
- L"Gilles Siberlin\r\n\r\n"
- L"Daniel Eck\r\n\r\n"
- L"VÃctor \"IlDucci\"\r\n\r\n"
- L"orbea\r\n\r\n"
- L"BenjaminSiskoo\r\n\r\n"
- L"ptitSeb\r\n\r\n"
- L"Kimberly J.Ortega\r\n\r\n"
- L"Maxime Morel\r\n\r\n"
- L"tony971\r\n\r\n"
- L"SigmaVirus\r\n\r\n"
- L"Jools Wills\r\n\r\n"
- L"Nekokabu\r\n\r\n"
- L"nicklauslittle\r\n\r\n"
- L"Nebuleon\r\n\r\n"
- L"sergiobenrocha2\r\n\r\n"
- L"Michał Durak\r\n\r\n"
- L"Mushman"
- };
- GetDlgItem(IDC_CONTRIBUTORS).SetWindowText(Contributors);
- return true;
- }
- LRESULT OnColorStatic(UINT /*uMsg*/, WPARAM wParam, LPARAM lParam, BOOL& /*bHandled*/)
- {
- if ((HWND)lParam == GetDlgItem(IDC_CONTRIBUTORS))
- {
- SetBkMode((HDC)wParam, TRANSPARENT);
- return (LRESULT)GetSysColorBrush(COLOR_3DFACE);
- }
- return (LRESULT)GetStockObject(WHITE_BRUSH);
- }
-};
-
-class CAboutFundersTab :
- public CAboutTab
-{
-public:
- BEGIN_MSG_MAP(CAboutFundersTab)
- MSG_WM_INITDIALOG(OnInitDialog)
- MESSAGE_HANDLER(WM_CTLCOLORDLG, OnColorStatic)
- MESSAGE_HANDLER(WM_CTLCOLORSTATIC, OnColorStatic)
- END_MSG_MAP()
-
- CAboutFundersTab() :
- CAboutTab(IDD_TAB_FUNDERS)
- {
- }
-
- BOOL OnInitDialog(CWindow /*wndFocus*/, LPARAM /*lInitParam*/)
- {
- const TCHAR Funders1[] =
- {
- L"zolcos\r\n"
- L"Mush Man\r\n"
- L"nesplayer4life\r\n"
- L"neko9876\r\n"
- L"AnthonyHeathcoat\r\n"
- L"daman6009\r\n"
- L"Paul Lamb\r\n"
- L"zilmar\r\n"
- };
- std::wstring FundersList =
- {
- L"Ryan Rosser\r\n"
- L"Amadeus Sterl\r\n"
- L"Narann\r\n"
- L"camara_luiz\r\n"
- L"weinerschnitzel\r\n"
- L"microdev\r\n"
- L"Thomas Ginelli\r\n"
- L"ace977\r\n"
- L"patryk.szalanski\r\n"
- L"Detomine\r\n"
- L"itasovski\r\n"
- L"keithclark1985\r\n"
- L"josephrmoore\r\n"
- L"fckyourlies\r\n"
- L"dougforr\r\n"
- L"camdenfurse\r\n"
- L"grandslam810\r\n"
- L"rictic\r\n"
- L"Fred Lambes\r\n"
- L"David Vercruyssen\r\n"
- L"danielgormly\r\n"
- L"lukecool\r\n"
- L"rhilsky\r\n"
- L"phillipstuerzl\r\n"
- L"killjoy1337\r\n"
- L"ratop46\r\n"
- L"william.a.moore\r\n"
- L"RSP16\r\n"
- L"kzidek127\r\n"
- L"Dan Holberg\r\n"
- L"178amm\r\n"
- L"peterchrjoergensen\r\n"
- L"hill_jm\r\n"
- L"petercullenbryan\r\n"
- L"Christopher M Rock\r\n"
- L"Kenny.R.Mitchell\r\n"
- L"Kevin Grasso\r\n"
- L"mtgyure\r\n"
- L"Anthony Heathcoat\r\n"
- L"Liam Burns\r\n"
- L"Steven Impson\r\n"
- L"Gwyn.Whieldon\r\n"
- L"hipnotoad\r\n"
- L"shmuklidooha\r\n"
- L"bcanard123\r\n"
- L"Ben Slater\r\n"
- L"Mike Nagy\r\n"
- L"littlegreendude55\r\n"
- L"Jay Loring\r\n"
- L"Damion D\r\n"
- L"heranbago\r\n"
- L"baptiste.guilbert\r\n"
- L"shadowpower69\r\n"
- L"j.mcguirk72\r\n"
- L"Peter Greenwood\r\n"
- L"fla56\r\n"
- L"Sergio\r\n"
- L"theboy_181\r\n"
- L"Jindo Fox\r\n"
- L"s1n.pcc\r\n"
- L"rafaelvasco\r\n"
- L"copileo\r\n"
- L"hugues.fabien\r\n"
- L"seanmcm157\r\n"
- L"David Morris\r\n"
- L"Jason Lightner\r\n"
- L"olivier_crepin77\r\n"
- L"Paul Lamb\r\n"
- L"thegump2.0\r\n"
- L"Bates\r\n"
- L"cdoublejj\r\n"
- L"buddybenj\r\n"
- L"don.carmical\r\n"
- L"kyussgreen\r\n"
- L"info1092\r\n"
- L"YQ\r\n"
- L"Allan Nordhøy\r\n"
- L"christian010\r\n"
- L"creuseur2patateradio\r\n"
- L"chrisbevanlee\r\n"
- L"theschklingen\r\n"
- L"Thomas Lindstrøm\r\n"
- L"Djipi\r\n"
- L"Dartus\r\n"
- L"Oscar Abraham\r\n"
- L"nwstrathdee\r\n"
- L"will7046\r\n"
- L"Richard42\r\n"
- L"V1del\r\n"
- L"AnthonyBentley\r\n"
- L"buddybenj\r\n"
- L"nickshooter251\r\n"
- L"sicurella12\r\n"
- L"jcspringer\r\n"
- L"Gru So\r\n"
- L"VinÃcius dos Santos Oliveira\r\n"
- L"Jimmy Haugh\r\n"
- L"Malcolm\r\n"
- L"Alex Strange\r\n"
- L"Espen Jensen\r\n"
- L"m.johnsondelta\r\n"
- L"alexzandar.toxic2\r\n"
- L"Ben Slater\r\n"
- L"WC-Predator\r\n"
- L"Mush Man\r\n"
- L"Ben Slater\r\n"
- L"aznlucidx\r\n"
- L"Nathan Dick\r\n"
- L"paulanocom\r\n"
- L"Ryan Rosser\r\n"
- L"nekow42\r\n"
- L"mgos1\r\n"
- L"ian.macdonald996\r\n"
- L"itasovski\r\n"
- L"vikingpower1\r\n"
- L"DukeX007X\r\n"
- L"palaciosgabriel\r\n"
- L"Franz-Josef Haider\r\n"
- L"e-male\r\n"
- L"aweath\r\n"
- L"famicom4\r\n"
- L"Keith_at_UMR\r\n"
- L"sweatypickle\r\n"
- L"jeremydmiller\r\n\r\n"
- };
- FundersList += wGS(ABOUT_AND_MORE);
- CWindow Funders = GetDlgItem(IDC_FUNDERS);
- Funders.SetWindowText(Funders1);
- m_SubtitleFont.Apply(m_hWnd, CWindowFont::typeBold | CWindowFont::typeSubheading, IDC_FUNDERS);
- GetDlgItem(IDC_FUNDERS_LIST).SetWindowText(FundersList.c_str());
- return true;
- };
- LRESULT OnColorStatic(UINT /*uMsg*/, WPARAM wParam, LPARAM lParam, BOOL& /*bHandled*/)
- {
- if ((HWND)lParam == GetDlgItem(IDC_FUNDERS_LIST))
- {
- SetBkMode((HDC)wParam, TRANSPARENT);
- return (LRESULT)GetSysColorBrush(COLOR_3DFACE);
- }
- return (LRESULT)GetStockObject(WHITE_BRUSH);
- }
-};
-
-class CAboutCreditsTab :
- public CAboutTab
-{
-public:
- BEGIN_MSG_MAP(CAboutCreditsTab)
- MSG_WM_INITDIALOG(OnInitDialog)
- MESSAGE_HANDLER(WM_CTLCOLORDLG, OnColorStatic)
- MESSAGE_HANDLER(WM_CTLCOLORSTATIC, OnColorStatic)
- END_MSG_MAP()
-
- CAboutCreditsTab() :
- CAboutTab(IDD_TAB_CREDITS)
- {
- }
- BOOL OnInitDialog(CWindow /*wndFocus*/, LPARAM /*lInitParam*/)
- {
- SetDlgItemTextW(IDC_TXT_AUTHOR_GLN64, wGS(ABOUT_AUTHOR_GLN64).c_str());
- SetDlgItemTextW(IDC_TXT_AUTHOR_GLES2N64, wGS(ABOUT_AUTHOR_GLES2N64).c_str());
- SetDlgItemTextW(IDC_TXT_AUTHOR_GLIDEHQ, wGS(ABOUT_AUTHOR_GLIDEHQ).c_str());
- SetDlgItemTextW(IDC_TXT_AUTHOR_Z64, wGS(ABOUT_AUTHOR_Z64).c_str());
-
- const UINT Creditors[] =
- {
- IDC_ORKIN,
- IDC_YONGZH,
- IDC_HIROSHI,
- IDC_ZIGGY
- };
- for (const UINT &Creditor : Creditors) {
- m_SubtitleFont.Apply(m_hWnd, CWindowFont::typeBold | CWindowFont::typeSubheading, Creditor);
- }
- return true;
- };
-};
-
-CAboutTab::CAboutTab(uint32_t _IDD) :
- IDD(_IDD)
-{
-}
-
-CAboutTab::~CAboutTab()
-{
-}
-
-BOOL CAboutTab::OnInitDialog(CWindow /*wndFocus*/, LPARAM /*lInitParam*/)
-{
- SetDlgItemTextW(IDC_TXT_NEW_GEN, wGS(ABOUT_NEXT_GENERATION).c_str());
- SetDlgItemTextW(IDC_TXT_AUTHORS, wGS(ABOUT_AUTHORS).c_str());
- SetDlgItemTextW(IDC_TXT_DEVELOPER, wGS(ABOUT_DEVELOPER).c_str());
- SetDlgItemTextW(IDC_TXT_BETA_TESTER, wGS(ABOUT_BETA_TESTER).c_str());
- SetDlgItemTextW(IDC_TXT_GUI_DESIGNER, wGS(ABOUT_GUI_DESIGNER).c_str());
-
- const UINT Authors[] =
- {
- IDC_SERGEY,
- IDC_OLIVIER,
- IDC_RYAN
- };
- for (const UINT &Author : Authors) {
- m_SubtitleFont.Apply(m_hWnd, CWindowFont::typeBold | CWindowFont::typeSubheading, Author);
- }
- return true;
-}
-
-LRESULT CAboutTab::OnColorStatic(UINT /*uMsg*/, WPARAM /*wParam*/, LPARAM /*lParam*/, BOOL& /*bHandled*/)
-{
- return (LRESULT)GetStockObject(WHITE_BRUSH);
-}
-
-CAboutDlg::~CAboutDlg()
-{
- for (size_t i = 0, n = m_TabWindows.size(); i < n; i++)
- {
- delete m_TabWindows[i];
- }
- m_TabWindows.clear();
-}
-
-LRESULT CAboutDlg::OnInitDialog(UINT /*uMsg*/, WPARAM /*wParam*/ , LPARAM /*lParam*/, BOOL& /*bHandled*/)
-{
- SetWindowText(wGS(ABOUT_ABOUT_TITLE).c_str());
-
- HICON hIcon = AtlLoadIconImage(IDI_APPICON, LR_DEFAULTCOLOR, ::GetSystemMetrics(SM_CXICON), ::GetSystemMetrics(SM_CYICON));
- SetIcon(hIcon, TRUE);
- HICON hIconSmall = AtlLoadIconImage(IDI_APPICON, LR_DEFAULTCOLOR, ::GetSystemMetrics(SM_CXSMICON), ::GetSystemMetrics(SM_CYSMICON));
- SetIcon(hIconSmall, FALSE);
- SIZEF dpiScale = DpiScale(m_hWnd);
- SIZE iconSz = { (LONG)(48 * dpiScale.cx), (LONG)(48 * dpiScale.cy) };
-
- m_TitleFont.Apply(m_hWnd, CWindowFont::typeBold | CWindowFont::typeHeading, IDC_ABOUT_TITLE);
- m_AboutIcon.SubclassWindow(GetDlgItem(IDC_ABOUT_ICON));
- if (dpiScale.cx > 1.0 || dpiScale.cy > 1.0) {
- m_AboutIcon.SetIcon(MAKEINTRESOURCE(IDI_APPICON), 256, 256); //load hi-def icon
- }
- else {
- m_AboutIcon.SetIcon(MAKEINTRESOURCE(IDI_APPICON), 48, 48); //load regular icon
- }
- m_AboutIcon.SetWindowPos(HWND_TOP, 0, 0, iconSz.cx, iconSz.cy, SWP_NOMOVE | SWP_NOZORDER);
-
- m_Tabs.Attach(GetDlgItem(IDC_TABS));
- AddTab(wGS(ABOUT_TAB_ABOUT).c_str(), new CAboutTab(IDD_TAB_ABOUT));
- AddTab(wGS(ABOUT_TAB_CONTRIBUTORS).c_str(), new CAboutContributersTab);
- AddTab(wGS(ABOUT_TAB_FUNDERS).c_str(), new CAboutFundersTab);
- AddTab(wGS(ABOUT_TAB_CREDITS).c_str(), new CAboutCreditsTab);
- return 0;
-}
-
-CRect CAboutDlg::GetTabRect()
-{
- CRect TabRect;
- m_Tabs.GetWindowRect(&TabRect);
- ScreenToClient(&TabRect);
- m_Tabs.AdjustRect(FALSE, &TabRect);
- return TabRect;
-}
-
-void CAboutDlg::AddTab(const wchar_t * caption, CAboutTab * tab)
-{
- m_Tabs.AddItem(caption);
- tab->Create(m_hWnd, 0);
- tab->SetWindowPos(m_hWnd, 0, 0, 0, 0, SWP_HIDEWINDOW);
- m_TabWindows.push_back(tab);
-
- if (m_TabWindows.size() == 1)
- {
- ShowTab(0);
- }
-}
-
-void CAboutDlg::ShowTab(int nPage)
-{
- for (size_t i = 0; i < m_TabWindows.size(); i++)
- {
- m_TabWindows[i]->ShowWindow(SW_HIDE);
- }
-
- CRect TabRect = GetTabRect();
- m_TabWindows[nPage]->SetWindowPos(HWND_TOP, TabRect.left, TabRect.top, TabRect.Width(), TabRect.Height(), SWP_SHOWWINDOW);
-
- CRect WinRect, ClientRect;
- m_TabWindows[nPage]->GetWindowRect(WinRect);
- m_TabWindows[nPage]->GetClientRect(ClientRect);
-
- m_Tabs.RedrawWindow();
-}
-
-LRESULT CAboutDlg::OnTabChange(NMHDR* /*pNMHDR*/)
-{
- ShowTab(m_Tabs.GetCurSel());
- return FALSE;
-}
-
-LRESULT CAboutDlg::OnOK(WORD /*wNotifyCode*/, WORD wID, HWND /*hWndCtl*/, BOOL& /*bHandled*/)
-{
- EndDialog(wID);
- return 0;
-}
-
-LRESULT CAboutDlg::OnCancel(WORD /*wNotifyCode*/, WORD wID, HWND /*hWndCtl*/, BOOL& /*bHandled*/)
-{
- EndDialog(wID);
- return 0;
-}
\ No newline at end of file
diff --git a/src/GLideNUI-wtl/About.h b/src/GLideNUI-wtl/About.h
deleted file mode 100644
index 9274a883..00000000
--- a/src/GLideNUI-wtl/About.h
+++ /dev/null
@@ -1,60 +0,0 @@
-#pragma once
-#include "wtl.h"
-#include "wtl-WindowFont.h"
-#include "wtl-BitmapPicture.h"
-#include "resource.h"
-#include
-
-
-class CAboutTab :
- public CDialogImpl
-{
-public:
- CAboutTab(uint32_t _IDD);
- virtual ~CAboutTab();
-
- BEGIN_MSG_MAP(CAboutTab)
- MSG_WM_INITDIALOG(OnInitDialog)
- MESSAGE_HANDLER(WM_CTLCOLORDLG, OnColorStatic)
- MESSAGE_HANDLER(WM_CTLCOLORSTATIC, OnColorStatic)
- END_MSG_MAP()
-
- uint32_t IDD;
-
-protected:
- BOOL OnInitDialog(CWindow wndFocus, LPARAM lInitParam);
- LRESULT OnColorStatic(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled);
-
- CWindowFont m_SubtitleFont;
-};
-
-class CAboutDlg :
- public CDialogImpl
-{
-public:
- ~CAboutDlg();
-
- enum { IDD = IDD_ABOUT };
-
- BEGIN_MSG_MAP_EX(CAboutDlg)
- MESSAGE_HANDLER(WM_INITDIALOG, OnInitDialog)
- COMMAND_ID_HANDLER(IDOK, OnOK)
- COMMAND_ID_HANDLER(IDCANCEL, OnCancel)
- NOTIFY_HANDLER_EX(IDC_TABS, TCN_SELCHANGE, OnTabChange)
- END_MSG_MAP()
-
-protected:
- LRESULT OnInitDialog(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled);
- LRESULT OnOK(WORD wNotifyCode, WORD wID, HWND hWndCtl, BOOL& bHandled);
- LRESULT OnCancel(WORD wNotifyCode, WORD wID, HWND hWndCtl, BOOL& bHandled);
- LRESULT OnTabChange(NMHDR* pNMHDR);
-
- void AddTab(const wchar_t * caption, CAboutTab *);
- void ShowTab(int nPage);
- CRect GetTabRect();
-
- CWindowFont m_TitleFont;
- CBitmapPicture m_AboutIcon;
- CTabCtrl m_Tabs;
- std::vector m_TabWindows;
-};
\ No newline at end of file
diff --git a/src/GLideNUI-wtl/ConfigDlg.cpp b/src/GLideNUI-wtl/ConfigDlg.cpp
deleted file mode 100644
index 87496e4a..00000000
--- a/src/GLideNUI-wtl/ConfigDlg.cpp
+++ /dev/null
@@ -1,450 +0,0 @@
-#pragma once
-#include "wtl.h"
-#include "ConfigDlg.h"
-#include "../Config.h"
-#include "Settings.h"
-#include "config-video.h"
-#include "config-emulation.h"
-#include "config-framebuffer.h"
-#include "config-texture.h"
-#include "config-osd.h"
-#include "config-debug.h"
-#include "util/util.h"
-#include "InputDialog.h"
-#include "Language.h"
-
-CConfigDlg::CConfigDlg() :
- m_blockReInit(false),
- m_EmulationTab(NULL),
- m_Saved(false),
- m_TabLeft(0),
- m_ProfileLeft(0)
-{
-}
-
-CConfigDlg::~CConfigDlg() {
- m_EmulationTab = NULL;
- for (size_t i = 0; i < m_TabWindows.size(); i++)
- delete m_TabWindows[i];
- m_TabWindows.clear();
-}
-
-void CConfigDlg::setIniPath(const std::string & IniPath) {
- m_strIniPath = IniPath;
-}
-
-void CConfigDlg::setRomName(const char * RomName) {
- m_romName = RomName == NULL || strlen(RomName) == 0 ? NULL : RomName;
-}
-
-void CConfigDlg::setMSAALevel(uint32_t _maxMSAALevel) {
- m_maxMSAALevel = _maxMSAALevel;
-}
-
-uint32_t CConfigDlg::getMSAALevel() const {
- return m_maxMSAALevel;
-}
-
-void CConfigDlg::setMaxAnisotropy(uint32_t _maxAnisotropy)
-{
- m_maxAnisotropy = _maxAnisotropy;
-}
-
-uint32_t CConfigDlg::getMaxAnisotropy() const
-{
- return m_maxAnisotropy;
-}
-
-LRESULT CConfigDlg::OnInitDialog(UINT /*uMsg*/, WPARAM /*wParam*/, LPARAM /*lParam*/, BOOL& /*bHandled*/) {
- HICON hIcon = AtlLoadIconImage(IDI_APPICON, LR_DEFAULTCOLOR, ::GetSystemMetrics(SM_CXICON), ::GetSystemMetrics(SM_CYICON));
- SetIcon(hIcon, TRUE);
- HICON hIconSmall = AtlLoadIconImage(IDI_APPICON, LR_DEFAULTCOLOR, ::GetSystemMetrics(SM_CXSMICON), ::GetSystemMetrics(SM_CYSMICON));
- SetIcon(hIconSmall, FALSE);
-
- m_FrameBufferTab = new CFrameBufferTab();
- m_VideoTab = new CVideoTab(*this, *m_FrameBufferTab, m_strIniPath.c_str());
- m_EmulationTab = new CEmulationTab(*this);
- m_OsdTab = new COsdTab();
-
- m_Tabs.Attach(GetDlgItem(IDC_TABS));
- AddTab(TAB_VIDEO, m_VideoTab);
- AddTab(TAB_EMULATION, m_EmulationTab);
- AddTab(TAB_FRAME_BUFFER, m_FrameBufferTab);
- AddTab(TAB_TEXTURE_ENHANCEMENT, new CTextureEnhancementTab);
- AddTab(TAB_OSD, m_OsdTab);
-#ifdef DEBUG_DUMP
- AddTab(TAB_DEBUG, new CDebugTab);
-#endif
-
- RECT Rect;
- GetDlgItem(IDC_TABS).GetWindowRect(&Rect);
- ::MapWindowPoints(NULL, m_hWnd, (LPPOINT)&Rect, 2);
- m_TabLeft = Rect.left;
-
- if (m_romName != NULL) {
- std::wstring RomName(ToUTF16(m_romName));
- CWindow dlgItem = GetDlgItem(IDC_GAME_PROFILE_NAME);
- CDC dc;
- dc.CreateCompatibleDC(NULL);
- dc.SelectFont(dlgItem.GetFont());
- SIZE size;
- dc.GetTextExtent(RomName.c_str(), static_cast(RomName.length()), &size);
-
- RECT Rect;
- dlgItem.GetWindowRect(&Rect);
- ::MapWindowPoints(NULL, m_hWnd, (LPPOINT)&Rect, 2);
- Rect.right = Rect.left + size.cx;
- dlgItem.MoveWindow(&Rect);
- dlgItem.SetWindowText(RomName.c_str());
-
- m_ProfileLeft = Rect.right + 10;
-
- CButton(GetDlgItem(IDC_GAME_PROFILE)).SetCheck(BST_CHECKED);
- CButton(GetDlgItem(IDC_USE_PROFILE)).SetCheck(BST_UNCHECKED);
- } else {
- CButton(GetDlgItem(IDC_GAME_PROFILE)).SetCheck(BST_UNCHECKED);
- CButton(GetDlgItem(IDC_USE_PROFILE)).SetCheck(BST_CHECKED);
- GetDlgItem(IDC_SETTINGS_PROFILE_STATIC).GetWindowRect(&Rect);
- ::MapWindowPoints(NULL, m_hWnd, (LPPOINT)&Rect, 2);
- m_ProfileLeft = Rect.left;
- }
-
- ProfileList Profiles = getProfiles(m_strIniPath.c_str());
- std::string CurrentProfile = getCurrentProfile(m_strIniPath.c_str());
- CComboBox profilesComboBox(GetDlgItem(IDC_PROFILE));
- profilesComboBox.ResetContent();
- for (ProfileList::const_iterator itr = Profiles.begin(); itr != Profiles.end(); itr++) {
- int Index = profilesComboBox.AddString(ToUTF16(itr->c_str()).c_str());
- if (CurrentProfile == *itr)
- profilesComboBox.SetCurSel(Index);
- }
- profilesComboBox.AddString(L"New...");
- GetDlgItem(IDC_REMOVE_PROFILE).EnableWindow(profilesComboBox.GetCount() > 2);
- Init();
- return 0;
-}
-
-void CConfigDlg::OnCustomSettingsToggled(bool checked) {
- if (m_hWnd == NULL)
- return;
-
- checked = m_romName != NULL ? checked : false;
- GetDlgItem(IDC_GAME_PROFILE).ShowWindow(checked ? SW_SHOWNORMAL : SW_HIDE);
- GetDlgItem(IDC_SAVE_SETTINGS_STATIC).ShowWindow(checked ? SW_SHOWNORMAL : SW_HIDE);
- GetDlgItem(IDC_GAME_PROFILE_NAME).ShowWindow(checked ? SW_SHOWNORMAL : SW_HIDE);
- GetDlgItem(IDC_USE_PROFILE).ShowWindow(checked ? SW_SHOWNORMAL : SW_HIDE);
-
- int32_t Move = 0;
- if (checked) {
- RECT Rect;
- CWindow UseProfile = GetDlgItem(IDC_USE_PROFILE);
- UseProfile.GetWindowRect(&Rect);
- ::MapWindowPoints(NULL, m_hWnd, (LPPOINT)&Rect, 2);
- Move = Rect.left - m_ProfileLeft;
- if (Move != 0) {
- Rect.left -= Move;
- Rect.right -= Move;
- UseProfile.MoveWindow(&Rect);
- }
- uint32_t Left = Rect.right + 2;
-
- CWindow ProfileStatic = GetDlgItem(IDC_SETTINGS_PROFILE_STATIC);
- ProfileStatic.GetWindowRect(&Rect);
- ::MapWindowPoints(NULL, m_hWnd, (LPPOINT)&Rect, 2);
- Move = Rect.left - Left;
- } else {
- RECT Rect;
- GetDlgItem(IDC_SETTINGS_PROFILE_STATIC).GetWindowRect(&Rect);
- ::MapWindowPoints(NULL, m_hWnd, (LPPOINT)&Rect, 2);
-
- Move = Rect.left - m_TabLeft;
- }
- if (Move != 0) {
- int nID[] = {
- IDC_SETTINGS_PROFILE_STATIC,
- IDC_PROFILE,
- IDC_REMOVE_PROFILE,
- };
-
- RECT Rect;
- GetDlgItem(nID[0]).GetWindowRect(&Rect);
- ::MapWindowPoints(NULL, m_hWnd, (LPPOINT)&Rect, 2);
-
- for (size_t i = 0, n = sizeof(nID) / sizeof(nID[0]); i < n; i++) {
- CWindow window = GetDlgItem(nID[i]);
- window.GetWindowRect(&Rect);
- ::MapWindowPoints(NULL, m_hWnd, (LPPOINT)&Rect, 2);
-
- Rect.left -= Move;
- Rect.right -= Move;
- window.MoveWindow(&Rect);
- }
- }
-}
-
-LRESULT CConfigDlg::OnProfileChanged(WORD /*wNotifyCode*/, WORD /*wID*/, HWND /*hwnd*/, BOOL& /*bHandled*/) {
- CComboBox profilesComboBox(GetDlgItem(IDC_PROFILE));
- int nIndex = profilesComboBox.GetCurSel();
- if (nIndex < 0) { return 0; }
-
- int nLen = profilesComboBox.GetLBTextLen(nIndex);
- if (nLen == CB_ERR) { return FALSE; }
-
- std::wstring Profile;
- Profile.resize(nLen);
- profilesComboBox.GetLBText(nIndex, (wchar_t *)Profile.data());
-
- CButton(GetDlgItem(IDC_USE_PROFILE)).SetCheck(BST_CHECKED);
- CButton(GetDlgItem(IDC_GAME_PROFILE)).SetCheck(BST_UNCHECKED);
- if (Profile == L"New...") {
- bool ok;
- std::string switchToProfile = getCurrentProfile(m_strIniPath.c_str());
- std::string newProfile = FromUTF16(CInputDialog::getText(L"New Profile", L"New profile name:", ok).c_str());
- CComboBox profilesComboBox(GetDlgItem(IDC_PROFILE));
- if (ok) {
- ProfileList Profiles = getProfiles(m_strIniPath.c_str());
- if (strcmp(newProfile.c_str(), "New...") == 0) {
- MessageBox(L"New settings profiles cannot be called \"New...\".", L"New Profile", MB_OK | MB_ICONWARNING);
- }
- else if (newProfile.empty()) {
- MessageBox(L"Please type a name for your new settings profile.", L"New Profile", MB_OK | MB_ICONWARNING);
- }
- else if (Profiles.find(newProfile.c_str()) != Profiles.end()) {
- MessageBox(L"This settings profile already exists.", L"New Profile", MB_OK | MB_ICONWARNING);
- } else {
- profilesComboBox.AddString(ToUTF16(newProfile.c_str()).c_str());
- addProfile(m_strIniPath.c_str(), newProfile.c_str());
- GetDlgItem(IDC_REMOVE_PROFILE).EnableWindow(profilesComboBox.GetCount() > 2);
- switchToProfile = newProfile;
- }
- }
- for (int i = 0, n = profilesComboBox.GetCount(); i < n; ++i) {
- std::wstring Profile;
- Profile.resize(profilesComboBox.GetLBTextLen(i) + 1);
- profilesComboBox.GetLBText(i, (wchar_t *)Profile.data());
-
- if (strcmp(FromUTF16(Profile.c_str()).c_str(),switchToProfile.c_str()) == 0) {
- profilesComboBox.SetCurSel(i);
- break;
- }
- }
- return 0;
- }
- changeProfile(m_strIniPath.c_str(), FromUTF16(Profile.c_str()).c_str());
- Init(true);
- return 0;
-}
-
-void CConfigDlg::SaveSettings() {
- m_Saved = true;
- for (size_t i = 0; i < m_TabWindows.size(); i++)
- m_TabWindows[i]->SaveSettings();
-
- if (config.generalEmulation.enableCustomSettings && CButton(GetDlgItem(IDC_GAME_PROFILE)).GetCheck() == BST_CHECKED && m_romName != nullptr)
- saveCustomRomSettings(m_strIniPath.c_str(), m_romName);
- else
- writeSettings(m_strIniPath.c_str());
- Init(true);
-}
-
-LRESULT CConfigDlg::OnRestoreDefaults(WORD /*wNotifyCode*/, WORD /*wID*/, HWND /*hWndCtl*/, BOOL& /*bHandled*/) {
- int Res = MessageBox(L"Are you sure you want to reset all settings to default?", L"Restore Defaults?", MB_YESNO | MB_ICONWARNING);
- if (Res == IDYES) {
- const u32 enableCustomSettings = config.generalEmulation.enableCustomSettings;
- config.resetToDefaults();
- config.generalEmulation.enableCustomSettings = enableCustomSettings;
- setRomName(m_romName);
- Init();
- }
- return 0;
-}
-
-LRESULT CConfigDlg::OnGameProfile(UINT /*Code*/, int /*id*/, HWND /*ctl*/) {
- CButton(GetDlgItem(IDC_USE_PROFILE)).SetCheck(BST_UNCHECKED);
- Init(true, true);
- return 0;
-}
-
-LRESULT CConfigDlg::OnUseProfile(UINT /*Code*/, int /*id*/, HWND /*ctl*/) {
- CButton(GetDlgItem(IDC_GAME_PROFILE)).SetCheck(BST_UNCHECKED);
- Init(true, true);
- return 0;
-}
-
-LRESULT CConfigDlg::OnRemoveProfile(WORD /*wNotifyCode*/, WORD /*wID*/, HWND /*hWndCtl*/, BOOL& /*bHandled*/) {
- CComboBox profilesComboBox(GetDlgItem(IDC_PROFILE));
- if (profilesComboBox.GetCount() <= 2)
- return 0;
-
- int nIndex = profilesComboBox.GetCurSel();
- std::wstring profile;
- profile.resize(profilesComboBox.GetLBTextLen(nIndex) + 1);
- profilesComboBox.GetLBText(nIndex, (wchar_t *)profile.data());
-
- ProfileList Profiles = getProfiles(m_strIniPath.c_str());
- if (Profiles.find(FromUTF16(profile.c_str()).c_str()) == Profiles.end())
- return 0;
-
- std::wstring msg = L"Are you sure you want to remove the settings profile \"";
- msg += profile.c_str();
- msg += L"\"?";
- if (MessageBox(msg.c_str(), L"Remove Profile", MB_YESNO | MB_ICONWARNING) == IDYES) {
- removeProfile(m_strIniPath.c_str(), FromUTF16(profile.c_str()).c_str());
- for (int i = 0, n = profilesComboBox.GetCount(); i < n; ++i) {
- std::wstring ProfileItem;
- ProfileItem.resize(profilesComboBox.GetLBTextLen(i) + 1);
- profilesComboBox.GetLBText(i, (wchar_t *)ProfileItem.data());
-
- if (wcscmp(ProfileItem.c_str(),profile.c_str()) == 0) {
- profilesComboBox.DeleteString(i);
- break;
- }
- }
- for (int i = 0, n = profilesComboBox.GetCount(); i < n; ++i) {
- std::wstring ProfileItem;
- ProfileItem.resize(profilesComboBox.GetLBTextLen(i) + 1);
- profilesComboBox.GetLBText(i, (wchar_t *)ProfileItem.data());
- if (wcscmp(ProfileItem.c_str(),L"New...") != 0) {
- profilesComboBox.SetCurSel(i);
- changeProfile(m_strIniPath.c_str(), FromUTF16(ProfileItem.c_str()).c_str());
- Init(true);
- break;
- }
- }
- GetDlgItem(IDC_REMOVE_PROFILE).EnableWindow(profilesComboBox.GetCount() > 2);
- }
- return 0;
-}
-
-LRESULT CConfigDlg::OnSaveClose(WORD /*wNotifyCode*/, WORD wID, HWND /*hWndCtl*/, BOOL& /*bHandled*/) {
- SaveSettings();
- EndDialog(wID);
- return 0;
-}
-
-LRESULT CConfigDlg::OnSave(WORD /*wNotifyCode*/, WORD /*wID*/, HWND /*hWndCtl*/, BOOL& /*bHandled*/) {
- SaveSettings();
- return 0;
-}
-
-LRESULT CConfigDlg::OnTabChange(NMHDR* /*pNMHDR*/) {
- ShowTab(m_Tabs.GetCurSel());
- return FALSE;
-}
-
-LRESULT CConfigDlg::OnCancel(WORD /*wNotifyCode*/, WORD wID, HWND /*hWndCtl*/, BOOL& /*bHandled*/) {
- EndDialog(wID);
- return 0;
-}
-
-void CConfigDlg::Init(bool reInit, bool blockCustomSettings) {
- if (m_blockReInit)
- return;
-
- m_blockReInit = true;
- bool CustomSettings = m_EmulationTab != NULL && CButton(m_EmulationTab->GetDlgItem(IDC_CHK_USE_PER_GAME)).GetCheck() == BST_CHECKED;
-
- if (reInit && m_romName != NULL && CustomSettings && CButton(GetDlgItem(IDC_GAME_PROFILE)).GetCheck() == BST_CHECKED) {
- loadCustomRomSettings(m_strIniPath.c_str(), m_romName);
- } else if (reInit) {
- loadSettings(m_strIniPath.c_str());
- }
-
- for (size_t i = 0; i < m_TabWindows.size(); i++)
- m_TabWindows[i]->LoadSettings(blockCustomSettings);
-
- for (size_t i = 0; i < m_TabWindows.size(); i++)
- m_TabWindows[i]->ApplyLanguage();
- ApplyLanguage();
- m_blockReInit = false;
-}
-
-CRect CConfigDlg::GetTabRect() {
- CRect TabRect;
- m_Tabs.GetWindowRect(&TabRect);
- ScreenToClient(&TabRect);
- m_Tabs.AdjustRect(FALSE, &TabRect);
- return TabRect;
-}
-
-void CConfigDlg::AddTab(languageStringID caption, CConfigTab * tab) {
- m_Tabs.AddItem(TCIF_TEXT | TCIF_PARAM, wGS(caption).c_str(), 0, caption);
- tab->Create(m_hWnd, 0);
- tab->SetWindowPos(m_hWnd, 0, 0, 0, 0, SWP_HIDEWINDOW);
- m_TabWindows.push_back(tab);
-
- if (m_TabWindows.size() == 1)
- ShowTab(0);
-}
-
-void CConfigDlg::ShowTab(int nPage) {
- if (nPage == 4 && !m_OsdTab->m_FontsLoaded) { // OSD tab
- m_OsdTab->LoadFonts();
- }
-
- for (size_t i = 0; i < m_TabWindows.size(); i++)
- m_TabWindows[i]->ShowWindow(SW_HIDE);
-
- CRect TabRect = GetTabRect();
- m_TabWindows[nPage]->SetWindowPos(HWND_TOP, TabRect.left, TabRect.top, TabRect.Width(), TabRect.Height(), SWP_SHOWWINDOW);
-
- CRect WinRect, ClientRect;
- m_TabWindows[nPage]->GetWindowRect(WinRect);
- m_TabWindows[nPage]->GetClientRect(ClientRect);
-
- m_Tabs.RedrawWindow();
-}
-
-void CConfigDlg::SetLanguage(const std::string & language) {
- LoadCurrentStrings(m_strIniPath.c_str(), language);
- for (int i = 0, n = m_Tabs.GetItemCount(); i < n; i++) {
- TCITEM tci = { 0 };
- tci.mask = TCIF_PARAM;
- m_Tabs.GetItem(i, &tci);
- if (tci.lParam != 0) {
- tci.mask = TCIF_TEXT;
- std::wstring caption = wGS((languageStringID)tci.lParam);
- tci.pszText = (LPWSTR)caption.c_str();
- m_Tabs.SetItem(i, &tci);
- }
- }
- for (size_t i = 0; i < m_TabWindows.size(); i++)
- m_TabWindows[i]->ApplyLanguage();
- ApplyLanguage();
-}
-
-void CConfigDlg::ApplyLanguage(void)
-{
- SetDlgItemTextW(IDC_SAVE_SETTINGS_STATIC, wGS(CFG_SAVE_SETTINGS_FOR).c_str());
- SetDlgItemTextW(IDC_SETTINGS_PROFILE_STATIC, wGS(CFG_SETTINGS_PROFILE).c_str());
- SetDlgItemTextW(IDC_REMOVE_PROFILE, wGS(CFG_REMOVE).c_str());
- SetDlgItemTextW(ID_RESTORE_DEFAULTS, wGS(CFG_RESTORE_DEFAULTS).c_str());
- SetDlgItemTextW(ID_SAVECLOSE, wGS(CFG_SAVE_AND_CLOSE).c_str());
- SetDlgItemTextW(ID_SAVE, wGS(CFG_SAVE).c_str());
- SetDlgItemTextW(IDCANCEL, wGS(CFG_CLOSE).c_str());
-}
-
-class GlideN64WtlModule :
- public CAppModule
-{
-public:
- GlideN64WtlModule(HINSTANCE hinst) {
- Init(NULL, hinst);
- }
- virtual ~GlideN64WtlModule(void) {
- Term();
- }
-};
-
-GlideN64WtlModule * WtlModule = NULL;
-
-void ConfigInit(void * hinst) {
- WtlModule = new GlideN64WtlModule((HINSTANCE)hinst);
-}
-
-void ConfigCleanup(void) {
- if (WtlModule) {
- delete WtlModule;
- WtlModule = NULL;
- }
-}
diff --git a/src/GLideNUI-wtl/ConfigDlg.h b/src/GLideNUI-wtl/ConfigDlg.h
deleted file mode 100644
index 7f401573..00000000
--- a/src/GLideNUI-wtl/ConfigDlg.h
+++ /dev/null
@@ -1,83 +0,0 @@
-#pragma once
-#include
-#include "wtl.h"
-#include "config-tab.h"
-#include "language.h"
-#include "resource.h"
-#include
-
-class CFrameBufferTab;
-class CVideoTab;
-class CEmulationTab;
-class COsdTab;
-
-class CConfigDlg :
- public CDialogImpl
-{
-public:
- CConfigDlg();
- ~CConfigDlg();
-
- enum { IDD = IDD_CONFIG };
-
- BEGIN_MSG_MAP_EX(CConfigDlg)
- MESSAGE_HANDLER(WM_INITDIALOG, OnInitDialog)
- NOTIFY_HANDLER_EX(IDC_TABS, TCN_SELCHANGE, OnTabChange)
- COMMAND_HANDLER(IDC_PROFILE, CBN_SELCHANGE, OnProfileChanged)
- COMMAND_HANDLER_EX(IDC_GAME_PROFILE, BN_CLICKED, OnGameProfile)
- COMMAND_HANDLER_EX(IDC_USE_PROFILE, BN_CLICKED, OnUseProfile)
- COMMAND_ID_HANDLER(IDC_REMOVE_PROFILE, OnRemoveProfile)
- COMMAND_ID_HANDLER(ID_RESTORE_DEFAULTS, OnRestoreDefaults)
- COMMAND_ID_HANDLER(ID_SAVECLOSE, OnSaveClose)
- COMMAND_ID_HANDLER(ID_SAVE, OnSave)
- COMMAND_ID_HANDLER(IDCANCEL, OnCancel)
- END_MSG_MAP()
-
- void setIniPath(const std::string & IniPath);
- void setRomName(const char * RomName);
- void setMSAALevel(uint32_t _maxMSAALevel);
- uint32_t getMSAALevel() const;
- void setMaxAnisotropy(uint32_t _maxAnisotropy);
- uint32_t getMaxAnisotropy() const;
- bool Saved(void) const { return m_Saved; }
- void OnCustomSettingsToggled(bool checked);
- void SetLanguage(const std::string & language);
-
-protected:
- LRESULT OnInitDialog(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled);
- LRESULT OnRemoveProfile(WORD wNotifyCode, WORD wID, HWND hWndCtl, BOOL& bHandled);
- LRESULT OnRestoreDefaults(WORD wNotifyCode, WORD wID, HWND hWndCtl, BOOL& bHandled);
- LRESULT OnSaveClose(WORD wNotifyCode, WORD wID, HWND hWndCtl, BOOL& bHandled);
- LRESULT OnSave(WORD wNotifyCode, WORD wID, HWND hWndCtl, BOOL& bHandled);
- LRESULT OnCancel(WORD wNotifyCode, WORD wID, HWND hWndCtl, BOOL& bHandled);
- LRESULT OnTabChange(NMHDR* pNMHDR);
- LRESULT OnProfileChanged(WORD wNotifyCode, WORD wID, HWND hwnd, BOOL& bHandled);
- LRESULT OnGameProfile(UINT /*Code*/, int id, HWND /*ctl*/);
- LRESULT OnUseProfile(UINT /*Code*/, int id, HWND /*ctl*/);
-
- void Init(bool reInit = false, bool blockCustomSettings = false);
- void AddTab(languageStringID StringID, CConfigTab * tab);
- void ShowTab(int nPage);
- CRect GetTabRect();
- void SaveSettings();
- void ApplyLanguage();
-
- CTabCtrl m_Tabs;
- std::vector m_TabWindows;
- std::string m_strIniPath;
- const char * m_romName;
- uint32_t m_maxMSAALevel;
- uint32_t m_maxAnisotropy;
- bool m_blockReInit;
- CFrameBufferTab * m_FrameBufferTab;
- CVideoTab * m_VideoTab;
- CEmulationTab * m_EmulationTab;
- COsdTab * m_OsdTab;
- uint32_t m_TabLeft, m_ProfileLeft;
- bool m_Saved;
-};
-
-#ifdef _WIN32
-void ConfigInit(void * hinst);
-void ConfigCleanup(void);
-#endif
\ No newline at end of file
diff --git a/src/GLideNUI-wtl/FontInfo.cpp b/src/GLideNUI-wtl/FontInfo.cpp
deleted file mode 100644
index 9388c5b2..00000000
--- a/src/GLideNUI-wtl/FontInfo.cpp
+++ /dev/null
@@ -1,166 +0,0 @@
-#include "FontInfo.h"
-#include "FileClass.h"
-#include
-#include
-#include
-#include
-#include
-
-#pragma warning(disable:4996)
-
-typedef struct _tagTT_OFFSET_TABLE
-{
- uint16_t uMajorVersion;
- uint16_t uMinorVersion;
- uint16_t uNumOfTables;
- uint16_t uSearchRange;
- uint16_t uEntrySelector;
- uint16_t uRangeShift;
-} TT_OFFSET_TABLE;
-
-typedef struct _tagTT_TABLE_DIRECTORY
-{
- char szTag[4]; //table name
- uint32_t uCheckSum; //Check sum
- uint32_t uOffset; //Offset from beginning of file
- uint32_t uLength; //length of the table in bytes
-} TT_TABLE_DIRECTORY;
-
-typedef struct _tagTT_NAME_TABLE_HEADER
-{
- uint16_t uFSelector; //format selector. Always 0
- uint16_t uNRCount; //Name Records count
- uint16_t uStorageOffset; //Offset for strings storage, from start of the table
-} TT_NAME_TABLE_HEADER;
-
-typedef struct _tagTT_NAME_RECORD
-{
- uint16_t uPlatformID;
- uint16_t uEncodingID;
- uint16_t uLanguageID;
- uint16_t uNameID;
- uint16_t uStringLength;
- uint16_t uStringOffset; //from start of storage area
-} TT_NAME_RECORD;
-
-#define SWAPWORD(x) MAKEWORD(HIBYTE(x), LOBYTE(x))
-#define SWAPLONG(x) MAKELONG(SWAPWORD(HIWORD(x)), SWAPWORD(LOWORD(x)))
-
-std::string GetFontNameFromFile(const char * FontFilePath)
-{
- CFile f;
-
- if (!f.Open(FontFilePath, CFile::modeRead | CFile::shareDenyWrite))
- {
- return std::string("");
- }
- TT_OFFSET_TABLE ttOffsetTable;
- f.Read(&ttOffsetTable, sizeof(TT_OFFSET_TABLE));
- ttOffsetTable.uNumOfTables = SWAPWORD(ttOffsetTable.uNumOfTables);
- ttOffsetTable.uMajorVersion = SWAPWORD(ttOffsetTable.uMajorVersion);
- ttOffsetTable.uMinorVersion = SWAPWORD(ttOffsetTable.uMinorVersion);
-
- //check is this is a true type font and the version is 1.0
- if (ttOffsetTable.uMajorVersion != 1 || ttOffsetTable.uMinorVersion != 0)
- {
- return std::string("");
- }
-
- TT_TABLE_DIRECTORY tblDir;
- bool bFound = false;
- for (int i = 0; i< ttOffsetTable.uNumOfTables; i++)
- {
- f.Read(&tblDir, sizeof(TT_TABLE_DIRECTORY));
- if (_strnicmp(tblDir.szTag, "name", 4) == 0)
- {
- bFound = true;
- tblDir.uLength = SWAPLONG(tblDir.uLength);
- tblDir.uOffset = SWAPLONG(tblDir.uOffset);
- break;
- }
- }
-
- std::string res;
- if (bFound)
- {
- f.Seek(tblDir.uOffset, CFile::begin);
- TT_NAME_TABLE_HEADER ttNTHeader;
- f.Read(&ttNTHeader, sizeof(TT_NAME_TABLE_HEADER));
- ttNTHeader.uNRCount = SWAPWORD(ttNTHeader.uNRCount);
- ttNTHeader.uStorageOffset = SWAPWORD(ttNTHeader.uStorageOffset);
- TT_NAME_RECORD ttRecord;
- bFound = false;
-
- for (int i = 0; i NameBuf;
- NameBuf.resize(ttRecord.uStringLength + 1);
- memset(NameBuf.data(), 0, ttRecord.uStringLength + 1);
- f.Read(NameBuf.data(), ttRecord.uStringLength);
- if (NameBuf[0] != '\0')
- {
- res = NameBuf.data();
- break;
- }
- f.Seek(nPos, CFile::begin);
- }
- }
- }
- f.Close();
- return res;
-}
-
-std::string GetFontFolder()
-{
- char szFontPath[MAX_PATH];
- if (SUCCEEDED(SHGetFolderPathA(NULL, CSIDL_FONTS, NULL, 0, szFontPath)))
- {
- return szFontPath;
- }
- return "";
-}
-
-FontList GetFontFiles()
-{
- std::string FontFolder = GetFontFolder();
- FontList fonts;
-
- if (FontFolder.length() > 0)
- {
- std::string SearchQuery = FontFolder;
- SearchQuery += "\\*.ttf";
-
- WIN32_FIND_DATAA FindData;
- HANDLE hFind = FindFirstFileA(SearchQuery.c_str(), &FindData);
- if (hFind != INVALID_HANDLE_VALUE)
- {
- do
- {
- std::string FontFile = FontFolder;
- FontFile += "\\";
- FontFile += FindData.cFileName;
- std::string FontName = GetFontNameFromFile(FontFile.c_str());
- if (FontName.length() > 0)
- {
- fonts.insert(FontList::value_type(FindData.cFileName, FontName));
- }
- } while (FindNextFileA(hFind, &FindData));
- FindClose(hFind);
- }
- }
-
- if (fonts.size() == 0)
- {
- fonts.insert(FontList::value_type("arial.ttf", "Arial"));
- }
- return fonts;
-}
diff --git a/src/GLideNUI-wtl/FontInfo.h b/src/GLideNUI-wtl/FontInfo.h
deleted file mode 100644
index 2079dca1..00000000
--- a/src/GLideNUI-wtl/FontInfo.h
+++ /dev/null
@@ -1,10 +0,0 @@
-#pragma once
-#include
-#include