Skip to content

V
vlc-gpu
Commit d0f45735 authored by Gildas Bazin's avatar Gildas Bazin
Browse files
Options

* extras/contrib/src/Patches/livedotcom-win32.patch: adapted patch to work with cygwin.

parent 086b882f
Show whitespace changes
Inline Side-by-side
Showing with 4 additions and 4 deletions
extras/contrib/src/Patches/livedotcom-win32.patch
View file @ d0f45735
...@@ -6,20 +6,20 @@ diff -ru live.orig/config.mingw live/config.mingw ...@@ -6,20 +6,20 @@ diff -ru live.orig/config.mingw live/config.mingw
C = c C = c
-C_COMPILER = gcc -C_COMPILER = gcc
-C_FLAGS = $(COMPILE_OPTS) -DUSE_OUR_BZERO=1 -D__MINGW32__ -C_FLAGS = $(COMPILE_OPTS) -DUSE_OUR_BZERO=1 -D__MINGW32__
+C_COMPILER = i586-mingw32msvc-gcc +C_COMPILER = $(CC)
+C_FLAGS = $(COMPILE_OPTS) -DUSE_OUR_BZERO=1 -D__MINGW32__ -DUSE_LOCALE +C_FLAGS = $(COMPILE_OPTS) -DUSE_OUR_BZERO=1 -D__MINGW32__ -DUSE_LOCALE
CPP = cpp CPP = cpp
-CPLUSPLUS_COMPILER = c++ -CPLUSPLUS_COMPILER = c++
-CPLUSPLUS_FLAGS = $(COMPILE_OPTS) -D__MINGW32__ -Wall -Wno-deprecated -CPLUSPLUS_FLAGS = $(COMPILE_OPTS) -D__MINGW32__ -Wall -Wno-deprecated
+CPLUSPLUS_COMPILER = i586-mingw32msvc-g++ +CPLUSPLUS_COMPILER = $(CXX)
+CPLUSPLUS_FLAGS = $(COMPILE_OPTS) -D__MINGW32__ -DUSE_LOCALE -Wall -Wno-deprecated +CPLUSPLUS_FLAGS = $(COMPILE_OPTS) -D__MINGW32__ -DUSE_LOCALE -Wall -Wno-deprecated
OBJ = o OBJ = o
-LINK = c++ -o -LINK = c++ -o
+LINK = i586-mingw32msvc-g++ -o +LINK = $(CXX) -o
LINK_OPTS = -L. LINK_OPTS = -L.
CONSOLE_LINK_OPTS = $(LINK_OPTS) CONSOLE_LINK_OPTS = $(LINK_OPTS)
-LIBRARY_LINK = ld -o -LIBRARY_LINK = ld -o
+LIBRARY_LINK = i586-mingw32msvc-ld -o +LIBRARY_LINK = $(LD) -o
LIBRARY_LINK_OPTS = $(LINK_OPTS) -r -Bstatic LIBRARY_LINK_OPTS = $(LINK_OPTS) -r -Bstatic
LIB_SUFFIX = a LIB_SUFFIX = a
LIBS_FOR_CONSOLE_APPLICATION = -lws2_32 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