mirror of
https://git.code.sf.net/p/quake/quakeforge
synced 2025-05-11 10:10:48 +00:00
Okay, WildCode, check this.
This commit is contained in:
parent
b0dc19310a
commit
edea800aeb
1 changed files with 69 additions and 61 deletions
68
configure.ac
68
configure.ac
|
@ -42,30 +42,33 @@ endian=""
|
||||||
case "$host_os" in
|
case "$host_os" in
|
||||||
mingw32*)
|
mingw32*)
|
||||||
mingw=yes
|
mingw=yes
|
||||||
CPPFLAGS="$CPPFLAGS -I\$(top_srcdir)/include/win32"
|
CFLAGS="$CFLAGS -I\$(top_srcdir)/include/win32"
|
||||||
CPPFLAGS="$CPPFLAGS -I\$(top_srcdir)/include/win32/resources"
|
CFLAGS="$CFLAGS -I\$(top_srcdir)/include/win32/resources"
|
||||||
if test $host != $build; then
|
if test "$host" != "$build"; then
|
||||||
CC=$host_cpu-$host_os-gcc
|
CC="$host_cpu-$host_os-gcc"
|
||||||
AS=$host_cpu-$host_os-gcc
|
AS="$CC"
|
||||||
AR=$host_cpu-$host_os-ar
|
AR="$host_cpu-$host_os-ar"
|
||||||
RANLIB=$host_cpu-$host_os-ranlib
|
RANLIB="$host_cpu-$host_os-ranlib"
|
||||||
endian="little"
|
endian="little"
|
||||||
fi
|
fi
|
||||||
;;
|
;;
|
||||||
cygwin*)
|
cygwin*)
|
||||||
cygwin=yes
|
cygwin=yes
|
||||||
CPPFLAGS="$CPPFLAGS -mwindows -mno-cygwin"
|
if test "$host" != "$build"; then
|
||||||
CPPFLAGS="$CPPFLAGS -I\$(top_srcdir)/include/win32"
|
CC="$host_cpu-$host_os-gcc"
|
||||||
CPPFLAGS="$CPPFLAGS -I\$(top_srcdir)/include/win32/resources"
|
AS="$CC"
|
||||||
if test $host != $build; then
|
AR="$host_cpu_$host_os-ar"
|
||||||
CC=$host_cpu-$host_os-gcc
|
RANLIB="$host_cpu-$host_os-ranlib"
|
||||||
AS=$host_cpu-$host_os-gcc
|
case "$target" in
|
||||||
AR=$host_cpu_$host_os-ar
|
*mingw32)
|
||||||
RANLIB=$host_cpu-$host_os-ranlib
|
mingw=yes
|
||||||
|
CFLAGS="$CFLAGS -mno-cygwin -mwindows"
|
||||||
|
CFLAGS="$CFLAGS -I\$(top_srcdir)/include/win32"
|
||||||
|
CFLAGS="$CFLAGS -I\$(top_srcdir)/include/win32/resources"
|
||||||
endian="little"
|
endian="little"
|
||||||
|
;;
|
||||||
|
esac
|
||||||
fi
|
fi
|
||||||
LDFLAGS="$LDFLAGS -L/usr/local/lib"
|
|
||||||
LDFLAGS="$LDFLAGS -lSDL -mwindows -mno-cygwin"
|
|
||||||
;;
|
;;
|
||||||
esac
|
esac
|
||||||
|
|
||||||
|
@ -886,7 +889,8 @@ SAVELIBS="$LIBS"
|
||||||
LIBS="$LIBS -lwsock32"
|
LIBS="$LIBS -lwsock32"
|
||||||
AC_TRY_LINK([
|
AC_TRY_LINK([
|
||||||
#include <winsock.h>
|
#include <winsock.h>
|
||||||
],[
|
],
|
||||||
|
[
|
||||||
connect(0, NULL, 42);
|
connect(0, NULL, 42);
|
||||||
],
|
],
|
||||||
NET_LIBS="$NET_LIBS -lwsock32 -lwinmm"
|
NET_LIBS="$NET_LIBS -lwsock32 -lwinmm"
|
||||||
|
@ -912,9 +916,10 @@ if test "x$ac_cv_func_connect" != "xyes"; then
|
||||||
LIBS="$LIBS -lwsock32"
|
LIBS="$LIBS -lwsock32"
|
||||||
AC_TRY_LINK([
|
AC_TRY_LINK([
|
||||||
#include <winsock.h>
|
#include <winsock.h>
|
||||||
],[
|
],
|
||||||
connect(0, NULL, 42);
|
[
|
||||||
],
|
connect (0, NULL, 42);
|
||||||
|
],
|
||||||
NET_LIBS="$NET_LIBS -lwsock32 -lwinmm"
|
NET_LIBS="$NET_LIBS -lwsock32 -lwinmm"
|
||||||
AC_MSG_RESULT(yes),
|
AC_MSG_RESULT(yes),
|
||||||
AC_MSG_RESULT(no)
|
AC_MSG_RESULT(no)
|
||||||
|
@ -937,10 +942,10 @@ else
|
||||||
fi
|
fi
|
||||||
|
|
||||||
dnl Set $prefix and $exec_prefix to $ac_default_prefix if they are not set
|
dnl Set $prefix and $exec_prefix to $ac_default_prefix if they are not set
|
||||||
test "x$prefix" = xNONE && prefix=$ac_default_prefix
|
test "x$prefix" = "xNONE" && prefix=$ac_default_prefix
|
||||||
test "x$exec_prefix" = xNONE && exec_prefix="${prefix}"
|
test "x$exec_prefix" = "xNONE" && exec_prefix="${prefix}"
|
||||||
|
|
||||||
if test "x$SYSTYPE" = xWIN32; then
|
if test "x$SYSTYPE" = "xWIN32"; then
|
||||||
default_globalconf="~/${PACKAGE}.conf"
|
default_globalconf="~/${PACKAGE}.conf"
|
||||||
default_userconf="~/${PACKAGE}rc"
|
default_userconf="~/${PACKAGE}rc"
|
||||||
default_sharepath="."
|
default_sharepath="."
|
||||||
|
@ -1016,7 +1021,6 @@ AC_SUBST(plugindir)
|
||||||
AC_SUBST(PLUGINDIR)
|
AC_SUBST(PLUGINDIR)
|
||||||
|
|
||||||
dnl CFLAGS for release and devel versions
|
dnl CFLAGS for release and devel versions
|
||||||
CFLAGS=""
|
|
||||||
AC_ARG_ENABLE(debug,
|
AC_ARG_ENABLE(debug,
|
||||||
[ --disable-debug compile without debugging],
|
[ --disable-debug compile without debugging],
|
||||||
debug=$enable_debug
|
debug=$enable_debug
|
||||||
|
@ -1037,8 +1041,8 @@ AC_ARG_ENABLE(optimize,
|
||||||
)
|
)
|
||||||
|
|
||||||
AC_ARG_ENABLE(typecheck-progs,
|
AC_ARG_ENABLE(typecheck-progs,
|
||||||
[ --disable-typecheck-progs disable type checking on progs field access])
|
[ --enable-typecheck-progs Enable type checking on progs field access])
|
||||||
if test "x$enable_typecheck_progs" $cvs_def_enabled; then
|
if test "x$enable_typecheck_progs" = xyes; then
|
||||||
AC_DEFINE(TYPECHECK_PROGS)
|
AC_DEFINE(TYPECHECK_PROGS)
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
@ -1084,7 +1088,6 @@ if test "x$optimize" = xyes; then
|
||||||
fi
|
fi
|
||||||
else
|
else
|
||||||
AC_MSG_RESULT(no)
|
AC_MSG_RESULT(no)
|
||||||
CFLAGS="$CFLAGS "
|
|
||||||
fi
|
fi
|
||||||
|
|
||||||
dnl CFLAGS for release and devel versions
|
dnl CFLAGS for release and devel versions
|
||||||
|
@ -1108,8 +1111,13 @@ if test "x$GCC" = xyes; then
|
||||||
AC_MSG_CHECKING(for -pipe vs -save-temps)
|
AC_MSG_CHECKING(for -pipe vs -save-temps)
|
||||||
AC_ARG_ENABLE(save-temps,
|
AC_ARG_ENABLE(save-temps,
|
||||||
[ --enable-save-temps save temporary files],
|
[ --enable-save-temps save temporary files],
|
||||||
AC_MSG_RESULT(-save-temps); CFLAGS="$CFLAGS -save-temps"; BUILD_TYPE="$BUILD_TYPE Save-temps",
|
AC_MSG_RESULT(-save-temps)
|
||||||
AC_MSG_RESULT(-pipe); check_pipe=yes)
|
CFLAGS="$CFLAGS -save-temps"
|
||||||
|
BUILD_TYPE="$BUILD_TYPE Save-temps"
|
||||||
|
,
|
||||||
|
AC_MSG_RESULT(-pipe)
|
||||||
|
check_pipe=yes
|
||||||
|
)
|
||||||
fi
|
fi
|
||||||
if test "x$check_pipe" = xyes; then
|
if test "x$check_pipe" = xyes; then
|
||||||
AC_MSG_CHECKING(whether -pipe works)
|
AC_MSG_CHECKING(whether -pipe works)
|
||||||
|
|
Loading…
Reference in a new issue