mirror of https://github.com/odrling/Aegisub
parent
9d812a8aac
commit
47c95e5fe5
|
@ -88,7 +88,7 @@ script:
|
||||||
else
|
else
|
||||||
mkdir build-dir;
|
mkdir build-dir;
|
||||||
cd build-dir;
|
cd build-dir;
|
||||||
cmake -DCMAKE_CXX_FLAGS='-Wall -Wextra -Wno-unused-parameter -pedantic' -DCMAKE_C_FLAGS='-Wall' -DWITH_STARTUPLOG=ON -DWITH_TEST=ON ..;
|
cmake -DCMAKE_CXX_FLAGS='-Wall -Wextra -Wno-unused-parameter -pedantic' -DCMAKE_C_FLAGS='-Wall -Wextra -Wno-unused-parameter' -DWITH_STARTUPLOG=ON -DWITH_TEST=ON ..;
|
||||||
make -j2 || travis_terminate 1;
|
make -j2 || travis_terminate 1;
|
||||||
make test || travis_terminate 1;
|
make test || travis_terminate 1;
|
||||||
fi
|
fi
|
||||||
|
|
|
@ -142,11 +142,9 @@ AC_ARG_ENABLE(compiler-flags, AS_HELP_STRING([--disable-compiler-flags],[Disable
|
||||||
AS_IF([test x$enable_compiler_flags != xno], [
|
AS_IF([test x$enable_compiler_flags != xno], [
|
||||||
CFLAGS="$CFLAGS -Wall -Wextra -Wno-unused-parameter"
|
CFLAGS="$CFLAGS -Wall -Wextra -Wno-unused-parameter"
|
||||||
CXXFLAGS="$CXXFLAGS -Wall -Wextra -Wno-unused-parameter -fno-strict-aliasing"
|
CXXFLAGS="$CXXFLAGS -Wall -Wextra -Wno-unused-parameter -fno-strict-aliasing"
|
||||||
AC_C_FLAG([-std=gnu99])
|
|
||||||
|
# For mac compiler which still stuck on c++98
|
||||||
AC_CXX_FLAG([-std=c++11])
|
AC_CXX_FLAG([-std=c++11])
|
||||||
AC_CXX_FLAG([-Wno-narrowing])
|
|
||||||
AC_C_FLAG([-Wno-unused-local-typedefs])
|
|
||||||
AC_CXX_FLAG([-Wno-unused-local-typedefs])
|
|
||||||
|
|
||||||
# -O* messes with debugging.
|
# -O* messes with debugging.
|
||||||
AS_IF([test x$enable_debug = xyes], [
|
AS_IF([test x$enable_debug = xyes], [
|
||||||
|
|
Loading…
Reference in New Issue