MGislv/GLideN64
1
0
Fork 0
mirror of https://github.com/blawar/GLideN64.git synced 2024-06-25 22:09:35 +00:00
Code Issues Projects Releases Wiki Activity

Implement Factor5 ucodes for Indiana Jones/Battle of Naboo, task #1259

Browse Source
This commit is contained in:
Sergey Lipskiy 2018-05-24 21:53:00 +07:00
parent 582bfe353f
commit b0a575313a
24 changed files with 2744 additions and 96 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
projects/msvc12/GLideN64.vcxproj
View File

@ -408,8 +408,9 @@ copy /Y "$(ProjectDir)$(OutDir)$(TargetName).*" "$(Mupen64PluginsDir)"</Command>
<ClCompile Include="..\..\src\uCodes\F3DGOLDEN.cpp" />
<ClCompile Include="..\..\src\uCodes\F3DPD.cpp" />
<ClCompile Include="..\..\src\uCodes\F3DSETA.cpp" />
<ClCompile Include="..\..\src\uCodes\F3DSWRS.cpp" />
<ClCompile Include="..\..\src\uCodes\F3DTEXA.cpp" />
<ClCompile Include="..\..\src\uCodes\F5Indi_Naboo.cpp" />
<ClCompile Include="..\..\src\uCodes\F5Rogue.cpp" />
<ClCompile Include="..\..\src\uCodes\L3D.cpp" />
<ClCompile Include="..\..\src\uCodes\L3DEX.cpp" />
<ClCompile Include="..\..\src\uCodes\L3DEX2.cpp" />
@ -543,8 +544,9 @@ copy /Y "$(ProjectDir)$(OutDir)$(TargetName).*" "$(Mupen64PluginsDir)"</Command>
<ClInclude Include="..\..\src\uCodes\F3DGOLDEN.h" />
<ClInclude Include="..\..\src\uCodes\F3DPD.h" />
<ClInclude Include="..\..\src\uCodes\F3DSETA.h" />
<ClInclude Include="..\..\src\uCodes\F3DSWRS.h" />
<ClInclude Include="..\..\src\uCodes\F3DTEXA.h" />
<ClInclude Include="..\..\src\uCodes\F5Indi_Naboo.h" />
<ClInclude Include="..\..\src\uCodes\F5Rogue.h" />
<ClInclude Include="..\..\src\uCodes\L3D.h" />
<ClInclude Include="..\..\src\uCodes\L3DEX.h" />
<ClInclude Include="..\..\src\uCodes\L3DEX2.h" />

18
projects/msvc12/GLideN64.vcxproj.filters
View File

@ -341,9 +341,6 @@
<ClCompile Include="..\..\src\uCodes\F3DSETA.cpp">
<Filter>Source Files\uCodes</Filter>
</ClCompile>
<ClCompile Include="..\..\src\uCodes\F3DSWRS.cpp">
<Filter>Source Files\uCodes</Filter>
</ClCompile>
<ClCompile Include="..\..\src\uCodes\F3DTEXA.cpp">
<Filter>Source Files\uCodes</Filter>
</ClCompile>
@ -380,6 +377,12 @@
<ClCompile Include="..\..\src\DisplayLoadProgress.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="..\..\src\uCodes\F5Indi_Naboo.cpp">
<Filter>Source Files\uCodes</Filter>
</ClCompile>
<ClCompile Include="..\..\src\uCodes\F5Rogue.cpp">
<Filter>Source Files\uCodes</Filter>
</ClCompile>
</ItemGroup>
<ItemGroup>
<ClInclude Include="..\..\src\3DMath.h">
@ -667,9 +670,6 @@
<ClInclude Include="..\..\src\uCodes\F3DSETA.h">
<Filter>Header Files\uCodes</Filter>
</ClInclude>
<ClInclude Include="..\..\src\uCodes\F3DSWRS.h">
<Filter>Header Files\uCodes</Filter>
</ClInclude>
<ClInclude Include="..\..\src\uCodes\F3DTEXA.h">
<Filter>Header Files\uCodes</Filter>
</ClInclude>
@ -706,5 +706,11 @@
<ClInclude Include="..\..\src\DisplayLoadProgress.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="..\..\src\uCodes\F5Indi_Naboo.h">
<Filter>Header Files\uCodes</Filter>
</ClInclude>
<ClInclude Include="..\..\src\uCodes\F5Rogue.h">
<Filter>Header Files\uCodes</Filter>
</ClInclude>
</ItemGroup>
</Project>

14
projects/msvc12/GLideNUI.vcxproj
View File

@ -100,7 +100,7 @@
<ExceptionHandling>Sync</ExceptionHandling>
<ObjectFileName>$(IntDir)</ObjectFileName>
<Optimization>Disabled</Optimization>
<PreprocessorDefinitions>_DEBUG;OS_WINDOWS;_WINDOWS;UNICODE;WIN32;QT_STATICPLUGIN;QT_WIDGETS_LIB;QT_GUI_LIB;QT_CORE_LIB;QT_UITOOLS_LIB;QT_WINEXTRAS_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<PreprocessorDefinitions>DEBUG_DUMP;_DEBUG;OS_WINDOWS;_WINDOWS;UNICODE;WIN32;QT_STATICPLUGIN;QT_WIDGETS_LIB;QT_GUI_LIB;QT_CORE_LIB;QT_UITOOLS_LIB;QT_WINEXTRAS_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<PreprocessToFile>false</PreprocessToFile>
<RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
<RuntimeTypeInfo>true</RuntimeTypeInfo>
@ -156,17 +156,15 @@
<CustomBuild Include="..\..\src\GLideNUI\AboutDialog.h">
<Command Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">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_NO_DEBUG -DQT_WIDGETS_LIB -DQT_GUI_LIB -DQT_CORE_LIB -DNDEBUG "-I$(QTDIR)\include" "-I$(QTDIR)\include\QtWidgets" "-I$(QTDIR)\include\QtGui" "-I$(QTDIR)\include\QtCore" "-I.\release" "-I." "-I$(QTDIR)\mkspecs\win32-msvc2013"</Command>
"$(QTDIR)\bin\moc.exe" "%(FullPath)" -o "$(ConfigurationName)\moc_%(Filename).cpp" -DOS_WINDOWS -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"</Command>
<Message Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Moc%27ing AboutDialog.h...</Message>
<Command Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">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_WIDGETS_LIB -DQT_GUI_LIB -DQT_CORE_LIB "-I$(QTDIR)\include" "-I$(QTDIR)\include\QtWidgets" "-I$(QTDIR)\include\QtGui" "-I$(QTDIR)\include\QtCore" "-I.\debug" "-I." "-I$(QTDIR)\mkspecs\win32-msvc2013"</Command>
"$(QTDIR)\bin\moc.exe" "%(FullPath)" -o "$(ConfigurationName)\moc_%(Filename).cpp" -DDEBUG_DUMP -D_DEBUG -DOS_WINDOWS -D_WINDOWS -DUNICODE -DWIN32 -DQT_STATICPLUGIN -DQT_WIDGETS_LIB -DQT_GUI_LIB -DQT_CORE_LIB -DQT_UITOOLS_LIB -DQT_WINEXTRAS_LIB "-I$(QTDIR)\include" "-I$(QTDIR)\include\QtWidgets" "-I$(QTDIR)\include\QtGui" "-I$(QTDIR)\include\QtCore" "-I.\debug" "-I." "-I$(QTDIR)\mkspecs\win32-msvc2013" "-I.\GeneratedFiles"</Command>
<Message Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Moc%27ing AboutDialog.h...</Message>
<Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(ConfigurationName)\moc_%(Filename).cpp</Outputs>
<Outputs Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(ConfigurationName)\moc_%(Filename).cpp</Outputs>
@ -176,17 +174,15 @@ endlocal
<CustomBuild Include="..\..\src\GLideNUI\ConfigDialog.h">
<Command Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">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_NO_DEBUG -DQT_WIDGETS_LIB -DQT_GUI_LIB -DQT_CORE_LIB -DNDEBUG "-I$(QTDIR)\include" "-I$(QTDIR)\include\QtWidgets" "-I$(QTDIR)\include\QtGui" "-I$(QTDIR)\include\QtCore" "-I.\release" "-I." "-I$(QTDIR)\mkspecs\win32-msvc2013"</Command>
"$(QTDIR)\bin\moc.exe" "%(FullPath)" -o "$(ConfigurationName)\moc_%(Filename).cpp" -DOS_WINDOWS -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"</Command>
<Message Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Moc%27ing ConfigDialog.h...</Message>
<Command Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">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_WIDGETS_LIB -DQT_GUI_LIB -DQT_CORE_LIB "-I$(QTDIR)\include" "-I$(QTDIR)\include\QtWidgets" "-I$(QTDIR)\include\QtGui" "-I$(QTDIR)\include\QtCore" "-I.\debug" "-I." "-I$(QTDIR)\mkspecs\win32-msvc2013"</Command>
"$(QTDIR)\bin\moc.exe" "%(FullPath)" -o "$(ConfigurationName)\moc_%(Filename).cpp" -DDEBUG_DUMP -D_DEBUG -DOS_WINDOWS -D_WINDOWS -DUNICODE -DWIN32 -DQT_STATICPLUGIN -DQT_WIDGETS_LIB -DQT_GUI_LIB -DQT_CORE_LIB -DQT_UITOOLS_LIB -DQT_WINEXTRAS_LIB "-I$(QTDIR)\include" "-I$(QTDIR)\include\QtWidgets" "-I$(QTDIR)\include\QtGui" "-I$(QTDIR)\include\QtCore" "-I.\debug" "-I." "-I$(QTDIR)\mkspecs\win32-msvc2013" "-I.\GeneratedFiles"</Command>
<Message Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Moc%27ing ConfigDialog.h...</Message>
<Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(ConfigurationName)\moc_%(Filename).cpp</Outputs>
<Outputs Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(ConfigurationName)\moc_%(Filename).cpp</Outputs>

14
projects/msvc2015/GLideN64.sln
View File

@ -23,6 +23,8 @@ Global
MinSizeRel|x64 = MinSizeRel|x64
Release_mupenplus|Win32 = Release_mupenplus|Win32
Release_mupenplus|x64 = Release_mupenplus|x64
Release_with_debug_mupen64plus|Win32 = Release_with_debug_mupen64plus|Win32
Release_with_debug_mupen64plus|x64 = Release_with_debug_mupen64plus|x64
Release|Win32 = Release|Win32
Release|x64 = Release|x64
RelWithDebInfo|Win32 = RelWithDebInfo|Win32
@ -45,6 +47,10 @@ Global
{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_with_debug_mupen64plus|Win32.ActiveCfg = Release_with_debug_mupen64plus|Win32
{37D31D7F-C4E7-45B0-AEF6-D6824A243CF7}.Release_with_debug_mupen64plus|Win32.Build.0 = Release_with_debug_mupen64plus|Win32
{37D31D7F-C4E7-45B0-AEF6-D6824A243CF7}.Release_with_debug_mupen64plus|x64.ActiveCfg = Release_with_debug_mupen64plus|x64
{37D31D7F-C4E7-45B0-AEF6-D6824A243CF7}.Release_with_debug_mupen64plus|x64.Build.0 = Release_with_debug_mupen64plus|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
@ -69,6 +75,10 @@ Global
{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_with_debug_mupen64plus|Win32.ActiveCfg = Release_with_debug_mupen64plus|Win32
{DA965BCF-2219-47AF-ACE7-EAF76D5D4756}.Release_with_debug_mupen64plus|Win32.Build.0 = Release_with_debug_mupen64plus|Win32
{DA965BCF-2219-47AF-ACE7-EAF76D5D4756}.Release_with_debug_mupen64plus|x64.ActiveCfg = Release_with_debug_mupen64plus|x64
{DA965BCF-2219-47AF-ACE7-EAF76D5D4756}.Release_with_debug_mupen64plus|x64.Build.0 = Release_with_debug_mupen64plus|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
@ -93,6 +103,10 @@ Global
{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_with_debug_mupen64plus|Win32.ActiveCfg = Release_with_debug_mupen64plus|Win32
{7BF6F100-31DB-44AE-A2A5-5DDEED9A909C}.Release_with_debug_mupen64plus|Win32.Build.0 = Release_with_debug_mupen64plus|Win32
{7BF6F100-31DB-44AE-A2A5-5DDEED9A909C}.Release_with_debug_mupen64plus|x64.ActiveCfg = Release_with_debug_mupen64plus|x64
{7BF6F100-31DB-44AE-A2A5-5DDEED9A909C}.Release_with_debug_mupen64plus|x64.Build.0 = Release_with_debug_mupen64plus|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

151
projects/msvc2015/GLideN64.vcxproj
View File

@ -33,6 +33,14 @@
<Configuration>Release_mupenplus</Configuration>
<Platform>x64</Platform>
</ProjectConfiguration>
<ProjectConfiguration Include="Release_with_debug_mupen64plus|Win32">
<Configuration>Release_with_debug_mupen64plus</Configuration>
<Platform>Win32</Platform>
</ProjectConfiguration>
<ProjectConfiguration Include="Release_with_debug_mupen64plus|x64">
<Configuration>Release_with_debug_mupen64plus</Configuration>
<Platform>x64</Platform>
</ProjectConfiguration>
<ProjectConfiguration Include="Release|Win32">
<Configuration>Release</Configuration>
<Platform>Win32</Platform>
@ -63,11 +71,21 @@
<CharacterSet>MultiByte</CharacterSet>
<PlatformToolset>v140</PlatformToolset>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release_with_debug_mupen64plus|Win32'" Label="Configuration">
<ConfigurationType>DynamicLibrary</ConfigurationType>
<CharacterSet>MultiByte</CharacterSet>
<PlatformToolset>v140</PlatformToolset>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release_mupenplus|x64'" Label="Configuration">
<ConfigurationType>DynamicLibrary</ConfigurationType>
<CharacterSet>MultiByte</CharacterSet>
<PlatformToolset>v140</PlatformToolset>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release_with_debug_mupen64plus|x64'" Label="Configuration">
<ConfigurationType>DynamicLibrary</ConfigurationType>
<CharacterSet>MultiByte</CharacterSet>
<PlatformToolset>v140</PlatformToolset>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
<ConfigurationType>DynamicLibrary</ConfigurationType>
<CharacterSet>MultiByte</CharacterSet>
@ -113,10 +131,18 @@
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
<Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC70.props" />
</ImportGroup>
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release_with_debug_mupen64plus|Win32'" Label="PropertySheets">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
<Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC70.props" />
</ImportGroup>
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release_mupenplus|x64'" Label="PropertySheets">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
<Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC70.props" />
</ImportGroup>
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release_with_debug_mupen64plus|x64'" Label="PropertySheets">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
<Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC70.props" />
</ImportGroup>
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
<Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC70.props" />
@ -158,12 +184,16 @@
<LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug_mupenplus_uniformset|x64'">true</LinkIncremental>
<OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Release\</OutDir>
<OutDir Condition="'$(Configuration)|$(Platform)'=='Release_mupenplus|Win32'">Release\</OutDir>
<OutDir Condition="'$(Configuration)|$(Platform)'=='Release_with_debug_mupen64plus|Win32'">Release\</OutDir>
<IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Release\</IntDir>
<IntDir Condition="'$(Configuration)|$(Platform)'=='Release_mupenplus|Win32'">Release\</IntDir>
<IntDir Condition="'$(Configuration)|$(Platform)'=='Release_with_debug_mupen64plus|Win32'">Release\</IntDir>
<LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</LinkIncremental>
<LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</LinkIncremental>
<LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release_mupenplus|Win32'">false</LinkIncremental>
<LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release_with_debug_mupen64plus|Win32'">false</LinkIncremental>
<LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release_mupenplus|x64'">false</LinkIncremental>
<LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release_with_debug_mupen64plus|x64'">false</LinkIncremental>
<CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">AllRules.ruleset</CodeAnalysisRuleSet>
<CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">AllRules.ruleset</CodeAnalysisRuleSet>
<CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Debug_mupenplus|Win32'">AllRules.ruleset</CodeAnalysisRuleSet>
@ -185,15 +215,21 @@
<CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">AllRules.ruleset</CodeAnalysisRuleSet>
<CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Release|x64'">AllRules.ruleset</CodeAnalysisRuleSet>
<CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Release_mupenplus|Win32'">AllRules.ruleset</CodeAnalysisRuleSet>
<CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Release_with_debug_mupen64plus|Win32'">AllRules.ruleset</CodeAnalysisRuleSet>
<CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Release_mupenplus|x64'">AllRules.ruleset</CodeAnalysisRuleSet>
<CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Release_with_debug_mupen64plus|x64'">AllRules.ruleset</CodeAnalysisRuleSet>
<CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" />
<CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Release|x64'" />
<CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Release_mupenplus|Win32'" />
<CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Release_with_debug_mupen64plus|Win32'" />
<CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Release_mupenplus|x64'" />
<CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Release_with_debug_mupen64plus|x64'" />
<CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" />
<CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Release|x64'" />
<CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Release_mupenplus|Win32'" />
<CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Release_with_debug_mupen64plus|Win32'" />
<CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Release_mupenplus|x64'" />
<CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Release_with_debug_mupen64plus|x64'" />
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug_mupenplus|Win32'">
<TargetName>mupen64plus-video-GLideN64</TargetName>
@ -210,9 +246,15 @@
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release_mupenplus|Win32'">
<TargetName>mupen64plus-video-GLideN64</TargetName>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release_with_debug_mupen64plus|Win32'">
<TargetName>mupen64plus-video-GLideN64</TargetName>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release_mupenplus|x64'">
<TargetName>mupen64plus-video-GLideN64</TargetName>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release_with_debug_mupen64plus|x64'">
<TargetName>mupen64plus-video-GLideN64</TargetName>
</PropertyGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
<ClCompile>
<Optimization>Disabled</Optimization>
@ -323,7 +365,7 @@ copy /Y "$(ProjectDir)$(OutDir)$(TargetName).*" "$(Mupen64PluginsDir)"</Command>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug_mupenplus|x64'">
<ClCompile>
<Optimization>Disabled</Optimization>
<PreprocessorDefinitions>WIN64;DEBUG_DUMP;UNICODE;TXFILTER_LIB;MUPENPLUSAPI;OS_WINDOWS;_USRDLL;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<PreprocessorDefinitions>__VEC4_OPT;WIN64;GL_DEBUG;DEBUG_DUMP;UNICODE;TXFILTER_LIB;MUPENPLUSAPI;OS_WINDOWS;_USRDLL;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<MinimalRebuild>false</MinimalRebuild>
<BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
<RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
@ -518,6 +560,48 @@ copy /Y "$(ProjectDir)$(OutDir)$(TargetName).*" "$(N64PluginsDir)"</Command>
</Link>
<PostBuildEvent>
<Command>if not exist "$(Mupen64PluginsDir)" mkdir "$(Mupen64PluginsDir)"
copy /Y "$(ProjectDir)$(OutDir)$(TargetName).*" "$(Mupen64PluginsDir)"</Command>
</PostBuildEvent>
<PostBuildEvent>
<Message>Copy result to plugins folder</Message>
</PostBuildEvent>
<PreBuildEvent>
<Command>call ..\..\src\getRevision.bat</Command>
</PreBuildEvent>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release_with_debug_mupen64plus|Win32'">
<ClCompile>
<Optimization>Full</Optimization>
<InlineFunctionExpansion>AnySuitable</InlineFunctionExpansion>
<IntrinsicFunctions>true</IntrinsicFunctions>
<FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>
<OmitFramePointers>true</OmitFramePointers>
<PreprocessorDefinitions>__VEC4_OPT;NDEBUG;UNICODE;TXFILTER_LIB;MUPENPLUSAPI;WIN32;WIN32_ASM;OS_WINDOWS;_USRDLL;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<StringPooling>true</StringPooling>
<RuntimeLibrary>MultiThreaded</RuntimeLibrary>
<FunctionLevelLinking>true</FunctionLevelLinking>
<PrecompiledHeader>
</PrecompiledHeader>
<WarningLevel>Level3</WarningLevel>
<DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
<AdditionalIncludeDirectories>../../src;../../src/inc;../../src/osal;../../src/inc/freetype/include</AdditionalIncludeDirectories>
<ExceptionHandling>Async</ExceptionHandling>
<MultiProcessorCompilation>true</MultiProcessorCompilation>
<WholeProgramOptimization>true</WholeProgramOptimization>
</ClCompile>
<Link>
<AdditionalDependencies>freetype253MT.lib;osal\Release\osal.lib;GLideNHQ\Release\libGLideNHQ.lib;opengl32.lib;glu32.lib;winmm.lib;%(AdditionalDependencies)</AdditionalDependencies>
<GenerateDebugInformation>false</GenerateDebugInformation>
<SubSystem>Windows</SubSystem>
<OptimizeReferences>true</OptimizeReferences>
<EnableCOMDATFolding>true</EnableCOMDATFolding>
<ImportLibrary>$(OutDir)New glNintendo64().lib</ImportLibrary>
<TargetMachine>MachineX86</TargetMachine>
<AdditionalLibraryDirectories>lib/rel</AdditionalLibraryDirectories>
<LinkTimeCodeGeneration>UseLinkTimeCodeGeneration</LinkTimeCodeGeneration>
</Link>
<PostBuildEvent>
<Command>if not exist "$(Mupen64PluginsDir)" mkdir "$(Mupen64PluginsDir)"
copy /Y "$(ProjectDir)$(OutDir)$(TargetName).*" "$(Mupen64PluginsDir)"</Command>
</PostBuildEvent>
<PostBuildEvent>
@ -559,6 +643,48 @@ copy /Y "$(ProjectDir)$(OutDir)$(TargetName).*" "$(Mupen64PluginsDir)"</Command>
</Link>
<PostBuildEvent>
<Command>if not exist "$(Mupen64PluginsDir_x64)" mkdir "$(Mupen64PluginsDir_x64)"
copy /Y "$(OutDir)$(TargetName).*" "$(Mupen64PluginsDir_x64)"</Command>
</PostBuildEvent>
<PostBuildEvent>
<Message>Copy result to plugins folder</Message>
</PostBuildEvent>
<PreBuildEvent>
<Command>call ..\..\src\getRevision.bat</Command>
</PreBuildEvent>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release_with_debug_mupen64plus|x64'">
<ClCompile>
<Optimization>Full</Optimization>
<InlineFunctionExpansion>AnySuitable</InlineFunctionExpansion>
<IntrinsicFunctions>true</IntrinsicFunctions>
<FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>
<OmitFramePointers>true</OmitFramePointers>
<PreprocessorDefinitions>DEBUG_DUMP;WIN64;NDEBUG;UNICODE;TXFILTER_LIB;MUPENPLUSAPI;OS_WINDOWS;_USRDLL;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<StringPooling>true</StringPooling>
<RuntimeLibrary>MultiThreaded</RuntimeLibrary>
<FunctionLevelLinking>true</FunctionLevelLinking>
<PrecompiledHeader>
</PrecompiledHeader>
<WarningLevel>Level3</WarningLevel>
<DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
<AdditionalIncludeDirectories>../../src;../../src/inc;../../src/osal;../../src/inc/freetype/include</AdditionalIncludeDirectories>
<ExceptionHandling>Async</ExceptionHandling>
<MultiProcessorCompilation>true</MultiProcessorCompilation>
<WholeProgramOptimization>true</WholeProgramOptimization>
</ClCompile>
<Link>
<AdditionalDependencies>freetype253MT.lib;x64\Release\osal.lib;x64\Release\libGLideNHQ.lib;opengl32.lib;winmm.lib;%(AdditionalDependencies)</AdditionalDependencies>
<GenerateDebugInformation>true</GenerateDebugInformation>
<SubSystem>Windows</SubSystem>
<OptimizeReferences>true</OptimizeReferences>
<EnableCOMDATFolding>true</EnableCOMDATFolding>
<ImportLibrary>$(OutDir)New glNintendo64().lib</ImportLibrary>
<AdditionalLibraryDirectories>lib/x64/rel</AdditionalLibraryDirectories>
<LinkTimeCodeGeneration>UseLinkTimeCodeGeneration</LinkTimeCodeGeneration>
<FullProgramDatabaseFile>true</FullProgramDatabaseFile>
</Link>
<PostBuildEvent>
<Command>if not exist "$(Mupen64PluginsDir_x64)" mkdir "$(Mupen64PluginsDir_x64)"
copy /Y "$(OutDir)$(TargetName).*" "$(Mupen64PluginsDir_x64)"</Command>
</PostBuildEvent>
<PostBuildEvent>
@ -627,7 +753,9 @@ copy /Y "$(OutDir)$(TargetName).*" "$(Mupen64PluginsDir_x64)"</Command>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug_mupenplus|Win32'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug_mupenplus|x64'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release_mupenplus|Win32'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release_with_debug_mupen64plus|Win32'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release_mupenplus|x64'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release_with_debug_mupen64plus|x64'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug_mupenplus_uniformset|Win32'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug_mupenplus_uniformset|x64'">true</ExcludedFromBuild>
</ClCompile>
@ -637,6 +765,7 @@ copy /Y "$(OutDir)$(TargetName).*" "$(Mupen64PluginsDir_x64)"</Command>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug_mupenplus_uniformset|Win32'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release_mupenplus|Win32'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release_with_debug_mupen64plus|Win32'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug_mupenplus|Win32'">true</ExcludedFromBuild>
</ClCompile>
<ClCompile Include="..\..\src\Keys.cpp" />
@ -681,6 +810,7 @@ copy /Y "$(OutDir)$(TargetName).*" "$(Mupen64PluginsDir_x64)"</Command>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug_mupenplus_uniformset|Win32'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release_mupenplus|Win32'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release_with_debug_mupen64plus|Win32'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug_mupenplus|Win32'">true</ExcludedFromBuild>
</ClCompile>
<ClCompile Include="..\..\src\RSP_LoadMatrixX86.cpp">
@ -689,6 +819,7 @@ copy /Y "$(OutDir)$(TargetName).*" "$(Mupen64PluginsDir_x64)"</Command>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug_mupenplus_uniformset|x64'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release_mupenplus|x64'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release_with_debug_mupen64plus|x64'">true</ExcludedFromBuild>
</ClCompile>
<ClCompile Include="..\..\src\SoftwareRender.cpp" />
<ClCompile Include="..\..\src\TexrectDrawer.cpp" />
@ -708,8 +839,9 @@ copy /Y "$(OutDir)$(TargetName).*" "$(Mupen64PluginsDir_x64)"</Command>
<ClCompile Include="..\..\src\uCodes\F3DGOLDEN.cpp" />
<ClCompile Include="..\..\src\uCodes\F3DPD.cpp" />
<ClCompile Include="..\..\src\uCodes\F3DSETA.cpp" />
<ClCompile Include="..\..\src\uCodes\F3DSWRS.cpp" />
<ClCompile Include="..\..\src\uCodes\F5Rogue.cpp" />
<ClCompile Include="..\..\src\uCodes\F3DTEXA.cpp" />
<ClCompile Include="..\..\src\uCodes\F5Indi_Naboo.cpp" />
<ClCompile Include="..\..\src\uCodes\L3D.cpp" />
<ClCompile Include="..\..\src\uCodes\L3DEX.cpp" />
<ClCompile Include="..\..\src\uCodes\L3DEX2.cpp" />
@ -726,7 +858,9 @@ copy /Y "$(OutDir)$(TargetName).*" "$(Mupen64PluginsDir_x64)"</Command>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug_mupenplus_uniformset|Win32'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug_mupenplus_uniformset|x64'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release_mupenplus|Win32'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release_with_debug_mupen64plus|Win32'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release_mupenplus|x64'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release_with_debug_mupen64plus|x64'">true</ExcludedFromBuild>
</ClCompile>
<ClCompile Include="..\..\src\windows\Config_windows.cpp">
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug_mupenplus|Win32'">true</ExcludedFromBuild>
@ -734,7 +868,9 @@ copy /Y "$(OutDir)$(TargetName).*" "$(Mupen64PluginsDir_x64)"</Command>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug_mupenplus_uniformset|Win32'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug_mupenplus_uniformset|x64'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release_mupenplus|Win32'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release_with_debug_mupen64plus|Win32'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release_mupenplus|x64'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release_with_debug_mupen64plus|x64'">true</ExcludedFromBuild>
</ClCompile>
<ClCompile Include="..\..\src\windows\GLideN64_windows.cpp">
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug_mupenplus|Win32'">true</ExcludedFromBuild>
@ -742,7 +878,9 @@ copy /Y "$(OutDir)$(TargetName).*" "$(Mupen64PluginsDir_x64)"</Command>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug_mupenplus_uniformset|Win32'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug_mupenplus_uniformset|x64'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release_mupenplus|Win32'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release_with_debug_mupen64plus|Win32'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release_mupenplus|x64'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release_with_debug_mupen64plus|x64'">true</ExcludedFromBuild>
</ClCompile>
<ClCompile Include="..\..\src\windows\ZilmarAPIImpl_windows.cpp">
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug_mupenplus|Win32'">true</ExcludedFromBuild>
@ -750,7 +888,9 @@ copy /Y "$(OutDir)$(TargetName).*" "$(Mupen64PluginsDir_x64)"</Command>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug_mupenplus_uniformset|Win32'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug_mupenplus_uniformset|x64'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release_mupenplus|Win32'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release_with_debug_mupen64plus|Win32'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release_mupenplus|x64'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release_with_debug_mupen64plus|x64'">true</ExcludedFromBuild>
</ClCompile>
<ClCompile Include="..\..\src\xxHash\xxhash.c" />
<ClCompile Include="..\..\src\ZilmarPluginAPI.cpp">
@ -759,7 +899,9 @@ copy /Y "$(OutDir)$(TargetName).*" "$(Mupen64PluginsDir_x64)"</Command>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug_mupenplus_uniformset|Win32'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug_mupenplus_uniformset|x64'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release_mupenplus|Win32'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release_with_debug_mupen64plus|Win32'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release_mupenplus|x64'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release_with_debug_mupen64plus|x64'">true</ExcludedFromBuild>
</ClCompile>
<ClCompile Include="..\..\src\ZlutTexture.cpp" />
</ItemGroup>
@ -860,8 +1002,9 @@ copy /Y "$(OutDir)$(TargetName).*" "$(Mupen64PluginsDir_x64)"</Command>
<ClInclude Include="..\..\src\uCodes\F3DGOLDEN.h" />
<ClInclude Include="..\..\src\uCodes\F3DPD.h" />
<ClInclude Include="..\..\src\uCodes\F3DSETA.h" />
<ClInclude Include="..\..\src\uCodes\F3DSWRS.h" />
<ClInclude Include="..\..\src\uCodes\F5Rogue.h" />
<ClInclude Include="..\..\src\uCodes\F3DTEXA.h" />
<ClInclude Include="..\..\src\uCodes\F5Indi_Naboo.h" />
<ClInclude Include="..\..\src\uCodes\L3D.h" />
<ClInclude Include="..\..\src\uCodes\L3DEX.h" />
<ClInclude Include="..\..\src\uCodes\L3DEX2.h" />
@ -881,7 +1024,9 @@ copy /Y "$(OutDir)$(TargetName).*" "$(Mupen64PluginsDir_x64)"</Command>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug_mupenplus_uniformset|Win32'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug_mupenplus_uniformset|x64'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release_mupenplus|Win32'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release_with_debug_mupen64plus|Win32'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release_mupenplus|x64'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release_with_debug_mupen64plus|x64'">true</ExcludedFromBuild>
</ClInclude>
<ClInclude Include="..\..\src\ZlutTexture.h" />
</ItemGroup>

18
projects/msvc2015/GLideN64.vcxproj.filters
View File

@ -341,9 +341,6 @@
<ClCompile Include="..\..\src\uCodes\F3DSETA.cpp">
<Filter>Source Files\uCodes</Filter>
</ClCompile>
<ClCompile Include="..\..\src\uCodes\F3DSWRS.cpp">
<Filter>Source Files\uCodes</Filter>
</ClCompile>
<ClCompile Include="..\..\src\uCodes\F3DTEXA.cpp">
<Filter>Source Files\uCodes</Filter>
</ClCompile>
@ -386,6 +383,12 @@
<ClCompile Include="..\..\src\iob.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="..\..\src\uCodes\F5Indi_Naboo.cpp">
<Filter>Source Files\uCodes</Filter>
</ClCompile>
<ClCompile Include="..\..\src\uCodes\F5Rogue.cpp">
<Filter>Source Files\uCodes</Filter>
</ClCompile>
</ItemGroup>
<ItemGroup>
<ClInclude Include="..\..\src\3DMath.h">
@ -673,9 +676,6 @@
<ClInclude Include="..\..\src\uCodes\F3DSETA.h">
<Filter>Header Files\uCodes</Filter>
</ClInclude>
<ClInclude Include="..\..\src\uCodes\F3DSWRS.h">
<Filter>Header Files\uCodes</Filter>
</ClInclude>
<ClInclude Include="..\..\src\uCodes\F3DTEXA.h">
<Filter>Header Files\uCodes</Filter>
</ClInclude>
@ -712,5 +712,11 @@
<ClInclude Include="..\..\src\DisplayLoadProgress.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="..\..\src\uCodes\F5Indi_Naboo.h">
<Filter>Header Files\uCodes</Filter>
</ClInclude>
<ClInclude Include="..\..\src\uCodes\F5Rogue.h">
<Filter>Header Files\uCodes</Filter>
</ClInclude>
</ItemGroup>
</Project>

108
projects/msvc2015/libGLideNHQ.vcxproj
View File

@ -29,6 +29,14 @@
<Configuration>Release_dll</Configuration>
<Platform>x64</Platform>
</ProjectConfiguration>
<ProjectConfiguration Include="Release_with_debug_mupen64plus|Win32">
<Configuration>Release_with_debug_mupen64plus</Configuration>
<Platform>Win32</Platform>
</ProjectConfiguration>
<ProjectConfiguration Include="Release_with_debug_mupen64plus|x64">
<Configuration>Release_with_debug_mupen64plus</Configuration>
<Platform>x64</Platform>
</ProjectConfiguration>
<ProjectConfiguration Include="Release|Win32">
<Configuration>Release</Configuration>
<Platform>Win32</Platform>
@ -87,12 +95,24 @@
<CharacterSet>MultiByte</CharacterSet>
<PlatformToolset>v140</PlatformToolset>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release_with_debug_mupen64plus|Win32'" Label="Configuration">
<ConfigurationType>StaticLibrary</ConfigurationType>
<UseOfMfc>false</UseOfMfc>
<CharacterSet>MultiByte</CharacterSet>
<PlatformToolset>v140</PlatformToolset>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
<ConfigurationType>StaticLibrary</ConfigurationType>
<UseOfMfc>false</UseOfMfc>
<CharacterSet>MultiByte</CharacterSet>
<PlatformToolset>v140</PlatformToolset>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release_with_debug_mupen64plus|x64'" Label="Configuration">
<ConfigurationType>StaticLibrary</ConfigurationType>
<UseOfMfc>false</UseOfMfc>
<CharacterSet>MultiByte</CharacterSet>
<PlatformToolset>v140</PlatformToolset>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release_dll|Win32'" Label="Configuration">
<ConfigurationType>DynamicLibrary</ConfigurationType>
<UseOfMfc>false</UseOfMfc>
@ -149,9 +169,12 @@
<TargetExt Condition="'$(Configuration)|$(Platform)'=='Debug_mupenplus_uniformset|Win32'">.lib</TargetExt>
<TargetExt Condition="'$(Configuration)|$(Platform)'=='Debug_mupenplus_uniformset|x64'">.lib</TargetExt>
<IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">libGLideNHQ.dir\Release\</IntDir>
<IntDir Condition="'$(Configuration)|$(Platform)'=='Release_with_debug_mupen64plus|Win32'">libGLideNHQ.dir\Release\</IntDir>
<IntDir Condition="'$(Configuration)|$(Platform)'=='Release_dll|Win32'">libGLideNHQ.dir\Release\</IntDir>
<TargetName Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">libGLideNHQ</TargetName>
<TargetName Condition="'$(Configuration)|$(Platform)'=='Release_with_debug_mupen64plus|Win32'">libGLideNHQ</TargetName>
<TargetName Condition="'$(Configuration)|$(Platform)'=='Release|x64'">libGLideNHQ</TargetName>
<TargetName Condition="'$(Configuration)|$(Platform)'=='Release_with_debug_mupen64plus|x64'">libGLideNHQ</TargetName>
<TargetName Condition="'$(Configuration)|$(Platform)'=='Release_dll|Win32'">libGLideNHQ</TargetName>
<TargetName Condition="'$(Configuration)|$(Platform)'=='Release_dll|x64'">libGLideNHQ</TargetName>
<OutDir Condition="'$(Configuration)|$(Platform)'=='MinSizeRel|Win32'">$(SolutionDir)GLideNHQ\$(Configuration)\</OutDir>
@ -171,9 +194,16 @@
<TargetExt>.lib</TargetExt>
<OutDir>$(SolutionDir)GLideNHQ\$(Configuration)\</OutDir>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release_with_debug_mupen64plus|Win32'">
<TargetExt>.lib</TargetExt>
<OutDir>$(SolutionDir)GLideNHQ\$(Configuration)\</OutDir>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
<TargetExt>.lib</TargetExt>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release_with_debug_mupen64plus|x64'">
<TargetExt>.lib</TargetExt>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release_dll|Win32'">
<OutDir>$(SolutionDir)GLideNHQ\$(Configuration)\</OutDir>
</PropertyGroup>
@ -370,6 +400,45 @@
<AdditionalDependencies>libpng.lib;zlib.lib;libboost_filesystem-vc120-mt-sg-1_57.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies)</AdditionalDependencies>
</Link>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release_with_debug_mupen64plus|Win32'">
<ClCompile>
<AdditionalIncludeDirectories>..\..\src;..\..\src\inc;..\..\src\osal;..\..\src\GLideNHQ\inc;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<AssemblerListingLocation>Release/</AssemblerListingLocation>
<CompileAs>CompileAsCpp</CompileAs>
<ExceptionHandling>Sync</ExceptionHandling>
<InlineFunctionExpansion>AnySuitable</InlineFunctionExpansion>
<Optimization>MaxSpeed</Optimization>
<PrecompiledHeader>NotUsing</PrecompiledHeader>
<RuntimeLibrary>MultiThreaded</RuntimeLibrary>
<RuntimeTypeInfo>true</RuntimeTypeInfo>
<WarningLevel>Level3</WarningLevel>
<DebugInformationFormat>
</DebugInformationFormat>
<PreprocessorDefinitions>UNICODE;WIN32;_WINDOWS;NDEBUG;OS_WINDOWS;_CRT_SECURE_NO_WARNINGS;__MSC__;CMAKE_INTDIR="Release";%(PreprocessorDefinitions)</PreprocessorDefinitions>
<ObjectFileName>$(IntDir)</ObjectFileName>
<MultiProcessorCompilation>true</MultiProcessorCompilation>
</ClCompile>
<ResourceCompile>
<PreprocessorDefinitions>WIN32;_WINDOWS;NDEBUG;WIN32;OS_WINDOWS;_CRT_SECURE_NO_WARNINGS;DEBUG;__MSC__;CMAKE_INTDIR=\"Release\";%(PreprocessorDefinitions)</PreprocessorDefinitions>
<AdditionalIncludeDirectories>C:\Users\Sergey\Glide64\GLideN64\GLideNHQ\inc;C:\Tools\boost\boost_1_57_0;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
</ResourceCompile>
<Midl>
<AdditionalIncludeDirectories>C:\Users\Sergey\Glide64\GLideN64\GLideNHQ\inc;C:\Tools\boost\boost_1_57_0;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<OutputDirectory>$(IntDir)</OutputDirectory>
<HeaderFileName>%(Filename).h</HeaderFileName>
<TypeLibraryName>%(Filename).tlb</TypeLibraryName>
<InterfaceIdentifierFileName>%(Filename)_i.c</InterfaceIdentifierFileName>
<ProxyFileName>%(Filename)_p.c</ProxyFileName>
</Midl>
<Lib>
<AdditionalDependencies>libpng.lib;zlib.lib;legacy_stdio_definitions.lib</AdditionalDependencies>
<AdditionalLibraryDirectories>lib/rel</AdditionalLibraryDirectories>
</Lib>
<Link>
<AdditionalLibraryDirectories>%BOOST_ROOT%/lib32-msvc-12.0;../lib</AdditionalLibraryDirectories>
<AdditionalDependencies>libpng.lib;zlib.lib;libboost_filesystem-vc120-mt-sg-1_57.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies)</AdditionalDependencies>
</Link>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
<ClCompile>
<AdditionalIncludeDirectories>..\..\src;..\..\src\inc;..\..\src\osal;..\..\src\GLideNHQ\inc;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
@ -409,6 +478,45 @@
<AdditionalDependencies>libpng.lib;zlib.lib;libboost_filesystem-vc120-mt-sg-1_57.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies)</AdditionalDependencies>
</Link>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release_with_debug_mupen64plus|x64'">
<ClCompile>
<AdditionalIncludeDirectories>..\..\src;..\..\src\inc;..\..\src\osal;..\..\src\GLideNHQ\inc;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<AssemblerListingLocation>Release/</AssemblerListingLocation>
<CompileAs>CompileAsCpp</CompileAs>
<ExceptionHandling>Sync</ExceptionHandling>
<InlineFunctionExpansion>AnySuitable</InlineFunctionExpansion>
<Optimization>MaxSpeed</Optimization>
<PrecompiledHeader>NotUsing</PrecompiledHeader>
<RuntimeLibrary>MultiThreaded</RuntimeLibrary>
<RuntimeTypeInfo>true</RuntimeTypeInfo>
<WarningLevel>Level3</WarningLevel>
<DebugInformationFormat>
</DebugInformationFormat>
<PreprocessorDefinitions>UNICODE;_WINDOWS;NDEBUG;OS_WINDOWS;_CRT_SECURE_NO_WARNINGS;CMAKE_INTDIR="Release";%(PreprocessorDefinitions)</PreprocessorDefinitions>
<ObjectFileName>$(IntDir)</ObjectFileName>
<MultiProcessorCompilation>true</MultiProcessorCompilation>
</ClCompile>
<ResourceCompile>
<PreprocessorDefinitions>WIN32;_WINDOWS;NDEBUG;WIN32;OS_WINDOWS;_CRT_SECURE_NO_WARNINGS;DEBUG;__MSC__;CMAKE_INTDIR=\"Release\";%(PreprocessorDefinitions)</PreprocessorDefinitions>
<AdditionalIncludeDirectories>C:\Users\Sergey\Glide64\GLideN64\GLideNHQ\inc;C:\Tools\boost\boost_1_57_0;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
</ResourceCompile>
<Midl>
<AdditionalIncludeDirectories>C:\Users\Sergey\Glide64\GLideN64\GLideNHQ\inc;C:\Tools\boost\boost_1_57_0;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<OutputDirectory>$(IntDir)</OutputDirectory>
<HeaderFileName>%(Filename).h</HeaderFileName>
<TypeLibraryName>%(Filename).tlb</TypeLibraryName>
<InterfaceIdentifierFileName>%(Filename)_i.c</InterfaceIdentifierFileName>
<ProxyFileName>%(Filename)_p.c</ProxyFileName>
</Midl>
<Lib>
<AdditionalDependencies>libpng.lib;zlib.lib;legacy_stdio_definitions.lib</AdditionalDependencies>
<AdditionalLibraryDirectories>lib/x64/rel</AdditionalLibraryDirectories>
</Lib>
<Link>
<AdditionalLibraryDirectories>%BOOST_ROOT%/lib32-msvc-12.0;../lib</AdditionalLibraryDirectories>
<AdditionalDependencies>libpng.lib;zlib.lib;libboost_filesystem-vc120-mt-sg-1_57.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies)</AdditionalDependencies>
</Link>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release_dll|Win32'">
<ClCompile>
<AdditionalIncludeDirectories>%USERPROFILE%\WS\GLideN64\GLideNHQ\inc;C:\Tools\boost\boost_1_57_0;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

64
projects/msvc2015/osal.vcxproj
View File

@ -17,6 +17,14 @@
<Configuration>Debug</Configuration>
<Platform>x64</Platform>
</ProjectConfiguration>
<ProjectConfiguration Include="Release_with_debug_mupen64plus|Win32">
<Configuration>Release_with_debug_mupen64plus</Configuration>
<Platform>Win32</Platform>
</ProjectConfiguration>
<ProjectConfiguration Include="Release_with_debug_mupen64plus|x64">
<Configuration>Release_with_debug_mupen64plus</Configuration>
<Platform>x64</Platform>
</ProjectConfiguration>
<ProjectConfiguration Include="Release|Win32">
<Configuration>Release</Configuration>
<Platform>Win32</Platform>
@ -62,6 +70,13 @@
<WholeProgramOptimization>true</WholeProgramOptimization>
<CharacterSet>MultiByte</CharacterSet>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release_with_debug_mupen64plus|Win32'" Label="Configuration">
<ConfigurationType>StaticLibrary</ConfigurationType>
<UseDebugLibraries>false</UseDebugLibraries>
<PlatformToolset>v140</PlatformToolset>
<WholeProgramOptimization>true</WholeProgramOptimization>
<CharacterSet>MultiByte</CharacterSet>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
<ConfigurationType>StaticLibrary</ConfigurationType>
<UseDebugLibraries>false</UseDebugLibraries>
@ -69,6 +84,13 @@
<WholeProgramOptimization>true</WholeProgramOptimization>
<CharacterSet>MultiByte</CharacterSet>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release_with_debug_mupen64plus|x64'" Label="Configuration">
<ConfigurationType>StaticLibrary</ConfigurationType>
<UseDebugLibraries>false</UseDebugLibraries>
<PlatformToolset>v140</PlatformToolset>
<WholeProgramOptimization>true</WholeProgramOptimization>
<CharacterSet>MultiByte</CharacterSet>
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
<ImportGroup Label="ExtensionSettings">
</ImportGroup>
@ -87,9 +109,15 @@
<ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
</ImportGroup>
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release_with_debug_mupen64plus|Win32'" Label="PropertySheets">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
</ImportGroup>
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
</ImportGroup>
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release_with_debug_mupen64plus|x64'" Label="PropertySheets">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
</ImportGroup>
<PropertyGroup Label="UserMacros" />
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
<OutDir>$(SolutionDir)osal\$(Configuration)\</OutDir>
@ -103,6 +131,10 @@
<OutDir>$(SolutionDir)osal\$(Configuration)\</OutDir>
<IntDir>$(Configuration)\$ProjectName)\</IntDir>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release_with_debug_mupen64plus|Win32'">
<OutDir>$(SolutionDir)osal\$(Configuration)\</OutDir>
<IntDir>$(Configuration)\$ProjectName)\</IntDir>
</PropertyGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
<ClCompile>
<WarningLevel>Level3</WarningLevel>
@ -167,6 +199,22 @@
<OptimizeReferences>true</OptimizeReferences>
</Link>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release_with_debug_mupen64plus|Win32'">
<ClCompile>
<WarningLevel>Level3</WarningLevel>
<Optimization>MaxSpeed</Optimization>
<FunctionLevelLinking>true</FunctionLevelLinking>
<IntrinsicFunctions>true</IntrinsicFunctions>
<SDLCheck>true</SDLCheck>
<RuntimeLibrary>MultiThreaded</RuntimeLibrary>
<PreprocessorDefinitions>_CRT_SECURE_NO_WARNINGS;UNICODE;OS_WINDOWS;_MBCS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
</ClCompile>
<Link>
<GenerateDebugInformation>true</GenerateDebugInformation>
<EnableCOMDATFolding>true</EnableCOMDATFolding>
<OptimizeReferences>true</OptimizeReferences>
</Link>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
<ClCompile>
<WarningLevel>Level3</WarningLevel>
@ -183,6 +231,22 @@
<OptimizeReferences>true</OptimizeReferences>
</Link>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release_with_debug_mupen64plus|x64'">
<ClCompile>
<WarningLevel>Level3</WarningLevel>
<Optimization>MaxSpeed</Optimization>
<FunctionLevelLinking>true</FunctionLevelLinking>
<IntrinsicFunctions>true</IntrinsicFunctions>
<SDLCheck>true</SDLCheck>
<RuntimeLibrary>MultiThreaded</RuntimeLibrary>
<PreprocessorDefinitions>_CRT_SECURE_NO_WARNINGS;UNICODE;OS_WINDOWS;_MBCS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
</ClCompile>
<Link>
<GenerateDebugInformation>true</GenerateDebugInformation>
<EnableCOMDATFolding>true</EnableCOMDATFolding>
<OptimizeReferences>true</OptimizeReferences>
</Link>
</ItemDefinitionGroup>
<ItemGroup>
<ClInclude Include="..\..\src\osal\osal_files.h" />
</ItemGroup>

3
src/CMakeLists.txt
View File

@ -92,10 +92,11 @@ set(GLideN64_SOURCES
uCodes/F3DZEX2.cpp
uCodes/F3DFLX2.cpp
uCodes/F3DGOLDEN.cpp
uCodes/F3DSWRS.cpp
uCodes/F3DTEXA.cpp
uCodes/F3DPD.cpp
uCodes/F3DSETA.cpp
uCodes/F5Indi_Naboo.cpp
uCodes/F5Rogue.cpp
uCodes/L3D.cpp
uCodes/L3DEX2.cpp
uCodes/L3DEX.cpp

21
src/GBI.cpp
View File

@ -28,8 +28,9 @@
#include "uCodes/F3DZEX2.h"
#include "uCodes/F3DTEXA.h"
#include "uCodes/F3DEX2ACCLAIM.h"
#include "uCodes/F3DSWRS.h"
#include "uCodes/F3DFLX2.h"
#include "uCodes/F5Indi_Naboo.h"
#include "uCodes/F5Rogue.h"
#include "uCodes/ZSort.h"
#include "uCodes/ZSortBOSS.h"
#include "CRC.h"
@ -60,15 +61,17 @@ SpecialMicrocodeInfo specialMicrocodes[] =
{ F3DPD, true, true, 0x1c4f7869, "Perfect Dark" },
{ Turbo3D, false, true, 0x2bdcfc8a, "Turbo3D" },
{ F3DEX2CBFD, true, true, 0x1b4ace88, "Conker's Bad Fur Day" },
{ F3DSWRS, false, false, 0xda51ccdb, "Star Wars RS" },
{ F3DZEX2MM, true, true, 0xd39a0d4f, "Animal Forest" },
{ S2DEX2, false, true, 0x2c399dd, "Animal Forest" },
{ F5Rogue, false, false, 0xda51ccdb, "Star Wars RS" },
{ F3DZEX2MM, true, true, 0xd39a0d4f, "Animal Forest" },
{ S2DEX2, false, true, 0x02c399dd, "Animal Forest" },
{ T3DUX, false, true, 0xbad437f2, "T3DUX vers 0.83 for Toukon Road" },
{ T3DUX, false, true, 0xd0a1aa3d, "T3DUX vers 0.85 for Toukon Road 2" },
{ F3DEX2ACCLAIM,true, true, 0xe44df568, "Acclaim games: Turok2 & 3, Armories and South park" },
{ ZSortBOSS, false, false, 0x553538cc, "World Driver Championship" }, // USA
{ ZSortBOSS, false, false, 0x75ed44cc, "World Driver Championship" }, // European
{ ZSortBOSS, false, false, 0x6a76f8dd, "Stunt Racer" }
{ ZSortBOSS, false, false, 0x6a76f8dd, "Stunt Racer" },
{ F5Indi_Naboo, false, false, 0x6859bf8e, "Indiana Jones" },
{ F5Indi_Naboo, false, false, 0x23fef05f, "SW Ep.1 Battle for Naboo" }
};
u32 G_RDPHALF_1, G_RDPHALF_2, G_RDPHALF_CONT;
@ -269,8 +272,8 @@ void GBIInfo::_makeCurrent(MicrocodeInfo * _pCurrent)
F3DEX2ACCLAIM_Init();
m_hwlSupported = false;
break;
case F3DSWRS:
F3DSWRS_Init();
case F5Rogue:
F5Rogue_Init();
m_hwlSupported = false;
break;
case F3DFLX2:
@ -281,6 +284,10 @@ void GBIInfo::_makeCurrent(MicrocodeInfo * _pCurrent)
ZSortBOSS_Init();
m_hwlSupported = true;
break;
case F5Indi_Naboo:
F5Indi_Naboo_Init();
m_hwlSupported = false;
break;
}
if (m_pCurrent->NoN)
gfxContext.setClampMode(graphics::ClampMode::NoNearPlaneClipping);

11
src/GBI.h
View File

@ -27,12 +27,13 @@
#define F3DZEX2MM 18
#define F3DTEXA 19
#define T3DUX 20
#define F3DEX2ACCLAIM 21
#define F3DEX2ACCLAIM 21
#define F3DAM 22
#define F3DSWRS 23
#define F3DFLX2 24
#define ZSortBOSS 25
#define NONE 26
#define F3DFLX2 23
#define ZSortBOSS 24
#define F5Rogue 25
#define F5Indi_Naboo 26
#define NONE 27
// Fixed point conversion factors
#define FIXED2FLOATRECIP1 0.5f

6
src/GraphicsDrawer.cpp
View File

@ -4,7 +4,6 @@
#include <cmath>
#include "Platform.h"
#include "Graphics/Context.h"
#include "Graphics/Parameters.h"
#include "DisplayWindow.h"
#include "SoftwareRender.h"
#include "GraphicsDrawer.h"
@ -758,7 +757,7 @@ void GraphicsDrawer::drawTriangles()
triangles.maxElement = 0;
}
void GraphicsDrawer::drawScreenSpaceTriangle(u32 _numVtx)
void GraphicsDrawer::drawScreenSpaceTriangle(u32 _numVtx, graphics::DrawModeParam _mode)
{
if (_numVtx == 0 || !_canDraw())
return;
@ -776,13 +775,14 @@ void GraphicsDrawer::drawScreenSpaceTriangle(u32 _numVtx)
gfxContext.enable(enable::CULL_FACE, false);
Context::DrawTriangleParameters triParams;
triParams.mode = drawmode::TRIANGLE_STRIP;
triParams.mode = _mode;
triParams.flatColors = m_bFlatColors;
triParams.verticesCount = _numVtx;
triParams.vertices = m_dmaVertices.data();
triParams.combiner = currentCombiner();
gfxContext.drawTriangles(triParams);
g_debugger.addTriangles(triParams);
m_dmaVerticesNum = 0;
frameBufferList().setBufferChanged(maxY);
gSP.changed |= CHANGED_GEOMETRYMODE;

4
src/GraphicsDrawer.h
View File

@ -8,7 +8,7 @@
#include "gSP.h"
#include "TexrectDrawer.h"
#include "Graphics/ObjectHandle.h"
#include "Graphics/Parameter.h"
#include "Graphics/Parameters.h"
namespace graphics {
class CombinerProgram;
@ -44,7 +44,7 @@ public:
void drawTriangles();
void drawScreenSpaceTriangle(u32 _numVtx);
void drawScreenSpaceTriangle(u32 _numVtx, graphics::DrawModeParam _mode = graphics::drawmode::TRIANGLE_STRIP);
void drawDMATriangles(u32 _numVtx);

13
src/RDP.cpp
View File

@ -269,11 +269,14 @@ bool _getTexRectParams(u32 & w2, u32 & w3)
RSP.PC[RSP.PCi] += 8;
return false;
}
if (GBI.getMicrocodeType() == F3DSWRS) {
w2 = *(u32*)&RDRAM[RSP.PC[RSP.PCi] + 8];
w3 = *(u32*)&RDRAM[RSP.PC[RSP.PCi] + 12];
RSP.PC[RSP.PCi] += 8;
return true;
{
const u32 ucode = GBI.getMicrocodeType();
if (ucode == F5Rogue || ucode == F5Indi_Naboo) {
w2 = *(u32*)&RDRAM[RSP.PC[RSP.PCi] + 8];
w3 = *(u32*)&RDRAM[RSP.PC[RSP.PCi] + 12];
RSP.PC[RSP.PCi] += 8;
return true;
}
}
w2 = *(u32*)&RDRAM[RSP.PC[RSP.PCi] + 0];
w3 = *(u32*)&RDRAM[RSP.PC[RSP.PCi] + 4];

16
src/RSP.cpp
View File

@ -62,11 +62,18 @@ void _ProcessDList()
}
static
void _ProcessDListSWRS()
void _ProcessDListFactor5()
{
// Lemmy's note: read first 64 bits of this dlist
RSP.swDL[0] = _SHIFTR(*(u32*)&RDRAM[RSP.PC[0]], 0, 24);
RSP.F5DL[0] = _SHIFTR(*(u32*)&RDRAM[RSP.PC[0]], 0, 24);
RSP.PC[0] += 8;
static u32 vAddrToClear[7] = { 0x11C >> 2, 0x120 >> 2, 0x124 >> 2, 0x37C >> 2,
0x58C >> 2, 0x5B0 >> 2, 0x5B4 >> 2};
u32 * pDmem32 = reinterpret_cast<u32*>(DMEM);
for (u32 i = 0; i < 7; ++i)
pDmem32[vAddrToClear[i]] = 0U;
while (!RSP.halt) {
if ((RSP.PC[RSP.PCi] + 8) > RDRAMSize) {
break;
@ -163,8 +170,9 @@ void RSP_ProcessDList()
case T3DUX:
RunT3DUX();
break;
case F3DSWRS:
_ProcessDListSWRS();
case F5Rogue:
case F5Indi_Naboo:
_ProcessDListFactor5();
break;
default:
_ProcessDList();

2
src/RSP.h
View File

@ -7,7 +7,7 @@
typedef struct
{
u32 PC[18], PCi;
u32 swDL[10];
u32 F5DL[10];
u32 uc_start, uc_dstart, cmd, nextCmd;
u32 w0, w1;
s32 count;

38
src/gSP.cpp
View File

@ -1194,9 +1194,9 @@ void gSPF3DAMVertex(u32 a, u32 n, u32 v0)
}
template <u32 VNUM>
u32 gSPLoadSWVertexData(const SWVertex *orgVtx, SPVertex * spVtx, u32 v0, u32 vi, u32 n)
u32 gSPLoadSWVertexData(const SWVertex *orgVtx, SPVertex * spVtx, u32 vi, u32 n)
{
const u32 end = n - (n%VNUM) + v0;
const u32 end = n - (n%VNUM);
for (; vi < end; vi += VNUM) {
for(u32 j = 0; j < VNUM; ++j) {
SPVertex & vtx = spVtx[vi+j];
@ -1214,20 +1214,32 @@ u32 gSPLoadSWVertexData(const SWVertex *orgVtx, SPVertex * spVtx, u32 v0, u32 vi
return vi;
}
void gSPSWVertex(const SWVertex * vertex, u32 n, u32 v0)
void gSPSWVertex(const SWVertex * vertex, u32 n, const bool * const verticesToProcess)
{
DebugMsg(DEBUG_NORMAL, "gSPSWVertex n = %i, v0 = %i\n", n, v0);
if ((n + v0) > INDEXMAP_SIZE) {
LOG(LOG_ERROR, "Using Vertex outside buffer v0=%i, n=%i\n", v0, n);
DebugMsg(DEBUG_NORMAL | DEBUG_ERROR, "//Using Vertex outside buffer v0 = %i, n = %i\n", v0, n);
return;
}
DebugMsg(DEBUG_NORMAL, "gSPSWVertex n = %i\n", n);
SPVertex * spVtx = dwnd().getDrawer().getVertexPtr(0);
u32 i = gSPLoadSWVertexData<VEC_OPT>(vertex, spVtx, v0, v0, n);
if (i < n + v0)
gSPLoadSWVertexData<1>(vertex + (i - v0), spVtx, v0, i, n);
if (verticesToProcess == nullptr) {
u32 i = gSPLoadSWVertexData<VEC_OPT>(vertex, spVtx, 0, n);
if (i < n)
gSPLoadSWVertexData<1>(vertex + i, spVtx, i, n);
} else {
for (u32 i = 0; i < n; ++i) {
if (verticesToProcess[i])
gSPLoadSWVertexData<1>(vertex + i, spVtx, i, i + 1);
}
}
}
void gSPSWVertex(const SWVertex * vertex, u32 v0, u32 n)
{
DebugMsg(DEBUG_NORMAL, "gSPSWVertex v0 = %i, n = %i\n", v0, n);
SPVertex * spVtx = dwnd().getDrawer().getVertexPtr(0);
const u32 endIdx = v0 + n;
u32 i = gSPLoadSWVertexData<VEC_OPT>(vertex, spVtx, v0, endIdx);
if (i < endIdx)
gSPLoadSWVertexData<1>(vertex + i - v0, spVtx, i, endIdx);
}
void gSPT3DUXVertex(u32 a, u32 n, u32 ci)

3
src/gSP.h
View File

@ -164,7 +164,8 @@ void gSPDMAVertex( u32 v, u32 n, u32 v0 );
void gSPCBFDVertex( u32 v, u32 n, u32 v0 );
void gSPT3DUXVertex(u32 v, u32 n, u32 ci);
void gSPF3DAMVertex( u32 v, u32 n, u32 v0 );
void gSPSWVertex(const SWVertex * vertex, u32 n, u32 v0);
void gSPSWVertex(const SWVertex * vertex, u32 n, const bool * const verticesToProcess);
void gSPSWVertex(const SWVertex * vertex, u32 v0, u32 n);
void gSPDisplayList(u32 dl);
void gSPBranchList( u32 dl );
void gSPBranchLessZ(u32 branchdl, u32 vtx, u32 zval);

3
src/mupen64plus-video-gliden64.mk
View File

@ -104,7 +104,8 @@ MY_LOCAL_SRC_FILES :=
$(SRCDIR)/uCodes/F3DGOLDEN.cpp \
$(SRCDIR)/uCodes/F3DPD.cpp \
$(SRCDIR)/uCodes/F3DSETA.cpp \
$(SRCDIR)/uCodes/F3DSWRS.cpp \
$(SRCDIR)/uCodes/F5Indi_Naboo.cpp \
$(SRCDIR)/uCodes/F5Rogue.cpp \
$(SRCDIR)/uCodes/F3DTEXA.cpp \
$(SRCDIR)/uCodes/L3D.cpp \
$(SRCDIR)/uCodes/L3DEX2.cpp \

6
src/uCodes/F3DSWRS.h
View File

@ -1,6 +0,0 @@
#ifndef F3DSWRS_H
#define F3DSWRS_H
void F3DSWRS_Init();
#endif // F3DSWRS_H

2268
src/uCodes/F5Indi_Naboo.cpp Normal file
View File

File diff suppressed because it is too large Load Diff

6
src/uCodes/F5Indi_Naboo.h Normal file
View File

@ -0,0 +1,6 @@
#ifndef F5INDI_NABOO_H
#define F5INDI_NABOO_H
void F5Indi_Naboo_Init();
#endif

41
src/uCodes/F3DSWRS.cpp → src/uCodes/F5Rogue.cpp
View File

@ -11,6 +11,7 @@
#include "DebugDump.h"
#include "F3D.h"
#include "F3DEX.h"
#include "F5Rogue.h"
#include "N64.h"
#include "RSP.h"
#include "RDP.h"
@ -123,13 +124,13 @@ SWRSTriangle TriGen0001_defaultTriangleOrder[8] = {
};
inline
void _updateSWDL()
void _updateF5DL()
{
// Lemmy's note:
// differs from the other DL commands because it does skip the first command
// the first 32 bits are stored, because they are
// used as branch target address in the command in the QUAD "slot"
RSP.swDL[RSP.PCi] = _SHIFTR(*(u32*)&RDRAM[RSP.PC[RSP.PCi]], 0, 24);
RSP.F5DL[RSP.PCi] = _SHIFTR(*(u32*)&RDRAM[RSP.PC[RSP.PCi]], 0, 24);
}
void F3DSWRS_Mtx(u32 w0, u32 w1)
@ -173,7 +174,7 @@ void F3DSWRS_Vtx(u32 _w0, u32 _w1)
return;
const SWVertex * vertex = (const SWVertex*)&RDRAM[address];
gSPSWVertex(vertex, n, 0 );
gSPSWVertex(vertex, n, nullptr );
}
static
@ -835,7 +836,7 @@ void TriGen0000()
// Step 3. Process vertices
const SWVertex * vertex = (const SWVertex*)vtxData32.data();
const u32 vtxSize = static_cast<u32>(vtxData32.size()) / 2;
gSPSWVertex(vertex, vtxSize, 0);
gSPSWVertex(vertex, vtxSize, nullptr);
// Step 4. Prepare color indices and texture coordinates. Prepare vertices for rendering
@ -903,7 +904,7 @@ void TriGen0001()
// Step 3. Process vertices
const SWVertex * vertex = (const SWVertex*)vtxData32.data();
const u32 vtxSize = static_cast<u32>(vtxData32.size()) / 2;
gSPSWVertex(vertex, vtxSize, 0);
gSPSWVertex(vertex, vtxSize, nullptr);
// Step 4. Prepare color indices and texture coordinates. Prepare vertices for rendering
@ -944,7 +945,7 @@ void TriGen02()
u32 vecdata[8];
TriGen02_BuildVtxData(params, vecdata);
const SWVertex * vertex = (const SWVertex*)&vecdata[0];
gSPSWVertex(vertex, 4, 0);
gSPSWVertex(vertex, 4, nullptr);
GraphicsDrawer & drawer = dwnd().getDrawer();
const u32 v1 = 0;
@ -1009,22 +1010,22 @@ void F3DSWRS_TriGen(u32 _w0, u32 _w1)
void F3DSWRS_JumpSWDL(u32, u32)
{
DebugMsg(DEBUG_NORMAL, "F3DSWRS_JumpSWDL\n");
RSP.PC[RSP.PCi] = RSP.swDL[RSP.PCi];
_updateSWDL();
RSP.PC[RSP.PCi] = RSP.F5DL[RSP.PCi];
_updateF5DL();
}
void F3DSWRS_DList(u32, u32 _w1)
{
DebugMsg(DEBUG_NORMAL, "F3DSWRS_DList (0x%08x)\n", _w1);
gSPDisplayList(_w1);
_updateSWDL();
_updateF5DL();
}
void F3DSWRS_BranchDList(u32, u32 _w1)
{
DebugMsg(DEBUG_NORMAL, "F3DSWRS_BranchDList (0x%08x)\n", _w1);
gSPBranchList(_w1);
_updateSWDL();
_updateF5DL();
}
void F3DSWRS_EndDisplayList(u32, u32)
@ -1247,19 +1248,17 @@ void F3DSWRS_TexrectGen(u32 _w0, u32 _w1)
gDP.primDepth.deltaZ = 0.0f;
const u32 primColor = params[1];
gDPSetPrimColor( u32(gDP.primColor.m*255.0f), // m
u32(gDP.primColor.l*255.0f), // l
_SHIFTR( primColor, 24, 8 ), // r
_SHIFTR( primColor, 16, 8 ), // g
_SHIFTR( primColor, 8, 8 ), // b
_SHIFTR( primColor, 0, 8 ) ); // a
gDP.primColor.r = _FIXED2FLOATCOLOR(_SHIFTR(primColor, 24, 8), 8);
gDP.primColor.g = _FIXED2FLOATCOLOR(_SHIFTR(primColor, 16, 8), 8);
gDP.primColor.b = _FIXED2FLOATCOLOR(_SHIFTR(primColor, 8, 8), 8);
gDP.primColor.a = _FIXED2FLOATCOLOR(_SHIFTR(primColor, 0, 8), 8);
if ((gSP.geometryMode & G_FOG) != 0) {
const u32 fogColor = (params[1] & 0xFFFFFF00) | u32(v.a*255.0f);
gDPSetFogColor( _SHIFTR( fogColor, 24, 8 ), // r
_SHIFTR( fogColor, 16, 8 ), // g
_SHIFTR( fogColor, 8, 8 ), // b
_SHIFTR( fogColor, 0, 8 ) ); // a
gDPSetFogColor( _SHIFTR( fogColor, 24, 8 ), // r
_SHIFTR( fogColor, 16, 8 ), // g
_SHIFTR( fogColor, 8, 8 ), // b
_SHIFTR( fogColor, 0, 8 ) ); // a
}
gDPTextureRectangle(ulx, uly, lrx, lry, gSP.texture.tile, (s16)S, (s16)T, dsdx, dtdy, flip);
@ -1281,7 +1280,7 @@ void F3DSWRS_SetOtherMode_L_EX(u32 _w0, u32 _w1)
gDP.otherMode.l |= _w1;
}
void F3DSWRS_Init()
void F5Rogue_Init()
{
gSPSetupFunctions();
// Set GeometryMode flags

6
src/uCodes/F5Rogue.h Normal file
View File

@ -0,0 +1,6 @@
#ifndef F5ROGUE_H
#define F5ROGUE_H
void F5Rogue_Init();
#endif // F5ROGUE_H