[MPlayer-cvslog] r36011 - in trunk: Makefile configure

[diego]

Author: diego
Date: Tue Mar 19 11:42:33 2013
New Revision: 36011

Log:
build: Add proper conditional compilation for all tools.

Also add an SDL image library check to configure, which is required
for the bmovl test tool.

Modified:
   trunk/Makefile
   trunk/configure

Modified: trunk/Makefile
==============================================================================
--- trunk/Makefile	Tue Mar 19 11:42:30 2013	(r36010)
+++ trunk/Makefile	Tue Mar 19 11:42:33 2013	(r36011)
@@ -1031,19 +1031,18 @@ tests: $(addsuffix $(EXESUF),$(TESTS))
 testsclean:
 	-rm -f $(call ADD_ALL_EXESUFS,$(TESTS))
 
-TOOLS-$(ARCH_X86) += fastmemcpybench modify_reg
+TOOLS-$(ARCH_X86)       += fastmemcpybench modify_reg
+TOOLS-$(HAVE_WINDOWS_H) += vfw2menc
+TOOLS-$(SDL_IMAGE)      += bmovl-test
 
 TOOLS := $(addprefix TOOLS/,alaw-gen asfinfo avi-fix avisubdump compare dump_mp4 movinfo netstream subrip vivodump $(TOOLS-yes))
 
-ALLTOOLS = $(TOOLS) TOOLS/bmovl-test TOOLS/vfw2menc
-
-TOOLS_DEP_FILES = $(addsuffix .d,$(ALLTOOLS))
+TOOLS_DEP_FILES = $(addsuffix .d,$(TOOLS))
 
 tools: $(addsuffix $(EXESUF),$(TOOLS))
-alltools: $(addsuffix $(EXESUF),$(ALLTOOLS))
 
 toolsclean:
-	-rm -f $(call ADD_ALL_EXESUFS,$(ALLTOOLS))
+	-rm -f $(call ADD_ALL_EXESUFS,$(TOOLS) $(TOOLS-no))
 	-rm -f TOOLS/realcodecs/*.so.6.0
 
 TOOLS/bmovl-test$(EXESUF): LIBS = -lSDL_image

Modified: trunk/configure
==============================================================================
--- trunk/configure	Tue Mar 19 11:42:30 2013	(r36010)
+++ trunk/configure	Tue Mar 19 11:42:33 2013	(r36011)
@@ -5308,6 +5308,14 @@ fi
 echores "$_sdl"
 
 
+echocheck "SDL image"
+sdl_image=no
+if test "$_sdl" = yes ; then
+  header_check SDL/SDL_image.h -lSDL_image && sdl_image=yes
+fi
+echores "$sdl_image"
+
+
 # make sure this stays below CoreVideo to avoid issues due to namespace
 # conflicts between -lGL and -framework OpenGL
 echocheck "OpenGL"
@@ -8360,6 +8368,7 @@ GUI_GTK = $_gui_gtk
 GUI_WIN32 = $_gui_win32
 HAVE_POSIX_SELECT = $_posix_select
 HAVE_SYS_MMAN_H = $_mman
+HAVE_WINDOWS_H = $windows_h
 IVTV = $_ivtv
 JACK = $_jack
 JOYSTICK = $_joystick
@@ -8415,6 +8424,7 @@ RADIO_CAPTURE=$_radio_capture
 REAL_CODECS = $_real
 S3FB = $_s3fb
 SDL = $_sdl
+SDL_IMAGE = $sdl_image
 SPEEX = $_speex
 STREAM_CACHE = $_stream_cache
 SGIAUDIO = $_sgiaudio