summaryrefslogtreecommitdiff
path: root/progs
diff options
context:
space:
mode:
authorIan Romanick <idr@us.ibm.com>2005-08-08 23:22:46 +0000
committerIan Romanick <idr@us.ibm.com>2005-08-08 23:22:46 +0000
commitaba4864a25fbf056b4c34dd20cc000b7e3221ad3 (patch)
treeb4c0639eb658f6b199fa9037eedb79097de5e5c6 /progs
parent7bf08c23fdfe3e8a1dbfc44cad9e7e427f6e2630 (diff)
Make the linux-dri-x86 builds work on x86-64 again. mklib now
determines the bits (either 32 or 64) for libraries without the lib prefix. progs/egl/Makefile passes CFLAGS on the link commands so that things like '-m32' get propagated.
Diffstat (limited to 'progs')
-rw-r--r--progs/egl/Makefile10
1 files changed, 5 insertions, 5 deletions
diff --git a/progs/egl/Makefile b/progs/egl/Makefile
index be97ac607c..39741db7d3 100644
--- a/progs/egl/Makefile
+++ b/progs/egl/Makefile
@@ -25,35 +25,35 @@ default: $(PROGRAMS)
demo1: demo1.o $(LIB_DIR)/libEGL.so
- $(CC) demo1.o -L$(LIB_DIR) -lEGL -o $@
+ $(CC) $(CFLAGS) demo1.o -L$(LIB_DIR) -lEGL -o $@
demo1.o: demo1.c $(HEADERS)
$(CC) -c $(CFLAGS) -I$(TOP)/include demo1.c
demo2: demo2.o $(LIB_DIR)/libEGL.so
- $(CC) demo2.o -L$(LIB_DIR) -lEGL $(APP_LIB_DEPS) -o $@
+ $(CC) $(CFLAGS) demo2.o -L$(LIB_DIR) -lEGL $(APP_LIB_DEPS) -o $@
demo2.o: demo2.c $(HEADERS)
$(CC) -c $(CFLAGS) -I$(TOP)/include demo2.c
demo3: demo3.o $(LIB_DIR)/libEGL.so
- $(CC) demo3.o -L$(LIB_DIR) -lEGL $(APP_LIB_DEPS) -o $@
+ $(CC) $(CFLAGS) demo3.o -L$(LIB_DIR) -lEGL $(APP_LIB_DEPS) -o $@
demo3.o: demo3.c $(HEADERS)
$(CC) -c $(CFLAGS) -I$(TOP)/include demo3.c
eglinfo: eglinfo.o $(LIB_DIR)/libEGL.so
- $(CC) eglinfo.o -L$(LIB_DIR) -lEGL -o $@
+ $(CC) $(CFLAGS) eglinfo.o -L$(LIB_DIR) -lEGL -o $@
eglinfo.o: eglinfo.c $(HEADERS)
$(CC) -c $(CFLAGS) -I$(TOP)/include eglinfo.c
eglgears: eglgears.o $(LIB_DIR)/libEGL.so
- $(CC) eglgears.o -L$(LIB_DIR) -lEGL $(APP_LIB_DEPS) -o $@
+ $(CC) $(CFLAGS) eglgears.o -L$(LIB_DIR) -lEGL $(APP_LIB_DEPS) -o $@
eglgears.o: eglgears.c $(HEADERS)
$(CC) -c $(CFLAGS) -I$(TOP)/include eglgears.c