From 15b0ec7f4297b844f70332518b68331a6f3c9b7a Mon Sep 17 00:00:00 2001
From: Kp <kp@valhallalegends.com>
Date: Wed, 23 Oct 2019 03:02:16 +0000
Subject: [PATCH] Fix externally reported Mac OS X build break

    /Library/Developer/CommandLineTools/SDKs/MacOSX.sdk/System/Library/Frameworks/Foundation.framework/Headers/NSGeometry.h:10:9: fatal error:
	  'CoreGraphics/CGBase.h' file not found
    #import <CoreGraphics/CGBase.h>
	    ^~~~~~~~~~~~~~~~~~~~~~~
    /Library/Developer/CommandLineTools/SDKs/MacOSX.sdk/System/Library/Frameworks/Foundation.framework/Headers/NSGeometry.h:10:9: note: did not
	  find header 'CGBase.h' in framework 'CoreGraphics' (loaded from
	  '/System/Library/Frameworks/ApplicationServices.framework/Versions/A/Frameworks')
    similar/misc/physfsx.cpp:20:10: fatal error: 'HIServices/Processes.h' file not found
    #include <HIServices/Processes.h>

Since this is an OS X problem, this has only been tested by the original
reporter.

Reported-by: Sottises <https://github.com/dxx-rebirth/dxx-rebirth/issues/455>
Suggested-by: MaddTheSane <https://github.com/dxx-rebirth/dxx-rebirth/issues/455#issuecomment-536164089> # SConstruct part
---
 SConstruct               | 2 +-
 similar/misc/physfsx.cpp | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/SConstruct b/SConstruct
index 8b17717bd..8f4299f86 100644
--- a/SConstruct
+++ b/SConstruct
@@ -3946,7 +3946,7 @@ class DXXCommon(LazyObjectConstructor):
 				CPPDEFINES = ['__unix__'],
 				CPPPATH = [os.path.join(library_frameworks, 'SDL.framework/Headers'), '/Library/Frameworks/SDL.framework/Headers'],
 				FRAMEWORKS = ['ApplicationServices', 'Cocoa', 'SDL'],
-				FRAMEWORKPATH = [library_frameworks, '/System/Library/Frameworks/ApplicationServices.framework/Versions/A/Frameworks'],
+				FRAMEWORKPATH = [library_frameworks],
 				LINKFLAGS = ['-Wl,-rpath,@loader_path/../Frameworks'],	# Allow libraries & frameworks to go in app bundle
 			)
 			if self.user_settings.opengl or self.user_settings.opengles:
diff --git a/similar/misc/physfsx.cpp b/similar/misc/physfsx.cpp
index 8cbf3a3c4..46b425a70 100644
--- a/similar/misc/physfsx.cpp
+++ b/similar/misc/physfsx.cpp
@@ -17,7 +17,7 @@
 #if defined(__APPLE__) && defined(__MACH__)
 #include <sys/mount.h>
 #include <unistd.h>	// for chdir hack
-#include <HIServices/Processes.h>
+#include <ApplicationServices/ApplicationServices.h>
 #endif
 
 #include "args.h"