[xiph-commits] r15817 - branches/theora-thusnelda/win32/xmingw32

[giles at svn.xiph.org]

Author: giles
Date: 2009-03-21 00:13:44 -0700 (Sat, 21 Mar 2009)
New Revision: 15817

Modified:
   branches/theora-thusnelda/win32/xmingw32/Makefile
Log:
xming32: Only call sdl-config when building player_example.exe

Previously this was called for every compiler command, which is
unnecessary. Especially since player_example.exe isn't part of
the default build.

Corresponds to trunk r15440.


Modified: branches/theora-thusnelda/win32/xmingw32/Makefile
===================================================================
--- branches/theora-thusnelda/win32/xmingw32/Makefile	2009-03-21 07:12:44 UTC (rev 15816)
+++ branches/theora-thusnelda/win32/xmingw32/Makefile	2009-03-21 07:13:44 UTC (rev 15817)
@@ -47,7 +47,7 @@
 # The location of include files.
 # Modify these to point to your Ogg and Vorbis include directories if they are
 #  not installed in a standard location.
-CINCLUDE = `${SDLCONFIG} --cflags` -D_REENTRANT
+CINCLUDE = -D_REENTRANT
 # Extra compilation flags.
 # You may get speed increases by including flags such as -O2 or -O3 or
 #  -ffast-math, or additional flags, depending on your system and compiler.
@@ -59,7 +59,7 @@
 # The -g flag will generally include debugging information.
 DEBUG_CFLAGS = ${CFLAGS} -g
 # Libraries to link with, and the location of library files.
-LIBS = -logg -lvorbis -lvorbisenc `${SDLCONFIG} --libs`
+LIBS = -logg -lvorbis -lvorbisenc
 
 # ANYTHING BELOW THIS LINE PROBABLY DOES NOT NEED EDITING
 CINCLUDE := -I../../include ${CINCLUDE}
@@ -369,10 +369,11 @@
          ${LIBTHEORAENC_TARGET}.a ${LIBTHEORADEC_TARGET}.a
 
 # player_example
+${PLAYER_EXAMPLE_TARGET}: CINCLUDE += $(SDLCONFIG) --cflags
 ${PLAYER_EXAMPLE_TARGET}: ${PLAYER_EXAMPLE_OBJS} ${LIBTHEORADEC_TARGET}
 	mkdir -p ${TARGETBINDIR}
 	${CC} ${CFLAGS} -o $@ ${PLAYER_EXAMPLE_OBJS} ${LIBS} \
-         ${LIBTHEORADEC_TARGET}.a
+         ${LIBTHEORADEC_TARGET}.a `${SDLCONFIG} --libs`
 
 # Remove all targets.
 clean: