Revision 49ecc3fa
| b/configure | ||
|---|---|---|
| 908 | 908 |
if [ "$build_docs" = "yes" ] ; then |
| 909 | 909 |
echo "BUILD_DOCS=yes" >> $config_mak |
| 910 | 910 |
fi |
| 911 |
if test "$static" = "yes"; then |
|
| 912 |
sdl1=$sdl_static |
|
| 913 |
else |
|
| 914 |
sdl1=$sdl |
|
| 915 |
fi |
|
| 916 |
if test "$sdl1" = "yes" ; then |
|
| 917 |
echo "#define CONFIG_SDL 1" >> $config_h |
|
| 918 |
echo "CONFIG_SDL=yes" >> $config_mak |
|
| 919 |
if test "$target_softmmu" = "no" -o "$static" = "yes"; then |
|
| 920 |
echo "SDL_LIBS=$sdl_static_libs" >> $config_mak |
|
| 921 |
else |
|
| 922 |
echo "SDL_LIBS=`$sdl_config --libs`" >> $config_mak |
|
| 923 |
fi |
|
| 924 |
if [ "${aa}" = "yes" ] ; then
|
|
| 925 |
echo "SDL_CFLAGS=`$sdl_config --cflags` `aalib-config --cflags`" >> $config_mak |
|
| 926 |
else |
|
| 927 |
echo "SDL_CFLAGS=`$sdl_config --cflags`" >> $config_mak |
|
| 928 |
fi |
|
| 929 |
fi |
|
| 930 |
if test "$cocoa" = "yes" ; then |
|
| 931 |
echo "#define CONFIG_COCOA 1" >> $config_h |
|
| 932 |
echo "CONFIG_COCOA=yes" >> $config_mak |
|
| 933 |
fi |
|
| 911 | 934 |
|
| 912 | 935 |
# XXX: suppress that |
| 913 | 936 |
if [ "$bsd" = "yes" ] ; then |
| ... | ... | |
| 985 | 1008 |
if test "$target" = "arm-linux-user" -o "$target" = "armeb-linux-user" ; then |
| 986 | 1009 |
mkdir -p $target_dir/nwfpe |
| 987 | 1010 |
fi |
| 988 |
if test "$target_user_only" = "no" ; then |
|
| 989 |
mkdir -p $target_dir/slirp |
|
| 990 |
fi |
|
| 991 | 1011 |
|
| 992 | 1012 |
# |
| 993 | 1013 |
# don't use ln -sf as not all "ln -sf" over write the file/link |
| ... | ... | |
| 1147 | 1167 |
echo "TARGET_HAS_ELFLOAD32=yes" >> $config_mak |
| 1148 | 1168 |
echo "#define TARGET_HAS_ELFLOAD32 1" >> $config_h |
| 1149 | 1169 |
fi |
| 1150 |
# sdl defines |
|
| 1151 |
|
|
| 1152 |
if test "$target_user_only" = "no"; then |
|
| 1153 |
if test "$target_softmmu" = "no" -o "$static" = "yes"; then |
|
| 1154 |
sdl1=$sdl_static |
|
| 1155 |
else |
|
| 1156 |
sdl1=$sdl |
|
| 1157 |
fi |
|
| 1158 |
if test "$sdl1" = "yes" ; then |
|
| 1159 |
echo "#define CONFIG_SDL 1" >> $config_h |
|
| 1160 |
echo "CONFIG_SDL=yes" >> $config_mak |
|
| 1161 |
if test "$target_softmmu" = "no" -o "$static" = "yes"; then |
|
| 1162 |
echo "SDL_LIBS=$sdl_static_libs" >> $config_mak |
|
| 1163 |
else |
|
| 1164 |
echo "SDL_LIBS=`$sdl_config --libs`" >> $config_mak |
|
| 1165 |
fi |
|
| 1166 |
if [ "${aa}" = "yes" ] ; then
|
|
| 1167 |
echo "SDL_CFLAGS=`$sdl_config --cflags` `aalib-config --cflags`" >> $config_mak |
|
| 1168 |
else |
|
| 1169 |
echo "SDL_CFLAGS=`$sdl_config --cflags`" >> $config_mak |
|
| 1170 |
fi |
|
| 1171 |
fi |
|
| 1172 |
fi |
|
| 1173 |
|
|
| 1174 |
if test "$cocoa" = "yes" ; then |
|
| 1175 |
echo "#define CONFIG_COCOA 1" >> $config_h |
|
| 1176 |
echo "CONFIG_COCOA=yes" >> $config_mak |
|
| 1177 |
fi |
|
| 1178 | 1170 |
|
| 1179 | 1171 |
test -f ${config_h}~ && cmp -s $config_h ${config_h}~ && mv ${config_h}~ $config_h
|
| 1180 | 1172 |
|
| ... | ... | |
| 1182 | 1174 |
|
| 1183 | 1175 |
# build tree in object directory if source path is different from current one |
| 1184 | 1176 |
if test "$source_path_used" = "yes" ; then |
| 1185 |
DIRS="tests tests/cris" |
|
| 1177 |
DIRS="tests tests/cris slirp audio"
|
|
| 1186 | 1178 |
FILES="Makefile tests/Makefile" |
| 1187 | 1179 |
FILES="$FILES tests/cris/Makefile tests/cris/.gdbinit" |
| 1188 | 1180 |
for dir in $DIRS ; do |
Also available in: Unified diff