[mupen64plus-ui-console] 136/172: Fix console output under MINGW

[Sven Eckelmann]

This is an automated email from the git hooks/post-receive script.

ecsv-guest pushed a commit to branch armhf_test
in repository mupen64plus-ui-console.

commit 6f368c7b45192e4dd8c1ddf945ecb6c9f733e995
Author: Sven Eckelmann <sven at narfation.org>
Date:   Tue Jun 25 08:45:09 2013 +0200

    Fix console output under MINGW
---
 debian/patches/sdl_main.patch | 20 +++++++++++---------
 1 file changed, 11 insertions(+), 9 deletions(-)

diff --git a/debian/patches/sdl_main.patch b/debian/patches/sdl_main.patch
index b34babd..3eb91ef 100644
--- a/debian/patches/sdl_main.patch
+++ b/debian/patches/sdl_main.patch
@@ -5,7 +5,7 @@ Author: Sven Eckelmann <sven at narfation.org>
 
 ---
 diff --git a/projects/unix/Makefile b/projects/unix/Makefile
-index b6ee4944ce11945a9f7ba4c0b77a8210f7b9d41b..6fd25c2d218c7d0efcc739894c74070f02b0ea75 100644
+index b6ee4944ce11945a9f7ba4c0b77a8210f7b9d41b..848a3aeb051ec103d355d7468ae349daaefbd5c6 100644
 --- a/projects/unix/Makefile
 +++ b/projects/unix/Makefile
 @@ -128,18 +128,6 @@ ifeq ($(OS), OSX)
@@ -27,15 +27,10 @@ index b6ee4944ce11945a9f7ba4c0b77a8210f7b9d41b..6fd25c2d218c7d0efcc739894c74070f
    ifeq ($(CPU), X86)
      ifeq ($(ARCH_DETECTED), 64BITS)
        CFLAGS += -pipe -arch x86_64 -mmacosx-version-min=$(OSX_SDK) -isysroot $(OSX_SYSROOT)/MacOSX$(OSX_SDK).sdk
-@@ -149,12 +137,17 @@ ifeq ($(OS), OSX)
+@@ -149,11 +137,20 @@ ifeq ($(OS), OSX)
    endif
  endif
  
--ifeq ($(OS), MINGW)
--  # Do NOT include SDL_main for Windows; we are building a console app!
--  # NO -mwindows either!  (it will still be a valid 32-bit Windows program)
--  CFLAGS += -I/usr/local/include/SDL -D_GNU_SOURCE=1
--  LDLIBS += -L/usr/local/lib -lmingw32 -lSDL
 +# test for presence of SDL
 +ifeq ($(origin SDL_CFLAGS) $(origin SDL_LDLIBS), undefined undefined)
 +  SDL_CONFIG = $(CROSS_COMPILE)sdl-config
@@ -44,12 +39,19 @@ index b6ee4944ce11945a9f7ba4c0b77a8210f7b9d41b..6fd25c2d218c7d0efcc739894c74070f
 +  endif
 +  SDL_CFLAGS  += $(shell $(SDL_CONFIG) --cflags)
 +  SDL_LDLIBS += $(shell $(SDL_CONFIG) --libs)
- endif
++endif
 +CFLAGS += $(SDL_CFLAGS)
 +LDLIBS += $(SDL_LDLIBS)
++
+ ifeq ($(OS), MINGW)
+-  # Do NOT include SDL_main for Windows; we are building a console app!
+-  # NO -mwindows either!  (it will still be a valid 32-bit Windows program)
+-  CFLAGS += -I/usr/local/include/SDL -D_GNU_SOURCE=1
+-  LDLIBS += -L/usr/local/lib -lmingw32 -lSDL
++  LDLIBS += -mconsole
+ endif
  
  ifeq ($(BIG_ENDIAN), 1)
-   CFLAGS += -DM64P_BIG_ENDIAN
 diff --git a/src/main.c b/src/main.c
 index c7f20e23a390a83c9508e8800449b06d93910910..ea47d866b6b157b225053906491549206725480d 100644
 --- a/src/main.c

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-games/mupen64plus-ui-console.git