wxWidgets GUI can now be built through autoconf (use '--enable-wx').
This commit is contained in:
pcem_emulator
parent
7fe91626d6
commit
23b2ae0d9d
6 changed files with 3373 additions and 514 deletions
19
Makefile.in
19
Makefile.in
|
|
@ -243,10 +243,29 @@ PACKAGE_TARNAME = @PACKAGE_TARNAME@
|
|||
PACKAGE_URL = @PACKAGE_URL@
|
||||
PACKAGE_VERSION = @PACKAGE_VERSION@
|
||||
PATH_SEPARATOR = @PATH_SEPARATOR@
|
||||
PKG_CONFIG = @PKG_CONFIG@
|
||||
PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
|
||||
PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
|
||||
SDL2_CONFIG = @SDL2_CONFIG@
|
||||
SDL_CFLAGS = @SDL_CFLAGS@
|
||||
SDL_LIBS = @SDL_LIBS@
|
||||
SET_MAKE = @SET_MAKE@
|
||||
SHELL = @SHELL@
|
||||
STRIP = @STRIP@
|
||||
VERSION = @VERSION@
|
||||
WX_CFLAGS = @WX_CFLAGS@
|
||||
WX_CFLAGS_ONLY = @WX_CFLAGS_ONLY@
|
||||
WX_CONFIG_PATH = @WX_CONFIG_PATH@
|
||||
WX_CPPFLAGS = @WX_CPPFLAGS@
|
||||
WX_CXXFLAGS = @WX_CXXFLAGS@
|
||||
WX_CXXFLAGS_ONLY = @WX_CXXFLAGS_ONLY@
|
||||
WX_LIBS = @WX_LIBS@
|
||||
WX_LIBS_STATIC = @WX_LIBS_STATIC@
|
||||
WX_RESCOMP = @WX_RESCOMP@
|
||||
WX_VERSION = @WX_VERSION@
|
||||
WX_VERSION_MAJOR = @WX_VERSION_MAJOR@
|
||||
WX_VERSION_MICRO = @WX_VERSION_MICRO@
|
||||
WX_VERSION_MINOR = @WX_VERSION_MINOR@
|
||||
abs_builddir = @abs_builddir@
|
||||
abs_srcdir = @abs_srcdir@
|
||||
abs_top_builddir = @abs_top_builddir@
|
||||
|
|
|
|||
1539
aclocal.m4
vendored
1539
aclocal.m4
vendored
File diff suppressed because it is too large
Load diff
882
configure
vendored
882
configure
vendored
|
|
@ -2,7 +2,7 @@
|
|||
# Guess values for system-dependent variables and create Makefiles.
|
||||
# Generated by GNU Autoconf 2.69 for PCem v12.
|
||||
#
|
||||
# Report bugs to <Sarah Walker <pcem-emulator@pcem-emulator.co.uk>>.
|
||||
# Report bugs to <Sarah Walker <pcem@pcem-emulator.co.uk>>.
|
||||
#
|
||||
#
|
||||
# Copyright (C) 1992-1996, 1998-2012 Free Software Foundation, Inc.
|
||||
|
|
@ -266,10 +266,10 @@ fi
|
|||
$as_echo "$0: be upgraded to zsh 4.3.4 or later."
|
||||
else
|
||||
$as_echo "$0: Please tell bug-autoconf@gnu.org and Sarah Walker
|
||||
$0: <pcem-emulator@pcem-emulator.co.uk> about your system,
|
||||
$0: including any error possibly output before this
|
||||
$0: message. Then install a modern shell, or manually run
|
||||
$0: the script under such a shell if you do have one."
|
||||
$0: <pcem@pcem-emulator.co.uk> about your system, including
|
||||
$0: any error possibly output before this message. Then
|
||||
$0: install a modern shell, or manually run the script
|
||||
$0: under such a shell if you do have one."
|
||||
fi
|
||||
exit 1
|
||||
fi
|
||||
|
|
@ -581,16 +581,37 @@ PACKAGE_NAME='PCem'
|
|||
PACKAGE_TARNAME='pcem'
|
||||
PACKAGE_VERSION='v12'
|
||||
PACKAGE_STRING='PCem v12'
|
||||
PACKAGE_BUGREPORT='Sarah Walker <pcem-emulator@pcem-emulator.co.uk>'
|
||||
PACKAGE_BUGREPORT='Sarah Walker <pcem@pcem-emulator.co.uk>'
|
||||
PACKAGE_URL=''
|
||||
|
||||
ac_subst_vars='am__EXEEXT_FALSE
|
||||
am__EXEEXT_TRUE
|
||||
LTLIBOBJS
|
||||
LIBOBJS
|
||||
WX_VERSION_MICRO
|
||||
WX_VERSION_MINOR
|
||||
WX_VERSION_MAJOR
|
||||
WX_RESCOMP
|
||||
WX_VERSION
|
||||
WX_LIBS_STATIC
|
||||
WX_LIBS
|
||||
WX_CXXFLAGS_ONLY
|
||||
WX_CFLAGS_ONLY
|
||||
WX_CXXFLAGS
|
||||
WX_CFLAGS
|
||||
WX_CPPFLAGS
|
||||
WX_CONFIG_PATH
|
||||
SDL2_CONFIG
|
||||
SDL_LIBS
|
||||
SDL_CFLAGS
|
||||
PKG_CONFIG_LIBDIR
|
||||
PKG_CONFIG_PATH
|
||||
PKG_CONFIG
|
||||
allegro_LIBS
|
||||
allegro_CFLAGS
|
||||
ALLEGRO_CONFIG
|
||||
USE_WX_FALSE
|
||||
USE_WX_TRUE
|
||||
OS_LINUX_FALSE
|
||||
OS_LINUX_TRUE
|
||||
OS_WIN_FALSE
|
||||
|
|
@ -702,9 +723,17 @@ enable_option_checking
|
|||
enable_silent_rules
|
||||
enable_dependency_tracking
|
||||
enable_debug
|
||||
enable_wx
|
||||
with_allegro_prefix
|
||||
with_allegro_exec_prefix
|
||||
enable_allegrotest
|
||||
with_sdl_prefix
|
||||
with_sdl_exec_prefix
|
||||
enable_sdltest
|
||||
with_wxdir
|
||||
with_wx_config
|
||||
with_wx_prefix
|
||||
with_wx_exec_prefix
|
||||
'
|
||||
ac_precious_vars='build_alias
|
||||
host_alias
|
||||
|
|
@ -716,7 +745,12 @@ LIBS
|
|||
CPPFLAGS
|
||||
CXX
|
||||
CXXFLAGS
|
||||
CCC'
|
||||
CCC
|
||||
PKG_CONFIG
|
||||
PKG_CONFIG_PATH
|
||||
PKG_CONFIG_LIBDIR
|
||||
SDL_CFLAGS
|
||||
SDL_LIBS'
|
||||
|
||||
|
||||
# Initialize some variables set by options.
|
||||
|
|
@ -1353,13 +1387,22 @@ Optional Features:
|
|||
--disable-dependency-tracking
|
||||
speeds up one-time build
|
||||
--enable-debug build debug executable
|
||||
--enable-wx use wxWidgets GUI
|
||||
--disable-allegrotest Do not try to compile and run a test LIBallegro program
|
||||
--disable-sdltest Do not try to compile and run a test SDL program
|
||||
|
||||
Optional Packages:
|
||||
--with-PACKAGE[=ARG] use PACKAGE [ARG=yes]
|
||||
--without-PACKAGE do not use PACKAGE (same as --with-PACKAGE=no)
|
||||
--with-allegro-prefix=PFX Prefix where liballegro is installed (optional)
|
||||
--with-allegro-exec-prefix=PFX Exec prefix where liballegro is installed (optional)
|
||||
--with-sdl-prefix=PFX Prefix where SDL is installed (optional)
|
||||
--with-sdl-exec-prefix=PFX Exec prefix where SDL is installed (optional)
|
||||
--with-wxdir=PATH Use uninstalled version of wxWidgets in PATH
|
||||
--with-wx-config=CONFIG wx-config script to use (optional)
|
||||
--with-wx-prefix=PREFIX Prefix where wxWidgets is installed (optional)
|
||||
--with-wx-exec-prefix=PREFIX
|
||||
Exec prefix where wxWidgets is installed (optional)
|
||||
|
||||
Some influential environment variables:
|
||||
CC C compiler command
|
||||
|
|
@ -1371,11 +1414,18 @@ Some influential environment variables:
|
|||
you have headers in a nonstandard directory <include dir>
|
||||
CXX C++ compiler command
|
||||
CXXFLAGS C++ compiler flags
|
||||
PKG_CONFIG path to pkg-config utility
|
||||
PKG_CONFIG_PATH
|
||||
directories to add to pkg-config's search path
|
||||
PKG_CONFIG_LIBDIR
|
||||
path overriding pkg-config's built-in search path
|
||||
SDL_CFLAGS C compiler flags for SDL, overriding pkg-config
|
||||
SDL_LIBS linker flags for SDL, overriding pkg-config
|
||||
|
||||
Use these variables to override the choices made by `configure' or to help
|
||||
it to find libraries and programs with nonstandard names/locations.
|
||||
|
||||
Report bugs to <Sarah Walker <pcem-emulator@pcem-emulator.co.uk>>.
|
||||
Report bugs to <Sarah Walker <pcem@pcem-emulator.co.uk>>.
|
||||
_ACEOF
|
||||
ac_status=$?
|
||||
fi
|
||||
|
|
@ -4093,6 +4143,21 @@ else
|
|||
$as_echo "no" >&6; }
|
||||
fi
|
||||
|
||||
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to use the wxWidgets-based GUI" >&5
|
||||
$as_echo_n "checking whether to use the wxWidgets-based GUI... " >&6; }
|
||||
# Check whether --enable-wx was given.
|
||||
if test "${enable_wx+set}" = set; then :
|
||||
enableval=$enable_wx;
|
||||
fi
|
||||
|
||||
if test "$enable_wx" = "yes"; then
|
||||
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
|
||||
$as_echo "yes" >&6; }
|
||||
else
|
||||
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
|
||||
$as_echo "no" >&6; }
|
||||
fi
|
||||
|
||||
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for cpu" >&5
|
||||
$as_echo_n "checking for cpu... " >&6; }
|
||||
case "${host_cpu}" in
|
||||
|
|
@ -4148,12 +4213,22 @@ else
|
|||
fi
|
||||
|
||||
|
||||
# Do not run test for Allegro with Win32/MinGW version, as binary builds have
|
||||
# `allegro-config' missing.
|
||||
# NOTE: For the following Autoconf macro to be supported, you need to extract
|
||||
# allegro.m4 from the DOS/Windows Allegro sources (the file is contained
|
||||
# in `misc') and copy it to this directory or MSYS's `/share/aclocal'.
|
||||
if test "$OS" != "win"; then
|
||||
if test "$enable_wx" = "yes"; then
|
||||
USE_WX_TRUE=
|
||||
USE_WX_FALSE='#'
|
||||
else
|
||||
USE_WX_TRUE='#'
|
||||
USE_WX_FALSE=
|
||||
fi
|
||||
|
||||
|
||||
if test "$enable_wx" != "yes"; then
|
||||
# Do not run test for Allegro with Win32/MinGW version, as binary builds have
|
||||
# `allegro-config' missing.
|
||||
# NOTE: For the following Autoconf macro to be supported, you need to extract
|
||||
# allegro.m4 from the DOS/Windows Allegro sources (the file is contained
|
||||
# in `misc') and copy it to this directory or MSYS's `/share/aclocal'.
|
||||
if test "$OS" != "win"; then
|
||||
|
||||
|
||||
|
||||
|
|
@ -4418,6 +4493,779 @@ rm -f core conftest.err conftest.$ac_objext \
|
|||
|
||||
rm -f conf.allegrotest
|
||||
|
||||
fi
|
||||
else
|
||||
SDL_VERSION=2.0.0
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
if test "x$ac_cv_env_PKG_CONFIG_set" != "xset"; then
|
||||
if test -n "$ac_tool_prefix"; then
|
||||
# Extract the first word of "${ac_tool_prefix}pkg-config", so it can be a program name with args.
|
||||
set dummy ${ac_tool_prefix}pkg-config; ac_word=$2
|
||||
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
|
||||
$as_echo_n "checking for $ac_word... " >&6; }
|
||||
if ${ac_cv_path_PKG_CONFIG+:} false; then :
|
||||
$as_echo_n "(cached) " >&6
|
||||
else
|
||||
case $PKG_CONFIG in
|
||||
[\\/]* | ?:[\\/]*)
|
||||
ac_cv_path_PKG_CONFIG="$PKG_CONFIG" # Let the user override the test with a path.
|
||||
;;
|
||||
*)
|
||||
as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
|
||||
for as_dir in $PATH
|
||||
do
|
||||
IFS=$as_save_IFS
|
||||
test -z "$as_dir" && as_dir=.
|
||||
for ac_exec_ext in '' $ac_executable_extensions; do
|
||||
if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
|
||||
ac_cv_path_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext"
|
||||
$as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
|
||||
break 2
|
||||
fi
|
||||
done
|
||||
done
|
||||
IFS=$as_save_IFS
|
||||
|
||||
;;
|
||||
esac
|
||||
fi
|
||||
PKG_CONFIG=$ac_cv_path_PKG_CONFIG
|
||||
if test -n "$PKG_CONFIG"; then
|
||||
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $PKG_CONFIG" >&5
|
||||
$as_echo "$PKG_CONFIG" >&6; }
|
||||
else
|
||||
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
|
||||
$as_echo "no" >&6; }
|
||||
fi
|
||||
|
||||
|
||||
fi
|
||||
if test -z "$ac_cv_path_PKG_CONFIG"; then
|
||||
ac_pt_PKG_CONFIG=$PKG_CONFIG
|
||||
# Extract the first word of "pkg-config", so it can be a program name with args.
|
||||
set dummy pkg-config; ac_word=$2
|
||||
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
|
||||
$as_echo_n "checking for $ac_word... " >&6; }
|
||||
if ${ac_cv_path_ac_pt_PKG_CONFIG+:} false; then :
|
||||
$as_echo_n "(cached) " >&6
|
||||
else
|
||||
case $ac_pt_PKG_CONFIG in
|
||||
[\\/]* | ?:[\\/]*)
|
||||
ac_cv_path_ac_pt_PKG_CONFIG="$ac_pt_PKG_CONFIG" # Let the user override the test with a path.
|
||||
;;
|
||||
*)
|
||||
as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
|
||||
for as_dir in $PATH
|
||||
do
|
||||
IFS=$as_save_IFS
|
||||
test -z "$as_dir" && as_dir=.
|
||||
for ac_exec_ext in '' $ac_executable_extensions; do
|
||||
if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
|
||||
ac_cv_path_ac_pt_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext"
|
||||
$as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
|
||||
break 2
|
||||
fi
|
||||
done
|
||||
done
|
||||
IFS=$as_save_IFS
|
||||
|
||||
;;
|
||||
esac
|
||||
fi
|
||||
ac_pt_PKG_CONFIG=$ac_cv_path_ac_pt_PKG_CONFIG
|
||||
if test -n "$ac_pt_PKG_CONFIG"; then
|
||||
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_pt_PKG_CONFIG" >&5
|
||||
$as_echo "$ac_pt_PKG_CONFIG" >&6; }
|
||||
else
|
||||
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
|
||||
$as_echo "no" >&6; }
|
||||
fi
|
||||
|
||||
if test "x$ac_pt_PKG_CONFIG" = x; then
|
||||
PKG_CONFIG=""
|
||||
else
|
||||
case $cross_compiling:$ac_tool_warned in
|
||||
yes:)
|
||||
{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
|
||||
$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
|
||||
ac_tool_warned=yes ;;
|
||||
esac
|
||||
PKG_CONFIG=$ac_pt_PKG_CONFIG
|
||||
fi
|
||||
else
|
||||
PKG_CONFIG="$ac_cv_path_PKG_CONFIG"
|
||||
fi
|
||||
|
||||
fi
|
||||
if test -n "$PKG_CONFIG"; then
|
||||
_pkg_min_version=0.9.0
|
||||
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking pkg-config is at least version $_pkg_min_version" >&5
|
||||
$as_echo_n "checking pkg-config is at least version $_pkg_min_version... " >&6; }
|
||||
if $PKG_CONFIG --atleast-pkgconfig-version $_pkg_min_version; then
|
||||
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
|
||||
$as_echo "yes" >&6; }
|
||||
else
|
||||
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
|
||||
$as_echo "no" >&6; }
|
||||
PKG_CONFIG=""
|
||||
fi
|
||||
fi
|
||||
|
||||
# Check whether --with-sdl-prefix was given.
|
||||
if test "${with_sdl_prefix+set}" = set; then :
|
||||
withval=$with_sdl_prefix; sdl_prefix="$withval"
|
||||
else
|
||||
sdl_prefix=""
|
||||
fi
|
||||
|
||||
|
||||
# Check whether --with-sdl-exec-prefix was given.
|
||||
if test "${with_sdl_exec_prefix+set}" = set; then :
|
||||
withval=$with_sdl_exec_prefix; sdl_exec_prefix="$withval"
|
||||
else
|
||||
sdl_exec_prefix=""
|
||||
fi
|
||||
|
||||
# Check whether --enable-sdltest was given.
|
||||
if test "${enable_sdltest+set}" = set; then :
|
||||
enableval=$enable_sdltest;
|
||||
else
|
||||
enable_sdltest=yes
|
||||
fi
|
||||
|
||||
|
||||
min_sdl_version=$SDL_VERSION
|
||||
|
||||
if test "x$sdl_prefix$sdl_exec_prefix" = x ; then
|
||||
|
||||
pkg_failed=no
|
||||
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for SDL" >&5
|
||||
$as_echo_n "checking for SDL... " >&6; }
|
||||
|
||||
if test -n "$SDL_CFLAGS"; then
|
||||
pkg_cv_SDL_CFLAGS="$SDL_CFLAGS"
|
||||
elif test -n "$PKG_CONFIG"; then
|
||||
if test -n "$PKG_CONFIG" && \
|
||||
{ { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"sdl2 >= \$min_sdl_version\""; } >&5
|
||||
($PKG_CONFIG --exists --print-errors "sdl2 >= $min_sdl_version") 2>&5
|
||||
ac_status=$?
|
||||
$as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
|
||||
test $ac_status = 0; }; then
|
||||
pkg_cv_SDL_CFLAGS=`$PKG_CONFIG --cflags "sdl2 >= $min_sdl_version" 2>/dev/null`
|
||||
test "x$?" != "x0" && pkg_failed=yes
|
||||
else
|
||||
pkg_failed=yes
|
||||
fi
|
||||
else
|
||||
pkg_failed=untried
|
||||
fi
|
||||
if test -n "$SDL_LIBS"; then
|
||||
pkg_cv_SDL_LIBS="$SDL_LIBS"
|
||||
elif test -n "$PKG_CONFIG"; then
|
||||
if test -n "$PKG_CONFIG" && \
|
||||
{ { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"sdl2 >= \$min_sdl_version\""; } >&5
|
||||
($PKG_CONFIG --exists --print-errors "sdl2 >= $min_sdl_version") 2>&5
|
||||
ac_status=$?
|
||||
$as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
|
||||
test $ac_status = 0; }; then
|
||||
pkg_cv_SDL_LIBS=`$PKG_CONFIG --libs "sdl2 >= $min_sdl_version" 2>/dev/null`
|
||||
test "x$?" != "x0" && pkg_failed=yes
|
||||
else
|
||||
pkg_failed=yes
|
||||
fi
|
||||
else
|
||||
pkg_failed=untried
|
||||
fi
|
||||
|
||||
|
||||
|
||||
if test $pkg_failed = yes; then
|
||||
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
|
||||
$as_echo "no" >&6; }
|
||||
|
||||
if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
|
||||
_pkg_short_errors_supported=yes
|
||||
else
|
||||
_pkg_short_errors_supported=no
|
||||
fi
|
||||
if test $_pkg_short_errors_supported = yes; then
|
||||
SDL_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "sdl2 >= $min_sdl_version" 2>&1`
|
||||
else
|
||||
SDL_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "sdl2 >= $min_sdl_version" 2>&1`
|
||||
fi
|
||||
# Put the nasty error message in config.log where it belongs
|
||||
echo "$SDL_PKG_ERRORS" >&5
|
||||
|
||||
sdl_pc=no
|
||||
elif test $pkg_failed = untried; then
|
||||
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
|
||||
$as_echo "no" >&6; }
|
||||
sdl_pc=no
|
||||
else
|
||||
SDL_CFLAGS=$pkg_cv_SDL_CFLAGS
|
||||
SDL_LIBS=$pkg_cv_SDL_LIBS
|
||||
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
|
||||
$as_echo "yes" >&6; }
|
||||
sdl_pc=yes
|
||||
fi
|
||||
else
|
||||
sdl_pc=no
|
||||
if test x$sdl_exec_prefix != x ; then
|
||||
sdl_config_args="$sdl_config_args --exec-prefix=$sdl_exec_prefix"
|
||||
if test x${SDL2_CONFIG+set} != xset ; then
|
||||
SDL2_CONFIG=$sdl_exec_prefix/bin/sdl2-config
|
||||
fi
|
||||
fi
|
||||
if test x$sdl_prefix != x ; then
|
||||
sdl_config_args="$sdl_config_args --prefix=$sdl_prefix"
|
||||
if test x${SDL2_CONFIG+set} != xset ; then
|
||||
SDL2_CONFIG=$sdl_prefix/bin/sdl2-config
|
||||
fi
|
||||
fi
|
||||
fi
|
||||
|
||||
if test "x$sdl_pc" = xyes ; then
|
||||
no_sdl=""
|
||||
SDL2_CONFIG="pkg-config sdl2"
|
||||
else
|
||||
as_save_PATH="$PATH"
|
||||
if test "x$prefix" != xNONE && test "$cross_compiling" != yes; then
|
||||
PATH="$prefix/bin:$prefix/usr/bin:$PATH"
|
||||
fi
|
||||
# Extract the first word of "sdl2-config", so it can be a program name with args.
|
||||
set dummy sdl2-config; ac_word=$2
|
||||
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
|
||||
$as_echo_n "checking for $ac_word... " >&6; }
|
||||
if ${ac_cv_path_SDL2_CONFIG+:} false; then :
|
||||
$as_echo_n "(cached) " >&6
|
||||
else
|
||||
case $SDL2_CONFIG in
|
||||
[\\/]* | ?:[\\/]*)
|
||||
ac_cv_path_SDL2_CONFIG="$SDL2_CONFIG" # Let the user override the test with a path.
|
||||
;;
|
||||
*)
|
||||
as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
|
||||
for as_dir in $PATH
|
||||
do
|
||||
IFS=$as_save_IFS
|
||||
test -z "$as_dir" && as_dir=.
|
||||
for ac_exec_ext in '' $ac_executable_extensions; do
|
||||
if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
|
||||
ac_cv_path_SDL2_CONFIG="$as_dir/$ac_word$ac_exec_ext"
|
||||
$as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
|
||||
break 2
|
||||
fi
|
||||
done
|
||||
done
|
||||
IFS=$as_save_IFS
|
||||
|
||||
test -z "$ac_cv_path_SDL2_CONFIG" && ac_cv_path_SDL2_CONFIG="no"
|
||||
;;
|
||||
esac
|
||||
fi
|
||||
SDL2_CONFIG=$ac_cv_path_SDL2_CONFIG
|
||||
if test -n "$SDL2_CONFIG"; then
|
||||
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $SDL2_CONFIG" >&5
|
||||
$as_echo "$SDL2_CONFIG" >&6; }
|
||||
else
|
||||
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
|
||||
$as_echo "no" >&6; }
|
||||
fi
|
||||
|
||||
|
||||
PATH="$as_save_PATH"
|
||||
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for SDL - version >= $min_sdl_version" >&5
|
||||
$as_echo_n "checking for SDL - version >= $min_sdl_version... " >&6; }
|
||||
no_sdl=""
|
||||
|
||||
if test "$SDL2_CONFIG" = "no" ; then
|
||||
no_sdl=yes
|
||||
else
|
||||
SDL_CFLAGS=`$SDL2_CONFIG $sdl_config_args --cflags`
|
||||
SDL_LIBS=`$SDL2_CONFIG $sdl_config_args --libs`
|
||||
|
||||
sdl_major_version=`$SDL2_CONFIG $sdl_config_args --version | \
|
||||
sed 's/\([0-9]*\).\([0-9]*\).\([0-9]*\)/\1/'`
|
||||
sdl_minor_version=`$SDL2_CONFIG $sdl_config_args --version | \
|
||||
sed 's/\([0-9]*\).\([0-9]*\).\([0-9]*\)/\2/'`
|
||||
sdl_micro_version=`$SDL2_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"
|
||||
rm -f conf.sdltest
|
||||
if test "$cross_compiling" = yes; then :
|
||||
echo $ac_n "cross compiling; assumed OK... $ac_c"
|
||||
else
|
||||
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
|
||||
/* end confdefs.h. */
|
||||
|
||||
#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*** 'sdl2-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 sdl2-config is correct, then it is\n", major, minor, micro);
|
||||
printf("*** best to upgrade to the required version.\n");
|
||||
printf("*** If sdl2-config was wrong, set the environment variable SDL2_CONFIG\n");
|
||||
printf("*** to point to the correct copy of sdl2-config, and remove the file\n");
|
||||
printf("*** config.cache before re-running configure\n");
|
||||
return 1;
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
_ACEOF
|
||||
if ac_fn_c_try_run "$LINENO"; then :
|
||||
|
||||
else
|
||||
no_sdl=yes
|
||||
fi
|
||||
rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
|
||||
conftest.$ac_objext conftest.beam conftest.$ac_ext
|
||||
fi
|
||||
|
||||
CFLAGS="$ac_save_CFLAGS"
|
||||
CXXFLAGS="$ac_save_CXXFLAGS"
|
||||
LIBS="$ac_save_LIBS"
|
||||
fi
|
||||
fi
|
||||
if test "x$no_sdl" = x ; then
|
||||
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
|
||||
$as_echo "yes" >&6; }
|
||||
else
|
||||
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
|
||||
$as_echo "no" >&6; }
|
||||
fi
|
||||
fi
|
||||
if test "x$no_sdl" = x ; then
|
||||
:
|
||||
else
|
||||
if test "$SDL2_CONFIG" = "no" ; then
|
||||
echo "*** The sdl2-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 SDL2_CONFIG environment variable to the"
|
||||
echo "*** full path to sdl2-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"
|
||||
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
|
||||
/* end confdefs.h. */
|
||||
|
||||
#include <stdio.h>
|
||||
#include "SDL.h"
|
||||
|
||||
int main(int argc, char *argv[])
|
||||
{ return 0; }
|
||||
#undef main
|
||||
#define main K_and_R_C_main
|
||||
|
||||
int
|
||||
main ()
|
||||
{
|
||||
return 0;
|
||||
;
|
||||
return 0;
|
||||
}
|
||||
_ACEOF
|
||||
if ac_fn_c_try_link "$LINENO"; then :
|
||||
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"
|
||||
else
|
||||
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 sdl2-config script: $SDL2_CONFIG"
|
||||
fi
|
||||
rm -f core conftest.err conftest.$ac_objext \
|
||||
conftest$ac_exeext conftest.$ac_ext
|
||||
CFLAGS="$ac_save_CFLAGS"
|
||||
CXXFLAGS="$ac_save_CXXFLAGS"
|
||||
LIBS="$ac_save_LIBS"
|
||||
fi
|
||||
fi
|
||||
SDL_CFLAGS=""
|
||||
SDL_LIBS=""
|
||||
as_fn_error $? "*** SDL version $SDL_VERSION not found!" "$LINENO" 5
|
||||
|
||||
fi
|
||||
|
||||
|
||||
rm -f conf.sdltest
|
||||
|
||||
|
||||
|
||||
# Check whether --with-wxdir was given.
|
||||
if test "${with_wxdir+set}" = set; then :
|
||||
withval=$with_wxdir; wx_config_name="$withval/wx-config"
|
||||
wx_config_args="--inplace"
|
||||
fi
|
||||
|
||||
|
||||
# Check whether --with-wx-config was given.
|
||||
if test "${with_wx_config+set}" = set; then :
|
||||
withval=$with_wx_config; wx_config_name="$withval"
|
||||
fi
|
||||
|
||||
|
||||
# Check whether --with-wx-prefix was given.
|
||||
if test "${with_wx_prefix+set}" = set; then :
|
||||
withval=$with_wx_prefix; wx_config_prefix="$withval"
|
||||
else
|
||||
wx_config_prefix=""
|
||||
fi
|
||||
|
||||
|
||||
# Check whether --with-wx-exec-prefix was given.
|
||||
if test "${with_wx_exec_prefix+set}" = set; then :
|
||||
withval=$with_wx_exec_prefix; wx_config_exec_prefix="$withval"
|
||||
else
|
||||
wx_config_exec_prefix=""
|
||||
fi
|
||||
|
||||
|
||||
reqwx=3.0.0
|
||||
|
||||
|
||||
if test x${WX_CONFIG_NAME+set} != xset ; then
|
||||
WX_CONFIG_NAME=wx-config
|
||||
fi
|
||||
|
||||
if test "x$wx_config_name" != x ; then
|
||||
WX_CONFIG_NAME="$wx_config_name"
|
||||
fi
|
||||
|
||||
if test x$wx_config_exec_prefix != x ; then
|
||||
wx_config_args="$wx_config_args --exec-prefix=$wx_config_exec_prefix"
|
||||
WX_LOOKUP_PATH="$wx_config_exec_prefix/bin"
|
||||
fi
|
||||
if test x$wx_config_prefix != x ; then
|
||||
wx_config_args="$wx_config_args --prefix=$wx_config_prefix"
|
||||
WX_LOOKUP_PATH="$WX_LOOKUP_PATH:$wx_config_prefix/bin"
|
||||
fi
|
||||
if test "$cross_compiling" = "yes"; then
|
||||
wx_config_args="$wx_config_args --host=$host_alias"
|
||||
fi
|
||||
|
||||
if test -x "$WX_CONFIG_NAME" ; then
|
||||
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for wx-config" >&5
|
||||
$as_echo_n "checking for wx-config... " >&6; }
|
||||
WX_CONFIG_PATH="$WX_CONFIG_NAME"
|
||||
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $WX_CONFIG_PATH" >&5
|
||||
$as_echo "$WX_CONFIG_PATH" >&6; }
|
||||
else
|
||||
# Extract the first word of "$WX_CONFIG_NAME", so it can be a program name with args.
|
||||
set dummy $WX_CONFIG_NAME; ac_word=$2
|
||||
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
|
||||
$as_echo_n "checking for $ac_word... " >&6; }
|
||||
if ${ac_cv_path_WX_CONFIG_PATH+:} false; then :
|
||||
$as_echo_n "(cached) " >&6
|
||||
else
|
||||
case $WX_CONFIG_PATH in
|
||||
[\\/]* | ?:[\\/]*)
|
||||
ac_cv_path_WX_CONFIG_PATH="$WX_CONFIG_PATH" # Let the user override the test with a path.
|
||||
;;
|
||||
*)
|
||||
as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
|
||||
as_dummy=""$WX_LOOKUP_PATH:$PATH""
|
||||
for as_dir in $as_dummy
|
||||
do
|
||||
IFS=$as_save_IFS
|
||||
test -z "$as_dir" && as_dir=.
|
||||
for ac_exec_ext in '' $ac_executable_extensions; do
|
||||
if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
|
||||
ac_cv_path_WX_CONFIG_PATH="$as_dir/$ac_word$ac_exec_ext"
|
||||
$as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
|
||||
break 2
|
||||
fi
|
||||
done
|
||||
done
|
||||
IFS=$as_save_IFS
|
||||
|
||||
test -z "$ac_cv_path_WX_CONFIG_PATH" && ac_cv_path_WX_CONFIG_PATH="no"
|
||||
;;
|
||||
esac
|
||||
fi
|
||||
WX_CONFIG_PATH=$ac_cv_path_WX_CONFIG_PATH
|
||||
if test -n "$WX_CONFIG_PATH"; then
|
||||
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $WX_CONFIG_PATH" >&5
|
||||
$as_echo "$WX_CONFIG_PATH" >&6; }
|
||||
else
|
||||
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
|
||||
$as_echo "no" >&6; }
|
||||
fi
|
||||
|
||||
|
||||
fi
|
||||
|
||||
if test "$WX_CONFIG_PATH" != "no" ; then
|
||||
WX_VERSION=""
|
||||
|
||||
min_wx_version=$reqwx
|
||||
if test -z "" ; then
|
||||
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for wxWidgets version >= $min_wx_version" >&5
|
||||
$as_echo_n "checking for wxWidgets version >= $min_wx_version... " >&6; }
|
||||
else
|
||||
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for wxWidgets version >= $min_wx_version ()" >&5
|
||||
$as_echo_n "checking for wxWidgets version >= $min_wx_version ()... " >&6; }
|
||||
fi
|
||||
|
||||
WX_CONFIG_WITH_ARGS="$WX_CONFIG_PATH $wx_config_args "
|
||||
|
||||
WX_VERSION=`$WX_CONFIG_WITH_ARGS --version 2>/dev/null`
|
||||
wx_config_major_version=`echo $WX_VERSION | \
|
||||
sed 's/\([0-9]*\).\([0-9]*\).\([0-9]*\)/\1/'`
|
||||
wx_config_minor_version=`echo $WX_VERSION | \
|
||||
sed 's/\([0-9]*\).\([0-9]*\).\([0-9]*\)/\2/'`
|
||||
wx_config_micro_version=`echo $WX_VERSION | \
|
||||
sed 's/\([0-9]*\).\([0-9]*\).\([0-9]*\)/\3/'`
|
||||
|
||||
wx_requested_major_version=`echo $min_wx_version | \
|
||||
sed 's/\([0-9]*\).\([0-9]*\).\([0-9]*\)/\1/'`
|
||||
wx_requested_minor_version=`echo $min_wx_version | \
|
||||
sed 's/\([0-9]*\).\([0-9]*\).\([0-9]*\)/\2/'`
|
||||
wx_requested_micro_version=`echo $min_wx_version | \
|
||||
sed 's/\([0-9]*\).\([0-9]*\).\([0-9]*\)/\3/'`
|
||||
|
||||
|
||||
wx_ver_ok=""
|
||||
if test "x$WX_VERSION" != x ; then
|
||||
if test $wx_config_major_version -gt $wx_requested_major_version; then
|
||||
wx_ver_ok=yes
|
||||
else
|
||||
if test $wx_config_major_version -eq $wx_requested_major_version; then
|
||||
if test $wx_config_minor_version -gt $wx_requested_minor_version; then
|
||||
wx_ver_ok=yes
|
||||
else
|
||||
if test $wx_config_minor_version -eq $wx_requested_minor_version; then
|
||||
if test $wx_config_micro_version -ge $wx_requested_micro_version; then
|
||||
wx_ver_ok=yes
|
||||
fi
|
||||
fi
|
||||
fi
|
||||
fi
|
||||
fi
|
||||
fi
|
||||
|
||||
|
||||
if test -n "$wx_ver_ok"; then
|
||||
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes (version $WX_VERSION)" >&5
|
||||
$as_echo "yes (version $WX_VERSION)" >&6; }
|
||||
WX_LIBS=`$WX_CONFIG_WITH_ARGS --libs `
|
||||
|
||||
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for wxWidgets static library" >&5
|
||||
$as_echo_n "checking for wxWidgets static library... " >&6; }
|
||||
WX_LIBS_STATIC=`$WX_CONFIG_WITH_ARGS --static --libs 2>/dev/null`
|
||||
if test "x$WX_LIBS_STATIC" = "x"; then
|
||||
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
|
||||
$as_echo "no" >&6; }
|
||||
else
|
||||
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
|
||||
$as_echo "yes" >&6; }
|
||||
fi
|
||||
|
||||
wx_has_cppflags=""
|
||||
if test $wx_config_major_version -gt 2; then
|
||||
wx_has_cppflags=yes
|
||||
else
|
||||
if test $wx_config_major_version -eq 2; then
|
||||
if test $wx_config_minor_version -gt 2; then
|
||||
wx_has_cppflags=yes
|
||||
else
|
||||
if test $wx_config_minor_version -eq 2; then
|
||||
if test $wx_config_micro_version -ge 6; then
|
||||
wx_has_cppflags=yes
|
||||
fi
|
||||
fi
|
||||
fi
|
||||
fi
|
||||
fi
|
||||
|
||||
wx_has_rescomp=""
|
||||
if test $wx_config_major_version -gt 2; then
|
||||
wx_has_rescomp=yes
|
||||
else
|
||||
if test $wx_config_major_version -eq 2; then
|
||||
if test $wx_config_minor_version -ge 7; then
|
||||
wx_has_rescomp=yes
|
||||
fi
|
||||
fi
|
||||
fi
|
||||
if test "x$wx_has_rescomp" = x ; then
|
||||
WX_RESCOMP=
|
||||
else
|
||||
WX_RESCOMP=`$WX_CONFIG_WITH_ARGS --rescomp`
|
||||
fi
|
||||
|
||||
if test "x$wx_has_cppflags" = x ; then
|
||||
WX_CFLAGS=`$WX_CONFIG_WITH_ARGS --cflags `
|
||||
WX_CPPFLAGS=$WX_CFLAGS
|
||||
WX_CXXFLAGS=$WX_CFLAGS
|
||||
|
||||
WX_CFLAGS_ONLY=$WX_CFLAGS
|
||||
WX_CXXFLAGS_ONLY=$WX_CFLAGS
|
||||
else
|
||||
WX_CPPFLAGS=`$WX_CONFIG_WITH_ARGS --cppflags `
|
||||
WX_CXXFLAGS=`$WX_CONFIG_WITH_ARGS --cxxflags `
|
||||
WX_CFLAGS=`$WX_CONFIG_WITH_ARGS --cflags `
|
||||
|
||||
WX_CFLAGS_ONLY=`echo $WX_CFLAGS | sed "s@^$WX_CPPFLAGS *@@"`
|
||||
WX_CXXFLAGS_ONLY=`echo $WX_CXXFLAGS | sed "s@^$WX_CFLAGS *@@"`
|
||||
fi
|
||||
|
||||
wxWin=1
|
||||
|
||||
else
|
||||
|
||||
if test "x$WX_VERSION" = x; then
|
||||
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
|
||||
$as_echo "no" >&6; }
|
||||
else
|
||||
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no (version $WX_VERSION is not new enough)" >&5
|
||||
$as_echo "no (version $WX_VERSION is not new enough)" >&6; }
|
||||
fi
|
||||
|
||||
WX_CFLAGS=""
|
||||
WX_CPPFLAGS=""
|
||||
WX_CXXFLAGS=""
|
||||
WX_LIBS=""
|
||||
WX_LIBS_STATIC=""
|
||||
WX_RESCOMP=""
|
||||
|
||||
if test ! -z ""; then
|
||||
|
||||
wx_error_message="
|
||||
The configuration you asked for $PACKAGE_NAME requires a wxWidgets
|
||||
build with the following settings:
|
||||
|
||||
but such build is not available.
|
||||
|
||||
To see the wxWidgets builds available on this system, please use
|
||||
'wx-config --list' command. To use the default build, returned by
|
||||
'wx-config --selected-config', use the options with their 'auto'
|
||||
default values."
|
||||
|
||||
fi
|
||||
|
||||
wx_error_message="
|
||||
The requested wxWidgets build couldn't be found.
|
||||
$wx_error_message
|
||||
|
||||
If you still get this error, then check that 'wx-config' is
|
||||
in path, the directory where wxWidgets libraries are installed
|
||||
(returned by 'wx-config --libs' command) is in LD_LIBRARY_PATH
|
||||
or equivalent variable and wxWidgets version is $reqwx or above."
|
||||
|
||||
as_fn_error $? "$wx_error_message" "$LINENO" 5
|
||||
|
||||
fi
|
||||
else
|
||||
|
||||
WX_CFLAGS=""
|
||||
WX_CPPFLAGS=""
|
||||
WX_CXXFLAGS=""
|
||||
WX_LIBS=""
|
||||
WX_LIBS_STATIC=""
|
||||
WX_RESCOMP=""
|
||||
|
||||
:
|
||||
|
||||
fi
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
WX_VERSION_MAJOR="$wx_config_major_version"
|
||||
WX_VERSION_MINOR="$wx_config_minor_version"
|
||||
WX_VERSION_MICRO="$wx_config_micro_version"
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
if test "$wxWin" != 1; then
|
||||
as_fn_error $? "
|
||||
wxWidgets must be installed on your system.
|
||||
|
||||
Please check that wx-config is in path, the directory
|
||||
where wxWidgets libraries are installed (returned by
|
||||
'wx-config --libs' or 'wx-config --static --libs' command)
|
||||
is in LD_LIBRARY_PATH or equivalent variable and
|
||||
wxWidgets version is $reqwx or above.
|
||||
" "$LINENO" 5
|
||||
fi
|
||||
LIBS="$LIBS $WX_LIBS $SDL_LIBS"
|
||||
fi
|
||||
|
||||
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for alGetError in -lopenal" >&5
|
||||
|
|
@ -4756,6 +5604,10 @@ if test -z "${OS_LINUX_TRUE}" && test -z "${OS_LINUX_FALSE}"; then
|
|||
as_fn_error $? "conditional \"OS_LINUX\" was never defined.
|
||||
Usually this means the macro was only invoked conditionally." "$LINENO" 5
|
||||
fi
|
||||
if test -z "${USE_WX_TRUE}" && test -z "${USE_WX_FALSE}"; then
|
||||
as_fn_error $? "conditional \"USE_WX\" was never defined.
|
||||
Usually this means the macro was only invoked conditionally." "$LINENO" 5
|
||||
fi
|
||||
|
||||
: "${CONFIG_STATUS=./config.status}"
|
||||
ac_write_fail=0
|
||||
|
|
@ -5204,7 +6056,7 @@ $config_files
|
|||
Configuration commands:
|
||||
$config_commands
|
||||
|
||||
Report bugs to <Sarah Walker <pcem-emulator@pcem-emulator.co.uk>>."
|
||||
Report bugs to <Sarah Walker <pcem@pcem-emulator.co.uk>>."
|
||||
|
||||
_ACEOF
|
||||
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
|
||||
|
|
|
|||
52
configure.ac
52
configure.ac
|
|
@ -2,7 +2,7 @@
|
|||
#
|
||||
|
||||
AC_PREREQ([2.61])
|
||||
AC_INIT(PCem, v12, Sarah Walker <pcem-emulator@pcem-emulator.co.uk>, pcem)
|
||||
AC_INIT(PCem, v12, Sarah Walker <pcem@pcem-emulator.co.uk>, pcem)
|
||||
|
||||
AC_CANONICAL_HOST
|
||||
|
||||
|
|
@ -24,6 +24,15 @@ else
|
|||
AC_MSG_RESULT([no])
|
||||
fi
|
||||
|
||||
AC_MSG_CHECKING([whether to use the wxWidgets-based GUI])
|
||||
AC_ARG_ENABLE(wx,
|
||||
AC_HELP_STRING([--enable-wx], [use wxWidgets GUI]))
|
||||
if test "$enable_wx" = "yes"; then
|
||||
AC_MSG_RESULT([yes])
|
||||
else
|
||||
AC_MSG_RESULT([no])
|
||||
fi
|
||||
|
||||
AC_MSG_CHECKING([for cpu])
|
||||
case "${host_cpu}" in
|
||||
i?86)
|
||||
|
|
@ -48,14 +57,39 @@ AM_CONDITIONAL(CPU_X86_64, test "$CPU" = "x86_64")
|
|||
AM_CONDITIONAL(OS_WIN, test "$OS" = "win")
|
||||
AM_CONDITIONAL(OS_LINUX, test "$OS" = "linux")
|
||||
|
||||
# Do not run test for Allegro with Win32/MinGW version, as binary builds have
|
||||
# `allegro-config' missing.
|
||||
# NOTE: For the following Autoconf macro to be supported, you need to extract
|
||||
# allegro.m4 from the DOS/Windows Allegro sources (the file is contained
|
||||
# in `misc') and copy it to this directory or MSYS's `/share/aclocal'.
|
||||
if test "$OS" != "win"; then
|
||||
AC_CONFIG_MACRO_DIR([./])
|
||||
AM_PATH_ALLEGRO(, , AC_MSG_ERROR(building PCem requires Allegro to be installed))
|
||||
AM_CONDITIONAL(USE_WX, test "$enable_wx" = "yes")
|
||||
|
||||
if test "$enable_wx" != "yes"; then
|
||||
# Do not run test for Allegro with Win32/MinGW version, as binary builds have
|
||||
# `allegro-config' missing.
|
||||
# NOTE: For the following Autoconf macro to be supported, you need to extract
|
||||
# allegro.m4 from the DOS/Windows Allegro sources (the file is contained
|
||||
# in `misc') and copy it to this directory or MSYS's `/share/aclocal'.
|
||||
if test "$OS" != "win"; then
|
||||
AC_CONFIG_MACRO_DIR([./])
|
||||
AM_PATH_ALLEGRO(, , AC_MSG_ERROR(building PCem requires Allegro to be installed))
|
||||
fi
|
||||
else
|
||||
SDL_VERSION=2.0.0
|
||||
AM_PATH_SDL2($SDL_VERSION,
|
||||
:,
|
||||
AC_MSG_ERROR([*** SDL version $SDL_VERSION not found!])
|
||||
)
|
||||
AM_OPTIONS_WXCONFIG
|
||||
reqwx=3.0.0
|
||||
AM_PATH_WXCONFIG($reqwx, wxWin=1)
|
||||
if test "$wxWin" != 1; then
|
||||
AC_MSG_ERROR([
|
||||
wxWidgets must be installed on your system.
|
||||
|
||||
Please check that wx-config is in path, the directory
|
||||
where wxWidgets libraries are installed (returned by
|
||||
'wx-config --libs' or 'wx-config --static --libs' command)
|
||||
is in LD_LIBRARY_PATH or equivalent variable and
|
||||
wxWidgets version is $reqwx or above.
|
||||
])
|
||||
fi
|
||||
LIBS="$LIBS $WX_LIBS $SDL_LIBS"
|
||||
fi
|
||||
|
||||
AC_CHECK_LIB([openal], [alGetError], [], \
|
||||
|
|
|
|||
|
|
@ -10,13 +10,7 @@ CLEANFILES = $(noinst_SCRIPTS)
|
|||
amrefresh:
|
||||
|
||||
|
||||
pcem_CFLAGS = $(allegro_CFLAGS) -DPCEM_ALLEGRO
|
||||
|
||||
pcem_LDADD = $(allegro_LIBS) -lopenal
|
||||
|
||||
pcem_SOURCES = 386.c 386_dynarec.c 386_dynarec_ops.c 808x.c acer386sx.c ali1429.c allegro-gui.c \
|
||||
allegro-gui-config-sel.c allegro-gui-configure.c allegro-gui-deviceconfig.c allegro-gui-hdconf.c allegro-joystick.c allegro-keyboard.c allegro-main.c \
|
||||
allegro-midi.c allegro-mouse.c allegro-video.c amstrad.c cdrom-ioctl-linux.c cdrom-image.cc cdrom-null.c \
|
||||
pcem_SOURCES = 386.c 386_dynarec.c 386_dynarec_ops.c 808x.c acer386sx.c ali1429.c amstrad.c cdrom-ioctl-linux.c cdrom-image.cc cdrom-null.c \
|
||||
codegen.c codegen_ops.c codegen_timing_486.c codegen_timing_686.c codegen_timing_pentium.c codegen_timing_winchip.c compaq.c config.c cpu.c \
|
||||
dac.c dells200.c device.c disc.c disc_fdi.c disc_img.c disc_sector.c dma.c fdc.c fdc37c665.c fdd.c fdi2raw.c gameport.c \
|
||||
hdd.c hdd_esdi.c headland.c i430lx.c i430fx.c i430vx.c ide.c intel.c intel_flash.c io.c jim.c joystick_ch_flightstick_pro.c joystick_standard.c joystick_sw_pad.c \
|
||||
|
|
@ -25,7 +19,7 @@ lpt.c mca.c mcr.c mem.c mfm_at.c mfm_xebec.c model.c mouse.c mouse_ps2.c mouse_s
|
|||
opti495.c pc.c pci.c pic.c piix.c pit.c ppi.c ps1.c ps2.c ps2_mca.c ps2_nvr.c rom.c rtc.c scat.c serial.c sis496.c sound.c \
|
||||
sound_ad1848.c sound_adlib.c sound_adlibgold.c sound_cms.c sound_emu8k.c sound_gus.c \
|
||||
sound_mpu401_uart.c sound_opl.c sound_pas16.c sound_ps1.c sound_pssj.c sound_sb.c sound_sb_dsp.c sound_sn76489.c \
|
||||
sound_speaker.c sound_ssi2001.c sound_wss.c sound_ym7128.c soundopenal.c tandy_eeprom.c tandy_rom.c thread-pthread.c \
|
||||
sound_speaker.c sound_ssi2001.c sound_wss.c sound_ym7128.c soundopenal.c tandy_eeprom.c tandy_rom.c \
|
||||
timer.c um8669f.c um8881f.c vid_ati_eeprom.c vid_ati_mach64.c vid_ati18800.c vid_ati28800.c \
|
||||
vid_ati68860_ramdac.c vid_cga.c vid_cl5429.c vid_colorplus.c vid_ega.c vid_et4000.c vid_et4000w32.c vid_genius.c vid_hercules.c \
|
||||
vid_icd2061.c vid_ics2595.c vid_incolor.c vid_mda.c vid_olivetti_m24.c vid_oti067.c vid_paradise.c vid_pc200.c \
|
||||
|
|
@ -40,6 +34,23 @@ resid-fp/wave6581_P_T.cc resid-fp/wave6581__ST.cc resid-fp/wave8580_PS_.cc \
|
|||
resid-fp/wave8580_PST.cc resid-fp/wave8580_P_T.cc resid-fp/wave8580__ST.cc \
|
||||
resid-fp/wave.cc
|
||||
|
||||
if USE_WX
|
||||
pcem_CFLAGS = $(shell wx-config --cxxflags) $(shell sdl2-config --cflags)
|
||||
pcem_CXXFLAGS = $(shell wx-config --cxxflags) $(shell sdl2-config --cflags)
|
||||
pcem_LDADD = @LIBS@
|
||||
pcem_SOURCES += wx-main.cc wx-config_sel.c wx-dialogbox.cc wx-utils.cc wx-app.cc \
|
||||
wx-sdl2-joystick.c wx-sdl2-mouse.c wx-sdl2-keyboard.c wx-sdl2-video.c wx-sdl2-midi.c \
|
||||
wx-sdl2.c wx-config.c wx-deviceconfig.cc wx-sdl2-hdconf.c wx-status.cc wx-sdl2-status.c \
|
||||
wx-resources.cpp wx-thread.c wx-common.c wx-sdl2-display.c
|
||||
else
|
||||
pcem_CFLAGS = $(allegro_CFLAGS) -DPCEM_ALLEGRO
|
||||
pcem_LDADD = $(allegro_LIBS) -lopenal
|
||||
pcem_SOURCES += allegro-gui.c allegro-gui-config-sel.c allegro-gui-configure.c \
|
||||
allegro-gui-deviceconfig.c allegro-gui-hdconf.c allegro-joystick.c \
|
||||
allegro-keyboard.c allegro-main.c allegro-midi.c allegro-mouse.c allegro-video.c \
|
||||
thread-pthread.c
|
||||
endif
|
||||
|
||||
if CPU_I386
|
||||
pcem_SOURCES += codegen_x86.c
|
||||
pcem_CFLAGS += -msse2
|
||||
|
|
|
|||
1368
src/Makefile.in
1368
src/Makefile.in
File diff suppressed because it is too large
Load diff
Loading…
Reference in a new issue