From d26b363562701c3fa085c9585ffb95ea6851794d Mon Sep 17 00:00:00 2001
From: Frederic L <27208977+FreddyFunk@users.noreply.github.com>
Date: Fri, 14 Sep 2018 02:27:33 +0200
Subject: [PATCH 1/4] Set citra-qt project as default StartUp Project in Visual
 Studio

Set citra-qt project as default StartUp Project in Visual Studio
---
 CMakeLists.txt | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 46de712f6..2c3336f42 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -383,6 +383,9 @@ add_subdirectory(externals)
 add_subdirectory(src)
 add_subdirectory(dist/installer)
 
+# Set citra-qt project as default StartUp Project in Visual Studio
+set_property(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} PROPERTY VS_STARTUP_PROJECT citra-qt)
+
 
 # Installation instructions
 # =========================

From cc3404a097b0b41ade9be317a53eb5533f0785be Mon Sep 17 00:00:00 2001
From: Frederic Laing <27208977+FreddyFunk@users.noreply.github.com>
Date: Fri, 21 Sep 2018 14:46:20 +0200
Subject: [PATCH 2/4] Set citra-qt project as default StartUp Project in Visual
 Studio

Set citra-qt project as default StartUp Project in Visual Studio
---
 CMakeLists.txt | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 46de712f6..2c3336f42 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -383,6 +383,9 @@ add_subdirectory(externals)
 add_subdirectory(src)
 add_subdirectory(dist/installer)
 
+# Set citra-qt project as default StartUp Project in Visual Studio
+set_property(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} PROPERTY VS_STARTUP_PROJECT citra-qt)
+
 
 # Installation instructions
 # =========================

From c4bf626b88cf8101fd1965754822b5c94c1b1737 Mon Sep 17 00:00:00 2001
From: Frederic Laing <27208977+FreddyFunk@users.noreply.github.com>
Date: Fri, 21 Sep 2018 14:47:43 +0200
Subject: [PATCH 3/4] Addressed feedback

---
 CMakeLists.txt | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 2c3336f42..2797d182e 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -383,9 +383,13 @@ add_subdirectory(externals)
 add_subdirectory(src)
 add_subdirectory(dist/installer)
 
-# Set citra-qt project as default StartUp Project in Visual Studio
-set_property(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} PROPERTY VS_STARTUP_PROJECT citra-qt)
 
+# Set citra-qt project or citra project as default StartUp Project in Visual Studio depending on whether QT is enabled or not
+if(ENABLE_QT)
+    set_property(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} PROPERTY VS_STARTUP_PROJECT citra-qt)
+else()
+    set_property(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} PROPERTY VS_STARTUP_PROJECT citra)
+endif()
 
 # Installation instructions
 # =========================

From d8f09f69eb87f80754cfeb99dd817f80e59cde5f Mon Sep 17 00:00:00 2001
From: Frederic Laing <27208977+FreddyFunk@users.noreply.github.com>
Date: Fri, 21 Sep 2018 14:48:55 +0200
Subject: [PATCH 4/4] Addressed feedback

---
 CMakeLists.txt | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index e2c1e3082..2797d182e 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -383,9 +383,6 @@ add_subdirectory(externals)
 add_subdirectory(src)
 add_subdirectory(dist/installer)
 
-# Set citra-qt project as default StartUp Project in Visual Studio
-set_property(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} PROPERTY VS_STARTUP_PROJECT citra-qt)
-
 
 # Set citra-qt project or citra project as default StartUp Project in Visual Studio depending on whether QT is enabled or not
 if(ENABLE_QT)