Skip to content

Commit ea2bf84

Browse files
harrynullharrynull
committed
Add more build files & Change indent
1 parent 544290c commit ea2bf84

File tree

3 files changed

+749
-674
lines changed

3 files changed

+749
-674
lines changed

‎linux/Makefile.am‎

Lines changed: 44 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -156,7 +156,6 @@ ccextractor_SOURCES = \
156156
../src/lib_ccx/ccx_encoders_smptett.c \
157157
../src/lib_ccx/ccx_encoders_splitbysentence.c \
158158
../src/lib_ccx/ccx_encoders_spupng.c \
159-
../src/lib_ccx/ccx_encoders_spupng.h \
160159
../src/lib_ccx/ccx_encoders_srt.c \
161160
../src/lib_ccx/ccx_encoders_ssa.c \
162161
../src/lib_ccx/ccx_encoders_structs.h \
@@ -208,8 +207,6 @@ ccextractor_SOURCES = \
208207
../src/lib_ccx/params.c \
209208
../src/lib_ccx/params_dump.c \
210209
../src/lib_ccx/sequencing.c \
211-
../src/lib_ccx/spupng_encoder.c \
212-
../src/lib_ccx/spupng_encoder.h \
213210
../src/lib_ccx/stdintmsc.h \
214211
../src/lib_ccx/stream_functions.c \
215212
../src/lib_ccx/teletext.h \
@@ -268,12 +265,52 @@ ccextractor_SOURCES = \
268265
../src/extractors/extractor.c \
269266
../src/extractors/extractor.h \
270267
../src/wrappers/wrapper.c \
271-
../src/wrappers/wrapper.h
272-
268+
../src/wrappers/wrapper.h \
269+
../src/freetype/autofit/autofit.c \
270+
../src/freetype/base/ftbase.c \
271+
../src/freetype/base/ftbbox.c \
272+
../src/freetype/base/ftbdf.c \
273+
../src/freetype/base/ftbitmap.c \
274+
../src/freetype/base/ftcid.c \
275+
../src/freetype/base/ftfntfmt.c \
276+
../src/freetype/base/ftfstype.c \
277+
../src/freetype/base/ftgasp.c \
278+
../src/freetype/base/ftglyph.c \
279+
../src/freetype/base/ftgxval.c \
280+
../src/freetype/base/ftinit.c \
281+
../src/freetype/base/ftlcdfil.c \
282+
../src/freetype/base/ftmm.c \
283+
../src/freetype/base/ftotval.c \
284+
../src/freetype/base/ftpatent.c \
285+
../src/freetype/base/ftpfr.c \
286+
../src/freetype/base/ftstroke.c \
287+
../src/freetype/base/ftsynth.c \
288+
../src/freetype/base/ftsystem.c \
289+
../src/freetype/base/fttype1.c \
290+
../src/freetype/base/ftwinfnt.c \
291+
../src/freetype/bdf/bdf.c \
292+
../src/freetype/bzip2/ftbzip2.c \
293+
../src/freetype/cache/ftcache.c \
294+
../src/freetype/cff/cff.c \
295+
../src/freetype/cid/type1cid.c \
296+
../src/freetype/gzip/ftgzip.c \
297+
../src/freetype/lzw/ftlzw.c \
298+
../src/freetype/pcf/pcf.c \
299+
../src/freetype/pfr/pfr.c \
300+
../src/freetype/psaux/psaux.c \
301+
../src/freetype/pshinter/pshinter.c \
302+
../src/freetype/psnames/psnames.c \
303+
../src/freetype/raster/raster.c \
304+
../src/freetype/sfnt/sfnt.c \
305+
../src/freetype/smooth/smooth.c \
306+
../src/freetype/truetype/truetype.c \
307+
../src/freetype/type1/type1.c \
308+
../src/freetype/type42/type42.c \
309+
../src/freetype/winfonts/winfnt.c
273310

274-
ccextractor_CFLAGS = -std=gnu99 -Wno-write-strings -D_FILE_OFFSET_BITS=64 -DVERSION_FILE_PRESENT
311+
ccextractor_CFLAGS = -std=gnu99 -Wno-write-strings -D_FILE_OFFSET_BITS=64 -DVERSION_FILE_PRESENT -DFT2_BUILD_LIBRARY
275312

276-
ccextractor_CPPFLAGS =-I../src/lib_ccx/ -I../src/gpacmp4/ -I../src/libpng/ -I../src/zlib/ -I../src/zvbi/ -I../src/lib_hash/ -I../src/protobuf-c/ -I../src/utf8proc/ -I../src/
313+
ccextractor_CPPFLAGS =-I../src/lib_ccx/ -I../src/gpacmp4/ -I../src/libpng/ -I../src/zlib/ -I../src/zvbi/ -I../src/lib_hash/ -I../src/protobuf-c/ -I../src/utf8proc/ -I../src/ -I../src/freetype/include/
277314

278315

279316
ccextractor_LDADD=-lm

‎mac/Makefile.am‎

Lines changed: 44 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -156,7 +156,6 @@ ccextractor_SOURCES = \
156156
../src/lib_ccx/ccx_encoders_smptett.c \
157157
../src/lib_ccx/ccx_encoders_splitbysentence.c \
158158
../src/lib_ccx/ccx_encoders_spupng.c \
159-
../src/lib_ccx/ccx_encoders_spupng.h \
160159
../src/lib_ccx/ccx_encoders_srt.c \
161160
../src/lib_ccx/ccx_encoders_ssa.c \
162161
../src/lib_ccx/ccx_encoders_structs.h \
@@ -208,8 +207,6 @@ ccextractor_SOURCES = \
208207
../src/lib_ccx/params.c \
209208
../src/lib_ccx/params_dump.c \
210209
../src/lib_ccx/sequencing.c \
211-
../src/lib_ccx/spupng_encoder.c \
212-
../src/lib_ccx/spupng_encoder.h \
213210
../src/lib_ccx/stdintmsc.h \
214211
../src/lib_ccx/stream_functions.c \
215212
../src/lib_ccx/teletext.h \
@@ -268,12 +265,53 @@ ccextractor_SOURCES = \
268265
../src/extractors/extractor.c \
269266
../src/extractors/extractor.h \
270267
../src/wrappers/wrapper.c \
271-
../src/wrappers/wrapper.h
268+
../src/wrappers/wrapper.h \
269+
../src/freetype/autofit/autofit.c \
270+
../src/freetype/base/ftbase.c \
271+
../src/freetype/base/ftbbox.c \
272+
../src/freetype/base/ftbdf.c \
273+
../src/freetype/base/ftbitmap.c \
274+
../src/freetype/base/ftcid.c \
275+
../src/freetype/base/ftfntfmt.c \
276+
../src/freetype/base/ftfstype.c \
277+
../src/freetype/base/ftgasp.c \
278+
../src/freetype/base/ftglyph.c \
279+
../src/freetype/base/ftgxval.c \
280+
../src/freetype/base/ftinit.c \
281+
../src/freetype/base/ftlcdfil.c \
282+
../src/freetype/base/ftmm.c \
283+
../src/freetype/base/ftotval.c \
284+
../src/freetype/base/ftpatent.c \
285+
../src/freetype/base/ftpfr.c \
286+
../src/freetype/base/ftstroke.c \
287+
../src/freetype/base/ftsynth.c \
288+
../src/freetype/base/ftsystem.c \
289+
../src/freetype/base/fttype1.c \
290+
../src/freetype/base/ftwinfnt.c \
291+
../src/freetype/bdf/bdf.c \
292+
../src/freetype/bzip2/ftbzip2.c \
293+
../src/freetype/cache/ftcache.c \
294+
../src/freetype/cff/cff.c \
295+
../src/freetype/cid/type1cid.c \
296+
../src/freetype/gzip/ftgzip.c \
297+
../src/freetype/lzw/ftlzw.c \
298+
../src/freetype/pcf/pcf.c \
299+
../src/freetype/pfr/pfr.c \
300+
../src/freetype/psaux/psaux.c \
301+
../src/freetype/pshinter/pshinter.c \
302+
../src/freetype/psnames/psnames.c \
303+
../src/freetype/raster/raster.c \
304+
../src/freetype/sfnt/sfnt.c \
305+
../src/freetype/smooth/smooth.c \
306+
../src/freetype/truetype/truetype.c \
307+
../src/freetype/type1/type1.c \
308+
../src/freetype/type42/type42.c \
309+
../src/freetype/winfonts/winfnt.c
272310

273311

274-
ccextractor_CFLAGS = -std=gnu99 -Wno-write-strings -D_FILE_OFFSET_BITS=64 -DVERSION_FILE_PRESENT
312+
ccextractor_CFLAGS = -std=gnu99 -Wno-write-strings -D_FILE_OFFSET_BITS=64 -DVERSION_FILE_PRESENT -DFT2_BUILD_LIBRARY
275313

276-
ccextractor_CPPFLAGS =-I../src/lib_ccx/ -I../src/gpacmp4/ -I../src/libpng/ -I../src/zlib/ -I../src/zvbi/ -I../src/lib_hash/ -I../src/protobuf-c/ -I../src/utf8proc/ -I../src/
314+
ccextractor_CPPFLAGS =-I../src/lib_ccx/ -I../src/gpacmp4/ -I../src/libpng/ -I../src/zlib/ -I../src/zvbi/ -I../src/lib_hash/ -I../src/protobuf-c/ -I../src/utf8proc/ -I../src/ -I../src/freetype/include/
277315

278316

279317
ccextractor_LDADD=-lm

0 commit comments

Comments
 (0)