diff options
author | Chia-I Wu <olv@lunarg.com> | 2010-04-01 11:17:43 +0800 |
---|---|---|
committer | Chia-I Wu <olv@lunarg.com> | 2010-04-01 22:25:48 +0800 |
commit | c727ef01083c873abfaf3c79b28d7cbcd6361bf3 (patch) | |
tree | bb6e39db1c2ae014b7df589748b992d20b25e198 | |
parent | 2da7ef077a494373904f2e8ad4fcd3885c2bba9b (diff) |
progs/egl: Move demos a level deeper.
Move the demos to "opengl" subdirectory.
-rw-r--r-- | configs/linux-dri | 2 | ||||
-rw-r--r-- | configs/linux-egl | 2 | ||||
-rw-r--r-- | configure.ac | 2 | ||||
-rw-r--r-- | progs/egl/opengl/.gitignore (renamed from progs/egl/.gitignore) | 0 | ||||
-rw-r--r-- | progs/egl/opengl/Makefile (renamed from progs/egl/Makefile) | 2 | ||||
-rw-r--r-- | progs/egl/opengl/demo1.c (renamed from progs/egl/demo1.c) | 0 | ||||
-rw-r--r-- | progs/egl/opengl/demo2.c (renamed from progs/egl/demo2.c) | 0 | ||||
-rw-r--r-- | progs/egl/opengl/demo3.c (renamed from progs/egl/demo3.c) | 0 | ||||
-rw-r--r-- | progs/egl/opengl/eglgears.c (renamed from progs/egl/eglgears.c) | 0 | ||||
-rw-r--r-- | progs/egl/opengl/eglinfo.c (renamed from progs/egl/eglinfo.c) | 0 | ||||
-rw-r--r-- | progs/egl/opengl/eglscreen.c (renamed from progs/egl/eglscreen.c) | 0 | ||||
-rw-r--r-- | progs/egl/opengl/egltri.c (renamed from progs/egl/egltri.c) | 0 | ||||
-rw-r--r-- | progs/egl/opengl/peglgears.c (renamed from progs/egl/peglgears.c) | 0 | ||||
-rw-r--r-- | progs/egl/opengl/xegl_tri.c (renamed from progs/egl/xegl_tri.c) | 0 | ||||
-rw-r--r-- | progs/egl/opengl/xeglgears.c (renamed from progs/egl/xeglgears.c) | 0 | ||||
-rw-r--r-- | progs/egl/opengl/xeglthreads.c (renamed from progs/egl/xeglthreads.c) | 0 |
16 files changed, 4 insertions, 4 deletions
diff --git a/configs/linux-dri b/configs/linux-dri index e21a3e95943..9017becdafe 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 $(PROGRAM_DIRS) +PROGRAM_DIRS := egl/opengl $(PROGRAM_DIRS) # EGL directories EGL_DRIVERS_DIRS = glx diff --git a/configs/linux-egl b/configs/linux-egl index 28165ed5b5a..cd664b4171f 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 +PROGRAM_DIRS = egl/opengl DRIVER_DIRS = dri GALLIUM_WINSYS_DIRS = egl_drm diff --git a/configure.ac b/configure.ac index f2e87f4d4c2..5647442ea17 100644 --- a/configure.ac +++ b/configure.ac @@ -954,7 +954,7 @@ if test "x$enable_egl" = xyes; then fi if test "$with_demos" = yes; then - PROGRAM_DIRS="$PROGRAM_DIRS egl" + PROGRAM_DIRS="$PROGRAM_DIRS egl/opengl" fi fi AC_SUBST([EGL_LIB_DEPS]) diff --git a/progs/egl/.gitignore b/progs/egl/opengl/.gitignore index 7a13d4686a0..7a13d4686a0 100644 --- a/progs/egl/.gitignore +++ b/progs/egl/opengl/.gitignore diff --git a/progs/egl/Makefile b/progs/egl/opengl/Makefile index 890240f9a38..50a60c701d0 100644 --- a/progs/egl/Makefile +++ b/progs/egl/opengl/Makefile @@ -1,6 +1,6 @@ # progs/egl/Makefile -TOP = ../.. +TOP = ../../.. include $(TOP)/configs/current diff --git a/progs/egl/demo1.c b/progs/egl/opengl/demo1.c index d892734ee55..d892734ee55 100644 --- a/progs/egl/demo1.c +++ b/progs/egl/opengl/demo1.c diff --git a/progs/egl/demo2.c b/progs/egl/opengl/demo2.c index b9e92f62ac2..b9e92f62ac2 100644 --- a/progs/egl/demo2.c +++ b/progs/egl/opengl/demo2.c diff --git a/progs/egl/demo3.c b/progs/egl/opengl/demo3.c index 64b9ee652cd..64b9ee652cd 100644 --- a/progs/egl/demo3.c +++ b/progs/egl/opengl/demo3.c diff --git a/progs/egl/eglgears.c b/progs/egl/opengl/eglgears.c index 63490953aee..63490953aee 100644 --- a/progs/egl/eglgears.c +++ b/progs/egl/opengl/eglgears.c diff --git a/progs/egl/eglinfo.c b/progs/egl/opengl/eglinfo.c index 961fd9ccc76..961fd9ccc76 100644 --- a/progs/egl/eglinfo.c +++ b/progs/egl/opengl/eglinfo.c diff --git a/progs/egl/eglscreen.c b/progs/egl/opengl/eglscreen.c index 520f76ea036..520f76ea036 100644 --- a/progs/egl/eglscreen.c +++ b/progs/egl/opengl/eglscreen.c diff --git a/progs/egl/egltri.c b/progs/egl/opengl/egltri.c index 006e06eb03e..006e06eb03e 100644 --- a/progs/egl/egltri.c +++ b/progs/egl/opengl/egltri.c diff --git a/progs/egl/peglgears.c b/progs/egl/opengl/peglgears.c index 212d1acf692..212d1acf692 100644 --- a/progs/egl/peglgears.c +++ b/progs/egl/opengl/peglgears.c diff --git a/progs/egl/xegl_tri.c b/progs/egl/opengl/xegl_tri.c index 1f1a005a210..1f1a005a210 100644 --- a/progs/egl/xegl_tri.c +++ b/progs/egl/opengl/xegl_tri.c diff --git a/progs/egl/xeglgears.c b/progs/egl/opengl/xeglgears.c index a6a977d9fff..a6a977d9fff 100644 --- a/progs/egl/xeglgears.c +++ b/progs/egl/opengl/xeglgears.c diff --git a/progs/egl/xeglthreads.c b/progs/egl/opengl/xeglthreads.c index 5787faecb90..5787faecb90 100644 --- a/progs/egl/xeglthreads.c +++ b/progs/egl/opengl/xeglthreads.c |