progs/egl: Link to eglut first.

This moves eglut before EGL so that the symbols can be resolved.

diff --git a/progs/egl/opengl/Makefile b/progs/egl/opengl/Makefile
index cca843f4573c71045cd07974a4d1eb5f24bf3d39..9a91df99064c61ec6e46b42055f0e8aa6cf87140 100644 (file)
--- a/progs/egl/opengl/Makefile
+++ b/progs/egl/opengl/Makefile
@@ -73,9 +73,9 @@ $(foreach demo, $(EGLUT_DEMOS), $(eval $(call eglut-demo-rule,$(demo))))
 
 # build EGLUT demos
 $(EGLUT_X11_DEMOS):
-       $(CC) $(CFLAGS) $(LDFLAGS) -o $@ $< $(LIBS) -L$(EGLUT_DIR) -leglut-$* -lX11
-$(EGLUT_SCREEN_DEMOS):
-       $(CC) $(CFLAGS) $(LDFLAGS) -o $@ $< $(LIBS) -L$(EGLUT_DIR) -leglut-$*
+       $(CC) $(CFLAGS) $(LDFLAGS) -o $@ $< -L$(EGLUT_DIR) -leglut-$* $(LIBS) -lX11
+$(EGLUT_SCREEN_DEMOS):                                                
+       $(CC) $(CFLAGS) $(LDFLAGS) -o $@ $< -L$(EGLUT_DIR) -leglut-$* $(LIBS)
 
 clean:
        -rm -f *.o *~

diff --git a/progs/egl/opengles1/Makefile b/progs/egl/opengles1/Makefile
index 27caa0cd0f681622cc9593b7264f453bcd11d963..c575a9703ed3490b1f020f2c5962eeede44986bc 100644 (file)
--- a/progs/egl/opengles1/Makefile
+++ b/progs/egl/opengles1/Makefile
@@ -91,9 +91,9 @@ $(foreach demo, $(EGLUT_DEMOS), $(eval $(call eglut-demo-rule,$(demo))))
 
 # build EGLUT demos
 $(EGLUT_X11_DEMOS):
-       $(CC) $(CFLAGS) $(LDFLAGS) -o $@ $< $(ES1_LIBS) -L$(EGLUT_DIR) -leglut-$* -lX11
-$(EGLUT_SCREEN_DEMOS):
-       $(CC) $(CFLAGS) $(LDFLAGS) -o $@ $< $(ES1_LIBS) -L$(EGLUT_DIR) -leglut-$*
+       $(CC) $(CFLAGS) $(LDFLAGS) -o $@ $< -L$(EGLUT_DIR) -leglut-$* $(ES1_LIBS) -lX11
+$(EGLUT_SCREEN_DEMOS):                                                
+       $(CC) $(CFLAGS) $(LDFLAGS) -o $@ $< -L$(EGLUT_DIR) -leglut-$* $(ES1_LIBS)
 
 
 clean:

diff --git a/progs/egl/openvg/Makefile b/progs/egl/openvg/Makefile
index 8ab0e68d876a31cfd7c8bc97b7ded800a512c4ae..5a10cc8055fd9ea174984d68157d58f017feee2c 100644 (file)
--- 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 *~