From f31ef233dd695e2bbeee0d714932cc500b544f63 Mon Sep 17 00:00:00 2001 From: vvaltman Date: Tue, 18 Nov 2014 00:23:26 +0300 Subject: [PATCH] Updated to use new version of tgl --- Makefile.tgl | 7 +++++-- mime.types | 1 + tgl | 2 +- 3 files changed, 7 insertions(+), 3 deletions(-) create mode 120000 mime.types diff --git a/Makefile.tgl b/Makefile.tgl index 4ed85b6..57066ca 100644 --- a/Makefile.tgl +++ b/Makefile.tgl @@ -1,4 +1,4 @@ -TGL_OBJECTS=${OBJ}/mtproto-common.o ${OBJ}/mtproto-client.o ${OBJ}/queries.o ${OBJ}/structures.o ${OBJ}/binlog.o ${OBJ}/tgl.o ${OBJ}/updates.o ${OBJ}/tgl-net.o ${OBJ}/tgl-timers.o +TGL_OBJECTS=${OBJ}/mtproto-common.o ${OBJ}/mtproto-client.o ${OBJ}/queries.o ${OBJ}/structures.o ${OBJ}/binlog.o ${OBJ}/tgl.o ${OBJ}/updates.o ${OBJ}/tgl-net.o ${OBJ}/tgl-timers.o ${OBJ}/tg-mime-types.o TLD_OBJECTS=${OBJ}/dump-tl-file.o GENERATE_OBJECTS=${OBJ}/generate.o TGL_COMMON_OBJECTS=${OBJ}/tools.o @@ -15,10 +15,13 @@ ${OBJ}/auto/auto.o ${TGL_OBJECTS}: ${AUTO}/constants.h ${AUTO}/auto-header.h ${TGL_OBJ_C}: ${OBJ}/%.o: ${srcdir}/tgl/%.c | create_dirs ${CC} ${INCLUDE} ${COMPILE_FLAGS} -iquote ${srcdir}/tgl -c -MP -MD -MF ${DEP}/$*.d -MQ ${OBJ}/$*.o -o $@ $< +${OBJ}/mime-types.o: ${srcdir}/mime.types + ld -r -b binary -o $@ $^ + ${OBJ}/auto/auto.o: ${AUTO}/auto.c ${CC} ${INCLUDE} ${COMPILE_FLAGS} -iquote ${srcdir}/tgl -c -MP -MD -MF ${DEP}/auto/auto.d -MQ ${OBJ}/auto/auto.o -o $@ $< -${LIB}/libtgl.a: ${TGL_OBJECTS} ${TGL_COMMON_OBJECTS} ${OBJ}/auto/auto.o +${LIB}/libtgl.a: ${TGL_OBJECTS} ${TGL_COMMON_OBJECTS} ${OBJ}/auto/auto.o ${OBJ}/mime-types.o ar ruv $@ $^ ${EXE}/generate: ${GENERATE_OBJECTS} ${TGL_COMMON_OBJECTS} diff --git a/mime.types b/mime.types new file mode 120000 index 0000000..5178e6f --- /dev/null +++ b/mime.types @@ -0,0 +1 @@ +tgl/mime.types \ No newline at end of file diff --git a/tgl b/tgl index a2403df..b0c0eaf 160000 --- a/tgl +++ b/tgl @@ -1 +1 @@ -Subproject commit a2403df85b430311feb6a8c214428802800b1633 +Subproject commit b0c0eaf4d2b4cd387c883c07fe8916eb8022307b