]> git.proxmox.com Git - mirror_edk2.git/commitdiff
EmulatorPkg:Unix: Add support for X11 on Mac OS X via XQuartz
authorAnderw Fish <afish@apple.com>
Thu, 28 Aug 2014 03:38:21 +0000 (03:38 +0000)
committerandrewfish <andrewfish@6f19259b-4bc3-4df7-8a09-765794883524>
Thu, 28 Aug 2014 03:38:21 +0000 (03:38 +0000)
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

EmulatorPkg/Unix/Host/Host.inf
EmulatorPkg/Unix/Host/X11IncludeHack [new symlink]

index dee2e0df23289a5fad4218537be0032c4ad4b68c..d0b4927d1678ba620894978eb68f66383193204b 100644 (file)
    XCODE:*_*_X64_DLINK_PATH == gcc\r
    XCODE:*_*_X64_DLINK_FLAGS == -o $(BIN_DIR)/Host -L/usr/X11R6/lib -lXext -lX11 -framework Carbon\r
    XCODE:*_*_X64_ASM_FLAGS == -g\r
-\r
+   XCODE:*_*_X64_CC_FLAGS = -I$(WORKSPACE)/EmulatorPkg/Unix/Host/X11IncludeHack\r
diff --git a/EmulatorPkg/Unix/Host/X11IncludeHack b/EmulatorPkg/Unix/Host/X11IncludeHack
new file mode 120000 (symlink)
index 0000000..f7ab103
--- /dev/null
@@ -0,0 +1 @@
+/opt/X11/include
\ No newline at end of file