MGislv/GLideN64
1
0
Fork 0
mirror of https://github.com/blawar/GLideN64.git synced 2024-07-02 09:03:37 +00:00
Code Issues Projects Releases Wiki Activity

Move code from ZilmarAPIImpl_common.cpp to ZilmarAPIImpl_windows.cpp

Browse Source 
Remove ZilmarAPIImpl_common.cpp
This commit is contained in:
Sergey Lipskiy 2015-04-20 16:12:42 +06:00
parent 138d270dfd
commit 13d2ff4710
5 changed files with 27 additions and 45 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
projects/msvc12/GLideN64.vcxproj
View File

@ -254,10 +254,6 @@
<ClCompile Include="..\..\src\Combiner.cpp" />
<ClCompile Include="..\..\src\CommonPluginAPI.cpp" />
<ClCompile Include="..\..\src\common\CommonAPIImpl_common.cpp" />
<ClCompile Include="..\..\src\common\ZilmarAPIImpl_common.cpp">
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug_mupenplus|Win32'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release_mupenplus|Win32'">true</ExcludedFromBuild>
</ClCompile>
<ClCompile Include="..\..\src\Config.cpp" />
<ClCompile Include="..\..\src\CRC.cpp" />
<ClCompile Include="..\..\src\DepthBuffer.cpp" />

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

@ -131,9 +131,6 @@
<ClCompile Include="..\..\src\common\CommonAPIImpl_common.cpp">
<Filter>Source Files\common</Filter>
</ClCompile>
<ClCompile Include="..\..\src\common\ZilmarAPIImpl_common.cpp">
<Filter>Source Files\common</Filter>
</ClCompile>
<ClCompile Include="..\..\src\mupenplus\CommonAPIImpl_mupenplus.cpp">
<Filter>Source Files\mupenplus</Filter>
</ClCompile>

1
src/CMakeLists.txt
View File

@ -66,7 +66,6 @@ else(MUPENPLUSAPI)
endif(NOT UNIX)
set(GLideN64_SOURCES_WIN
ZilmarPluginAPI.cpp
common/ZilmarAPIImpl_common.cpp
windows/Config_windows.cpp
windows/CommonAPIImpl_windows.cpp
windows/GLideN64_windows.cpp

37
src/common/ZilmarAPIImpl_common.cpp
View File

@ -1,37 +0,0 @@
#ifdef OS_WINDOWS
# include <windows.h>
#else
# include "../winlnxdefs.h"
#endif // OS_WINDOWS
#include "../PluginAPI.h"
#include "../GLideN64.h"
#include "../Revision.h"
#include "../OpenGL.h"
#include "../Config.h"
#include "../RSP.h"
void PluginAPI::CaptureScreen(char * _Directory)
{
video().setCaptureScreen(_Directory);
}
void PluginAPI::DllConfig(HWND _hParent)
{
Config_DoConfig(/*_hParent*/);
}
void PluginAPI::GetDllInfo(PLUGIN_INFO * PluginInfo)
{
PluginInfo->Version = 0x103;
PluginInfo->Type = PLUGIN_TYPE_GFX;
sprintf(PluginInfo->Name, "%s rev.%s", pluginName, PLUGIN_REVISION);
PluginInfo->NormalMemory = FALSE;
PluginInfo->MemoryBswaped = TRUE;
}
void PluginAPI::ReadScreen(void **_dest, long *_width, long *_height)
{
video().readScreen(_dest, _width, _height);
}

27
src/windows/ZilmarAPIImpl_windows.cpp
View File

@ -2,8 +2,35 @@
#include "../PluginAPI.h"
#include "../GLideN64.h"
#include "../GLideNUI/GLideNUI.h"
#include "../OpenGL.h"
#include "../Config.h"
#include "../Revision.h"
void PluginAPI::DllAbout(/*HWND _hParent*/)
{
RunAbout();
}
void PluginAPI::CaptureScreen(char * _Directory)
{
video().setCaptureScreen(_Directory);
}
void PluginAPI::DllConfig(HWND _hParent)
{
Config_DoConfig(/*_hParent*/);
}
void PluginAPI::GetDllInfo(PLUGIN_INFO * PluginInfo)
{
PluginInfo->Version = 0x103;
PluginInfo->Type = PLUGIN_TYPE_GFX;
sprintf(PluginInfo->Name, "%s rev.%s", pluginName, PLUGIN_REVISION);
PluginInfo->NormalMemory = FALSE;
PluginInfo->MemoryBswaped = TRUE;
}
void PluginAPI::ReadScreen(void **_dest, long *_width, long *_height)
{
video().readScreen(_dest, _width, _height);
}