ALL: Merge the win32-contrib branch.
[vlc.git] / extras / contrib / src / Patches / livedotcom-win32.patch
1 diff -ru live.orig/config.mingw live/config.mingw
2 --- live.orig/config.mingw      2005-10-23 08:50:31.000000000 +0200
3 +++ live/config.mingw   2005-10-23 17:09:35.000000000 +0200
4 @@ -1,15 +1,15 @@
5  COMPILE_OPTS =         $(INCLUDES) -I. -O -DSOCKLEN_T=int
6  C =                    c
7 -C_COMPILER =           gcc
8 -C_FLAGS =              $(COMPILE_OPTS) -DUSE_OUR_BZERO=1 -D__MINGW32__
9 +C_COMPILER =           i586-mingw32msvc-gcc
10 +C_FLAGS =              $(COMPILE_OPTS) -DUSE_OUR_BZERO=1 -D__MINGW32__ -DUSE_LOCALE
11  CPP =                  cpp
12 -CPLUSPLUS_COMPILER =   c++
13 -CPLUSPLUS_FLAGS =      $(COMPILE_OPTS) -D__MINGW32__ -Wall -Wno-deprecated
14 +CPLUSPLUS_COMPILER =   i586-mingw32msvc-g++
15 +CPLUSPLUS_FLAGS =      $(COMPILE_OPTS) -D__MINGW32__ -DUSE_LOCALE -Wall -Wno-deprecated 
16  OBJ =                  o
17 -LINK =                 c++ -o 
18 +LINK =                 i586-mingw32msvc-g++ -o 
19  LINK_OPTS =            -L.
20  CONSOLE_LINK_OPTS =    $(LINK_OPTS)
21 -LIBRARY_LINK =         ld -o 
22 +LIBRARY_LINK =         i586-mingw32msvc-ld -o 
23  LIBRARY_LINK_OPTS =    $(LINK_OPTS) -r -Bstatic
24  LIB_SUFFIX =                   a
25  LIBS_FOR_CONSOLE_APPLICATION = -lws2_32