diff options
| author | Chia-I Wu <olv@lunarg.com> | 2010-04-02 09:59:36 +0800 |
|---|---|---|
| committer | Chia-I Wu <olv@lunarg.com> | 2010-04-02 10:01:00 +0800 |
| commit | 1054f22e480875b2d91c3d9ad1b85080e4705a35 (patch) | |
| tree | ca5d1452274767d8099f96c3ad0526306ef36998 /progs | |
| parent | 87275e8fab51a906903e676f8f1762afe096aeb0 (diff) | |
progs/egl: Link to eglut first.
This moves eglut before EGL so that the symbols can be resolved.
Diffstat (limited to 'progs')
| -rw-r--r-- | progs/egl/opengl/Makefile | 6 | ||||
| -rw-r--r-- | progs/egl/opengles1/Makefile | 6 | ||||
| -rw-r--r-- | progs/egl/openvg/Makefile | 10 |
3 files changed, 11 insertions, 11 deletions
diff --git a/progs/egl/opengl/Makefile b/progs/egl/opengl/Makefile index cca843f457..9a91df9906 100644 --- 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 27caa0cd0f..c575a9703e 100644 --- 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 8ab0e68d87..5a10cc8055 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 *~ |