MGislv/GLideN64
1
0
Fork 0
mirror of https://github.com/blawar/GLideN64.git synced 2024-06-30 08:24:05 +00:00
Code Issues Projects Releases Wiki Activity

Rename Ext_TxFilter.h to TxFilterExport.h

Browse Source 
Correct #include
This commit is contained in:
Sergey Lipskiy 2021-10-24 17:11:42 +07:00
parent 22f50fafb5
commit 71788c320d
11 changed files with 19 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
projects/msvc/GLideN64.vcxproj
View File

@ -461,7 +461,7 @@ copy /Y "$(OutDir)$(TargetName).*" "$(Mupen64PluginsDir_x64)")</Command>
<ClInclude Include="..\..\src\GBI.h" /> <ClInclude Include="..\..\src\GBI.h" />
<ClInclude Include="..\..\src\gDP.h" /> <ClInclude Include="..\..\src\gDP.h" />
<ClInclude Include="..\..\src\GLideN64.h" /> <ClInclude Include="..\..\src\GLideN64.h" />
<ClInclude Include="..\..\src\GLideNHQ\Ext_TxFilter.h" /> <ClInclude Include="..\..\src\GLideNHQ\TxFilterExport.h" />
<ClInclude Include="..\..\src\Graphics\ColorBufferReader.h" /> <ClInclude Include="..\..\src\Graphics\ColorBufferReader.h" />
<ClInclude Include="..\..\src\Graphics\CombinerProgram.h" /> <ClInclude Include="..\..\src\Graphics\CombinerProgram.h" />
<ClInclude Include="..\..\src\Graphics\Context.h" /> <ClInclude Include="..\..\src\Graphics\Context.h" />
@ -594,4 +594,4 @@ copy /Y "$(OutDir)$(TargetName).*" "$(Mupen64PluginsDir_x64)")</Command>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" /> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
<ImportGroup Label="ExtensionTargets"> <ImportGroup Label="ExtensionTargets">
</ImportGroup> </ImportGroup>
</Project> </Project>

8
projects/msvc/GLideN64.vcxproj.filters
View File

@ -511,9 +511,6 @@
<ClInclude Include="..\..\src\Log.h"> <ClInclude Include="..\..\src\Log.h">
<Filter>Header Files</Filter> <Filter>Header Files</Filter>
</ClInclude> </ClInclude>
<ClInclude Include="..\..\src\GLideNHQ\Ext_TxFilter.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="..\..\src\PostProcessor.h"> <ClInclude Include="..\..\src\PostProcessor.h">
<Filter>Header Files</Filter> <Filter>Header Files</Filter>
</ClInclude> </ClInclude>
@ -823,10 +820,13 @@
<ClInclude Include="..\..\src\Graphics\OpenGLContext\GLSL\glsl_CombinerProgramUniformFactoryFast.h"> <ClInclude Include="..\..\src\Graphics\OpenGLContext\GLSL\glsl_CombinerProgramUniformFactoryFast.h">
<Filter>Header Files\Graphics\OpenGL\GLSL</Filter> <Filter>Header Files\Graphics\OpenGL\GLSL</Filter>
</ClInclude> </ClInclude>
<ClInclude Include="..\..\src\GLideNHQ\TxFilterExport.h">
<Filter>Header Files</Filter>
</ClInclude>
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<ResourceCompile Include="..\..\src\GLideN64.rc"> <ResourceCompile Include="..\..\src\GLideN64.rc">
<Filter>Resource Files</Filter> <Filter>Resource Files</Filter>
</ResourceCompile> </ResourceCompile>
</ItemGroup> </ItemGroup>
</Project> </Project>

2
src/DisplayLoadProgress.cpp
View File

@ -1,7 +1,7 @@
#include <stdarg.h> #include <stdarg.h>
#include <string.h> #include <string.h>
#include <cstdlib> #include <cstdlib>
#include "GLideNHQ/Ext_TxFilter.h" #include "GLideNHQ/TxFilterExport.h"
#include <Graphics/Context.h> #include <Graphics/Context.h>
#include <Graphics/Parameters.h> #include <Graphics/Parameters.h>

1
src/GLideNHQ/TxFilterExport.cpp
View File

@ -26,6 +26,7 @@
#endif #endif
#include "TxFilter.h" #include "TxFilter.h"
#include "TxFilterExport.h"
TxFilter *txFilter = nullptr; TxFilter *txFilter = nullptr;

0
src/GLideNHQ/Ext_TxFilter.h → src/GLideNHQ/TxFilterExport.h
View File

12
src/GLideNHQ/TxHiResLoader.cpp
View File

@ -1,7 +1,7 @@
#include "TxHiResLoader.h" #include "TxHiResLoader.h"
#include "TxDbg.h" #include "TxDbg.h"
#include "TxDbg.h" #include "TxDbg.h"
#include "Ext_TxFilter.h" #include "TxFilterExport.h"
#include <string.h> #include <string.h>
#include <math.h> #include <math.h>
@ -58,7 +58,7 @@ uint32_t TxHiResLoader::checkFileName(char* ident, char* filename,
}; };
pfilename = filename + strlen(filename) - 4; pfilename = filename + strlen(filename) - 4;
if (strcmp(pfilename, ".png") && if (strcmp(pfilename, ".png") &&
strcmp(pfilename, ".bmp")) { strcmp(pfilename, ".bmp")) {
#if !DEBUG #if !DEBUG
@ -68,7 +68,7 @@ uint32_t TxHiResLoader::checkFileName(char* ident, char* filename,
INFO(80, wst("Error: not png or bmp!\n")); INFO(80, wst("Error: not png or bmp!\n"));
return 0; return 0;
} }
/* make sure filename contains ident */ /* make sure filename contains ident */
pfilename = strstr(filename, ident); pfilename = strstr(filename, ident);
if (!pfilename) { if (!pfilename) {
@ -152,8 +152,8 @@ uint32_t TxHiResLoader::checkFileName(char* ident, char* filename,
return length; return length;
} }
uint8_t* TxHiResLoader::loadFileInfoTex(char* fname, uint8_t* TxHiResLoader::loadFileInfoTex(char* fname,
int siz, int* pWidth, int* pHeight, int siz, int* pWidth, int* pHeight,
uint32_t fmt, uint32_t fmt,
ColorFormat* pFormat) ColorFormat* pFormat)
{ {
@ -320,7 +320,7 @@ uint8_t* TxHiResLoader::loadFileInfoTex(char* fname,
tex = _txImage->readPNG(fp, &width, &height, &format); tex = _txImage->readPNG(fp, &width, &height, &format);
else else
tex = _txImage->readBMP(fp, &width, &height, &format); tex = _txImage->readBMP(fp, &width, &height, &format);
fclose(fp); fclose(fp);
} }
} }

2
src/GLideNHQ/TxHiResNoCache.cpp
View File

@ -1,7 +1,7 @@
#include "TxHiResNoCache.h" #include "TxHiResNoCache.h"
#include "TxDbg.h" #include "TxDbg.h"
#include "Ext_TxFilter.h" #include "TxFilterExport.h"
#include <osal_files.h> #include <osal_files.h>
TxHiResNoCache::TxHiResNoCache(int maxwidth, TxHiResNoCache::TxHiResNoCache(int maxwidth,

2
src/GLideNHQ/TxInternal.h
View File

@ -24,7 +24,7 @@
#ifndef __INTERNAL_H__ #ifndef __INTERNAL_H__
#define __INTERNAL_H__ #define __INTERNAL_H__
#include "Ext_TxFilter.h" #include "TxFilterExport.h"
#include "txWidestringWrapper.h" #include "txWidestringWrapper.h"
#include <Graphics/Parameters.h> #include <Graphics/Parameters.h>

2
src/TextureFilterHandler.cpp
View File

@ -1,6 +1,6 @@
#include <stdarg.h> #include <stdarg.h>
#include <osal_files.h> #include <osal_files.h>
#include "GLideNHQ/Ext_TxFilter.h" #include "GLideNHQ/TxFilterExport.h"
#include <Graphics/Context.h> #include <Graphics/Context.h>
#include <Graphics/Parameters.h> #include <Graphics/Parameters.h>

2
src/Textures.cpp
View File

@ -14,7 +14,7 @@
#include "convert.h" #include "convert.h"
#include "FrameBuffer.h" #include "FrameBuffer.h"
#include "Config.h" #include "Config.h"
#include "GLideNHQ/Ext_TxFilter.h" #include "GLideNHQ/TxFilterExport.h"
#include "TextureFilterHandler.h" #include "TextureFilterHandler.h"
#include "DisplayLoadProgress.h" #include "DisplayLoadProgress.h"
#include "Graphics/Context.h" #include "Graphics/Context.h"

2
src/VI.cpp
View File

@ -15,7 +15,7 @@
#include "DebugDump.h" #include "DebugDump.h"
#include "osal_keys.h" #include "osal_keys.h"
#include "DisplayWindow.h" #include "DisplayWindow.h"
#include "GLideNHQ/Ext_TxFilter.h" #include "GLideNHQ/TxFilterExport.h"
#include <Graphics/Context.h> #include <Graphics/Context.h>
using namespace std; using namespace std;