mirror of
https://github.com/nishiowo/nishbox
synced 2025-04-21 04:04:39 +00:00
link stdc++
This commit is contained in:
parent
dc0e72e56f
commit
3f481ee5fd
4
config.status
generated
4
config.status
generated
@ -603,8 +603,8 @@ S["LUA_SOURCES"]=" ../external/lua/lapi.c ../external/lua/lauxlib.c ../external/
|
||||
"./external/lua/lobject.c ../external/lua/lopcodes.c ../external/lua/loslib.c ../external/lua/lparser.c ../external/lua/lstate.c ../external/lua/lstr"\
|
||||
"ing.c ../external/lua/lstrlib.c ../external/lua/ltable.c ../external/lua/ltablib.c ../external/lua/ltests.c ../external/lua/ltm.c ../external/lua/lu"\
|
||||
"a.c ../external/lua/lundump.c ../external/lua/lutf8lib.c ../external/lua/lvm.c ../external/lua/lzio.c ../external/lua/onelua.c"
|
||||
S["NB_LDADD"]="-Wl,-rpath,/usr/X11R7/lib -L/usr/X11R7/lib -lX11 -Wl,-rpath,/usr/X11R7/lib -L/usr/X11R7/lib -lGL -L/usr/X11R7/lib -lGLU -Wl,-rpath,/usr/X11R7/lib -"\
|
||||
"lGL -Wl,-R/usr/pkg/lib -L/usr/pkg/lib -lode"
|
||||
S["NB_LDADD"]="-lstdc++ -Wl,-rpath,/usr/X11R7/lib -L/usr/X11R7/lib -lX11 -Wl,-rpath,/usr/X11R7/lib -L/usr/X11R7/lib -lGL -L/usr/X11R7/lib -lGLU -Wl,-rpath,/usr/X1"\
|
||||
"1R7/lib -lGL -Wl,-R/usr/pkg/lib -L/usr/pkg/lib -lode"
|
||||
S["NB_CPPFLAGS"]="-DHAVE_UNISTD_H=1 -DHAVE_STDARG_H=1 -I/usr/X11R7/include -D_REENTRANT -I/usr/X11R7/include -D_REENTRANT -I/usr/X11R7/include/libdrm -I/usr/X11R7/inc"\
|
||||
"lude -D_REENTRANT -I/usr/X11R7/include/libdrm -I/usr/pkg/include"
|
||||
S["NB_BACKEND"]="GLX"
|
||||
|
45
configure
generated
vendored
45
configure
generated
vendored
@ -6469,8 +6469,51 @@ esac
|
||||
fi
|
||||
|
||||
|
||||
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for main in -lstdc++" >&5
|
||||
printf %s "checking for main in -lstdc++... " >&6; }
|
||||
if test ${ac_cv_lib_stdcpp_main+y}
|
||||
then :
|
||||
printf %s "(cached) " >&6
|
||||
else case e in #(
|
||||
e) ac_check_lib_save_LIBS=$LIBS
|
||||
LIBS="-lstdc++ $LIBS"
|
||||
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
|
||||
/* end confdefs.h. */
|
||||
|
||||
|
||||
int
|
||||
main (void)
|
||||
{
|
||||
return main ();
|
||||
;
|
||||
return 0;
|
||||
}
|
||||
_ACEOF
|
||||
if ac_fn_c_try_link "$LINENO"
|
||||
then :
|
||||
ac_cv_lib_stdcpp_main=yes
|
||||
else case e in #(
|
||||
e) ac_cv_lib_stdcpp_main=no ;;
|
||||
esac
|
||||
fi
|
||||
rm -f core conftest.err conftest.$ac_objext conftest.beam \
|
||||
conftest$ac_exeext conftest.$ac_ext
|
||||
LIBS=$ac_check_lib_save_LIBS ;;
|
||||
esac
|
||||
fi
|
||||
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_stdcpp_main" >&5
|
||||
printf "%s\n" "$ac_cv_lib_stdcpp_main" >&6; }
|
||||
if test "x$ac_cv_lib_stdcpp_main" = xyes
|
||||
then :
|
||||
STDCXX_LIBS="-lstdc++"
|
||||
else case e in #(
|
||||
e) : ;;
|
||||
esac
|
||||
fi
|
||||
|
||||
|
||||
NB_CPPFLAGS="$UNISTD_CFLAGS $STDARG_CFLAGS $GL_MORE_CFLAGS $GL_CFLAGS $GLU_CFLAGS $ODE_CFLAGS"
|
||||
NB_LDADD="$GL_MORE_LIBS $SOCKET_LIBS $GL_LIBS $GLU_LIBS $ODE_LIBS"
|
||||
NB_LDADD="$STDCXX_LIBS $GL_MORE_LIBS $SOCKET_LIBS $GL_LIBS $GLU_LIBS $ODE_LIBS"
|
||||
|
||||
|
||||
|
||||
|
@ -48,8 +48,10 @@ AC_CHECK_LIB(socket,socket,SOCKET_LIBS="-lsocket",:)
|
||||
AC_CHECK_HEADER(unistd.h,UNISTD_CFLAGS="-DHAVE_UNISTD_H=1",:)
|
||||
AC_CHECK_HEADER(stdarg.h,STDARG_CFLAGS="-DHAVE_STDARG_H=1",:)
|
||||
|
||||
AC_CHECK_LIB(stdc++,main,STDCXX_LIBS="-lstdc++",:)
|
||||
|
||||
NB_CPPFLAGS="$UNISTD_CFLAGS $STDARG_CFLAGS $GL_MORE_CFLAGS $GL_CFLAGS $GLU_CFLAGS $ODE_CFLAGS"
|
||||
NB_LDADD="$GL_MORE_LIBS $SOCKET_LIBS $GL_LIBS $GLU_LIBS $ODE_LIBS"
|
||||
NB_LDADD="$STDCXX_LIBS $GL_MORE_LIBS $SOCKET_LIBS $GL_LIBS $GLU_LIBS $ODE_LIBS"
|
||||
|
||||
AC_SUBST(NB_DRIVER)
|
||||
AC_SUBST(NB_BACKEND)
|
||||
|
Loading…
x
Reference in New Issue
Block a user