diff options
-rw-r--r-- | libass/Makefile.am | 3 | ||||
-rw-r--r-- | libass/ass_cache.c | 4 | ||||
-rw-r--r-- | libass/ass_cache.h | 2 | ||||
-rw-r--r-- | libass/ass_cache_template.h (renamed from libass/ass_cache_template.c) | 0 |
4 files changed, 5 insertions, 4 deletions
diff --git a/libass/Makefile.am b/libass/Makefile.am index 4f846995..e984ce10 100644 --- a/libass/Makefile.am +++ b/libass/Makefile.am @@ -7,10 +7,11 @@ libass_la_SOURCES = ass.c ass_cache.c ass_font.c ass_fontconfig.c ass_render.c \ ass_utils.c ass_bitmap.c ass_library.c ass_bitmap.h \ ass_cache.h ass_fontconfig.h ass_font.h ass.h \ ass_library.h ass_types.h ass_utils.h ass_drawing.c \ - ass_drawing.h + ass_drawing.h ass_cache_template.h libass_la_LDFLAGS = -version-info $(LIBASS_LT_CURRENT):$(LIBASS_LT_REVISION):$(LIBASS_LT_AGE) libass_la_LDFLAGS += -export-symbols $(srcdir)/libass.sym assheadersdir = $(includedir)/ass dist_assheaders_HEADERS = ass.h ass_types.h +EXTRA_DIST = libass.sym diff --git a/libass/ass_cache.c b/libass/ass_cache.c index ed44a2f1..4c7a3fa5 100644 --- a/libass/ass_cache.c +++ b/libass/ass_cache.c @@ -199,9 +199,9 @@ void ass_font_cache_done(hashmap_t *font_cache) // Create hash/compare functions for bitmap and glyph #define CREATE_HASH_FUNCTIONS -#include "ass_cache_template.c" +#include "ass_cache_template.h" #define CREATE_COMPARISON_FUNCTIONS -#include "ass_cache_template.c" +#include "ass_cache_template.h" //--------------------------------- // bitmap cache diff --git a/libass/ass_cache.h b/libass/ass_cache.h index 004a4b67..83c99438 100644 --- a/libass/ass_cache.h +++ b/libass/ass_cache.h @@ -68,7 +68,7 @@ void ass_font_cache_done(hashmap_t *); // Create definitions for bitmap_hash_key and glyph_hash_key #define CREATE_STRUCT_DEFINITIONS -#include "ass_cache_template.c" +#include "ass_cache_template.h" typedef struct bitmap_hash_val_s { bitmap_t *bm; // the actual bitmaps diff --git a/libass/ass_cache_template.c b/libass/ass_cache_template.h index eae98074..eae98074 100644 --- a/libass/ass_cache_template.c +++ b/libass/ass_cache_template.h |