Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
V
vlc
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
Commits
891719b5
Commit
891719b5
authored
Jan 04, 2008
by
Jean-Baptiste Kempf
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
COntribs: remove livedotcome.win32 patch, merged upstream (kudos to Ross)
parent
7a7bb889
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
0 additions
and
28 deletions
+0
-28
extras/contrib/src/Makefile
extras/contrib/src/Makefile
+0
-3
extras/contrib/src/Patches/livedotcom-win32.patch
extras/contrib/src/Patches/livedotcom-win32.patch
+0
-25
No files found.
extras/contrib/src/Makefile
View file @
891719b5
...
@@ -1227,9 +1227,6 @@ live555-$(LIVEDOTCOM_VERSION).tar.gz:
...
@@ -1227,9 +1227,6 @@ live555-$(LIVEDOTCOM_VERSION).tar.gz:
live
:
live555-$(LIVEDOTCOM_VERSION).tar.gz
live
:
live555-$(LIVEDOTCOM_VERSION).tar.gz
$(EXTRACT_GZ)
$(EXTRACT_GZ)
# patch -p0 < Patches/live.patch
# patch -p0 < Patches/live.patch
ifdef
HAVE_WIN32
patch
-p0
<
Patches/livedotcom-win32.patch
endif
ifdef
HAVE_DARWIN_OS
ifdef
HAVE_DARWIN_OS
patch
-p0
<
Patches/live-osx.patch
patch
-p0
<
Patches/live-osx.patch
endif
endif
...
...
extras/contrib/src/Patches/livedotcom-win32.patch
deleted
100644 → 0
View file @
7a7bb889
diff -ru live.orig/config.mingw live/config.mingw
--- live.orig/config.mingw 2005-10-23 08:50:31.000000000 +0200
+++ live/config.mingw 2005-10-23 17:09:35.000000000 +0200
@@ -1,15 +1,15 @@
COMPILE_OPTS = $(INCLUDES) -I. -O -DSOCKLEN_T=int
C = c
-C_COMPILER = gcc
-C_FLAGS = $(COMPILE_OPTS) -DUSE_OUR_BZERO=1 -D__MINGW32__
+C_COMPILER = $(CC)
+C_FLAGS = $(COMPILE_OPTS) -DUSE_OUR_BZERO=1 -D__MINGW32__ -DUSE_LOCALE
CPP = cpp
-CPLUSPLUS_COMPILER = c++
-CPLUSPLUS_FLAGS = $(COMPILE_OPTS) -D__MINGW32__ -Wall -Wno-deprecated
+CPLUSPLUS_COMPILER = $(CXX)
+CPLUSPLUS_FLAGS = $(COMPILE_OPTS) -D__MINGW32__ -DUSE_LOCALE -Wall -Wno-deprecated
OBJ = o
-LINK = c++ -o
+LINK = $(CXX) -o
LINK_OPTS = -L.
CONSOLE_LINK_OPTS = $(LINK_OPTS)
-LIBRARY_LINK = ld -o
+LIBRARY_LINK = $(LD) -o
LIBRARY_LINK_OPTS = $(LINK_OPTS) -r -Bstatic
LIB_SUFFIX = a
LIBS_FOR_CONSOLE_APPLICATION = -lws2_32
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