From fc6a480a53466d9f8fec36adddfcb13691bca2cd Mon Sep 17 00:00:00 2001
From: rock88 <rock88a@gmail.com>
Date: Sat, 2 May 2020 17:57:02 +0300
Subject: [PATCH] Fix makefile...

---
 Makefile                                      | 11 +++--
 moonlight.xcodeproj/project.pbxproj           | 40 +++++++++++++------
 .../xcshareddata/xcschemes/moonlight.xcscheme |  9 +++--
 src/moonlight_libretro.c                      |  4 +-
 src/ui/{ => buttons}/AppButton.cpp            |  0
 src/ui/{ => buttons}/AppButton.hpp            |  0
 src/ui/{ => buttons}/HostButton.cpp           |  0
 src/ui/{ => buttons}/HostButton.hpp           |  0
 src/ui/{ => windows}/AddHostWindow.cpp        |  0
 src/ui/{ => windows}/AddHostWindow.hpp        |  0
 src/ui/{ => windows}/AppListWindow.cpp        |  0
 src/ui/{ => windows}/AppListWindow.hpp        |  0
 src/ui/{ => windows}/ContentWindow.cpp        |  0
 src/ui/{ => windows}/ContentWindow.hpp        |  0
 src/ui/{ => windows}/MainWindow.cpp           |  0
 src/ui/{ => windows}/MainWindow.hpp           |  0
 16 files changed, 44 insertions(+), 20 deletions(-)
 rename src/ui/{ => buttons}/AppButton.cpp (100%)
 rename src/ui/{ => buttons}/AppButton.hpp (100%)
 rename src/ui/{ => buttons}/HostButton.cpp (100%)
 rename src/ui/{ => buttons}/HostButton.hpp (100%)
 rename src/ui/{ => windows}/AddHostWindow.cpp (100%)
 rename src/ui/{ => windows}/AddHostWindow.hpp (100%)
 rename src/ui/{ => windows}/AppListWindow.cpp (100%)
 rename src/ui/{ => windows}/AppListWindow.hpp (100%)
 rename src/ui/{ => windows}/ContentWindow.cpp (100%)
 rename src/ui/{ => windows}/ContentWindow.hpp (100%)
 rename src/ui/{ => windows}/MainWindow.cpp (100%)
 rename src/ui/{ => windows}/MainWindow.hpp (100%)

diff --git a/Makefile b/Makefile
index 521adbe..648f801 100644
--- a/Makefile
+++ b/Makefile
@@ -163,11 +163,14 @@ MOONLIGHT_LIBRETRO_C_SOURCES = \
 	src/moonlight_libretro.c
 
 MOONLIGHT_LIBRETRO_CXX_SOURCES = \
-	src/ui/AddHostWindow.cpp \
+	src/ui/windows/AddHostWindow.cpp \
+	src/ui/windows/ContentWindow.cpp \
+	src/ui/windows/MainWindow.cpp \
+	src/ui/windows/AppListWindow.cpp \
+	src/ui/buttons/AppButton.cpp \
+	src/ui/buttons/HostButton.cpp \
 	src/ui/Application.cpp \
-	src/ui/ContentWindow.cpp \
 	src/ui/LoadingOverlay.cpp \
-	src/ui/MainWindow.cpp \
 	src/Server.cpp \
 	src/moonlight_libretro_wrapper.cpp
 
@@ -241,7 +244,7 @@ NANOGUI_CXX_SOURCES = \
 INCLUDES += \
 	-Isrc \
 	-Isrc/nanogui_resources \
-	-Isrc/ui \
+	-Isrc/ui -Isrc/ui/buttons -Isrc/ui/windows \
 	-Ilibgamestream \
 	-Ithird_party/moonlight-common-c/reedsolomon \
 	-Ithird_party/moonlight-common-c/src \
diff --git a/moonlight.xcodeproj/project.pbxproj b/moonlight.xcodeproj/project.pbxproj
index 87878fe..4abcff0 100644
--- a/moonlight.xcodeproj/project.pbxproj
+++ b/moonlight.xcodeproj/project.pbxproj
@@ -303,6 +303,32 @@
 /* End PBXFrameworksBuildPhase section */
 
 /* Begin PBXGroup section */
+		3602C3BE245DBFF900368900 /* buttons */ = {
+			isa = PBXGroup;
+			children = (
+				3602C3B5245D903000368900 /* HostButton.cpp */,
+				3602C3B6245D903000368900 /* HostButton.hpp */,
+				3602C3BB245DBA9100368900 /* AppButton.cpp */,
+				3602C3BC245DBA9100368900 /* AppButton.hpp */,
+			);
+			path = buttons;
+			sourceTree = "<group>";
+		};
+		3602C3BF245DC00700368900 /* windows */ = {
+			isa = PBXGroup;
+			children = (
+				3652F089245C8569001FABF3 /* ContentWindow.cpp */,
+				3652EFFD245B645C001FABF3 /* ContentWindow.hpp */,
+				3652EFFA245B6434001FABF3 /* MainWindow.cpp */,
+				3652EFFB245B6434001FABF3 /* MainWindow.hpp */,
+				3652F000245B6961001FABF3 /* AddHostWindow.cpp */,
+				3652F001245B6961001FABF3 /* AddHostWindow.hpp */,
+				3602C3B8245DB3C800368900 /* AppListWindow.cpp */,
+				3602C3B9245DB3C800368900 /* AppListWindow.hpp */,
+			);
+			path = windows;
+			sourceTree = "<group>";
+		};
 		3652ECC3245B3AFF001FABF3 /* nanogui */ = {
 			isa = PBXGroup;
 			children = (
@@ -602,22 +628,12 @@
 		36DFDCF12459F79000FC51CE /* ui */ = {
 			isa = PBXGroup;
 			children = (
+				3602C3BF245DC00700368900 /* windows */,
+				3602C3BE245DBFF900368900 /* buttons */,
 				36DFDCF22459F7A200FC51CE /* Application.cpp */,
 				36DFDCF32459F7A200FC51CE /* Application.hpp */,
-				3652F089245C8569001FABF3 /* ContentWindow.cpp */,
-				3652EFFD245B645C001FABF3 /* ContentWindow.hpp */,
-				3652EFFA245B6434001FABF3 /* MainWindow.cpp */,
-				3652EFFB245B6434001FABF3 /* MainWindow.hpp */,
-				3652F000245B6961001FABF3 /* AddHostWindow.cpp */,
-				3652F001245B6961001FABF3 /* AddHostWindow.hpp */,
-				3602C3B8245DB3C800368900 /* AppListWindow.cpp */,
-				3602C3B9245DB3C800368900 /* AppListWindow.hpp */,
 				3652F081245C60D1001FABF3 /* LoadingOverlay.cpp */,
 				3652F082245C60D1001FABF3 /* LoadingOverlay.hpp */,
-				3602C3B5245D903000368900 /* HostButton.cpp */,
-				3602C3B6245D903000368900 /* HostButton.hpp */,
-				3602C3BB245DBA9100368900 /* AppButton.cpp */,
-				3602C3BC245DBA9100368900 /* AppButton.hpp */,
 			);
 			path = ui;
 			sourceTree = "<group>";
diff --git a/moonlight.xcodeproj/xcshareddata/xcschemes/moonlight.xcscheme b/moonlight.xcodeproj/xcshareddata/xcschemes/moonlight.xcscheme
index e6b02aa..6b4eeda 100644
--- a/moonlight.xcodeproj/xcshareddata/xcschemes/moonlight.xcscheme
+++ b/moonlight.xcodeproj/xcshareddata/xcschemes/moonlight.xcscheme
@@ -42,8 +42,11 @@
       debugDocumentVersioning = "YES"
       debugServiceExtension = "internal"
       allowLocationSimulation = "YES">
-      <BuildableProductRunnable
-         runnableDebuggingMode = "0">
+      <PathRunnable
+         runnableDebuggingMode = "0"
+         FilePath = "/Applications/RetroArch.app">
+      </PathRunnable>
+      <MacroExpansion>
          <BuildableReference
             BuildableIdentifier = "primary"
             BlueprintIdentifier = "36DBDE8D2450BB7E0057C8D3"
@@ -51,7 +54,7 @@
             BlueprintName = "moonlight"
             ReferencedContainer = "container:moonlight.xcodeproj">
          </BuildableReference>
-      </BuildableProductRunnable>
+      </MacroExpansion>
       <CommandLineArguments>
          <CommandLineArgument
             argument = "-L /Users/rock88/Documents/Projects/RetroArch/moonlight-libretro/moonlight_libretro.dylib"
diff --git a/src/moonlight_libretro.c b/src/moonlight_libretro.c
index 0481419..e6ae9ef 100644
--- a/src/moonlight_libretro.c
+++ b/src/moonlight_libretro.c
@@ -89,7 +89,9 @@ void retro_set_environment(retro_environment_t cb) {
     
     const char *dir = NULL;
     cb(RETRO_ENVIRONMENT_GET_SYSTEM_DIRECTORY, &dir);
-    moonlight_libretro_wrapper_set_working_dir(dir);
+    if (dir != NULL) {
+        moonlight_libretro_wrapper_set_working_dir(dir);
+    }
     
     static struct retro_log_callback logging;
     if (cb(RETRO_ENVIRONMENT_GET_LOG_INTERFACE, &logging))
diff --git a/src/ui/AppButton.cpp b/src/ui/buttons/AppButton.cpp
similarity index 100%
rename from src/ui/AppButton.cpp
rename to src/ui/buttons/AppButton.cpp
diff --git a/src/ui/AppButton.hpp b/src/ui/buttons/AppButton.hpp
similarity index 100%
rename from src/ui/AppButton.hpp
rename to src/ui/buttons/AppButton.hpp
diff --git a/src/ui/HostButton.cpp b/src/ui/buttons/HostButton.cpp
similarity index 100%
rename from src/ui/HostButton.cpp
rename to src/ui/buttons/HostButton.cpp
diff --git a/src/ui/HostButton.hpp b/src/ui/buttons/HostButton.hpp
similarity index 100%
rename from src/ui/HostButton.hpp
rename to src/ui/buttons/HostButton.hpp
diff --git a/src/ui/AddHostWindow.cpp b/src/ui/windows/AddHostWindow.cpp
similarity index 100%
rename from src/ui/AddHostWindow.cpp
rename to src/ui/windows/AddHostWindow.cpp
diff --git a/src/ui/AddHostWindow.hpp b/src/ui/windows/AddHostWindow.hpp
similarity index 100%
rename from src/ui/AddHostWindow.hpp
rename to src/ui/windows/AddHostWindow.hpp
diff --git a/src/ui/AppListWindow.cpp b/src/ui/windows/AppListWindow.cpp
similarity index 100%
rename from src/ui/AppListWindow.cpp
rename to src/ui/windows/AppListWindow.cpp
diff --git a/src/ui/AppListWindow.hpp b/src/ui/windows/AppListWindow.hpp
similarity index 100%
rename from src/ui/AppListWindow.hpp
rename to src/ui/windows/AppListWindow.hpp
diff --git a/src/ui/ContentWindow.cpp b/src/ui/windows/ContentWindow.cpp
similarity index 100%
rename from src/ui/ContentWindow.cpp
rename to src/ui/windows/ContentWindow.cpp
diff --git a/src/ui/ContentWindow.hpp b/src/ui/windows/ContentWindow.hpp
similarity index 100%
rename from src/ui/ContentWindow.hpp
rename to src/ui/windows/ContentWindow.hpp
diff --git a/src/ui/MainWindow.cpp b/src/ui/windows/MainWindow.cpp
similarity index 100%
rename from src/ui/MainWindow.cpp
rename to src/ui/windows/MainWindow.cpp
diff --git a/src/ui/MainWindow.hpp b/src/ui/windows/MainWindow.hpp
similarity index 100%
rename from src/ui/MainWindow.hpp
rename to src/ui/windows/MainWindow.hpp