Skip to content
This repository

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse code

Include sqlite3 in build

  • Loading branch information...
commit e9d4815aebb277f0ef7615f92aa98759eff0cd54 1 parent c569d26
Andreas Öman authored

Showing 3 changed files with 135,164 additions and 9 deletions. Show diff stats Hide diff stats

  1. +17 9 Makefile
  2. +128,416 0 ext/sqlite/sqlite3.c
  3. +6,731 0 ext/sqlite/sqlite3.h
26 Makefile
@@ -27,7 +27,7 @@ BUILDDIR = build.${PLATFORM}
27 27 include ${BUILDDIR}/config.mak
28 28
29 29 CFLAGS = -Wall -Werror -Wwrite-strings -Wno-deprecated-declarations
30   -CFLAGS += -Wmissing-prototypes -Iext/dvd
  30 +CFLAGS += -Wmissing-prototypes -Iext/dvd ${OPTFLAGS}
31 31
32 32
33 33 #
@@ -95,6 +95,14 @@ SRCS += src/misc/ptrvec.c \
95 95 SRCS-${CONFIG_TREX} += ext/trex/trex.c
96 96
97 97 #
  98 +# Sqlite3
  99 +#
  100 +SRCS += ext/sqlite/sqlite3.c
  101 +
  102 +${BUILDDIR}/ext/sqlite/sqlite3.o : CFLAGS = -Os \
  103 + -DSQLITE_OMIT_UTF16 \
  104 +
  105 +#
98 106 # HTSMSG
99 107 #
100 108 SRCS += src/htsmsg/htsbuf.c \
@@ -145,7 +153,7 @@ SRCS += src/sd/sd.c \
145 153
146 154 SRCS-$(CONFIG_AVAHI) += src/sd/avahi.c \
147 155
148   -${BUILDDIR}/src/sd/avahi.o : CFLAGS = $(CFLAGS_AVAHI) -Wall -Werror
  156 +${BUILDDIR}/src/sd/avahi.o : CFLAGS = $(CFLAGS_AVAHI) -Wall -Werror ${OPTFLAGS}
149 157
150 158 BUNDLES += resources/tvheadend
151 159 BUNDLES += resources/fileaccess
@@ -351,8 +359,8 @@ SRCS-$(CONFIG_GU) += src/ui/gu/gu.c \
351 359 src/ui/gu/gu_video.c \
352 360 src/ui/linux/x11_common.c \
353 361
354   -${BUILDDIR}/src/ui/gu/%.o : CFLAGS = $(CFLAGS_GTK) \
355   --Wall -Werror -Wmissing-prototypes -Wno-cast-qual -Wno-deprecated-declarations
  362 +${BUILDDIR}/src/ui/gu/%.o : CFLAGS = $(CFLAGS_GTK) ${OPTFLAGS} \
  363 +-Wall -Werror -Wmissing-prototypes -Wno-cast-qual -Wno-deprecated-declarations
356 364
357 365 #
358 366 # IPC
@@ -391,7 +399,7 @@ SRCS-$(CONFIG_LIBRTMP) += ext/librtmp/amf.c \
391 399 ${BUILDDIR}/ext/librtmp/%.o : CFLAGS = ${OPTFLAGS}
392 400
393 401 SRCS-$(CONFIG_LIBRTMP) += src/backend/rtmp/rtmp.c
394   -${BUILDDIR}/src/backend/rtmp/rtmp.o : CFLAGS = -Wall -Werror -Iext
  402 +${BUILDDIR}/src/backend/rtmp/rtmp.o : CFLAGS = ${OPTFLAGS} -Wall -Werror -Iext
395 403
396 404
397 405 #
@@ -412,7 +420,7 @@ endif
412 420 endif
413 421
414 422
415   -${BUILDDIR}/ext/dvd/dvdcss/%.o : CFLAGS = \
  423 +${BUILDDIR}/ext/dvd/dvdcss/%.o : CFLAGS = ${OPTFLAGS} \
416 424 -DHAVE_LIMITS_H -DHAVE_UNISTD_H -DHAVE_ERRNO_H -DVERSION="0" $(DVDCSS_CFLAGS)
417 425
418 426 #
@@ -426,7 +434,7 @@ SRCS-$(CONFIG_DVD) += ext/dvd/libdvdread/dvd_input.c \
426 434 ext/dvd/libdvdread/nav_read.c \
427 435 ext/dvd/libdvdread/bitreader.c
428 436
429   -${BUILDDIR}/ext/dvd/libdvdread/%.o : CFLAGS = \
  437 +${BUILDDIR}/ext/dvd/libdvdread/%.o : CFLAGS = ${OPTFLAGS} \
430 438 -DHAVE_DVDCSS_DVDCSS_H -DDVDNAV_COMPILE -Wno-strict-aliasing -Iext/dvd
431 439
432 440 #
@@ -443,7 +451,7 @@ SRCS-$(CONFIG_DVD) += ext/dvd/dvdnav/dvdnav.c \
443 451 ext/dvd/dvdnav/vm/vmcmd.c \
444 452 ext/dvd/dvdnav/searching.c
445 453
446   -${BUILDDIR}/ext/dvd/dvdnav/%.o : CFLAGS = \
  454 +${BUILDDIR}/ext/dvd/dvdnav/%.o : CFLAGS = ${OPTFLAGS} \
447 455 -DVERSION=\"showtime\" -DDVDNAV_COMPILE -Wno-strict-aliasing -Iext/dvd \
448 456 -Iext/dvd/dvdnav
449 457
@@ -531,7 +539,7 @@ SRCS-$(CONFIG_POLARSSL) += \
531 539 ext/polarssl-0.14.0/library/x509parse.c \
532 540 ext/polarssl-0.14.0/library/xtea.c \
533 541
534   -${BUILDDIR}/ext/polarssl-0.14.0/library/%.o : CFLAGS = -Wall
  542 +${BUILDDIR}/ext/polarssl-0.14.0/library/%.o : CFLAGS = -Wall ${OPTFLAGS}
535 543
536 544 ifeq ($(CONFIG_POLARSSL), yes)
537 545 CFLAGS_com += -Iext/polarssl-0.14.0/include
128,416 ext/sqlite/sqlite3.c
128,416 additions, 0 deletions not shown
6,731 ext/sqlite/sqlite3.h
6,731 additions, 0 deletions not shown

0 comments on commit e9d4815

Please sign in to comment.
Something went wrong with that request. Please try again.