pandory500/SDL-mirror
2
0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fixed build dependencies... ugh

Browse source 
--HG--
extra : convert_revision : svn%3Ac70aab31-4412-0410-b14c-859654838e24/trunk%401392
This commit is contained in:
Sam Lantinga 2006-02-20 11:29:36 +00:00
parent 7e395220f0
commit 5b3fcf92ea
2 changed files with 18 additions and 18 deletions
Download patch file Download diff file Expand all files Collapse all files

6
Makefile.in
View file

@ -31,9 +31,9 @@ OBJECTS = @OBJECTS@
DIST = acinclude.m4 autogen.sh Borland.html Borland.zip BUGS build-scripts configure configure.in COPYING CREDITS CWprojects.sea.bin docs docs.html EpocBuildFiles.zip include INSTALL Makefile.dc Makefile.in MPWmake.sea.bin PBProjects.tar.gz README* sdl-config.in sdl.m4 SDL.qpg.in SDL.spec SDL.spec.in setvars.cmd src test TODO VisualCE.zip VisualC.html VisualC.zip Watcom.mif WhatsNew Xcode21.tar.gz Xcode.tar.gz XcodeUniversal.tar.gz DIST = acinclude.m4 autogen.sh Borland.html Borland.zip BUGS build-scripts configure configure.in COPYING CREDITS CWprojects.sea.bin docs docs.html EpocBuildFiles.zip include INSTALL Makefile.dc Makefile.in MPWmake.sea.bin PBProjects.tar.gz README* sdl-config.in sdl.m4 SDL.qpg.in SDL.spec SDL.spec.in setvars.cmd src test TODO VisualCE.zip VisualC.html VisualC.zip Watcom.mif WhatsNew Xcode21.tar.gz Xcode.tar.gz XcodeUniversal.tar.gz
BUILDC = $(LIBTOOL) --mode=compile $(CC) $(CFLAGS) -c $? -o $@ BUILDC = $(LIBTOOL) --mode=compile $(CC) $(CFLAGS) -c `echo $? | sed 's| .*||'` -o $@
BUILDCC = $(LIBTOOL) --mode=compile $(CC) $(CFLAGS) -c $? -o $@ BUILDCC = $(LIBTOOL) --mode=compile $(CC) $(CFLAGS) -c `echo $? | sed 's| .*||'` -o $@
BUILDM = $(LIBTOOL) --mode=compile $(CC) $(CFLAGS) -c $? -o $@ BUILDM = $(LIBTOOL) --mode=compile $(CC) $(CFLAGS) -c `echo $? | sed 's| .*||'` -o $@
BUILDASM = $(LIBTOOL) --tag=CC --mode=compile @ac_aux_dir@/strip_fPIC.sh $(NASM) $? -o $@ BUILDASM = $(LIBTOOL) --tag=CC --mode=compile @ac_aux_dir@/strip_fPIC.sh $(NASM) $? -o $@
LT_AGE = @LT_AGE@ LT_AGE = @LT_AGE@

30
build-scripts/makedep.sh
View file

@ -22,37 +22,37 @@ search_deps()
do cache=${cache_prefix}_`generate_var $file` do cache=${cache_prefix}_`generate_var $file`
if test -f $cache; then if test -f $cache; then
# We already ahve this cached # We already ahve this cached
cat $cache if test x$2 = x; then
cat $cache
else
cat $cache >>$2
fi
continue; continue;
fi fi
for path in $base `echo $INCLUDE | sed 's|-I||g'` for path in $base `echo $INCLUDE | sed 's|-I||g'`
do dep="$path/$file" do dep="$path/$file"
if test -f "$dep"; then if test -f "$dep"; then
echo " $dep \\" >$cache echo " $dep \\" >>$cache
echo " $dep \\" if test x$2 = x; then
generate_dep $dep echo " $dep \\"
else
echo " $dep \\" >>$2
fi
search_deps $dep $cache
break break
fi fi
done done
done done
} }
generate_dep()
{
cat >>${output}.new <<__EOF__
$1: \\
`search_deps $1`
__EOF__
}
:>${output}.new :>${output}.new
for src in $SOURCES for src in $SOURCES
do echo "Generating dependencies for $src" do echo "Generating dependencies for $src"
generate_dep $src
ext=`echo $src | sed 's|.*\.\(.*\)|\1|'` ext=`echo $src | sed 's|.*\.\(.*\)|\1|'`
obj=`echo $src | sed "s|^.*/\([^ ]*\)\..*|$objects/\1.lo|g"` obj=`echo $src | sed "s|^.*/\([^ ]*\)\..*|$objects/\1.lo|g"`
echo "$obj: $src" >>${output}.new echo "$obj: $src \\" >>${output}.new
search_deps $src | sort | uniq >>${output}.new
echo "" >>${output}.new
case $ext in case $ext in
asm) echo " \$(BUILDASM)" >>${output}.new;; asm) echo " \$(BUILDASM)" >>${output}.new;;
cc) echo " \$(BUILDCC)" >>${output}.new;; cc) echo " \$(BUILDCC)" >>${output}.new;;