TakeV/dxx-rebirth
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Fix externally reported Mac OS X build break

Browse source 
/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
This commit is contained in:
Kp 2019-10-23 03:02:16 +00:00
parent d056611989
commit 15b0ec7f42
2 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
SConstruct
View file

@ -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:

2
similar/misc/physfsx.cpp
View file

@ -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"