Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
V
vlc-2-2
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Redmine
Redmine
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Operations
Operations
Metrics
Environments
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
videolan
vlc-2-2
Commits
d4bb448c
Commit
d4bb448c
authored
Mar 03, 2006
by
Derk-Jan Hartman
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
* Fix liveMedia on all platforms now hopefully
parent
45cf5c0d
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
8 additions
and
8 deletions
+8
-8
extras/contrib/src/Makefile
extras/contrib/src/Makefile
+7
-7
extras/contrib/src/Patches/live-osx.patch
extras/contrib/src/Patches/live-osx.patch
+1
-1
No files found.
extras/contrib/src/Makefile
View file @
d4bb448c
...
...
@@ -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),p
owerpc-apple-darwin*
)
ifeq
($(HOST),p
pc-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
...
...
extras/contrib/src/Patches/live-osx.patch
View file @
d4bb448c
...
...
@@ -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
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment