diff options
| author | Luca Deri <lucaderi@users.noreply.github.com> | 2019-12-18 19:22:12 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-12-18 19:22:12 +0100 |
| commit | 5c225b8a2ef5f89ab99256481065d969863a6018 (patch) | |
| tree | e6705d26005bf87415d642c9f4675553904b9930 /src/lib | |
| parent | 4961241c624b4dc8847d70c8501ecad019768fcc (diff) | |
| parent | acb74905a571b846408f7db89812742794b8c2b3 (diff) | |
Merge pull request #821 from aouinizied/win32-lib-appveyor
Win32 lib appveyor
Diffstat (limited to 'src/lib')
| -rw-r--r-- | src/lib/Makefile.in | 7 | ||||
| -rw-r--r-- | src/lib/protocols/btlib.c | 2 |
2 files changed, 6 insertions, 3 deletions
diff --git a/src/lib/Makefile.in b/src/lib/Makefile.in index 0c3f44838..3a29a4d3f 100644 --- a/src/lib/Makefile.in +++ b/src/lib/Makefile.in @@ -15,6 +15,7 @@ libdir = ${prefix}/lib includedir = ${prefix}/include/ndpi CC = @CC@ CFLAGS += -fPIC -DPIC -I../include -Ithird_party/include -DNDPI_LIB_COMPILATION -O2 -g -Wall @CUSTOM_NDPI@ +LDFLAGS = @LDFLAGS@ RANLIB = ranlib OBJECTS = $(patsubst protocols/%.c, protocols/%.o, $(wildcard protocols/*.c)) $(patsubst third_party/src/%.c, third_party/src/%.o, $(wildcard third_party/src/*.c)) $(patsubst ./%.c, ./%.o, $(wildcard ./*.c)) @@ -42,15 +43,15 @@ ndpi_main.c: ndpi_content_match.c.inc $(NDPI_LIB_STATIC): $(OBJECTS) ar rc $@ $(OBJECTS) - $(RANLIB) $@ + $(RANLIB) $@ $(NDPI_LIB_SHARED): $(OBJECTS) - $(CC) -shared -fPIC $(SONAME_FLAG) -o $@ $(OBJECTS) + $(CC) -shared -fPIC $(SONAME_FLAG) -o $@ $(OBJECTS) $(LDFLAGS) ln -fs $(NDPI_LIB_SHARED) $(NDPI_LIB_SHARED_BASE) ln -fs $(NDPI_LIB_SHARED) $(NDPI_LIB_SHARED_BASE).$(NDPI_VERSION_MAJOR) %.o: %.c $(HEADERS) Makefile - $(CC) $(CFLAGS) -c $< -o $@ + $(CC) $(CFLAGS) -c $< -o $@ $(LDFLAGS) clean: /bin/rm -f $(NDPI_LIB_STATIC) $(OBJECTS) *.o *.so *.lo $(NDPI_LIB_SHARED) diff --git a/src/lib/protocols/btlib.c b/src/lib/protocols/btlib.c index 8268e144d..9ddcab84f 100644 --- a/src/lib/protocols/btlib.c +++ b/src/lib/protocols/btlib.c @@ -39,8 +39,10 @@ typedef unsigned long long int u_int64_t; #include <stdint.h> #include <stdlib.h> +#ifndef WIN32 #include <arpa/inet.h> #endif +#endif #include "btlib.h" |