projects
/
platform
/
upstream
/
xorg-server.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
5115c2c
)
XQuartz: Remove explicit link against libGL
author
Jeremy Huddleston
<jeremyhu@apple.com>
Fri, 3 Jun 2011 06:34:28 +0000
(
02:34
-0400)
committer
Jeremy Huddleston
<jeremyhu@apple.com>
Fri, 3 Jun 2011 20:01:18 +0000
(16:01 -0400)
This was indented to force a link against OpenGL.framework's libGL, but it
actually resulted in linking against mesa's libGL due to the ordering of -L
Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com>
hw/xquartz/mach-startup/Makefile.am
patch
|
blob
|
history
diff --git
a/hw/xquartz/mach-startup/Makefile.am
b/hw/xquartz/mach-startup/Makefile.am
index
4b7b2bc
..
8e49ea8
100644
(file)
--- a/
hw/xquartz/mach-startup/Makefile.am
+++ b/
hw/xquartz/mach-startup/Makefile.am
@@
-39,7
+39,6
@@
X11_bin_LDADD += \
$(top_builddir)/glx/libglx.la
X11_bin_LDFLAGS += \
- -L/System/Library/Frameworks/OpenGL.framework/Libraries -lGL \
-Wl,-framework,OpenGL
endif