From 13d2ff4710292c0fac95cbb4034c4bde3c234d89 Mon Sep 17 00:00:00 2001
From: Sergey Lipskiy <gonetz@ngs.ru>
Date: Mon, 20 Apr 2015 16:12:42 +0600
Subject: [PATCH] Move code from ZilmarAPIImpl_common.cpp to
 ZilmarAPIImpl_windows.cpp Remove ZilmarAPIImpl_common.cpp

---
 projects/msvc12/GLideN64.vcxproj         |  4 ---
 projects/msvc12/GLideN64.vcxproj.filters |  3 --
 src/CMakeLists.txt                       |  1 -
 src/common/ZilmarAPIImpl_common.cpp      | 37 ------------------------
 src/windows/ZilmarAPIImpl_windows.cpp    | 27 +++++++++++++++++
 5 files changed, 27 insertions(+), 45 deletions(-)
 delete mode 100644 src/common/ZilmarAPIImpl_common.cpp

diff --git a/projects/msvc12/GLideN64.vcxproj b/projects/msvc12/GLideN64.vcxproj
index 931166ba..6a4e5df9 100644
--- a/projects/msvc12/GLideN64.vcxproj
+++ b/projects/msvc12/GLideN64.vcxproj
@@ -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" />
diff --git a/projects/msvc12/GLideN64.vcxproj.filters b/projects/msvc12/GLideN64.vcxproj.filters
index ed29b211..fd4d9bcd 100644
--- a/projects/msvc12/GLideN64.vcxproj.filters
+++ b/projects/msvc12/GLideN64.vcxproj.filters
@@ -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>
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 98253680..7959357d 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -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
diff --git a/src/common/ZilmarAPIImpl_common.cpp b/src/common/ZilmarAPIImpl_common.cpp
deleted file mode 100644
index 79741842..00000000
--- a/src/common/ZilmarAPIImpl_common.cpp
+++ /dev/null
@@ -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);
-}
diff --git a/src/windows/ZilmarAPIImpl_windows.cpp b/src/windows/ZilmarAPIImpl_windows.cpp
index 22ca25a4..5022c22e 100644
--- a/src/windows/ZilmarAPIImpl_windows.cpp
+++ b/src/windows/ZilmarAPIImpl_windows.cpp
@@ -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);
+}