Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
V
vlc-gpu
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-gpu
Commits
1d001afc
Commit
1d001afc
authored
Mar 13, 2006
by
Derk-Jan Hartman
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
* Fix x264 compilation on Darwin
parent
3fdc34d5
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
0 additions
and
31 deletions
+0
-31
extras/contrib/src/Makefile
extras/contrib/src/Makefile
+0
-3
extras/contrib/src/Patches/x264_svn.patch
extras/contrib/src/Patches/x264_svn.patch
+0
-28
No files found.
extras/contrib/src/Makefile
View file @
1d001afc
...
...
@@ -1159,9 +1159,6 @@ x264:
$(SVN)
co svn://svn.videolan.org/x264/trunk/ x264
ifdef
HAVE_WIN32
(
cd
x264
;
patch
-p
0 < ../Patches/x264-svn-win32.patch
)
else
patch
-p
0 < Patches/x264_svn.patch
rm
x264/x264.c
endif
else
x264-$(X264_VERSION).tar.gz
:
...
...
extras/contrib/src/Patches/x264_svn.patch
deleted
100644 → 0
View file @
3fdc34d5
Index: x264/Makefile
===================================================================
--- x264/Makefile (revision 381)
+++ x264/Makefile (working copy)
@@ -60,7 +60,7 @@
DEP = depend
.PHONY: default fprofiled clean distclean install uninstall
-default: $(DEP) x264$(EXE)
+default: $(DEP) libx264.a
libx264.a: .depend $(OBJS) $(OBJASM)
ar rc libx264.a $(OBJS) $(OBJASM)
@@ -128,13 +128,12 @@
distclean: clean
rm -f config.mak vfw/build/cygwin/config.mak x264.pc
-install: x264
+install: libx264.a
install -d $(DESTDIR)$(bindir) $(DESTDIR)$(includedir)
install -d $(DESTDIR)$(libdir) $(DESTDIR)$(libdir)/pkgconfig
install -m 644 x264.h $(DESTDIR)$(includedir)
install -m 644 libx264.a $(DESTDIR)$(libdir)
install -m 644 x264.pc $(DESTDIR)$(libdir)/pkgconfig
- install x264 $(DESTDIR)$(bindir)
ranlib $(DESTDIR)$(libdir)/libx264.a
uninstall:
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