From 1054f22e480875b2d91c3d9ad1b85080e4705a35 Mon Sep 17 00:00:00 2001 From: Chia-I Wu Date: Fri, 2 Apr 2010 09:59:36 +0800 Subject: progs/egl: Link to eglut first. This moves eglut before EGL so that the symbols can be resolved. --- progs/egl/openvg/Makefile | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'progs/egl/openvg/Makefile') diff --git a/progs/egl/openvg/Makefile b/progs/egl/openvg/Makefile index 8ab0e68..5a10cc8 100644 --- a/progs/egl/openvg/Makefile +++ b/progs/egl/openvg/Makefile @@ -27,11 +27,11 @@ default: $(PROGRAMS) $(EGLUT_X11_DEMOS) $(EGLUT_SCREEN_DEMOS) lion_x11: lion.o lion-render.o $(EGLUT_DIR)/libeglut-x11.a $(CC) $(CFLAGS) $(LDFLAGS) -o $@ lion.o lion-render.o \ - $(VG_LIBS) -L$(EGLUT_DIR) -leglut-x11 -lX11 + -L$(EGLUT_DIR) -leglut-x11 $(VG_LIBS) -lX11 lion_screen: lion.o lion-render.o $(EGLUT_DIR)/libeglut-screen.a $(CC) $(CFLAGS) $(LDFLAGS) -o $@ lion.o lion-render.o \ - $(VG_LIBS) -L$(EGLUT_DIR) -leglut-screen + -L$(EGLUT_DIR) -leglut-screen $(VG_LIBS) $(EGLUT_DIR)/libeglut-x11.a $(EGLUT_DIR)/libeglut-screen.a: @@ -45,9 +45,9 @@ $(foreach demo, $(EGLUT_DEMOS), $(eval $(call eglut-demo-rule,$(demo)))) # build EGLUT demos $(EGLUT_X11_DEMOS): - $(CC) $(CFLAGS) $(LDFLAGS) -o $@ $< $(VG_LIBS) -L$(EGLUT_DIR) -leglut-$* -lX11 -$(EGLUT_SCREEN_DEMOS): - $(CC) $(CFLAGS) $(LDFLAGS) -o $@ $< $(VG_LIBS) -L$(EGLUT_DIR) -leglut-$* + $(CC) $(CFLAGS) $(LDFLAGS) -o $@ $< -L$(EGLUT_DIR) -leglut-$* $(VG_LIBS) -lX11 +$(EGLUT_SCREEN_DEMOS): + $(CC) $(CFLAGS) $(LDFLAGS) -o $@ $< -L$(EGLUT_DIR) -leglut-$* $(VG_LIBS) clean: rm -f *.o *~ -- cgit v1.1