[bTSstream-devel] [Git][videolan/bitstream][master] 3 commits: examples: Fix compilation under OS X

[Christophe Massiot]

Christophe Massiot pushed to branch master at VideoLAN / bitstream


Commits:
cf5f7a8e by Georgi Chorbadzhiyski at 2018-05-02T10:02:50+03:00
examples: Fix compilation under OS X

- - - - -
6bf35fcf by Christophe Massiot at 2018-05-02T21:21:11+02:00
Merge branch 'examples_fixup' of https://github.com/gfto/bitstream-1 into gfto-examples_fixup

- - - - -
b1aa8180 by Christophe Massiot at 2018-05-02T21:21:29+02:00
Merge branch 'gfto-examples_fixup'

- - - - -


1 changed file:

- examples/Makefile


Changes:

=====================================
examples/Makefile
=====================================
--- a/examples/Makefile
+++ b/examples/Makefile
@@ -1,14 +1,15 @@
 PREFIX ?= /usr/local
 WARN = -Wall -Wextra -Wno-unused-parameter -Wno-sign-compare
-CPPFLAGS = -I.
+CPPFLAGS = -I. -I.. -I../..
 CFLAGS := $(WARN) -O2 -g $(CFLAGS)
-LDFLAGS := -lrt $(LDFLAGS)
 OBJ = dvb_print_si dvb_gen_si dvb_ecmg dvb_ecmg_test mpeg_print_pcr rtp_check_seqnum mpeg_restamp
 
+ifeq "$(shell uname -s)" "Linux"
+LDFLAGS += -lrt
+endif
+
 ifeq "$(shell uname -s)" "Darwin"
-LDLIBS += -liconv
-# Prevent generation of .dSYM debug directories
-CFLAGS += -gstabs
+LDFLAGS += -liconv
 endif
 
 all: $(OBJ)
@@ -21,4 +22,4 @@ install: $(OBJ)
 	install -m 755 $(OBJ) "$(DESTDIR)$(PREFIX)/bin"
 
 clean:
-	$(RM) $(OBJ)
+	$(RM) -rf $(OBJ) *.dSYM



View it on GitLab: https://code.videolan.org/videolan/bitstream/compare/11dc4a96a6d335099e70d853906b948028fa094e...b1aa8180486c5443b4ecb3b24fa4929e892a68dc

---
View it on GitLab: https://code.videolan.org/videolan/bitstream/compare/11dc4a96a6d335099e70d853906b948028fa094e...b1aa8180486c5443b4ecb3b24fa4929e892a68dc
You're receiving this email because of your account on code.videolan.org.