[Video] Make all video plugin in to one project

This commit is contained in:
zilmar 2017-04-26 19:40:23 +10:00
parent ea009c1ca1
commit 894706a379
14 changed files with 115 additions and 402 deletions

4
.gitignore vendored
View File

@ -37,8 +37,8 @@ Thumbs.db
/Plugin/GFX/lib
/Plugin/GFX/map
/Plugin/GFX/pdb
/Plugin/GFX/PJ64Glide64.dll
/Plugin/GFX/PJ64Glide64_d.dll
/Plugin/GFX/Project64-Video.dll
/Plugin/GFX/Project64-Video_d.dll
/Plugin/Input/lib
/Plugin/Input/map
/Plugin/Input/pdb

View File

@ -23,18 +23,6 @@ echo copy Common
xcopy "%base_dir%/Source/Common" "%base_dir%/Android/jni/Common/" /D /I /F /Y /E
IF %ERRORLEVEL% NEQ 0 (exit /B 1)
echo copy Glide64
xcopy "%base_dir%/Source/Glide64" "%base_dir%/Android/jni/Glide64/" /D /I /F /Y /E
IF %ERRORLEVEL% NEQ 0 (exit /B 1)
echo copy GlideHQ
xcopy "%base_dir%/Source/GlideHQ" "%base_dir%/Android/jni/GlideHQ/" /D /I /F /Y /E
IF %ERRORLEVEL% NEQ 0 (exit /B 1)
echo copy Glitch64
xcopy "%base_dir%/Source/Glitch64" "%base_dir%/Android/jni/Glitch64/" /D /I /F /Y /E
IF %ERRORLEVEL% NEQ 0 (exit /B 1)
echo copy PluginAudio
xcopy "%base_dir%/Source/Android/PluginAudio" "%base_dir%/Android/jni/PluginAudio/" /D /I /F /Y /E
IF %ERRORLEVEL% NEQ 0 (exit /B 1)
@ -55,6 +43,10 @@ echo copy Project64-core
xcopy "%base_dir%/Source/Project64-core" "%base_dir%/Android/jni/Project64-core/" /D /I /F /Y /E
IF %ERRORLEVEL% NEQ 0 (exit /B 1)
echo copy Project64-video
xcopy "%base_dir%/Source/Project64-video" "%base_dir%/Android/jni/Project64-video/" /D /I /F /Y /E
IF %ERRORLEVEL% NEQ 0 (exit /B 1)
echo copy Settings
xcopy "%base_dir%/Source/Settings" "%base_dir%/Android/jni/Settings/" /D /I /F /Y /E
IF %ERRORLEVEL% NEQ 0 (exit /B 1)

View File

@ -13,15 +13,6 @@
<copy todir="./jni/Common/">
<fileset dir="../Source/Common"/>
</copy>
<copy todir="./jni/Glide64/">
<fileset dir="../Source/Glide64"/>
</copy>
<copy todir="./jni/GlideHQ/">
<fileset dir="../Source/GlideHQ"/>
</copy>
<copy todir="./jni/Glitch64/">
<fileset dir="../Source/Glitch64"/>
</copy>
<copy todir="./jni/PluginAudio/">
<fileset dir="../Source/Android/PluginAudio"/>
</copy>
@ -37,6 +28,9 @@
<copy todir="./jni/Project64-core/">
<fileset dir="../Source/Project64-core"/>
</copy>
<copy todir="./jni/Project64-video/">
<fileset dir="../Source/Project64-video"/>
</copy>
<copy todir="./jni/Settings/">
<fileset dir="../Source/Settings"/>
</copy>

View File

@ -4,8 +4,6 @@ VisualStudioVersion = 14.0.25420.1
MinimumVisualStudioVersion = 10.0.40219.1
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "3rd Party", "3rd Party", "{AA8F7F8E-5377-4911-859D-8A8817B0DB26}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Glide", "Glide", "{9FE699A5-41C3-4441-92AB-639B3D77DE26}"
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Common", "Source\Common\Common.vcxproj", "{B4A4B994-9111-42B1-93C2-6F1CA8BC4421}"
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Project64", "Source\Project64\Project64.vcxproj", "{7E534C8E-1ACE-4A88-8807-39A11ED4DA18}"
@ -56,11 +54,7 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "PluginRSP", "Source\Android
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "JniBridge", "Source\Android\Bridge\Bridge.vcxproj", "{593B00E6-1987-415D-A62C-26533FC3E95C}"
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Glide64", "Source\Project64-video\Glide64.vcxproj", "{A4D13408-A794-4199-8FC7-4A9A32505005}"
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Glitch64", "Source\Project64-video\Renderer\Glitch64.vcxproj", "{462C2608-182F-452C-944F-AF201E19300B}"
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "GlideHQ", "Source\Project64-video\TextureEnhancer\GlideHQ.vcxproj", "{2DADDAA5-0F57-46ED-A974-747908DDC7F3}"
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Project64-video", "Source\Project64-video\Project64-video.vcxproj", "{A4D13408-A794-4199-8FC7-4A9A32505005}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
@ -187,22 +181,6 @@ Global
{A4D13408-A794-4199-8FC7-4A9A32505005}.Release|Win32.Build.0 = Release|Win32
{A4D13408-A794-4199-8FC7-4A9A32505005}.Release|x64.ActiveCfg = Release|x64
{A4D13408-A794-4199-8FC7-4A9A32505005}.Release|x64.Build.0 = Release|x64
{462C2608-182F-452C-944F-AF201E19300B}.Debug|Win32.ActiveCfg = Debug|Win32
{462C2608-182F-452C-944F-AF201E19300B}.Debug|Win32.Build.0 = Debug|Win32
{462C2608-182F-452C-944F-AF201E19300B}.Debug|x64.ActiveCfg = Debug|x64
{462C2608-182F-452C-944F-AF201E19300B}.Debug|x64.Build.0 = Debug|x64
{462C2608-182F-452C-944F-AF201E19300B}.Release|Win32.ActiveCfg = Release|Win32
{462C2608-182F-452C-944F-AF201E19300B}.Release|Win32.Build.0 = Release|Win32
{462C2608-182F-452C-944F-AF201E19300B}.Release|x64.ActiveCfg = Release|x64
{462C2608-182F-452C-944F-AF201E19300B}.Release|x64.Build.0 = Release|x64
{2DADDAA5-0F57-46ED-A974-747908DDC7F3}.Debug|Win32.ActiveCfg = Debug|Win32
{2DADDAA5-0F57-46ED-A974-747908DDC7F3}.Debug|Win32.Build.0 = Debug|Win32
{2DADDAA5-0F57-46ED-A974-747908DDC7F3}.Debug|x64.ActiveCfg = Debug|x64
{2DADDAA5-0F57-46ED-A974-747908DDC7F3}.Debug|x64.Build.0 = Debug|x64
{2DADDAA5-0F57-46ED-A974-747908DDC7F3}.Release|Win32.ActiveCfg = Release|Win32
{2DADDAA5-0F57-46ED-A974-747908DDC7F3}.Release|Win32.Build.0 = Release|Win32
{2DADDAA5-0F57-46ED-A974-747908DDC7F3}.Release|x64.ActiveCfg = Release|x64
{2DADDAA5-0F57-46ED-A974-747908DDC7F3}.Release|x64.Build.0 = Release|x64
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
@ -216,8 +194,5 @@ Global
{1133A1CC-A9E5-4026-B20D-6A2987130D4E} = {0E0FCAC2-E128-4886-8EE6-1BCA84551F58}
{B685BB34-D700-4FCC-8503-9B6AA1A0C95D} = {0E0FCAC2-E128-4886-8EE6-1BCA84551F58}
{593B00E6-1987-415D-A62C-26533FC3E95C} = {0E0FCAC2-E128-4886-8EE6-1BCA84551F58}
{A4D13408-A794-4199-8FC7-4A9A32505005} = {9FE699A5-41C3-4441-92AB-639B3D77DE26}
{462C2608-182F-452C-944F-AF201E19300B} = {9FE699A5-41C3-4441-92AB-639B3D77DE26}
{2DADDAA5-0F57-46ED-A974-747908DDC7F3} = {9FE699A5-41C3-4441-92AB-639B3D77DE26}
EndGlobalSection
EndGlobal

View File

@ -20,7 +20,7 @@
</ItemGroup>
<PropertyGroup Label="Globals">
<ProjectGuid>{A4D13408-A794-4199-8FC7-4A9A32505005}</ProjectGuid>
<RootNamespace>n64Glide</RootNamespace>
<RootNamespace>Project64-video</RootNamespace>
</PropertyGroup>
<PropertyGroup Label="Configuration">
<ConfigurationType>DynamicLibrary</ConfigurationType>
@ -32,8 +32,8 @@
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
<PropertyGroup>
<TargetName>PJ64Glide64</TargetName>
<TargetName Condition="'$(Configuration)'=='Debug'">PJ64Glide64_d</TargetName>
<TargetName>Project64-Video</TargetName>
<TargetName Condition="'$(Configuration)'=='Debug'">Project64-Video_d</TargetName>
<OutDir>$(SolutionDir)Plugin\GFX\</OutDir>
<OutDir Condition="'$(Platform)'=='x64'">$(SolutionDir)Plugin64\GFX\</OutDir>
</PropertyGroup>
@ -51,6 +51,26 @@
<ClInclude Include="ScreenResolution.h" />
<ClInclude Include="Settings.h" />
<ClInclude Include="SettingsID.h" />
<ClInclude Include="TextureEnhancer\Ext_TxFilter.h" />
<ClInclude Include="TextureEnhancer\tc-1.1+\dxtn.h" />
<ClInclude Include="TextureEnhancer\tc-1.1+\fxt1.h" />
<ClInclude Include="TextureEnhancer\tc-1.1+\internal.h" />
<ClInclude Include="TextureEnhancer\tc-1.1+\types.h" />
<ClInclude Include="TextureEnhancer\TextureFilters.h" />
<ClInclude Include="TextureEnhancer\TextureFilters_2xsai.h" />
<ClInclude Include="TextureEnhancer\TextureFilters_hq2x.h" />
<ClInclude Include="TextureEnhancer\TextureFilters_hq4x.h" />
<ClInclude Include="TextureEnhancer\TextureFilters_lq2x.h" />
<ClInclude Include="TextureEnhancer\TxCache.h" />
<ClInclude Include="TextureEnhancer\TxDbg.h" />
<ClInclude Include="TextureEnhancer\TxFilter.h" />
<ClInclude Include="TextureEnhancer\TxHiResCache.h" />
<ClInclude Include="TextureEnhancer\TxImage.h" />
<ClInclude Include="TextureEnhancer\TxInternal.h" />
<ClInclude Include="TextureEnhancer\TxQuantize.h" />
<ClInclude Include="TextureEnhancer\TxReSample.h" />
<ClInclude Include="TextureEnhancer\TxTexCache.h" />
<ClInclude Include="TextureEnhancer\TxUtil.h" />
<ClInclude Include="trace.h" />
<ClInclude Include="turbo3D.h" />
<ClInclude Include="ucode.h" />
@ -98,6 +118,10 @@
<ItemGroup>
<ClCompile Include="Android.cpp" />
<ClCompile Include="CRC.cpp" />
<ClCompile Include="Renderer\OGLcombiner.cpp" />
<ClCompile Include="Renderer\OGLgeometry.cpp" />
<ClCompile Include="Renderer\OGLglitchmain.cpp" />
<ClCompile Include="Renderer\OGLtextures.cpp" />
<ClCompile Include="ScreenResolution.cpp" />
<ClCompile Include="Settings.cpp" />
<ClCompile Include="TexCache.cpp" />
@ -111,6 +135,24 @@
<ClCompile Include="Main.cpp" />
<ClCompile Include="rdp.cpp" />
<ClCompile Include="TexBuffer.cpp" />
<ClCompile Include="TextureEnhancer\tc-1.1+\dxtn.c" />
<ClCompile Include="TextureEnhancer\tc-1.1+\fxt1.c" />
<ClCompile Include="TextureEnhancer\tc-1.1+\texstore.c" />
<ClCompile Include="TextureEnhancer\tc-1.1+\wrapper.c" />
<ClCompile Include="TextureEnhancer\TextureFilters.cpp" />
<ClCompile Include="TextureEnhancer\TextureFilters_2xsai.cpp" />
<ClCompile Include="TextureEnhancer\TextureFilters_hq2x.cpp" />
<ClCompile Include="TextureEnhancer\TextureFilters_hq4x.cpp" />
<ClCompile Include="TextureEnhancer\TxCache.cpp" />
<ClCompile Include="TextureEnhancer\TxDbg.cpp" />
<ClCompile Include="TextureEnhancer\TxFilter.cpp" />
<ClCompile Include="TextureEnhancer\TxFilterExport.cpp" />
<ClCompile Include="TextureEnhancer\TxHiResCache.cpp" />
<ClCompile Include="TextureEnhancer\TxImage.cpp" />
<ClCompile Include="TextureEnhancer\TxQuantize.cpp" />
<ClCompile Include="TextureEnhancer\TxReSample.cpp" />
<ClCompile Include="TextureEnhancer\TxTexCache.cpp" />
<ClCompile Include="TextureEnhancer\TxUtil.cpp" />
<ClCompile Include="trace.cpp" />
<ClCompile Include="Util.cpp" />
</ItemGroup>
@ -144,11 +186,5 @@
<Project>{8b9961b1-88d9-4ea3-a752-507a00dd9f3d}</Project>
<ReferenceOutputAssembly>false</ReferenceOutputAssembly>
</ProjectReference>
<ProjectReference Include="Renderer\Glitch64.vcxproj">
<Project>{462c2608-182f-452c-944f-af201e19300b}</Project>
</ProjectReference>
<ProjectReference Include="TextureEnhancer\GlideHQ.vcxproj">
<Project>{2daddaa5-0f57-46ed-a974-747908ddc7f3}</Project>
</ProjectReference>
</ItemGroup>
</Project>

View File

@ -20,6 +20,9 @@
<Filter Include="Res">
<UniqueIdentifier>{f0e9ed7a-3046-4b82-a4b1-5f58e1fe7446}</UniqueIdentifier>
</Filter>
<Filter Include="Renderer">
<UniqueIdentifier>{2f56a742-ee60-47e1-ae68-6d19d9be996a}</UniqueIdentifier>
</Filter>
</ItemGroup>
<ItemGroup>
<ClInclude Include="turbo3D.h">
@ -131,6 +134,26 @@
<ClInclude Include="Settings.h" />
<ClInclude Include="SettingsID.h" />
<ClInclude Include="ScreenResolution.h" />
<ClInclude Include="TextureEnhancer\Ext_TxFilter.h" />
<ClInclude Include="TextureEnhancer\tc-1.1+\dxtn.h" />
<ClInclude Include="TextureEnhancer\tc-1.1+\fxt1.h" />
<ClInclude Include="TextureEnhancer\tc-1.1+\internal.h" />
<ClInclude Include="TextureEnhancer\tc-1.1+\types.h" />
<ClInclude Include="TextureEnhancer\TextureFilters.h" />
<ClInclude Include="TextureEnhancer\TextureFilters_2xsai.h" />
<ClInclude Include="TextureEnhancer\TextureFilters_hq2x.h" />
<ClInclude Include="TextureEnhancer\TextureFilters_hq4x.h" />
<ClInclude Include="TextureEnhancer\TextureFilters_lq2x.h" />
<ClInclude Include="TextureEnhancer\TxCache.h" />
<ClInclude Include="TextureEnhancer\TxDbg.h" />
<ClInclude Include="TextureEnhancer\TxFilter.h" />
<ClInclude Include="TextureEnhancer\TxHiResCache.h" />
<ClInclude Include="TextureEnhancer\TxImage.h" />
<ClInclude Include="TextureEnhancer\TxInternal.h" />
<ClInclude Include="TextureEnhancer\TxQuantize.h" />
<ClInclude Include="TextureEnhancer\TxReSample.h" />
<ClInclude Include="TextureEnhancer\TxTexCache.h" />
<ClInclude Include="TextureEnhancer\TxUtil.h" />
</ItemGroup>
<ItemGroup>
<ClCompile Include="CRC.cpp">
@ -156,6 +179,36 @@
<ClCompile Include="Settings.cpp" />
<ClCompile Include="ScreenResolution.cpp" />
<ClCompile Include="Android.cpp" />
<ClCompile Include="TextureEnhancer\tc-1.1+\dxtn.c" />
<ClCompile Include="TextureEnhancer\tc-1.1+\fxt1.c" />
<ClCompile Include="TextureEnhancer\tc-1.1+\texstore.c" />
<ClCompile Include="TextureEnhancer\tc-1.1+\wrapper.c" />
<ClCompile Include="TextureEnhancer\TextureFilters.cpp" />
<ClCompile Include="TextureEnhancer\TextureFilters_2xsai.cpp" />
<ClCompile Include="TextureEnhancer\TextureFilters_hq2x.cpp" />
<ClCompile Include="TextureEnhancer\TextureFilters_hq4x.cpp" />
<ClCompile Include="TextureEnhancer\TxCache.cpp" />
<ClCompile Include="TextureEnhancer\TxDbg.cpp" />
<ClCompile Include="TextureEnhancer\TxFilter.cpp" />
<ClCompile Include="TextureEnhancer\TxFilterExport.cpp" />
<ClCompile Include="TextureEnhancer\TxHiResCache.cpp" />
<ClCompile Include="TextureEnhancer\TxImage.cpp" />
<ClCompile Include="TextureEnhancer\TxQuantize.cpp" />
<ClCompile Include="TextureEnhancer\TxReSample.cpp" />
<ClCompile Include="TextureEnhancer\TxTexCache.cpp" />
<ClCompile Include="TextureEnhancer\TxUtil.cpp" />
<ClCompile Include="Renderer\OGLcombiner.cpp">
<Filter>Renderer</Filter>
</ClCompile>
<ClCompile Include="Renderer\OGLgeometry.cpp">
<Filter>Renderer</Filter>
</ClCompile>
<ClCompile Include="Renderer\OGLglitchmain.cpp">
<Filter>Renderer</Filter>
</ClCompile>
<ClCompile Include="Renderer\OGLtextures.cpp">
<Filter>Renderer</Filter>
</ClCompile>
</ItemGroup>
<ItemGroup>
<Text Include="gpl.txt">

View File

@ -1,71 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<ItemGroup Label="ProjectConfigurations">
<ProjectConfiguration Include="Debug|Win32">
<Configuration>Debug</Configuration>
<Platform>Win32</Platform>
</ProjectConfiguration>
<ProjectConfiguration Include="Debug|x64">
<Configuration>Debug</Configuration>
<Platform>x64</Platform>
</ProjectConfiguration>
<ProjectConfiguration Include="Release|Win32">
<Configuration>Release</Configuration>
<Platform>Win32</Platform>
</ProjectConfiguration>
<ProjectConfiguration Include="Release|x64">
<Configuration>Release</Configuration>
<Platform>x64</Platform>
</ProjectConfiguration>
</ItemGroup>
<PropertyGroup Label="Globals">
<ProjectGuid>{462C2608-182F-452C-944F-AF201E19300B}</ProjectGuid>
<RootNamespace>glide3x</RootNamespace>
</PropertyGroup>
<PropertyGroup Label="Configuration">
<ConfigurationType>StaticLibrary</ConfigurationType>
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
<ImportGroup Label="PropertySheets">
<Import Project="$(SolutionDir)PropertySheets\Platform.$(Configuration).props" />
</ImportGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
<ItemDefinitionGroup>
<ClCompile>
<AdditionalIncludeDirectories>inc;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PrecompiledHeader />
</ClCompile>
<Lib>
<AdditionalDependencies>OpenGL32.lib;%(AdditionalDependencies)</AdditionalDependencies>
</Lib>
</ItemDefinitionGroup>
<ItemGroup>
<ClCompile Include="OGLcombiner.cpp" />
<ClCompile Include="OGLEScombiner.cpp">
<ExcludedFromBuild>true</ExcludedFromBuild>
</ClCompile>
<ClCompile Include="OGLESgeometry.cpp">
<ExcludedFromBuild>true</ExcludedFromBuild>
</ClCompile>
<ClCompile Include="OGLESglitchmain.cpp">
<ExcludedFromBuild>true</ExcludedFromBuild>
</ClCompile>
<ClCompile Include="OGLEStextures.cpp">
<ExcludedFromBuild>true</ExcludedFromBuild>
</ClCompile>
<ClCompile Include="OGLESwrappers.cpp">
<ExcludedFromBuild>true</ExcludedFromBuild>
</ClCompile>
<ClCompile Include="OGLgeometry.cpp" />
<ClCompile Include="OGLglitchmain.cpp" />
<ClCompile Include="OGLtextures.cpp" />
</ItemGroup>
<ItemGroup>
<ClInclude Include="glitchmain.h" />
<ClInclude Include="OGLESwrappers.h">
<ExcludedFromBuild>true</ExcludedFromBuild>
</ClInclude>
<ClInclude Include="opengl.h" />
</ItemGroup>
</Project>

View File

@ -1,53 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<ItemGroup>
<Filter Include="Headers">
<UniqueIdentifier>{67046859-ebd4-4537-aed8-a6d9f2fd82b5}</UniqueIdentifier>
<Extensions>*.h</Extensions>
</Filter>
<Filter Include="Source Files">
<UniqueIdentifier>{2b6170d8-e8e8-4f3a-94af-a88d7b8ce7d9}</UniqueIdentifier>
<Extensions>*.cpp</Extensions>
</Filter>
</ItemGroup>
<ItemGroup>
<ClCompile Include="OGLcombiner.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="OGLgeometry.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="OGLglitchmain.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="OGLtextures.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="OGLEScombiner.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="OGLESgeometry.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="OGLESglitchmain.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="OGLEStextures.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="OGLESwrappers.cpp">
<Filter>Source Files</Filter>
</ClCompile>
</ItemGroup>
<ItemGroup>
<ClInclude Include="glitchmain.h">
<Filter>Headers</Filter>
</ClInclude>
<ClInclude Include="OGLESwrappers.h">
<Filter>Source Files</Filter>
</ClInclude>
<ClInclude Include="opengl.h">
<Filter>Headers</Filter>
</ClInclude>
</ItemGroup>
</Project>

View File

@ -29,8 +29,8 @@
#include <stdlib.h>
#include "glide.h"
#include "glitchmain.h"
#include <Glide64/trace.h>
#include <Glide64/Settings.h>
#include <Project64-video/trace.h>
#include <Project64-video/Settings.h>
#include <vector>
void vbo_draw();

View File

@ -25,9 +25,9 @@
#endif // _WIN32
#include "glide.h"
#include "glitchmain.h"
#include "../Glide64/winlnxdefs.h"
#include "../Glide64/rdp.h"
#include <Glide64/trace.h>
#include <Project64-video/winlnxdefs.h>
#include <Project64-video/rdp.h>
#include <Project64-video/trace.h>
#define Z_MAX (65536.0f)
#define VERTEX_SIZE sizeof(VERTEX) //Size of vertex struct

View File

@ -35,7 +35,7 @@
#include "glide.h"
#include "g3ext.h"
#include "glitchmain.h"
#include <Glide64/trace.h>
#include <Project64-video/trace.h>
#define OPENGL_CHECK_ERRORS { const GLenum errcode = glGetError(); if (errcode != GL_NO_ERROR) LOG("OpenGL Error code %i in '%s' line %i\n", errcode, __FILE__, __LINE__-1); }

View File

@ -26,7 +26,7 @@
#include "glide.h"
#include "glitchmain.h"
#include <stdio.h>
#include <Glide64/trace.h>
#include <Project64-video/trace.h>
/* Napalm extensions to GrTextureFormat_t */
#define GR_TEXFMT_ARGB_CMP_FXT1 0x11

View File

@ -1,88 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<ItemGroup Label="ProjectConfigurations">
<ProjectConfiguration Include="Debug|Win32">
<Configuration>Debug</Configuration>
<Platform>Win32</Platform>
</ProjectConfiguration>
<ProjectConfiguration Include="Debug|x64">
<Configuration>Debug</Configuration>
<Platform>x64</Platform>
</ProjectConfiguration>
<ProjectConfiguration Include="Release|Win32">
<Configuration>Release</Configuration>
<Platform>Win32</Platform>
</ProjectConfiguration>
<ProjectConfiguration Include="Release|x64">
<Configuration>Release</Configuration>
<Platform>x64</Platform>
</ProjectConfiguration>
</ItemGroup>
<PropertyGroup Label="Globals">
<ProjectGuid>{2DADDAA5-0F57-46ED-A974-747908DDC7F3}</ProjectGuid>
<RootNamespace>GlideHQ</RootNamespace>
</PropertyGroup>
<PropertyGroup Label="Configuration">
<ConfigurationType>StaticLibrary</ConfigurationType>
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
<ImportGroup Label="PropertySheets">
<Import Project="$(SolutionDir)PropertySheets\Platform.$(Configuration).props" />
</ImportGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
<ItemDefinitionGroup>
<ClCompile>
<PrecompiledHeader />
<WarningLevel>Level3</WarningLevel>
</ClCompile>
</ItemDefinitionGroup>
<ItemGroup>
<ClCompile Include="TextureFilters.cpp" />
<ClCompile Include="TextureFilters_2xsai.cpp" />
<ClCompile Include="TextureFilters_hq2x.cpp" />
<ClCompile Include="TextureFilters_hq4x.cpp" />
<ClCompile Include="TxCache.cpp" />
<ClCompile Include="TxDbg.cpp" />
<ClCompile Include="TxFilter.cpp" />
<ClCompile Include="TxFilterExport.cpp" />
<ClCompile Include="TxHiResCache.cpp" />
<ClCompile Include="TxImage.cpp" />
<ClCompile Include="TxQuantize.cpp" />
<ClCompile Include="TxReSample.cpp" />
<ClCompile Include="TxTexCache.cpp" />
<ClCompile Include="TxUtil.cpp" />
<ClCompile Include="tc-1.1+\dxtn.c" />
<ClCompile Include="tc-1.1+\fxt1.c" />
<ClCompile Include="tc-1.1+\texstore.c" />
<ClCompile Include="tc-1.1+\wrapper.c" />
</ItemGroup>
<ItemGroup>
<ClInclude Include="Ext_TxFilter.h" />
<ClInclude Include="TextureFilters.h" />
<ClInclude Include="TextureFilters_2xsai.h" />
<ClInclude Include="TextureFilters_hq2x.h" />
<ClInclude Include="TextureFilters_hq4x.h" />
<ClInclude Include="TextureFilters_lq2x.h" />
<ClInclude Include="TxCache.h" />
<ClInclude Include="TxDbg.h" />
<ClInclude Include="TxFilter.h" />
<ClInclude Include="TxHiResCache.h" />
<ClInclude Include="TxImage.h" />
<ClInclude Include="TxQuantize.h" />
<ClInclude Include="TxTexCache.h" />
<ClInclude Include="TxUtil.h" />
<ClInclude Include="tc-1.1+\fxt1.h" />
<ClInclude Include="tc-1.1+\internal.h" />
<ClInclude Include="tc-1.1+\types.h" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\3rdParty\zlib\zlib.vcxproj">
<Project>{731bd205-2826-4631-b7af-117658e88dbc}</Project>
</ProjectReference>
<ProjectReference Include="..\Common\Common.vcxproj">
<Project>{b4a4b994-9111-42b1-93c2-6f1ca8bc4421}</Project>
<ReferenceOutputAssembly>false</ReferenceOutputAssembly>
</ProjectReference>
</ItemGroup>
</Project>

View File

@ -1,125 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<ItemGroup>
<Filter Include="Source Files">
<UniqueIdentifier>{4FC737F1-C7A5-4376-A066-2A32D752A2FF}</UniqueIdentifier>
<Extensions>cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx</Extensions>
</Filter>
<Filter Include="Header Files">
<UniqueIdentifier>{93995380-89BD-4b04-88EB-625FBE52EBFB}</UniqueIdentifier>
<Extensions>h;hpp;hxx;hm;inl;inc;xsd</Extensions>
</Filter>
<Filter Include="tc-1.1+">
<UniqueIdentifier>{e42072d3-97be-40c3-b6eb-6a250288e739}</UniqueIdentifier>
</Filter>
</ItemGroup>
<ItemGroup>
<ClCompile Include="TextureFilters.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="TextureFilters_2xsai.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="TextureFilters_hq2x.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="TextureFilters_hq4x.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="TxCache.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="TxDbg.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="TxFilter.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="TxFilterExport.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="TxHiResCache.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="TxImage.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="TxQuantize.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="TxReSample.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="TxTexCache.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="TxUtil.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="tc-1.1+\dxtn.c">
<Filter>tc-1.1+</Filter>
</ClCompile>
<ClCompile Include="tc-1.1+\fxt1.c">
<Filter>tc-1.1+</Filter>
</ClCompile>
<ClCompile Include="tc-1.1+\texstore.c">
<Filter>tc-1.1+</Filter>
</ClCompile>
<ClCompile Include="tc-1.1+\wrapper.c">
<Filter>tc-1.1+</Filter>
</ClCompile>
</ItemGroup>
<ItemGroup>
<ClInclude Include="Ext_TxFilter.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="TextureFilters.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="TextureFilters_2xsai.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="TextureFilters_hq2x.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="TextureFilters_hq4x.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="TextureFilters_lq2x.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="TxCache.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="TxDbg.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="TxFilter.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="TxHiResCache.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="TxImage.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="TxQuantize.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="TxTexCache.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="TxUtil.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="tc-1.1+\fxt1.h">
<Filter>tc-1.1+</Filter>
</ClInclude>
<ClInclude Include="tc-1.1+\internal.h">
<Filter>tc-1.1+</Filter>
</ClInclude>
<ClInclude Include="tc-1.1+\types.h">
<Filter>tc-1.1+</Filter>
</ClInclude>
</ItemGroup>
</Project>