diff --git a/.gitignore b/.gitignore
index aed6d423f..ee2b36c4a 100644
--- a/.gitignore
+++ b/.gitignore
@@ -129,3 +129,5 @@ Thumbs.db
/Source/Project64-input/Version.h
/Source/Project64-video/Version.h
/Source/Project64-rsp-core/Version.h
+/Plugin/Win32/GFX/GLideN64
+/Plugin/x64/GFX/GLideN64
diff --git a/Project64.sln b/Project64.sln
index 0ed4cc0ba..4480fc0e0 100644
--- a/Project64.sln
+++ b/Project64.sln
@@ -60,6 +60,7 @@ EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Project64", "Source\Project64\Project64.vcxproj", "{7E534C8E-1ACE-4A88-8807-39A11ED4DA18}"
ProjectSection(ProjectDependencies) = postProject
{A7ED562C-63F3-4B7E-B6B3-2CF7848752E1} = {A7ED562C-63F3-4B7E-B6B3-2CF7848752E1}
+ {37D31D7F-C4E7-45B0-AEF6-D6824A243CF7} = {37D31D7F-C4E7-45B0-AEF6-D6824A243CF7}
{D3F979CE-8FA7-48C9-A2B3-A33594B48536} = {D3F979CE-8FA7-48C9-A2B3-A33594B48536}
EndProjectSection
EndProject
@@ -78,6 +79,23 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Project64-rsp-core", "Sourc
{1968162C-0793-491D-91A1-81645A24D399} = {1968162C-0793-491D-91A1-81645A24D399}
EndProjectSection
EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "GlideN64", "GlideN64", "{31AE6C95-A997-4C7C-B592-BC202A29996F}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "GLideNUI-wtl", "Source\GLideN64\GLideNUI-wtl.vcxproj", "{9E05B70F-A294-44A9-A151-B2CC95AA884E}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "GLideN64", "Source\GLideN64\GLideN64.vcxproj", "{37D31D7F-C4E7-45B0-AEF6-D6824A243CF7}"
+ ProjectSection(ProjectDependencies) = postProject
+ {5480BC17-9C40-4E41-8AD4-AE12316D4CA4} = {5480BC17-9C40-4E41-8AD4-AE12316D4CA4}
+ EndProjectSection
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "osal", "Source\GLideN64\osal.vcxproj", "{7BF6F100-31DB-44AE-A2A5-5DDEED9A909C}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libGLideNHQ", "Source\GLideN64\libGLideNHQ.vcxproj", "{DA965BCF-2219-47AF-ACE7-EAF76D5D4756}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ticpp", "Source\GLideN64\ticpp.vcxproj", "{4F28B56B-F4B0-41B0-A785-597F6EF0163A}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ts2lang", "Source\GLideN64\ts2lang.vcxproj", "{5480BC17-9C40-4E41-8AD4-AE12316D4CA4}"
+EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Win32 = Debug|Win32
@@ -268,6 +286,54 @@ Global
{7598F6B8-9DA6-4897-B26F-F6865F824BF4}.Release|Win32.Build.0 = Release|Win32
{7598F6B8-9DA6-4897-B26F-F6865F824BF4}.Release|x64.ActiveCfg = Release|x64
{7598F6B8-9DA6-4897-B26F-F6865F824BF4}.Release|x64.Build.0 = Release|x64
+ {9E05B70F-A294-44A9-A151-B2CC95AA884E}.Debug|Win32.ActiveCfg = Debug|Win32
+ {9E05B70F-A294-44A9-A151-B2CC95AA884E}.Debug|Win32.Build.0 = Debug|Win32
+ {9E05B70F-A294-44A9-A151-B2CC95AA884E}.Debug|x64.ActiveCfg = Debug|x64
+ {9E05B70F-A294-44A9-A151-B2CC95AA884E}.Debug|x64.Build.0 = Debug|x64
+ {9E05B70F-A294-44A9-A151-B2CC95AA884E}.Release|Win32.ActiveCfg = Release|Win32
+ {9E05B70F-A294-44A9-A151-B2CC95AA884E}.Release|Win32.Build.0 = Release|Win32
+ {9E05B70F-A294-44A9-A151-B2CC95AA884E}.Release|x64.ActiveCfg = Release|x64
+ {9E05B70F-A294-44A9-A151-B2CC95AA884E}.Release|x64.Build.0 = Release|x64
+ {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}.Debug|x64.ActiveCfg = Debug|x64
+ {37D31D7F-C4E7-45B0-AEF6-D6824A243CF7}.Debug|x64.Build.0 = Debug|x64
+ {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}.Release|x64.ActiveCfg = Release|x64
+ {37D31D7F-C4E7-45B0-AEF6-D6824A243CF7}.Release|x64.Build.0 = Release|x64
+ {7BF6F100-31DB-44AE-A2A5-5DDEED9A909C}.Debug|Win32.ActiveCfg = Debug|Win32
+ {7BF6F100-31DB-44AE-A2A5-5DDEED9A909C}.Debug|Win32.Build.0 = Debug|Win32
+ {7BF6F100-31DB-44AE-A2A5-5DDEED9A909C}.Debug|x64.ActiveCfg = Debug|x64
+ {7BF6F100-31DB-44AE-A2A5-5DDEED9A909C}.Debug|x64.Build.0 = Debug|x64
+ {7BF6F100-31DB-44AE-A2A5-5DDEED9A909C}.Release|Win32.ActiveCfg = Release|Win32
+ {7BF6F100-31DB-44AE-A2A5-5DDEED9A909C}.Release|Win32.Build.0 = Release|Win32
+ {7BF6F100-31DB-44AE-A2A5-5DDEED9A909C}.Release|x64.ActiveCfg = Release|x64
+ {7BF6F100-31DB-44AE-A2A5-5DDEED9A909C}.Release|x64.Build.0 = Release|x64
+ {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}.Debug|x64.ActiveCfg = Debug|x64
+ {DA965BCF-2219-47AF-ACE7-EAF76D5D4756}.Debug|x64.Build.0 = Debug|x64
+ {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}.Release|x64.ActiveCfg = Release|x64
+ {DA965BCF-2219-47AF-ACE7-EAF76D5D4756}.Release|x64.Build.0 = Release|x64
+ {4F28B56B-F4B0-41B0-A785-597F6EF0163A}.Debug|Win32.ActiveCfg = Debug|Win32
+ {4F28B56B-F4B0-41B0-A785-597F6EF0163A}.Debug|Win32.Build.0 = Debug|Win32
+ {4F28B56B-F4B0-41B0-A785-597F6EF0163A}.Debug|x64.ActiveCfg = Debug|x64
+ {4F28B56B-F4B0-41B0-A785-597F6EF0163A}.Debug|x64.Build.0 = Debug|x64
+ {4F28B56B-F4B0-41B0-A785-597F6EF0163A}.Release|Win32.ActiveCfg = Release|Win32
+ {4F28B56B-F4B0-41B0-A785-597F6EF0163A}.Release|Win32.Build.0 = Release|Win32
+ {4F28B56B-F4B0-41B0-A785-597F6EF0163A}.Release|x64.ActiveCfg = Release|x64
+ {4F28B56B-F4B0-41B0-A785-597F6EF0163A}.Release|x64.Build.0 = Release|x64
+ {5480BC17-9C40-4E41-8AD4-AE12316D4CA4}.Debug|Win32.ActiveCfg = Debug|Win32
+ {5480BC17-9C40-4E41-8AD4-AE12316D4CA4}.Debug|Win32.Build.0 = Debug|Win32
+ {5480BC17-9C40-4E41-8AD4-AE12316D4CA4}.Debug|x64.ActiveCfg = Debug|x64
+ {5480BC17-9C40-4E41-8AD4-AE12316D4CA4}.Debug|x64.Build.0 = Debug|x64
+ {5480BC17-9C40-4E41-8AD4-AE12316D4CA4}.Release|Win32.ActiveCfg = Release|Win32
+ {5480BC17-9C40-4E41-8AD4-AE12316D4CA4}.Release|Win32.Build.0 = Release|Win32
+ {5480BC17-9C40-4E41-8AD4-AE12316D4CA4}.Release|x64.ActiveCfg = Release|x64
+ {5480BC17-9C40-4E41-8AD4-AE12316D4CA4}.Release|x64.Build.0 = Release|x64
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
@@ -283,6 +349,12 @@ Global
{E8D9A652-A354-4374-B6C5-A51EE62749FD} = {AA8F7F8E-5377-4911-859D-8A8817B0DB26}
{DCC841B2-298A-40F0-84D1-ACBABD3B86E8} = {AA8F7F8E-5377-4911-859D-8A8817B0DB26}
{A72C9F08-EBB4-443D-9982-DA21AE8B367D} = {AA8F7F8E-5377-4911-859D-8A8817B0DB26}
+ {9E05B70F-A294-44A9-A151-B2CC95AA884E} = {31AE6C95-A997-4C7C-B592-BC202A29996F}
+ {37D31D7F-C4E7-45B0-AEF6-D6824A243CF7} = {31AE6C95-A997-4C7C-B592-BC202A29996F}
+ {7BF6F100-31DB-44AE-A2A5-5DDEED9A909C} = {31AE6C95-A997-4C7C-B592-BC202A29996F}
+ {DA965BCF-2219-47AF-ACE7-EAF76D5D4756} = {31AE6C95-A997-4C7C-B592-BC202A29996F}
+ {4F28B56B-F4B0-41B0-A785-597F6EF0163A} = {31AE6C95-A997-4C7C-B592-BC202A29996F}
+ {5480BC17-9C40-4E41-8AD4-AE12316D4CA4} = {31AE6C95-A997-4C7C-B592-BC202A29996F}
EndGlobalSection
GlobalSection(ExtensibilityGlobals) = postSolution
SolutionGuid = {F0EC030A-58B3-4FC1-B6B6-E5CF5CD885E3}
diff --git a/Source/GLideN64/GLideN64.vcxproj b/Source/GLideN64/GLideN64.vcxproj
new file mode 100644
index 000000000..ef12e1b0e
--- /dev/null
+++ b/Source/GLideN64/GLideN64.vcxproj
@@ -0,0 +1,357 @@
+
+
+
+
+ Debug
+ Win32
+
+
+ Debug
+ x64
+
+
+ Release
+ Win32
+
+
+ Release
+ x64
+
+
+
+ {37D31D7F-C4E7-45B0-AEF6-D6824A243CF7}
+ GLideN64
+
+
+ DynamicLibrary
+
+
+
+
+
+
+
+
+ GLideN64_d
+ $(SolutionDir)Plugin\$(Platform)\GFX\GLideN64\
+
+
+
+ $(ProjectDir)Source\src;$(ProjectDir)Source\src\inc;$(ProjectDir)Source\src\osal;$(ProjectDir)Source\src\inc\freetype\include;%(AdditionalIncludeDirectories)
+ _SCL_SECURE_NO_WARNINGS;OS_WINDOWS;NOMINMAX;%(PreprocessorDefinitions)
+
+ Level3
+
+ cstdlib;
+ windows.h;
+
+
+
+ freetype253MT.lib;%(AdditionalDependencies)
+ freetype253MT_D.lib;%(AdditionalDependencies)
+
+
+ call Source\src\getRevision.bat
+
+
+
+
+ WIN32_ASM;%(PreprocessorDefinitions)
+
+
+ Source/projects/msvc/lib/msvc12/dbg
+ Source/projects/msvc/lib/dbg
+ Source/projects/msvc/lib/msvc12/rel
+ Source/projects/msvc/lib/rel
+
+
+ copy /y "$(ProjectDir)Source\ini\GLideN64.ini" "$(SolutionDir)Plugin\$(Platform)\GFX\GLideN64"
+copy /y "$(ProjectDir)Source\ini\GLideN64.custom.ini" "$(SolutionDir)Plugin\$(Platform)\GFX\GLideN64"
+
+
+
+ WTL_UI;%(PreprocessorDefinitions)
+ $(ProjectDir)Source\projects\msvc;%(AdditionalIncludeDirectories)
+
+
+
+
+ Source/projects/msvc/lib/x64/dbg
+ Source/projects/msvc/lib/x64/rel
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ true
+
+
+
+
+
+
+
+
+
+
+ true
+
+
+ true
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {17836496-31b0-46f2-b1b1-366d7df6f04c}
+
+
+ {731bd205-2826-4631-b7af-117658e88dbc}
+
+
+ {9e05b70f-a294-44a9-a151-b2cc95aa884e}
+
+
+
+
+ {da965bcf-2219-47af-ace7-eaf76d5d4756}
+
+
+ {7bf6f100-31db-44ae-a2a5-5ddeed9a909c}
+
+
+
+
+
+
\ No newline at end of file
diff --git a/Source/GLideN64/GLideN64.vcxproj.filters b/Source/GLideN64/GLideN64.vcxproj.filters
new file mode 100644
index 000000000..768c119b4
--- /dev/null
+++ b/Source/GLideN64/GLideN64.vcxproj.filters
@@ -0,0 +1,815 @@
+
+
+
+
+ {315ddc50-16f7-4058-b6e4-05afaad9c0b3}
+ cpp;c;cxx;def;odl;idl;hpj;bat;asm
+
+
+ {23e5405e-5c26-4dcf-8c37-426901e33c55}
+
+
+ {94476478-6142-414d-8301-45122ec74f2c}
+ h;hpp;hxx;hm;inl;inc
+
+
+ {80c1d464-fcae-461c-91c8-4c25b4f93055}
+
+
+ {384c65a8-5096-4ef9-bdec-3256fcd337f2}
+
+
+ {7c6de76c-0fca-47cf-99b1-0ee0fd845d7e}
+
+
+ {cad4dfbc-6dba-4d7c-805b-b2ba719da383}
+
+
+ {5481df48-dd50-42c8-89e5-670b337403e2}
+
+
+ {b10a85f0-0fbb-4f8e-b6d8-78ee2a6394bf}
+
+
+ {e9bcfc4d-06e5-496a-a069-3d28e2fcd559}
+
+
+ {03c90b24-47cf-4a72-8652-837470d2a641}
+
+
+ {763fe27e-e0ab-4884-9794-727c47a9dd24}
+
+
+ {ac6b6e3c-c470-4a66-ad6c-d4ad388ec793}
+
+
+ {ed46d297-e09c-4187-870c-1f03bc54905f}
+
+
+ {abdc978d-26cb-4c32-9b72-4c92b05f9e24}
+
+
+ {ac45d108-eb77-4831-b7aa-5efa9e48d4ec}
+
+
+ {207de069-1088-4913-84f5-3cf0804928dc}
+
+
+ {f6f08b9a-17ba-4e14-a73b-bb0c3878811f}
+
+
+ {e67eafa1-5cea-4267-bc12-715e06c744db}
+
+
+ {dfff6885-c7e7-4b77-863e-7eeea6753d5a}
+
+
+ {e8b5c80f-51ec-45c2-bcdb-5e18868073df}
+
+
+ {77259791-9942-4601-a63f-5a0468e69e49}
+
+
+ {09919f83-2933-4b48-a4c7-f7bf6e790304}
+
+
+ {32e9be50-cb55-445a-9562-bbe05085bbe1}
+
+
+ {afe20b4b-eb13-4282-bf72-47335887c770}
+
+
+
+
+ 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
+
+
+ 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
+
+
+ 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
+
+
+ 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
+
+
+ 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
+
+
+ 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
+
+
+ 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
+
+
+ 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
+
+
+ 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
+
+
+
+
+
+
\ No newline at end of file
diff --git a/Source/GLideN64/GLideNUI-wtl.vcxproj b/Source/GLideN64/GLideNUI-wtl.vcxproj
new file mode 100644
index 000000000..8795bdb38
--- /dev/null
+++ b/Source/GLideN64/GLideNUI-wtl.vcxproj
@@ -0,0 +1,142 @@
+
+
+
+
+ Debug
+ Win32
+
+
+ Debug
+ x64
+
+
+ Release
+ Win32
+
+
+ Release
+ x64
+
+
+
+ {9E05B70F-A294-44A9-A151-B2CC95AA884E}
+ GLideNUIwtl
+
+
+ StaticLibrary
+
+
+
+
+
+
+
+
+
+ NotUsing
+ Level3
+
+ windows.h;
+ shellapi.h;
+ commdlg.h;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/Source/GLideN64/GLideNUI-wtl.vcxproj.filters b/Source/GLideN64/GLideNUI-wtl.vcxproj.filters
new file mode 100644
index 000000000..766103089
--- /dev/null
+++ b/Source/GLideN64/GLideNUI-wtl.vcxproj.filters
@@ -0,0 +1,295 @@
+
+
+
+
+ {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/Source/GLideN64/Source b/Source/GLideN64/Source
index 7294f02b0..f4b0755e2 160000
--- a/Source/GLideN64/Source
+++ b/Source/GLideN64/Source
@@ -1 +1 @@
-Subproject commit 7294f02b0062cd2696efeb3078bc81cc91a48c4c
+Subproject commit f4b0755e2722d59fe1c20d7e470f7b8929dcae85
diff --git a/Source/GLideN64/libGLideNHQ.vcxproj b/Source/GLideN64/libGLideNHQ.vcxproj
new file mode 100644
index 000000000..24bafaee2
--- /dev/null
+++ b/Source/GLideN64/libGLideNHQ.vcxproj
@@ -0,0 +1,66 @@
+
+
+
+
+ Debug
+ Win32
+
+
+ Debug
+ x64
+
+
+ Release
+ Win32
+
+
+ Release
+ x64
+
+
+
+ {DA965BCF-2219-47AF-ACE7-EAF76D5D4756}
+ libGLideNHQ
+
+
+ StaticLibrary
+
+
+
+
+
+
+
+
+
+ $(ProjectDir)Source\src;$(ProjectDir)Source\src\osal;$(ProjectDir)Source\src\GLideNHQ\inc;%(AdditionalIncludeDirectories)
+ NotUsing
+ Level3
+ OS_WINDOWS;%(PreprocessorDefinitions)
+
+
+
+
+ WIN32_ASM;%(PreprocessorDefinitions)
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/Source/GLideN64/libGLideNHQ.vcxproj.filters b/Source/GLideN64/libGLideNHQ.vcxproj.filters
new file mode 100644
index 000000000..a06963e89
--- /dev/null
+++ b/Source/GLideN64/libGLideNHQ.vcxproj.filters
@@ -0,0 +1,61 @@
+
+
+
+
+ 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
+
+
+
+
+ {33102939-F957-4BA3-A93C-F47F30765004}
+
+
+
\ No newline at end of file
diff --git a/Source/GLideN64/osal.vcxproj b/Source/GLideN64/osal.vcxproj
new file mode 100644
index 000000000..e1b59ae48
--- /dev/null
+++ b/Source/GLideN64/osal.vcxproj
@@ -0,0 +1,50 @@
+
+
+
+
+ Debug
+ Win32
+
+
+ Debug
+ x64
+
+
+ Release
+ Win32
+
+
+ Release
+ x64
+
+
+
+ {7BF6F100-31DB-44AE-A2A5-5DDEED9A909C}
+ osal
+
+
+ StaticLibrary
+
+
+
+
+
+
+
+
+
+ NotUsing
+ Level3
+ OS_WINDOWS;%(PreprocessorDefinitions)
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/Source/GLideN64/osal.vcxproj.filters b/Source/GLideN64/osal.vcxproj.filters
new file mode 100644
index 000000000..2006305f3
--- /dev/null
+++ b/Source/GLideN64/osal.vcxproj.filters
@@ -0,0 +1,32 @@
+
+
+
+
+ {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
+
+
+
+
+ Header Files
+
+
+ Header Files
+
+
+ Header Files
+
+
+
+
+ Source Files
+
+
+ Source Files
+
+
+
\ No newline at end of file
diff --git a/Source/GLideN64/ticpp.vcxproj b/Source/GLideN64/ticpp.vcxproj
new file mode 100644
index 000000000..2f9f637d9
--- /dev/null
+++ b/Source/GLideN64/ticpp.vcxproj
@@ -0,0 +1,55 @@
+
+
+
+
+ Debug
+ Win32
+
+
+ Debug
+ x64
+
+
+ Release
+ Win32
+
+
+ Release
+ x64
+
+
+
+ {4F28B56B-F4B0-41B0-A785-597F6EF0163A}
+ ticpp
+
+
+ StaticLibrary
+
+
+
+
+
+
+
+
+
+ NotUsing
+ Level3
+ TIXML_USE_TICPP;_WINDOWS;TIXML_USE_TICPP;%(PreprocessorDefinitions)
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/Source/GLideN64/ticpp.vcxproj.filters b/Source/GLideN64/ticpp.vcxproj.filters
new file mode 100644
index 000000000..fb38fa37a
--- /dev/null
+++ b/Source/GLideN64/ticpp.vcxproj.filters
@@ -0,0 +1,51 @@
+
+
+
+
+ {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/Source/GLideN64/ts2lang.vcxproj b/Source/GLideN64/ts2lang.vcxproj
new file mode 100644
index 000000000..71430f1de
--- /dev/null
+++ b/Source/GLideN64/ts2lang.vcxproj
@@ -0,0 +1,68 @@
+
+
+
+
+ Debug
+ Win32
+
+
+ Debug
+ x64
+
+
+ Release
+ Win32
+
+
+ Release
+ x64
+
+
+
+ {5480BC17-9C40-4E41-8AD4-AE12316D4CA4}
+ ts2lang
+
+
+ Application
+
+
+
+
+
+
+ MultiByte
+
+
+
+
+
+ if not exist "$(SolutionDir)Plugin\$(Platform)\GFX\GLideN64" mkdir "$(SolutionDir)Plugin\$(Platform)\GFX\GLideN64"
+if not exist "$(SolutionDir)Plugin\$(Platform)\GFX\GLideN64\translations" mkdir "$(SolutionDir)Plugin\$(Platform)\GFX\GLideN64\translations"
+"$(TargetDir)ts2lang.exe" "$(SolutionDir)Source\GLideN64\Source\translations" "$(SolutionDir)Plugin\$(Platform)\GFX\GLideN64\translations"
+
+ Converting .ts translations to .Lang...
+
+
+ NotUsing
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {4f28b56b-f4b0-41b0-a785-597f6ef0163a}
+ true
+
+
+
\ No newline at end of file
diff --git a/Source/GLideN64/ts2lang.vcxproj.filters b/Source/GLideN64/ts2lang.vcxproj.filters
new file mode 100644
index 000000000..052e905bf
--- /dev/null
+++ b/Source/GLideN64/ts2lang.vcxproj.filters
@@ -0,0 +1,42 @@
+
+
+
+
+ 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/Source/Installer/Installer.iss b/Source/Installer/Installer.iss
index 002de60ae..35d0d6621 100644
--- a/Source/Installer/Installer.iss
+++ b/Source/Installer/Installer.iss
@@ -35,7 +35,7 @@ Source: "{#BaseDir}\Plugin\{#Platform}\Audio\Jabo_Dsound.dll"; DestDir: "{app}\P
Source: "{#BaseDir}\Plugin\{#Platform}\Audio\Project64-Audio.dll"; DestDir: "{app}\Plugin\Audio"
Source: "{#BaseDir}\Plugin\{#Platform}\GFX\Jabo_Direct3D8.dll"; DestDir: "{app}\Plugin\GFX"
Source: "{#BaseDir}\Plugin\{#Platform}\GFX\Project64-Video.dll"; DestDir: "{app}\Plugin\GFX"
-Source: "{#BaseDir}\Plugin\{#Platform}\GFX\GLideN64\*"; DestDir: "{app}\Plugin\GFX\GLideN64"; Flags: recursesubdirs skipifsourcedoesntexist
+Source: "{#BaseDir}\Plugin\{#Platform}\GFX\GLideN64\*"; DestDir: "{app}\Plugin\GFX\GLideN64"; Flags: recursesubdirs
Source: "{#BaseDir}\Plugin\{#Platform}\Input\PJ64_NRage.dll"; DestDir: "{app}\Plugin\Input"
Source: "{#BaseDir}\Plugin\{#Platform}\Input\Project64-Input.dll"; DestDir: "{app}\Plugin\Input"
Source: "{#BaseDir}\Plugin\{#Platform}\RSP\Project64-RSP.dll"; DestDir: "{app}\Plugin\RSP"
diff --git a/Source/Script/package_zip.cmd b/Source/Script/package_zip.cmd
index 41c944fa7..75d535f37 100644
--- a/Source/Script/package_zip.cmd
+++ b/Source/Script/package_zip.cmd
@@ -28,23 +28,23 @@ IF NOT EXIST "%base_dir%\Package" mkdir "%base_dir%\Package"
IF %ERRORLEVEL% NEQ 0 GOTO EndErr
rd "%base_dir%\Bin\Package" /Q /S > NUL 2>&1
-md "%base_dir%\Bin\Package"
-md "%base_dir%\Bin\Package\Config"
-md "%base_dir%\Bin\Package\Config\Cheats"
-md "%base_dir%\Bin\Package\Config\Enhancements"
-md "%base_dir%\Bin\Package\Lang"
-md "%base_dir%\Bin\Package\Plugin\%VSPlatform%"
-md "%base_dir%\Bin\Package\Plugin\%VSPlatform%\Audio"
-md "%base_dir%\Bin\Package\Plugin\%VSPlatform%\GFX"
-md "%base_dir%\Bin\Package\Plugin\%VSPlatform%\Input"
-md "%base_dir%\Bin\Package\Plugin\%VSPlatform%\RSP"
+md "%base_dir%\Bin\Package\"
+md "%base_dir%\Bin\Package\Config\"
+md "%base_dir%\Bin\Package\Config\Cheats\"
+md "%base_dir%\Bin\Package\Config\Enhancements\"
+md "%base_dir%\Bin\Package\Lang\"
+md "%base_dir%\Bin\Package\Plugin\"
+md "%base_dir%\Bin\Package\Plugin\Audio\"
+md "%base_dir%\Bin\Package\Plugin\GFX\"
+md "%base_dir%\Bin\Package\Plugin\Input\"
+md "%base_dir%\Bin\Package\Plugin\RSP\"
IF EXIST "%base_dir%\Plugin\%VSPlatform%\GFX\GLideN64" (
-md "%base_dir%\Bin\Package\Plugin\%VSPlatform%\GFX\GLideN64"
-copy "%base_dir%\Plugin\%VSPlatform%\GFX\GLideN64\GLideN64.dll" "%base_dir%\Bin\Package\Plugin\%VSPlatform%\GFX\GLideN64\GLideN64.dll"
-copy "%base_dir%\Plugin\%VSPlatform%\GFX\GLideN64\*.ini" "%base_dir%\Bin\Package\Plugin\%VSPlatform%\GFX\GLideN64"
-md "%base_dir%\Bin\Package\Plugin\%VSPlatform%\GFX\GLideN64\translations"
-copy "%base_dir%\Plugin\%VSPlatform%\GFX\GLideN64\translations\*.Lang" "%base_dir%\Bin\Package\Plugin\%VSPlatform%\GFX\GLideN64\translations"
+md "%base_dir%\Bin\Package\Plugin\GFX\GLideN64"
+copy "%base_dir%\Plugin\%VSPlatform%\GFX\GLideN64\GLideN64.dll" "%base_dir%\Bin\Package\Plugin\GFX\GLideN64\GLideN64.dll"
+copy "%base_dir%\Plugin\%VSPlatform%\GFX\GLideN64\*.ini" "%base_dir%\Bin\Package\Plugin\GFX\GLideN64"
+md "%base_dir%\Bin\Package\Plugin\GFX\GLideN64\translations"
+copy "%base_dir%\Plugin\%VSPlatform%\GFX\GLideN64\translations\*.Lang" "%base_dir%\Bin\Package\Plugin\GFX\GLideN64\translations"
)
copy "%base_dir%\Bin\%VSPlatform%\Release\Project64.exe" "%base_dir%\Bin\Package"
@@ -55,13 +55,13 @@ copy "%base_dir%\Config\Enhancements\*.enh" "%base_dir%\Bin\Package\Config\Enhan
copy "%base_dir%\Config\Project64.rdb" "%base_dir%\Bin\Package\Config"
copy "%base_dir%\Config\Project64.rdx" "%base_dir%\Bin\Package\Config"
copy "%base_dir%\Lang\*.pj.Lang" "%base_dir%\Bin\Package\Lang"
-copy "%base_dir%\Plugin\%VSPlatform%\Audio\Jabo_Dsound.dll" "%base_dir%\Bin\Package\Plugin\%VSPlatform%\Audio"
-copy "%base_dir%\Plugin\%VSPlatform%\Audio\Project64-Audio.dll" "%base_dir%\Bin\Package\Plugin\%VSPlatform%\Audio"
-copy "%base_dir%\Plugin\%VSPlatform%\GFX\Jabo_Direct3D8.dll" "%base_dir%\Bin\Package\Plugin\%VSPlatform%\GFX"
-copy "%base_dir%\Plugin\%VSPlatform%\GFX\Project64-Video.dll" "%base_dir%\Bin\Package\Plugin\%VSPlatform%\GFX"
-copy "%base_dir%\Plugin\%VSPlatform%\Input\PJ64_NRage.dll" "%base_dir%\Bin\Package\Plugin\%VSPlatform%\Input"
-copy "%base_dir%\Plugin\%VSPlatform%\Input\Project64-Input.dll" "%base_dir%\Bin\Package\Plugin\%VSPlatform%\Input"
-copy "%base_dir%\Plugin\%VSPlatform%\RSP\Project64-RSP.dll" "%base_dir%\Bin\Package\Plugin\%VSPlatform%\RSP"
+copy "%base_dir%\Plugin\%VSPlatform%\Audio\Jabo_Dsound.dll" "%base_dir%\Bin\Package\Plugin\Audio"
+copy "%base_dir%\Plugin\%VSPlatform%\Audio\Project64-Audio.dll" "%base_dir%\Bin\Package\Plugin\Audio"
+copy "%base_dir%\Plugin\%VSPlatform%\GFX\Jabo_Direct3D8.dll" "%base_dir%\Bin\Package\Plugin\GFX"
+copy "%base_dir%\Plugin\%VSPlatform%\GFX\Project64-Video.dll" "%base_dir%\Bin\Package\Plugin\GFX"
+copy "%base_dir%\Plugin\%VSPlatform%\Input\PJ64_NRage.dll" "%base_dir%\Bin\Package\Plugin\Input"
+copy "%base_dir%\Plugin\%VSPlatform%\Input\Project64-Input.dll" "%base_dir%\Bin\Package\Plugin\Input"
+copy "%base_dir%\Plugin\%VSPlatform%\RSP\Project64-RSP.dll" "%base_dir%\Bin\Package\Plugin\RSP"
cd %base_dir%\Bin\Package
"%zip%" a -tzip -r "%base_dir%\Package\%ZipFileName%" *