Revision 59e008ed chunker_player/Makefile

View differences:

chunker_player/Makefile
7 7
endif
8 8

  
9 9
ifeq ($(IO), httpevent)
10
#TODO add: or equals httpmhd
10 11
CPPFLAGS += -DHTTPIO
11 12
endif
12 13

  
......
56 57
LOCAL_CONFUSE_CPPFLAGS = -I$(LOCAL_CONFUSE)/include
57 58
LOCAL_CONFUSE_LDLIBS = $(LOCAL_CONFUSE)/lib/libconfuse.a
58 59

  
59
#LOCAL_PSNR_LDLIBS = ../../../NAPA-BASELIBS/rep/librep.a ../../../NAPA-BASELIBS/dclog/libdclog.a ../../../NAPA-BASELIBS/common/libcommon.a ../../../NAPA-BASELIBS/ml/libml.a
60
LOCAL_PSNR_LDLIBS = $(NAPA)/rep/librep.a $(NAPA)/dclog/libdclog.a $(NAPA)/common/libcommon.a $(NAPA)/ml/libml.a $(LIBEVENT_DIR)/lib/libevent.a
60 61

  
61 62
#put them in the correct order
62 63
CPPFLAGS += $(LOCAL_SDLTTF_CPPFLAGS) $(LOCAL_SDLIMAGE_CPPFLAGS) $(LOCAL_SDL_CPPFLAGS)
......
70 71
LDLIBS += $(LOCAL_SDLTTF_LDLIBS) $(LOCAL_SDLIMAGE_LDLIBS) $(LOCAL_SDL_LDLIBS)
71 72
LDLIBS += $(LOCAL_MHD_LDLIBS) $(LOCAL_CONFUSE_LDLIBS) $(LOCAL_FREETYPE_LDLIBS)
72 73
LDLIBS += $(LOCAL_FFMPEG_LDLIBS) $(LOCAL_COMMON_LDLIBS)
73
#LDLIBS += $(LOCAL_PSNR_LDLIBS)
74
LDLIBS += $(LOCAL_PSNR_LDLIBS)
74 75

  
75 76
ifdef WINDOWS
76 77
LDLIBS += $(DYNAMIC_LDLIBS) -lmingw32 $(LOCAL_ABS_SDL)/lib/libSDLmain.a $(LOCAL_ABS_SDL)/lib/libSDL.dll.a -lwinmm -lgdi32
77 78
else
78
LDLIBS += $(DYNAMIC_LDLIBS)
79
LDLIBS += $(DYNAMIC_LDLIBS) -lrt
79 80
endif
80 81

  
81 82
LINKER = $(CC)
......
84 85

  
85 86
OBJS = ../chunk_transcoding/external_chunk_transcoding.o
86 87
ifeq ($(IO), httpevent)
88
#TODO add: or equals httpmhd
87 89
OBJS += http_chunk_puller.o
88 90
endif
89 91

  

Also available in: Unified diff