Commit 891719b5 authored by Jean-Baptiste Kempf's avatar Jean-Baptiste Kempf

COntribs: remove livedotcome.win32 patch, merged upstream (kudos to Ross)

parent 7a7bb889
...@@ -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
......
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
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