Skip to content

Commit

Permalink
VO: rename file: vo_gl3_shaders.glsl -> vo_opengl_shaders.glsl
Browse files Browse the repository at this point in the history
  • Loading branch information
wm4 committed Oct 3, 2012
1 parent 7c6f229 commit 4ecb1b5
Show file tree
Hide file tree
Showing 4 changed files with 6 additions and 6 deletions.
2 changes: 1 addition & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
/TAGS
/locale
/po
/libvo/vo_gl3_shaders.h
/libvo/vo_opengl_shaders.h
/libmpdemux/ebml_defs.c
/libmpdemux/ebml_types.h
/libvo/vdpau_template.c
Expand Down
6 changes: 3 additions & 3 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -367,8 +367,8 @@ libmpdemux/ebml.c: libmpdemux/ebml_defs.c
libmpdemux/ebml_defs.c: TOOLS/matroska.py
./$< --generate-definitions > $@

libvo/vo_opengl.c: libvo/vo_gl3_shaders.h
libvo/vo_gl3_shaders.h: TOOLS/file2string.py libvo/vo_gl3_shaders.glsl
libvo/vo_opengl.c: libvo/vo_opengl_shaders.h
libvo/vo_opengl_shaders.h: TOOLS/file2string.py libvo/vo_opengl_shaders.glsl
./$^ >$@

sub/osd_libass.c: sub/osd_font.h
Expand Down Expand Up @@ -469,7 +469,7 @@ clean:
-$(RM) input/input_conf.h
-$(RM) libvo/vdpau_template.c
-$(RM) libmpdemux/ebml_types.h libmpdemux/ebml_defs.c
-$(RM) libvo/vo_gl3_shaders.h
-$(RM) libvo/vo_opengl_shaders.h
-$(RM) sub/osd_font.h

distclean: clean
Expand Down
4 changes: 2 additions & 2 deletions libvo/vo_opengl.c
Original file line number Diff line number Diff line change
Expand Up @@ -55,8 +55,8 @@
#include "sub/ass_mp.h"

static const char vo_gl3_shaders[] =
// Generated from libvo/vo_gl3_shaders.glsl
#include "libvo/vo_gl3_shaders.h"
// Generated from libvo/vo_opengl_shaders.glsl
#include "libvo/vo_opengl_shaders.h"
;

// How many parts the OSD may consist of at most.
Expand Down
File renamed without changes.

0 comments on commit 4ecb1b5

Please sign in to comment.