Compare commits
94 Commits
SDL_1_2_11
...
OLD_MOUSE_
Author | SHA1 | Date | |
---|---|---|---|
|
df0bcfd4c3 | ||
|
d131b63b6d | ||
|
1f720ce54b | ||
|
f104f965eb | ||
|
d55d0aa0f5 | ||
|
bef37c03db | ||
|
e2f369c206 | ||
|
3b56ef075a | ||
|
85df8658e0 | ||
|
8ea58028dc | ||
|
facdb39467 | ||
|
7e29723b0f | ||
|
c80b9af4d7 | ||
|
6dbe10e7a6 | ||
|
649850e16c | ||
|
b16e3fb5e8 | ||
|
b7cdbb0e4c | ||
|
5abcba0bef | ||
|
a978bcef22 | ||
|
ca818da556 | ||
|
a3a13581dd | ||
|
943240b264 | ||
|
ea8259f286 | ||
|
b28342f733 | ||
|
62b93fefcf | ||
|
f03ccf7b5b | ||
|
8dd0bb9ab7 | ||
|
bf4014c8de | ||
|
3ab62a0f7f | ||
|
f0b67b1c57 | ||
|
db086a01fa | ||
|
dd27aca4ee | ||
|
b5366def43 | ||
|
025f9ba319 | ||
|
634b9eb4e4 | ||
|
c7a0b9e59e | ||
|
8c1e69867c | ||
|
e65ebedd36 | ||
|
ebd161b6c8 | ||
|
07e9834fca | ||
|
4c81b707a5 | ||
|
0ddd59282b | ||
|
6e6616f755 | ||
|
e45a8e8b4e | ||
|
35fd96a83a | ||
|
6e78473c26 | ||
|
1ca6cc68e0 | ||
|
5b1d0de44a | ||
|
bc2dad04e7 | ||
|
a02336b2bb | ||
|
0399bce91f | ||
|
f40a103306 | ||
|
a10069108f | ||
|
925f7f2250 | ||
|
e90a2986c7 | ||
|
d0b9653f6c | ||
|
f85b3ee981 | ||
|
8d400a3a23 | ||
|
4d437f4b2b | ||
|
afcd76dae8 | ||
|
7ba00152a6 | ||
|
5096d88d2f | ||
|
06be91840a | ||
|
2026a23167 | ||
|
e4ced7154b | ||
|
dac7332cc2 | ||
|
bd9218ba08 | ||
|
c21be757d6 | ||
|
90909d6032 | ||
|
e24eca174c | ||
|
1a1edfc0ca | ||
|
325443b96b | ||
|
a360b8503e | ||
|
89196a1dab | ||
|
46f2baf74e | ||
|
2c0eba5f88 | ||
|
efe51556de | ||
|
53cec79bbc | ||
|
bc60c3d699 | ||
|
ddee3ee64d | ||
|
8f2ea39e1d | ||
|
4dc12a1a28 | ||
|
3b2555e2d0 | ||
|
be1f93ab87 | ||
|
4d3c4c2f94 | ||
|
9df4cddfa8 | ||
|
255792efdb | ||
|
c9278366ee | ||
|
04e2f7e395 | ||
|
f84d752df6 | ||
|
eeb2c17a67 | ||
|
65ab4b2f93 | ||
|
38824a7bf7 | ||
|
d020d746c4 |
@@ -1,181 +0,0 @@
|
|||||||
# Configure paths for SDL
|
|
||||||
# Sam Lantinga 9/21/99
|
|
||||||
# stolen from Manish Singh
|
|
||||||
# stolen back from Frank Belew
|
|
||||||
# stolen from Manish Singh
|
|
||||||
# Shamelessly stolen from Owen Taylor
|
|
||||||
|
|
||||||
dnl AM_PATH_SDL([MINIMUM-VERSION, [ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND]]])
|
|
||||||
dnl Test for SDL, and define SDL_CFLAGS and SDL_LIBS
|
|
||||||
dnl
|
|
||||||
AC_DEFUN([AM_PATH_SDL],
|
|
||||||
[dnl
|
|
||||||
dnl Get the cflags and libraries from the sdl-config script
|
|
||||||
dnl
|
|
||||||
AC_ARG_WITH(sdl-prefix,[ --with-sdl-prefix=PFX Prefix where SDL is installed (optional)],
|
|
||||||
sdl_prefix="$withval", sdl_prefix="")
|
|
||||||
AC_ARG_WITH(sdl-exec-prefix,[ --with-sdl-exec-prefix=PFX Exec prefix where SDL is installed (optional)],
|
|
||||||
sdl_exec_prefix="$withval", sdl_exec_prefix="")
|
|
||||||
AC_ARG_ENABLE(sdltest, [ --disable-sdltest Do not try to compile and run a test SDL program],
|
|
||||||
, enable_sdltest=yes)
|
|
||||||
|
|
||||||
if test x$sdl_exec_prefix != x ; then
|
|
||||||
sdl_args="$sdl_args --exec-prefix=$sdl_exec_prefix"
|
|
||||||
if test x${SDL_CONFIG+set} != xset ; then
|
|
||||||
SDL_CONFIG=$sdl_exec_prefix/bin/sdl-config
|
|
||||||
fi
|
|
||||||
fi
|
|
||||||
if test x$sdl_prefix != x ; then
|
|
||||||
sdl_args="$sdl_args --prefix=$sdl_prefix"
|
|
||||||
if test x${SDL_CONFIG+set} != xset ; then
|
|
||||||
SDL_CONFIG=$sdl_prefix/bin/sdl-config
|
|
||||||
fi
|
|
||||||
fi
|
|
||||||
|
|
||||||
if test "x$prefix" != xNONE; then
|
|
||||||
PATH="$prefix/bin:$prefix/usr/bin:$PATH"
|
|
||||||
fi
|
|
||||||
AC_PATH_PROG(SDL_CONFIG, sdl-config, no, [$PATH])
|
|
||||||
min_sdl_version=ifelse([$1], ,0.11.0,$1)
|
|
||||||
AC_MSG_CHECKING(for SDL - version >= $min_sdl_version)
|
|
||||||
no_sdl=""
|
|
||||||
if test "$SDL_CONFIG" = "no" ; then
|
|
||||||
no_sdl=yes
|
|
||||||
else
|
|
||||||
SDL_CFLAGS=`$SDL_CONFIG $sdlconf_args --cflags`
|
|
||||||
SDL_LIBS=`$SDL_CONFIG $sdlconf_args --libs`
|
|
||||||
|
|
||||||
sdl_major_version=`$SDL_CONFIG $sdl_args --version | \
|
|
||||||
sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\1/'`
|
|
||||||
sdl_minor_version=`$SDL_CONFIG $sdl_args --version | \
|
|
||||||
sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\2/'`
|
|
||||||
sdl_micro_version=`$SDL_CONFIG $sdl_config_args --version | \
|
|
||||||
sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\3/'`
|
|
||||||
if test "x$enable_sdltest" = "xyes" ; then
|
|
||||||
ac_save_CFLAGS="$CFLAGS"
|
|
||||||
ac_save_CXXFLAGS="$CXXFLAGS"
|
|
||||||
ac_save_LIBS="$LIBS"
|
|
||||||
CFLAGS="$CFLAGS $SDL_CFLAGS"
|
|
||||||
CXXFLAGS="$CXXFLAGS $SDL_CFLAGS"
|
|
||||||
LIBS="$LIBS $SDL_LIBS"
|
|
||||||
dnl
|
|
||||||
dnl Now check if the installed SDL is sufficiently new. (Also sanity
|
|
||||||
dnl checks the results of sdl-config to some extent
|
|
||||||
dnl
|
|
||||||
rm -f conf.sdltest
|
|
||||||
AC_TRY_RUN([
|
|
||||||
#include <stdio.h>
|
|
||||||
#include <stdlib.h>
|
|
||||||
#include <string.h>
|
|
||||||
#include "SDL.h"
|
|
||||||
|
|
||||||
char*
|
|
||||||
my_strdup (char *str)
|
|
||||||
{
|
|
||||||
char *new_str;
|
|
||||||
|
|
||||||
if (str)
|
|
||||||
{
|
|
||||||
new_str = (char *)malloc ((strlen (str) + 1) * sizeof(char));
|
|
||||||
strcpy (new_str, str);
|
|
||||||
}
|
|
||||||
else
|
|
||||||
new_str = NULL;
|
|
||||||
|
|
||||||
return new_str;
|
|
||||||
}
|
|
||||||
|
|
||||||
int main (int argc, char *argv[])
|
|
||||||
{
|
|
||||||
int major, minor, micro;
|
|
||||||
char *tmp_version;
|
|
||||||
|
|
||||||
/* This hangs on some systems (?)
|
|
||||||
system ("touch conf.sdltest");
|
|
||||||
*/
|
|
||||||
{ FILE *fp = fopen("conf.sdltest", "a"); if ( fp ) fclose(fp); }
|
|
||||||
|
|
||||||
/* HP/UX 9 (%@#!) writes to sscanf strings */
|
|
||||||
tmp_version = my_strdup("$min_sdl_version");
|
|
||||||
if (sscanf(tmp_version, "%d.%d.%d", &major, &minor, µ) != 3) {
|
|
||||||
printf("%s, bad version string\n", "$min_sdl_version");
|
|
||||||
exit(1);
|
|
||||||
}
|
|
||||||
|
|
||||||
if (($sdl_major_version > major) ||
|
|
||||||
(($sdl_major_version == major) && ($sdl_minor_version > minor)) ||
|
|
||||||
(($sdl_major_version == major) && ($sdl_minor_version == minor) && ($sdl_micro_version >= micro)))
|
|
||||||
{
|
|
||||||
return 0;
|
|
||||||
}
|
|
||||||
else
|
|
||||||
{
|
|
||||||
printf("\n*** 'sdl-config --version' returned %d.%d.%d, but the minimum version\n", $sdl_major_version, $sdl_minor_version, $sdl_micro_version);
|
|
||||||
printf("*** of SDL required is %d.%d.%d. If sdl-config is correct, then it is\n", major, minor, micro);
|
|
||||||
printf("*** best to upgrade to the required version.\n");
|
|
||||||
printf("*** If sdl-config was wrong, set the environment variable SDL_CONFIG\n");
|
|
||||||
printf("*** to point to the correct copy of sdl-config, and remove the file\n");
|
|
||||||
printf("*** config.cache before re-running configure\n");
|
|
||||||
return 1;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
],, no_sdl=yes,[echo $ac_n "cross compiling; assumed OK... $ac_c"])
|
|
||||||
CFLAGS="$ac_save_CFLAGS"
|
|
||||||
CXXFLAGS="$ac_save_CXXFLAGS"
|
|
||||||
LIBS="$ac_save_LIBS"
|
|
||||||
fi
|
|
||||||
fi
|
|
||||||
if test "x$no_sdl" = x ; then
|
|
||||||
AC_MSG_RESULT(yes)
|
|
||||||
ifelse([$2], , :, [$2])
|
|
||||||
else
|
|
||||||
AC_MSG_RESULT(no)
|
|
||||||
if test "$SDL_CONFIG" = "no" ; then
|
|
||||||
echo "*** The sdl-config script installed by SDL could not be found"
|
|
||||||
echo "*** If SDL was installed in PREFIX, make sure PREFIX/bin is in"
|
|
||||||
echo "*** your path, or set the SDL_CONFIG environment variable to the"
|
|
||||||
echo "*** full path to sdl-config."
|
|
||||||
else
|
|
||||||
if test -f conf.sdltest ; then
|
|
||||||
:
|
|
||||||
else
|
|
||||||
echo "*** Could not run SDL test program, checking why..."
|
|
||||||
CFLAGS="$CFLAGS $SDL_CFLAGS"
|
|
||||||
CXXFLAGS="$CXXFLAGS $SDL_CFLAGS"
|
|
||||||
LIBS="$LIBS $SDL_LIBS"
|
|
||||||
AC_TRY_LINK([
|
|
||||||
#include <stdio.h>
|
|
||||||
#include "SDL.h"
|
|
||||||
|
|
||||||
int main(int argc, char *argv[])
|
|
||||||
{ return 0; }
|
|
||||||
#undef main
|
|
||||||
#define main K_and_R_C_main
|
|
||||||
], [ return 0; ],
|
|
||||||
[ echo "*** The test program compiled, but did not run. This usually means"
|
|
||||||
echo "*** that the run-time linker is not finding SDL or finding the wrong"
|
|
||||||
echo "*** version of SDL. If it is not finding SDL, you'll need to set your"
|
|
||||||
echo "*** LD_LIBRARY_PATH environment variable, or edit /etc/ld.so.conf to point"
|
|
||||||
echo "*** to the installed location Also, make sure you have run ldconfig if that"
|
|
||||||
echo "*** is required on your system"
|
|
||||||
echo "***"
|
|
||||||
echo "*** If you have an old version installed, it is best to remove it, although"
|
|
||||||
echo "*** you may also be able to get things to work by modifying LD_LIBRARY_PATH"],
|
|
||||||
[ echo "*** The test program failed to compile or link. See the file config.log for the"
|
|
||||||
echo "*** exact error that occured. This usually means SDL was incorrectly installed"
|
|
||||||
echo "*** or that you have moved SDL since it was installed. In the latter case, you"
|
|
||||||
echo "*** may want to edit the sdl-config script: $SDL_CONFIG" ])
|
|
||||||
CFLAGS="$ac_save_CFLAGS"
|
|
||||||
CXXFLAGS="$ac_save_CXXFLAGS"
|
|
||||||
LIBS="$ac_save_LIBS"
|
|
||||||
fi
|
|
||||||
fi
|
|
||||||
SDL_CFLAGS=""
|
|
||||||
SDL_LIBS=""
|
|
||||||
ifelse([$3], , :, [$3])
|
|
||||||
fi
|
|
||||||
AC_SUBST(SDL_CFLAGS)
|
|
||||||
AC_SUBST(SDL_LIBS)
|
|
||||||
rm -f conf.sdltest
|
|
||||||
])
|
|
1278
src/univ/listbox.cpp
Normal file
1278
src/univ/listbox.cpp
Normal file
File diff suppressed because it is too large
Load Diff
Reference in New Issue
Block a user