summaryrefslogtreecommitdiffstats
path: root/EmulatorPkg
diff options
context:
space:
mode:
authorAnderw Fish <afish@apple.com>2014-08-28 03:38:21 +0000
committerandrewfish <andrewfish@6f19259b-4bc3-4df7-8a09-765794883524>2014-08-28 03:38:21 +0000
commit459eba01480e14ed15ddb88b515a921c34ee1b0b (patch)
treef32d09513cc9794a939159b009b9c6c896908b8a /EmulatorPkg
parent03d349ca584334ac9d92908172eaf621dd27a2ca (diff)
downloadedk2-459eba01480e14ed15ddb88b515a921c34ee1b0b.tar.gz
edk2-459eba01480e14ed15ddb88b515a921c34ee1b0b.tar.bz2
edk2-459eba01480e14ed15ddb88b515a921c34ee1b0b.zip
EmulatorPkg:Unix: Add support for X11 on Mac OS X via XQuartz
Starting in OS X Mountain Lion X11 is not longer part of the OS install, so you must download it from http://xquartz.macosforge.org. To make XQuartz work with the EmulatorPkg an include path needs to be added. The build tools fail the build if you try to add an absolute inculde path to the X11 headers, so Unix/Host/X11IncludeHack, a symbolic link, was added to get the system building. Contributed-under: TianoCore Contribution Agreement 1.0 Signed-off-by: Anderw Fish <afish@apple.com> Reviewed-by: Jordan Justen <jordan.l.justen@intel.com> git-svn-id: https://svn.code.sf.net/p/edk2/code/trunk/edk2@15929 6f19259b-4bc3-4df7-8a09-765794883524
Diffstat (limited to 'EmulatorPkg')
-rw-r--r--EmulatorPkg/Unix/Host/Host.inf2
l---------EmulatorPkg/Unix/Host/X11IncludeHack1
2 files changed, 2 insertions, 1 deletions
diff --git a/EmulatorPkg/Unix/Host/Host.inf b/EmulatorPkg/Unix/Host/Host.inf
index dee2e0df23..d0b4927d16 100644
--- a/EmulatorPkg/Unix/Host/Host.inf
+++ b/EmulatorPkg/Unix/Host/Host.inf
@@ -145,4 +145,4 @@
XCODE:*_*_X64_DLINK_PATH == gcc
XCODE:*_*_X64_DLINK_FLAGS == -o $(BIN_DIR)/Host -L/usr/X11R6/lib -lXext -lX11 -framework Carbon
XCODE:*_*_X64_ASM_FLAGS == -g
-
+ XCODE:*_*_X64_CC_FLAGS = -I$(WORKSPACE)/EmulatorPkg/Unix/Host/X11IncludeHack
diff --git a/EmulatorPkg/Unix/Host/X11IncludeHack b/EmulatorPkg/Unix/Host/X11IncludeHack
new file mode 120000
index 0000000000..f7ab103f69
--- /dev/null
+++ b/EmulatorPkg/Unix/Host/X11IncludeHack
@@ -0,0 +1 @@
+/opt/X11/include \ No newline at end of file