c57a9101a6
- Fix build on stable/10 and head. - Style clean-ups.
29 lines
707 B
Text
29 lines
707 B
Text
--- Makefile.orig 2010-02-15 10:06:20.000000000 +0900
|
|
+++ Makefile 2013-10-17 09:16:18.000000000 +0900
|
|
@@ -1,12 +1,12 @@
|
|
-CC=$(CROSS_COMPILE)gcc
|
|
-LD=$(CROSS_COMPILE)ld
|
|
+CC?=$(CROSS_COMPILE)gcc
|
|
+LD?=$(CROSS_COMPILE)ld
|
|
|
|
DEF=-DFLVSTREAMER_VERSION=\"v2.1c1\"
|
|
-OPT=-O2
|
|
+#OPT=-O2
|
|
CFLAGS=-Wall $(XCFLAGS) $(INC) $(DEF) $(OPT)
|
|
LDFLAGS=-Wall $(XLDFLAGS)
|
|
LIBS=
|
|
-THREADLIB=-lpthread
|
|
+THREADLIB?=-lpthread
|
|
SLIBS=$(THREADLIB) $(LIBS)
|
|
|
|
EXT=
|
|
@@ -18,8 +18,7 @@
|
|
|
|
progs: flvstreamer streams rtmpsrv rtmpsuck
|
|
|
|
-posix linux unix osx:
|
|
- @$(MAKE) $(MAKEFLAGS) progs
|
|
+posix linux unix osx: progs
|
|
|
|
mingw:
|
|
@$(MAKE) CROSS_COMPILE=mingw32- LIBS="$(LIBS) -lws2_32 -lwinmm -lgdi32" THREADLIB= EXT=.exe $(MAKEFLAGS) progs
|