diff options
author | Roland Scheidegger <[email protected]> | 2010-04-30 15:27:13 +0200 |
---|---|---|
committer | Roland Scheidegger <[email protected]> | 2010-04-30 15:27:13 +0200 |
commit | 7662e3519bef3802024da3050b886068281e02b1 (patch) | |
tree | bc5bf675e67febffaf9e4d1fadd139e8c253ae32 /progs/egl/opengles1 | |
parent | 9a966b93c03aecac8eb72e6133aa9a2f2c7673f3 (diff) | |
parent | 7c769bef052fc1936d7ab33e291bb4646dc5b0d1 (diff) |
Merge commit 'origin/master' into gallium-msaa
Diffstat (limited to 'progs/egl/opengles1')
-rw-r--r-- | progs/egl/opengles1/Makefile | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/progs/egl/opengles1/Makefile b/progs/egl/opengles1/Makefile index ba9d1b84d5f..593145d4bf2 100644 --- a/progs/egl/opengles1/Makefile +++ b/progs/egl/opengles1/Makefile @@ -81,9 +81,6 @@ two_win: two_win.o $(ES1_LIB_DEPS) $(CC) $(CFLAGS) two_win.o $(ES1_LIBS) -o $@ -$(EGLUT_DIR)/libeglut-x11.a $(EGLUT_DIR)/libeglut-screen.a: - @$(MAKE) -C $(EGLUT_DIR) - # define the rules for EGLUT demos define eglut-demo-rule $(1)_x11 $(1)_screen: $(1)_%: $(1).o $(EGLUT_DIR)/libeglut-%.a $(ES1_LIB_DEPS) @@ -100,4 +97,3 @@ $(EGLUT_SCREEN_DEMOS): clean: -rm -f *.o *~ -rm -f $(PROGRAMS) $(EGLUT_X11_DEMOS) $(EGLUT_SCREEN_DEMOS) - @$(MAKE) -C $(EGLUT_DIR) clean |