Revision 76c297b4

View differences:

chunker_player/Makefile
68 68
LOCAL_PSNR_LDLIBS = $(NAPA)/rep/librep.a $(NAPA)/dclog/libdclog.a $(NAPA)/common/libcommon.a $(NAPA)/ml/libml.a $(LIBEVENT_DIR)/lib/libevent.a
69 69
endif
70 70

  
71
ifdef WINDOWS
72
LOCAL_PSNR_LDLIBS += -lmsvcrt -lwsock32 -lws2_32 -liberty
73
endif
74

  
75 71
#endif
76 72

  
77 73
#put them in the correct order
......
89 85
LDLIBS += $(LOCAL_FFMPEG_LDLIBS) $(LOCAL_COMMON_LDLIBS)
90 86
LDLIBS += $(LOCAL_PSNR_LDLIBS)
91 87

  
88
ifdef LOCAL_CURL
89
LDLIBS += $(LOCAL_CURL)/lib/libcurl.a
90
endif
91

  
92 92
ifdef WINDOWS
93
LDLIBS += -lmsvcrt -lwsock32 -lws2_32 -liberty
93 94
LDLIBS += $(DYNAMIC_LDLIBS) -lmingw32 $(LOCAL_ABS_SDL)/lib/libSDLmain.a $(LOCAL_ABS_SDL)/lib/libSDL.a -lwinmm -lgdi32
94 95
else
95 96
LDLIBS += $(DYNAMIC_LDLIBS)
......
113 114

  
114 115
ifdef LOCAL_CURL
115 116
CPPFLAGS += -I$(LOCAL_CURL)/include
116
LDLIBS += $(LOCAL_CURL)/lib/libcurl.a
117 117
OBJS += http.o
118 118
CPPFLAGS += -DCHANNELS_DOWNLOAD
119 119
CFLAGS += -DCURL_STATICLIB	#required by MinGW; based on http://curl.haxx.se/docs/faq.html#Link_errors_when_building_libcur
chunker_player/chunker_player.h
6 6

  
7 7
#include "player_defines.h"
8 8

  
9
#ifdef __WIN32__
10
#include <windows.h>
11
#endif
12

  
9 13
#ifdef PSNR_PUBLICATION
10 14
#include <repoclient.h>
11 15
#endif

Also available in: Unified diff