OpenHarmony/third_party_mesa3d
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

progs/egl: Add egl/eglut to PROGRAM_DIRS.

Browse Source 
Make sure eglut is built before the demos.  This should work more
reliably with make -j<N>.
This commit is contained in:
Chia-I Wu
2010-04-27 14:13:13 +08:00
parent 0fcea8a411
commit fbfecda6ae
8 changed files with 8 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
configs/linux-dri
View File

@@ -52,7 +52,7 @@ GL_LIB_DEPS = $(EXTRA_LIB_PATH) -lX11 -lXext -lXxf86vm -lXdamage -lXfixes \
# Directories # Directories
SRC_DIRS := glx egl $(SRC_DIRS) SRC_DIRS := glx egl $(SRC_DIRS)
PROGRAM_DIRS := egl/opengl $(PROGRAM_DIRS) PROGRAM_DIRS := egl/eglut egl/opengl $(PROGRAM_DIRS)
# EGL directories # EGL directories
EGL_DRIVERS_DIRS = glx EGL_DRIVERS_DIRS = glx

2
configs/linux-egl
View File

@@ -48,7 +48,7 @@ GL_LIB_DEPS = $(EXTRA_LIB_PATH) -lX11 -lXext -lXxf86vm -lXdamage -lXfixes \
# Directories # Directories
SRC_DIRS = gallium mesa gallium/winsys gallium/targets glu egl SRC_DIRS = gallium mesa gallium/winsys gallium/targets glu egl
PROGRAM_DIRS = egl/opengl PROGRAM_DIRS = egl/eglut egl/opengl
DRIVER_DIRS = dri DRIVER_DIRS = dri
GALLIUM_WINSYS_DIRS = egl_drm GALLIUM_WINSYS_DIRS = egl_drm

2
configs/linux-opengl-es
View File

@@ -7,7 +7,7 @@ CONFIG_NAME = linux-opengl-es
# Directories to build # Directories to build
LIB_DIR = lib LIB_DIR = lib
SRC_DIRS = egl glsl mesa/es gallium gallium/winsys gallium/targets 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 # egl st needs this
DEFINES += -DGLX_DIRECT_RENDERING DEFINES += -DGLX_DIRECT_RENDERING

2
configure.ac
View File

@@ -955,7 +955,7 @@ if test "x$enable_egl" = xyes; then
fi fi
if test "$with_demos" = yes; then if test "$with_demos" = yes; then
PROGRAM_DIRS="$PROGRAM_DIRS egl/opengl" PROGRAM_DIRS="$PROGRAM_DIRS egl/eglut egl/opengl"
fi fi
fi fi
AC_SUBST([EGL_LIB_DEPS]) AC_SUBST([EGL_LIB_DEPS])

5
progs/egl/eglut/Makefile
View File

@@ -7,7 +7,10 @@ INCLUDES = \
-I$(TOP)/include \ -I$(TOP)/include \
$(X11_CFLAGS) $(X11_CFLAGS)
SOURCES = $(wildcard *.c) SOURCES = \
eglut.c \
eglut_screen.c \
eglut_x11.c
EGLUT_X11_OBJECTS = eglut.o eglut_x11.o EGLUT_X11_OBJECTS = eglut.o eglut_x11.o
EGLUT_SCREEN_OBJECTS = eglut.o eglut_screen.o EGLUT_SCREEN_OBJECTS = eglut.o eglut_screen.o

4
progs/egl/opengl/Makefile
View File

@@ -62,9 +62,6 @@ xeglgears: xeglgears.o $(HEADERS) $(LIB_DEP)
xeglthreads: xeglthreads.o $(HEADERS) $(LIB_DEP) xeglthreads: xeglthreads.o $(HEADERS) $(LIB_DEP)
$(CC) $(CFLAGS) $(LDFLAGS) -o $@ $< $(LIBS) -lpthread -lm $(X11_LIBS) $(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 the rules for EGLUT demos
define eglut-demo-rule define eglut-demo-rule
$(1)_x11 $(1)_screen: $(1)_%: $(1).o $(EGLUT_DIR)/libeglut-%.a $(LIB_DEP) $(1)_x11 $(1)_screen: $(1)_%: $(1).o $(EGLUT_DIR)/libeglut-%.a $(LIB_DEP)
@@ -80,4 +77,3 @@ $(EGLUT_SCREEN_DEMOS):
clean: clean:
-rm -f *.o *~ -rm -f *.o *~
-rm -f $(PROGRAMS) $(EGLUT_X11_DEMOS) $(EGLUT_SCREEN_DEMOS) -rm -f $(PROGRAMS) $(EGLUT_X11_DEMOS) $(EGLUT_SCREEN_DEMOS)
@$(MAKE) -C $(EGLUT_DIR) clean

4
progs/egl/opengles1/Makefile
View File

@@ -81,9 +81,6 @@ two_win: two_win.o $(ES1_LIB_DEPS)
$(CC) $(CFLAGS) two_win.o $(ES1_LIBS) -o $@ $(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 the rules for EGLUT demos
define eglut-demo-rule define eglut-demo-rule
$(1)_x11 $(1)_screen: $(1)_%: $(1).o $(EGLUT_DIR)/libeglut-%.a $(ES1_LIB_DEPS) $(1)_x11 $(1)_screen: $(1)_%: $(1).o $(EGLUT_DIR)/libeglut-%.a $(ES1_LIB_DEPS)
@@ -100,4 +97,3 @@ $(EGLUT_SCREEN_DEMOS):
clean: clean:
-rm -f *.o *~ -rm -f *.o *~
-rm -f $(PROGRAMS) $(EGLUT_X11_DEMOS) $(EGLUT_SCREEN_DEMOS) -rm -f $(PROGRAMS) $(EGLUT_X11_DEMOS) $(EGLUT_SCREEN_DEMOS)
@$(MAKE) -C $(EGLUT_DIR) clean

4
progs/egl/openvg/Makefile
View File

@@ -34,9 +34,6 @@ lion_screen: lion.o lion-render.o $(EGLUT_DIR)/libeglut-screen.a
-L$(EGLUT_DIR) -leglut-screen $(VG_LIBS) -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 the rules for EGLUT demos
define eglut-demo-rule define eglut-demo-rule
$(1)_x11 $(1)_screen: $(1)_%: $(1).o $(EGLUT_DIR)/libeglut-%.a $(1)_x11 $(1)_screen: $(1)_%: $(1).o $(EGLUT_DIR)/libeglut-%.a
@@ -52,4 +49,3 @@ $(EGLUT_SCREEN_DEMOS):
clean: clean:
rm -f *.o *~ rm -f *.o *~
rm -f $(EGLUT_X11_DEMOS) $(EGLUT_SCREEN_DEMOS) rm -f $(EGLUT_X11_DEMOS) $(EGLUT_SCREEN_DEMOS)
@$(MAKE) -C $(EGLUT_DIR) clean