Commit d4bb448c authored by hartman's avatar hartman

* Fix liveMedia on all platforms now hopefully

parent 45cf5c0d
......@@ -1017,17 +1017,17 @@ live: live555-$(LIVEDOTCOM_VERSION).tar.gz
patch -p 0 < Patches/live-osx.patch
.live: live
ifeq ($(HOST),powerpc-apple-darwin8)
(cd $<; sed -e 's%EXTRA_CFLAGS%$(EXTRA_CFLAGS)%' -e 's%EXTRA_LDFLAGS%$(EXTRA_LDFLAGS)%' -i.orig config.macosx)
(cd $<; ./genMakefiles macosx && make)
ifdef HAVE_WIN32
(cd $<;./genMakefiles mingw && make $(HOSTCC))
else
ifeq ($(HOST),powerpc-apple-darwin*)
ifeq ($(HOST),ppc-darwin)
(cd $<; ./genMakefiles macosx-before-version-10.4 && make )
else
ifdef HAVE_WIN32
(cd $<;./genMakefiles mingw && make $(HOSTCC))
ifdef HAVE_DARWIN_OS
(cd $<; sed -e 's%EXTRA_CFLAGS%$(EXTRA_CFLAGS)%' -e 's%EXTRA_LDFLAGS%$(EXTRA_LDFLAGS)%' -i.orig config.macosx)
(cd $<; ./genMakefiles macosx && make)
else
(cd $<;./genMakefiles linux && make )
(cd $<;./genMakefiles linux && make $(HOSTCC))
endif
endif
endif
......
......@@ -25,7 +25,7 @@ diff -ruN live.orig/config.macosx live/config.macosx
OBJ = o
LINK = c++ -o
-LINK_OPTS = -L.
+LINK_OPTS = -L. EXTRA_LDFLAGS
+LINK_OPTS = -L. EXTRA_LDFLAGS
CONSOLE_LINK_OPTS = $(LINK_OPTS)
-LIBRARY_LINK = ld -o
-LIBRARY_LINK_OPTS = $(LINK_OPTS) -r
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment