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

progs/egl: Link to eglut first.

Browse Source 
This moves eglut before EGL so that the symbols can be resolved.
This commit is contained in:
Chia-I Wu
2010-04-02 09:59:36 +08:00
parent 87275e8fab
commit 1054f22e48
3 changed files with 11 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
progs/egl/opengl/Makefile
+3 -3
View File
@@ -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 *~
progs/egl/opengles1/Makefile
+3 -3
View File
@@ -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:
progs/egl/openvg/Makefile
+5 -5
View File
@@ -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 *~