Commit 0ae0e591 authored by Vincent Cheng's avatar Vincent Cheng

Merge tag 'upstream/0_20150328'

Upstream version 0~20150328

Conflicts:
	libglfork.cpp
parents 9e45b288 9d55dc20
...@@ -30,4 +30,4 @@ CXXFLAGS += -DPRIMUS_libGLd='"$(PRIMUS_libGLd)"' ...@@ -30,4 +30,4 @@ CXXFLAGS += -DPRIMUS_libGLd='"$(PRIMUS_libGLd)"'
$(LIBDIR)/libGL.so.1: libglfork.cpp $(LIBDIR)/libGL.so.1: libglfork.cpp
mkdir -p $(LIBDIR) mkdir -p $(LIBDIR)
$(CXX) $(CXXFLAGS) -fvisibility=hidden -fPIC -shared -Wl,-Bsymbolic -o $@ $< -lX11 -lpthread -lrt $(CXX) $(CPPFLAGS) $(CXXFLAGS) -fvisibility=hidden -fPIC -shared -Wl,-Bsymbolic -o $@ $< -lX11 -lpthread -lrt
This diff is collapsed.
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment