Retro/pcem
Watch
1
0
Fork
You've already forked pcem
 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Changes to autoconf/automake scripts to improve MSYS2 compatibility. Patch from darksabre76.

Browse source
This commit is contained in:
SarahW 2018-02-10 11:30:26 +00:00
commit 2f73338081
6 changed files with 1134 additions and 501 deletions
Download patch file Download diff file Expand all files Collapse all files

86
configure vendored
View file

@ -1,6 +1,6 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
# Generated by GNU Autoconf 2.69 for PCem v12.
# Generated by GNU Autoconf 2.69 for PCem v13.1.
#
# Report bugs to <Sarah Walker <pcem@pcem-emulator.co.uk>>.
#
@ -579,8 +579,8 @@ MAKEFLAGS=
# Identity of this package.
PACKAGE_NAME='PCem'
PACKAGE_TARNAME='pcem'
PACKAGE_VERSION='v12'
PACKAGE_STRING='PCem v12'
PACKAGE_VERSION='v13.1'
PACKAGE_STRING='PCem v13.1'
PACKAGE_BUGREPORT='Sarah Walker <pcem@pcem-emulator.co.uk>'
PACKAGE_URL=''
@ -1310,7 +1310,7 @@ if test "$ac_init_help" = "long"; then
# Omit some internal or obsolete options to make the list less imposing.
# This message is too long to be a string in the A/UX 3.1 sh.
cat <<_ACEOF
\`configure' configures PCem v12 to adapt to many kinds of systems.
\`configure' configures PCem v13.1 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@ -1381,7 +1381,7 @@ fi
if test -n "$ac_init_help"; then
case $ac_init_help in
short | recursive ) echo "Configuration of PCem v12:";;
short | recursive ) echo "Configuration of PCem v13.1:";;
esac
cat <<\_ACEOF
@ -1499,7 +1499,7 @@ fi
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
PCem configure v12
PCem configure v13.1
generated by GNU Autoconf 2.69
Copyright (C) 2012 Free Software Foundation, Inc.
@ -1680,7 +1680,7 @@ cat >config.log <<_ACEOF
This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake.
It was created by PCem $as_me v12, which was
It was created by PCem $as_me v13.1, which was
generated by GNU Autoconf 2.69. Invocation command line was
$ $0 $@
@ -2616,7 +2616,7 @@ fi
# Define the identity of the package.
PACKAGE='pcem'
VERSION='v12'
VERSION='v13.1'
cat >>confdefs.h <<_ACEOF
@ -4210,19 +4210,19 @@ fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for cpu" >&5
$as_echo_n "checking for cpu... " >&6; }
case "${host_cpu}" in
i?86)
CPU=i386
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: ${host_cpu}" >&5
i?86)
CPU=i386
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: ${host_cpu}" >&5
$as_echo "${host_cpu}" >&6; }
;;
x86_64)
CPU=x86_64
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: ${host_cpu}" >&5
;;
x86_64)
CPU=x86_64
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: ${host_cpu}" >&5
$as_echo "${host_cpu}" >&6; }
;;
*)
as_fn_error $? "Unsupported CPU." "$LINENO" 5
;;
;;
*)
as_fn_error $? "Unsupported CPU." "$LINENO" 5
;;
esac
if test "$CPU" = "i386"; then
@ -5157,7 +5157,7 @@ _ACEOF
else
echo "You need to install the ALSA library."
exit -1
exit -1
fi
fi
@ -5219,48 +5219,42 @@ case "$host" in
build_macosx="yes"
;;
*-*-cygwin* | *-*-mingw32*)
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for glGetError in -lGL" >&5
$as_echo_n "checking for glGetError in -lGL... " >&6; }
if ${ac_cv_lib_GL_glGetError+:} false; then :
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for main in -lopengl32" >&5
$as_echo_n "checking for main in -lopengl32... " >&6; }
if ${ac_cv_lib_opengl32_main+:} false; then :
$as_echo_n "(cached) " >&6
else
ac_check_lib_save_LIBS=$LIBS
LIBS="-lGL $LIBS"
LIBS="-lopengl32 $LIBS"
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
/* Override any GCC internal prototype to avoid an error.
Use char because int might match the return type of a GCC
builtin and then its argument prototype would still apply. */
#ifdef __cplusplus
extern "C"
#endif
char glGetError ();
int
main ()
{
return glGetError ();
return main ();
;
return 0;
}
_ACEOF
if ac_fn_c_try_link "$LINENO"; then :
ac_cv_lib_GL_glGetError=yes
ac_cv_lib_opengl32_main=yes
else
ac_cv_lib_GL_glGetError=no
ac_cv_lib_opengl32_main=no
fi
rm -f core conftest.err conftest.$ac_objext \
conftest$ac_exeext conftest.$ac_ext
LIBS=$ac_check_lib_save_LIBS
fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_GL_glGetError" >&5
$as_echo "$ac_cv_lib_GL_glGetError" >&6; }
if test "x$ac_cv_lib_GL_glGetError" = xyes; then :
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_opengl32_main" >&5
$as_echo "$ac_cv_lib_opengl32_main" >&6; }
if test "x$ac_cv_lib_opengl32_main" = xyes; then :
cat >>confdefs.h <<_ACEOF
#define HAVE_LIBGL 1
#define HAVE_LIBOPENGL32 1
_ACEOF
LIBS="-lGL $LIBS"
LIBS="-lopengl32 $LIBS"
else
\
@ -5313,11 +5307,13 @@ _ACEOF
else
\
echo "You need to install the OpenAL library."
exit -1
echo "You need to install the OpenAL library."
exit -1
fi
build_win="yes"
SET_MAKE='MAKE=mingw32-make'
;;
*)
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for glGetError in -lGL" >&5
@ -5414,8 +5410,8 @@ _ACEOF
else
\
echo "You need to install the OpenAL library."
exit -1
echo "You need to install the OpenAL library."
exit -1
fi
build_linux="yes"
@ -6061,7 +6057,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
# report actual input values of CONFIG_FILES etc. instead of their
# values after options handling.
ac_log="
This file was extended by PCem $as_me v12, which was
This file was extended by PCem $as_me v13.1, which was
generated by GNU Autoconf 2.69. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@ -6118,7 +6114,7 @@ _ACEOF
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
ac_cs_version="\\
PCem config.status v12
PCem config.status v13.1
configured by $0, generated by GNU Autoconf 2.69,
with options \\"\$ac_cs_config\\"