diff options
| -rw-r--r-- | configs/linux-dri | 2 | ||||
| -rw-r--r-- | configs/linux-egl | 2 | ||||
| -rw-r--r-- | configs/linux-opengl-es | 2 | ||||
| -rw-r--r-- | configure.ac | 2 | ||||
| -rw-r--r-- | progs/egl/eglut/Makefile | 5 | ||||
| -rw-r--r-- | progs/egl/opengl/Makefile | 4 | ||||
| -rw-r--r-- | progs/egl/opengles1/Makefile | 4 | ||||
| -rw-r--r-- | progs/egl/openvg/Makefile | 4 |
8 files changed, 8 insertions, 17 deletions
diff --git a/configs/linux-dri b/configs/linux-dri index 9017bec..49e3579 100644 --- a/configs/linux-dri +++ b/configs/linux-dri @@ -52,7 +52,7 @@ GL_LIB_DEPS = $(EXTRA_LIB_PATH) -lX11 -lXext -lXxf86vm -lXdamage -lXfixes \ # Directories SRC_DIRS := glx egl $(SRC_DIRS) -PROGRAM_DIRS := egl/opengl $(PROGRAM_DIRS) +PROGRAM_DIRS := egl/eglut egl/opengl $(PROGRAM_DIRS) # EGL directories EGL_DRIVERS_DIRS = glx diff --git a/configs/linux-egl b/configs/linux-egl index cd664b4..566c7b9 100644 --- a/configs/linux-egl +++ b/configs/linux-egl @@ -48,7 +48,7 @@ GL_LIB_DEPS = $(EXTRA_LIB_PATH) -lX11 -lXext -lXxf86vm -lXdamage -lXfixes \ # Directories SRC_DIRS = gallium mesa gallium/winsys gallium/targets glu egl -PROGRAM_DIRS = egl/opengl +PROGRAM_DIRS = egl/eglut egl/opengl DRIVER_DIRS = dri GALLIUM_WINSYS_DIRS = egl_drm diff --git a/configs/linux-opengl-es b/configs/linux-opengl-es index ead4713..6984aa9 100644 --- a/configs/linux-opengl-es +++ b/configs/linux-opengl-es @@ -7,7 +7,7 @@ CONFIG_NAME = linux-opengl-es # Directories to build LIB_DIR = lib SRC_DIRS = egl glsl mesa/es gallium gallium/winsys gallium/targets -PROGRAM_DIRS = egl/opengles1 egl/opengles2 +PROGRAM_DIRS = egl/eglut egl/opengles1 egl/opengles2 # egl st needs this DEFINES += -DGLX_DIRECT_RENDERING diff --git a/configure.ac b/configure.ac index a4d9d94..5342563 100644 --- a/configure.ac +++ b/configure.ac @@ -955,7 +955,7 @@ if test "x$enable_egl" = xyes; then fi if test "$with_demos" = yes; then - PROGRAM_DIRS="$PROGRAM_DIRS egl/opengl" + PROGRAM_DIRS="$PROGRAM_DIRS egl/eglut egl/opengl" fi fi AC_SUBST([EGL_LIB_DEPS]) diff --git a/progs/egl/eglut/Makefile b/progs/egl/eglut/Makefile index dec8911..364f5b0 100644 --- a/progs/egl/eglut/Makefile +++ b/progs/egl/eglut/Makefile @@ -7,7 +7,10 @@ INCLUDES = \ -I$(TOP)/include \ $(X11_CFLAGS) -SOURCES = $(wildcard *.c) +SOURCES = \ + eglut.c \ + eglut_screen.c \ + eglut_x11.c EGLUT_X11_OBJECTS = eglut.o eglut_x11.o EGLUT_SCREEN_OBJECTS = eglut.o eglut_screen.o diff --git a/progs/egl/opengl/Makefile b/progs/egl/opengl/Makefile index 20158b1..79cd5fc 100644 --- a/progs/egl/opengl/Makefile +++ b/progs/egl/opengl/Makefile @@ -62,9 +62,6 @@ xeglgears: xeglgears.o $(HEADERS) $(LIB_DEP) xeglthreads: xeglthreads.o $(HEADERS) $(LIB_DEP) $(CC) $(CFLAGS) $(LDFLAGS) -o $@ $< $(LIBS) -lpthread -lm $(X11_LIBS) -$(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 $(LIB_DEP) @@ -80,4 +77,3 @@ $(EGLUT_SCREEN_DEMOS): clean: -rm -f *.o *~ -rm -f $(PROGRAMS) $(EGLUT_X11_DEMOS) $(EGLUT_SCREEN_DEMOS) - @$(MAKE) -C $(EGLUT_DIR) clean diff --git a/progs/egl/opengles1/Makefile b/progs/egl/opengles1/Makefile index ba9d1b8..593145d 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 diff --git a/progs/egl/openvg/Makefile b/progs/egl/openvg/Makefile index 431341c..3b11933 100644 --- a/progs/egl/openvg/Makefile +++ b/progs/egl/openvg/Makefile @@ -34,9 +34,6 @@ lion_screen: lion.o lion-render.o $(EGLUT_DIR)/libeglut-screen.a -L$(EGLUT_DIR) -leglut-screen $(VG_LIBS) -$(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 @@ -52,4 +49,3 @@ $(EGLUT_SCREEN_DEMOS): clean: rm -f *.o *~ rm -f $(EGLUT_X11_DEMOS) $(EGLUT_SCREEN_DEMOS) - @$(MAKE) -C $(EGLUT_DIR) clean |