From 740d0504ad4f4cd0efb0baa4b836c3b167dcee4e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Henrik=20Rydg=C3=A5rd?= <hrydgard@gmail.com>
Date: Tue, 19 Dec 2017 18:04:26 +0100
Subject: [PATCH] Move QtMain.cpp and PCMain.cpp to more sensible locations.
 Native isn't standalone anymore...

---
 CMakeLists.txt                                | 6 +++---
 {ext/native/base => Qt}/QtMain.cpp            | 0
 {ext/native/base => Qt}/QtMain.h              | 0
 Qt/mainwindow.h                               | 2 +-
 ext/native/base/PCMain.cpp => SDL/SDLMain.cpp | 0
 ext/native/base/NativeApp.h                   | 2 +-
 ext/native/native.vcxproj                     | 6 +++---
 ext/native/native.vcxproj.filters             | 6 +++---
 8 files changed, 11 insertions(+), 11 deletions(-)
 rename {ext/native/base => Qt}/QtMain.cpp (100%)
 rename {ext/native/base => Qt}/QtMain.h (100%)
 rename ext/native/base/PCMain.cpp => SDL/SDLMain.cpp (100%)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 628831ba30..d885888ae6 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -696,8 +696,8 @@ elseif(USING_QT_UI)
     qt5_wrap_ui(QT_UI_GEN ${Qt_UI})
     list(APPEND NativeAppSource
       ${QT_UI_GEN}
-      ext/native/base/QtMain.cpp
-      ext/native/base/QtMain.h
+      Qt/QtMain.cpp
+      Qt/QtMain.h
       Qt/mainwindow.cpp
       Qt/mainwindow.h
       Qt/Debugger/ctrldisasmview.cpp
@@ -742,7 +742,7 @@ elseif(TARGET SDL2::SDL2)
 	set(nativeExtra ${nativeExtra}
 		SDL/SDLJoystick.h
 		SDL/SDLJoystick.cpp
-		ext/native/base/PCMain.cpp)
+		SDL/SDLMain.cpp)
 	set(nativeExtraLibs ${nativeExtraLibs} SDL2::SDL2)
 	if(APPLE)
 		set(nativeExtra ${nativeExtra} SDL/SDLMain.h SDL/SDLMain.mm)
diff --git a/ext/native/base/QtMain.cpp b/Qt/QtMain.cpp
similarity index 100%
rename from ext/native/base/QtMain.cpp
rename to Qt/QtMain.cpp
diff --git a/ext/native/base/QtMain.h b/Qt/QtMain.h
similarity index 100%
rename from ext/native/base/QtMain.h
rename to Qt/QtMain.h
diff --git a/Qt/mainwindow.h b/Qt/mainwindow.h
index 51ffceb0de..c52120820e 100644
--- a/Qt/mainwindow.h
+++ b/Qt/mainwindow.h
@@ -14,7 +14,7 @@
 #include "Debugger/debugger_memory.h"
 #include "Debugger/debugger_memorytex.h"
 #include "Debugger/debugger_displaylist.h"
-#include "base/QtMain.h"
+#include "Qt/QtMain.h"
 
 extern bool g_TakeScreenshot;
 
diff --git a/ext/native/base/PCMain.cpp b/SDL/SDLMain.cpp
similarity index 100%
rename from ext/native/base/PCMain.cpp
rename to SDL/SDLMain.cpp
diff --git a/ext/native/base/NativeApp.h b/ext/native/base/NativeApp.h
index 69bdf90b91..dd07afb996 100644
--- a/ext/native/base/NativeApp.h
+++ b/ext/native/base/NativeApp.h
@@ -111,7 +111,7 @@ void NativeSaveState();  // onDestroy
 void NativePermissionStatus(SystemPermission permission, PermissionStatus status);
 
 // Calls back into Java / SDL
-// These APIs must be implemented by every port (for example app-android.cpp, PCMain.cpp).
+// These APIs must be implemented by every port (for example app-android.cpp, SDLMain.cpp).
 // You are free to call these.
 void SystemToast(const char *text);
 void ShowKeyboard();
diff --git a/ext/native/native.vcxproj b/ext/native/native.vcxproj
index ba0d1d399a..b8db0d2f53 100644
--- a/ext/native/native.vcxproj
+++ b/ext/native/native.vcxproj
@@ -299,13 +299,13 @@
     <ClCompile Include="base\colorutil.cpp" />
     <ClCompile Include="base\display.cpp" />
     <ClCompile Include="base\logging.cpp" />
-    <ClCompile Include="base\PCMain.cpp">
+    <ClCompile Include="..\..\SDL\SDLMain.cpp">
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
     </ClCompile>
-    <ClCompile Include="base\QtMain.cpp">
+    <ClCompile Include="..\..\Qt\QtMain.cpp">
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
@@ -761,4 +761,4 @@
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
   </ImportGroup>
-</Project>
\ No newline at end of file
+</Project>
diff --git a/ext/native/native.vcxproj.filters b/ext/native/native.vcxproj.filters
index 60c65f1746..175c41bf21 100644
--- a/ext/native/native.vcxproj.filters
+++ b/ext/native/native.vcxproj.filters
@@ -739,10 +739,10 @@
     <ClCompile Include="thread\executor.cpp">
       <Filter>thread</Filter>
     </ClCompile>
-    <ClCompile Include="base\PCMain.cpp">
+    <ClCompile Include="..\..\SDL\SDLMain.cpp">
       <Filter>base</Filter>
     </ClCompile>
-    <ClCompile Include="base\QtMain.cpp">
+    <ClCompile Include="..\..\Qt\QtMain.cpp">
       <Filter>base</Filter>
     </ClCompile>
     <ClCompile Include="file\free.cpp">
@@ -868,4 +868,4 @@
       <UniqueIdentifier>{06c6305a-a646-485b-85b9-645a24dd6553}</UniqueIdentifier>
     </Filter>
   </ItemGroup>
-</Project>
\ No newline at end of file
+</Project>