diff options
| author | diego <diego@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2007-03-20 01:06:51 +0000 |
|---|---|---|
| committer | diego <diego@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2007-03-20 01:06:51 +0000 |
| commit | b478785d8960987bd294285fc3d15525f0834d1f (patch) | |
| tree | 6e7f4b1cdfc056febc96b46e03a3b05b26086612 | |
| parent | 247e9ac3ffe8be57da9451caf46dcf06c678a02e (diff) | |
| download | mpv-b478785d8960987bd294285fc3d15525f0834d1f.tar.bz2 mpv-b478785d8960987bd294285fc3d15525f0834d1f.tar.xz | |
Move gltest and bmovl-test into the main TOOLS directory, subdirectories
for single files are silly.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@22755 b3059339-0415-0410-9bf9-f77b7e298cf2
| -rwxr-xr-x | TOOLS/GL-test/compile.sh | 2 | ||||
| -rw-r--r-- | TOOLS/Makefile | 8 | ||||
| -rw-r--r-- | TOOLS/bmovl-test.c (renamed from TOOLS/bmovl-test/bmovl-test.c) | 0 | ||||
| -rw-r--r-- | TOOLS/bmovl-test/Makefile | 7 | ||||
| -rw-r--r-- | TOOLS/gltest.c (renamed from TOOLS/GL-test/gltest.c) | 0 |
5 files changed, 7 insertions, 10 deletions
diff --git a/TOOLS/GL-test/compile.sh b/TOOLS/GL-test/compile.sh deleted file mode 100755 index 002d4a028d..0000000000 --- a/TOOLS/GL-test/compile.sh +++ /dev/null @@ -1,2 +0,0 @@ - -gcc -g -O4 gltest.c ../../osdep/timer-lx.o -o gltest -L/usr/X11/lib -L/usr/X11R6/lib -lglut -lGL -lGLU -lX11 -lXext -lXmu -lXi -lm diff --git a/TOOLS/Makefile b/TOOLS/Makefile index a60ff3d272..631bec9943 100644 --- a/TOOLS/Makefile +++ b/TOOLS/Makefile @@ -45,7 +45,13 @@ fastmemcpybench: fastmemcpybench.c $(CC) $(CFLAGS) -g $< -o fastmem2-k7$(EXESUF) ../libvo/aclib.o -DNAME=\"mga-k7\ \" -DHAVE_MGA -DHAVE_MMX -DHAVE_3DNOW -DHAVE_MMX2 $(CC) $(CFLAGS) -g $< -o fastmem2-sse$(EXESUF) ../libvo/aclib.o -DNAME=\"mga-sse\" -DHAVE_MGA -DHAVE_MMX -DHAVE_SSE -DHAVE_MMX2 +bmovl-test$(EXESUF): bmovl-test.c + $(CC) -O3 -I/usr/include/SDL -lSDL_image -o $@ $< + +gltest: gltest.c ../osdep/timer-lx.o + $(CC) -O4 -g -o $@ $^ -lglut + clean distclean: rm -f $(OBJS) rm -f fastmem-* fastmem2-* - rm -f cpuinfo$(EXESUF) fastmemcpybench + rm -f cpuinfo$(EXESUF) fastmemcpybench bmovl-test$(EXESUF) gltest diff --git a/TOOLS/bmovl-test/bmovl-test.c b/TOOLS/bmovl-test.c index 651c9c02ac..651c9c02ac 100644 --- a/TOOLS/bmovl-test/bmovl-test.c +++ b/TOOLS/bmovl-test.c diff --git a/TOOLS/bmovl-test/Makefile b/TOOLS/bmovl-test/Makefile deleted file mode 100644 index 0bc8b9ce5f..0000000000 --- a/TOOLS/bmovl-test/Makefile +++ /dev/null @@ -1,7 +0,0 @@ -include ../../config.mak - -bmovl-test$(EXESUF): bmovl-test.c - $(CC) -O3 $(EXTRA_INC) -lSDL_image -o $@ bmovl-test.c - -clean: - rm -f bmovl-test diff --git a/TOOLS/GL-test/gltest.c b/TOOLS/gltest.c index e8c6d33146..e8c6d33146 100644 --- a/TOOLS/GL-test/gltest.c +++ b/TOOLS/gltest.c |