KonstantinSeurer
/
mesa
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

d3d1x: fix progs linking if not all EGL platforms are enabled

This commit is contained in:
Luca Barbieri 2010-09-27 14:23:33 +02:00
parent 9ba4b30eae
commit 31d8f64f3f
1 changed files with 18 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
src/gallium/state_trackers/d3d1x/progs/Makefile
View File

@ -9,15 +9,29 @@ LIBS= \
../../../winsys/sw/wrapper/libwsw.a \
../../../winsys/sw/xlib/libws_xlib.a \
../../../winsys/sw/dri/libswdri.a \
../../../winsys/sw/fbdev/libfbdev.a \
../../../../../lib/libEGL.so
LIBS_D3D10 = ../dxgid3d10/libdxgid3d10.a ../gd3d10/libgd3d10.a $(LIBS)
LIBS_D3D11 = ../dxgid3d11/libdxgid3d11.a ../gd3d11/libgd3d11.a $(LIBS)
LDADD=-lXext -lXfixes -lX11 -ldrm -ldl
LDADD=-ldl
all: bin/d3d10tri bin/d3d11tri bin/d3d11tex bin/d3d11gears
include ../Makefile.inc
ifneq ($(findstring fbdev, $(EGL_PLATFORMS)),)
LIBS += ../../../winsys/sw/fbdev/libfbdev.a
endif
ifneq ($(findstring x11, $(EGL_PLATFORMS)),)
LDADD += -lX11 -lXext -lXfixes
LIBS += ../../../winsys/sw/xlib/libws_xlib.a
endif
ifneq ($(findstring kms, $(EGL_PLATFORMS)),)
LDADD += -ldrm
endif
LIBS_D3D10 = ../dxgid3d10/libdxgid3d10.a ../gd3d10/libgd3d10.a $(LIBS)
LIBS_D3D11 = ../dxgid3d11/libdxgid3d11.a ../gd3d11/libgd3d11.a $(LIBS)
bin/d3d10tri: d3d10app/d3d10x11main.o d3d10tri/d3d10tri.o $(LIBS_D3D10)
$(CXX) $(LDFLAGS) $(filter %.o,$^) -o $@ -Wl,--start-group $(LIBS_D3D10) -Wl,--end-group $(LDADD)