From d2a9ba1701fd4deab76c83be968860826773c9c6 Mon Sep 17 00:00:00 2001 From: zhaozg Date: Mon, 1 Sep 2014 16:30:45 +0800 Subject: [PATCH 1/3] update --- Makefile | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/Makefile b/Makefile index 75cee28..f8ed133 100644 --- a/Makefile +++ b/Makefile @@ -5,10 +5,19 @@ PREFIX=/usr/local LUA_VERSION = $(shell pkg-config luajit --print-provides) +#try to use luajit +LUA_VERSION = $(shell pkg-config luajit --print-provides) ifeq ($(LUA_VERSION),) +#try to use lua5.1 +LUA_VERSION = $(shell pkg-config lua --print-provides) +ifeq ($(LUA_VERSION,) LUA_CFLAGS=$(shell pkg-config lua --cflags) LUA_LIBS=$(shell pkg-config lua --libs) else +LUA_CFLAGS=-I$(PREFIX)/include/lua5.2 +LUA_LIBS=-L$(PREFIX)/lib -llua5.2 +endif +else LUA_CFLAGS=$(shell pkg-config luajit --cflags) LUA_LIBS=$(shell pkg-config luajit --libs) endif From eefa1bedbfa1083263457fc363c0e27c57840bcb Mon Sep 17 00:00:00 2001 From: zhaozg Date: Mon, 1 Sep 2014 16:34:23 +0800 Subject: [PATCH 2/3] update --- Makefile | 2 -- 1 file changed, 2 deletions(-) diff --git a/Makefile b/Makefile index f8ed133..5348544 100644 --- a/Makefile +++ b/Makefile @@ -3,8 +3,6 @@ T=lcurl #default installtion prefix PREFIX=/usr/local -LUA_VERSION = $(shell pkg-config luajit --print-provides) - #try to use luajit LUA_VERSION = $(shell pkg-config luajit --print-provides) ifeq ($(LUA_VERSION),) From 3610d064a676c11a580cdc3154c8b46da0c43818 Mon Sep 17 00:00:00 2001 From: zhaozg Date: Wed, 3 Sep 2014 21:36:57 +0800 Subject: [PATCH 3/3] update makefile for linux success build with luajit and lua fix a warning miss string.h --- Makefile | 50 +++++++++++++++++++++++++++++--------------------- src/lcurl.h | 1 + 2 files changed, 30 insertions(+), 21 deletions(-) diff --git a/Makefile b/Makefile index 5348544..4ba6cfe 100644 --- a/Makefile +++ b/Makefile @@ -3,49 +3,57 @@ T=lcurl #default installtion prefix PREFIX=/usr/local -#try to use luajit +UNAME=$(shell uname) + +ifeq ($(UNAME),Linux) ###########################Linux +#try to use luajit LUA_VERSION = $(shell pkg-config luajit --print-provides) -ifeq ($(LUA_VERSION),) -#try to use lua5.1 -LUA_VERSION = $(shell pkg-config lua --print-provides) -ifeq ($(LUA_VERSION,) -LUA_CFLAGS=$(shell pkg-config lua --cflags) -LUA_LIBS=$(shell pkg-config lua --libs) -else -LUA_CFLAGS=-I$(PREFIX)/include/lua5.2 -LUA_LIBS=-L$(PREFIX)/lib -llua5.2 -endif -else +ifeq ($(LUA_VERSION),) ###########################Lua +LUA_CFLAGS=-I$(PREFIX)/include +LUA_LIBS=-L$(PREFIX)/lib +else ###########################Luajit LUA_CFLAGS=$(shell pkg-config luajit --cflags) LUA_LIBS=$(shell pkg-config luajit --libs) endif - CURL_CFLAGS=$(shell pkg-config libcurl --cflags) CURL_LIBS=$(shell pkg-config libcurl --libs) +CC= gcc -g -fPIC -shared +LIB_OPTION= -lrt -ldl + +else #####other platform + +LUA_CFLAGS=-I$(PREFIX)/include +LUA_LIBS=-llua5.1 +CURL_CFLAGS=-I$(PREFIX)/include +CURL_LIBS=-L$(PREFIX)/lib -lcurl + +CC= gcc -g -shared $(CFLAGS) + +endif + + + # System's libraries directory (where binary libraries are installed) LUA_LIBDIR= $(PREFIX)/lib/lua/5.1 # OS dependent -LIB_OPTION= -shared #for Linux #LIB_OPTION= -bundle -undefined dynamic_lookup #for MacOS X LIBNAME= $T.so.$V # Compilation directives -WARN_MOST= -Wall -fPIC -W -Waggregate-return -Wcast-align -Wmissing-prototypes -Wnested-externs -Wshadow -Wwrite-strings -pedantic -WARN= -Wall -fPIC -Wno-unused-value -CFLAGS= $(WARN) -DPTHREADS $(LUA_CFLAGS) $(CURL_CFLAGS) -CC= gcc -g -shared -fPIC $(CFLAGS) -LIB_OPTION=$(LUA_LIBS) $(CURL_LIBS) - +WARN_MOST= -Wall -W -Waggregate-return -Wcast-align -Wmissing-prototypes -Wnested-externs -Wshadow -Wwrite-strings -pedantic +WARN= -Wall -Wno-unused-value +CFLAGS= $(WARN) -DPTHREADS $(LUA_CFLAGS) $(CURL_CFLAGS) +CC+= $(CFLAGS) SRCS=$(shell echo src/*.c) all: $T.so $T.so: $(SRCS) - MACOSX_DEPLOYMENT_TARGET="10.3"; export MACOSX_DEPLOYMENT_TARGET; $(CC) $(CFLAGS) $(LIB_OPTION) -o $T.so $(SRCS) -lrt -ldl + MACOSX_DEPLOYMENT_TARGET="10.3"; export MACOSX_DEPLOYMENT_TARGET; $(CC) $(CFLAGS) -o $T.so $(SRCS) $(CURL_LIBS) $(LUA_LIBS) $(LIB_OPTION) install: all mkdir -p $(LUA_LIBDIR) diff --git a/src/lcurl.h b/src/lcurl.h index a13162b..e29fa5d 100644 --- a/src/lcurl.h +++ b/src/lcurl.h @@ -7,6 +7,7 @@ #include "curl/multi.h" #include +#include #define LCURL_PREFIX "LcURL"