eion/purple-hangouts

Merged in xvitaly/purple-hangouts/xvitaly/makefile-edited-online-with-bitbucket-1527955650040 (pull request #19)
draft
2018-06-02, Eion Robb
02157f05704f
Parents 90b80be96433f11d9d341b3c
Children 081dbaf240e2
Merged in xvitaly/purple-hangouts/xvitaly/makefile-edited-online-with-bitbucket-1527955650040 (pull request #19)

Added missing zlib dependency and missing -ldl
1 files changed, 2 insertions(+), 2 deletions(-)
  • +2 -2
    Makefile
    • --- a/Makefile Thu Apr 19 17:18:50 2018 +1200
    +++ b/Makefile Sat Jun 02 21:12:04 2018 +0000
    @@ -96,10 +96,10 @@
    $(PROTOC_C) --c_out=. gmail.proto
    libhangouts.so: $(PURPLE_C_FILES) $(PURPLE_COMPAT_FILES)
    - $(CC) -fPIC $(CFLAGS) -shared -o $@ $^ $(LDFLAGS) $(PROTOBUF_OPTS) `$(PKG_CONFIG) purple glib-2.0 json-glib-1.0 --libs --cflags` $(INCLUDES) -Ipurple2compat -g -ggdb
    + $(CC) -fPIC $(CFLAGS) -shared -o $@ $^ $(LDFLAGS) $(PROTOBUF_OPTS) `$(PKG_CONFIG) purple glib-2.0 json-glib-1.0 zlib --libs --cflags` -ldl $(INCLUDES) -Ipurple2compat -g -ggdb
    libhangouts3.so: $(PURPLE_C_FILES)
    - $(CC) -fPIC $(CFLAGS) -shared -o $@ $^ $(LDFLAGS) $(PROTOBUF_OPTS) `$(PKG_CONFIG) purple-3 glib-2.0 json-glib-1.0 --libs --cflags` $(INCLUDES) -g -ggdb
    + $(CC) -fPIC $(CFLAGS) -shared -o $@ $^ $(LDFLAGS) $(PROTOBUF_OPTS) `$(PKG_CONFIG) purple-3 glib-2.0 json-glib-1.0 zlib --libs --cflags` -ldl $(INCLUDES) -g -ggdb
    libhangouts.dll: $(PURPLE_C_FILES) $(PURPLE_COMPAT_FILES)
    $(WIN32_CC) -shared -o $@ $^ $(WIN32_PIDGIN2_CFLAGS) $(WIN32_PIDGIN2_LDFLAGS) -Ipurple2compat