Patchwork [34/81] move SDL_LIBS Win32 hack to configure

login
register
mail settings
Submitter Juan Quintela
Date Aug. 3, 2009, 12:46 p.m.
Message ID <dfab17e0967d49110005b49c086ba26390edd346.1249301360.git.quintela@redhat.com>
Download mbox | patch
Permalink /patch/30535/
State Superseded
Headers show

Comments

Juan Quintela - Aug. 3, 2009, 12:46 p.m.
Signed-off-by: Juan Quintela <quintela@redhat.com>
---
 Makefile.target |    4 ----
 configure       |    3 +++
 2 files changed, 3 insertions(+), 4 deletions(-)

Patch

diff --git a/Makefile.target b/Makefile.target
index d5e38b3..69fb53a 100644
--- a/Makefile.target
+++ b/Makefile.target
@@ -441,10 +441,6 @@  ifeq ($(ARCH),ia64)
 LDFLAGS+=-Wl,-G0 -Wl,-T,$(SRC_PATH)/ia64.ld
 endif

-ifdef CONFIG_WIN32
-SDL_LIBS := $(filter-out -mwindows, $(SDL_LIBS)) -mconsole
-endif
-
 # profiling code
 ifdef TARGET_GPROF
 LDFLAGS+=-p
diff --git a/configure b/configure
index 1a3ced7..b704e7f 100755
--- a/configure
+++ b/configure
@@ -887,6 +887,9 @@  EOF
   if compile_prog "$sdl_cflags" "$sdl_libs" ; then
     sdl_libs="$sdl_libs -lX11"
   fi
+  if test "$mingw32" = "yes" ; then
+    sdl_libs="`echo $sdl_libs | sed s/-mwindows//g` -mconsole"
+  fi
 fi

 ##########################################