Revision 0cd6b05d common.mak

View differences:

common.mak
12 12
else
13 13
CFLAGS = -pthread -g -O0 -Wall
14 14
LDFLAGS += -pthread
15
DYNAMIC_LDLIBS += -lm
15
DYNAMIC_LDLIBS += -lm -lrt
16 16
endif
17 17

  
18 18
CFLAGS += -DHAVE_OPENGL -Wl,--warn-common -Wl,--as-needed -Wl,-Bsymbolic
19
CPPFLAGS += -I../chunk_transcoding -I../
19
CPPFLAGS += -I../chunk_transcoding -I../ -I../../../NAPA-BASELIBS/include
20 20

  
21 21
#default fmmpeg here
22 22
LOCAL_FFMPEG_CPPFLAGS = -I$(LOCAL_FFMPEG)/include
......
30 30

  
31 31
LOCAL_COMMON_CPPFLAGS = -I$(LOCAL_X264)/include -I$(LOCAL_BZ2)/include -I$(LOCAL_Z)/include -I$(LOCAL_MP3LAME)/include
32 32
#LOCAL_COMMON_LDFLAGS = -L$(LOCAL_X264)/lib -L$(LOCAL_BZ2)/lib -L$(LOCAL_MP3LAME)/lib
33
LOCAL_COMMON_LDLIBS = $(LOCAL_X264)/lib/libx264.a $(LOCAL_BZ2)/lib/libbz2.a $(LOCAL_Z)/lib/libz.a $(LOCAL_MP3LAME)/lib/libmp3lame.a
33
LOCAL_COMMON_LDLIBS = $(LOCAL_X264)/lib/libx264.a $(LOCAL_BZ2)/lib/libbz2.a $(LOCAL_Z)/lib/libz.a $(LOCAL_MP3LAME)/lib/libmp3lame.a ../../../NAPA-BASELIBS/rep/librep.a ../../../NAPA-BASELIBS/dclog/libdclog.a ../../../NAPA-BASELIBS/common/libcommon.a ../../../NAPA-BASELIBS/ml/libml.a
34
LOCAL_COMMON_LDLIBS += ../../../3RDPARTY-LIBS/libevent/lib/libevent.a -L../../../3RDPARTY-LIBS/libconfuse/lib/libconfuse.a

Also available in: Unified diff