win32: Strip unneeded flags from env.sh

This remove CXXFLAGS since we don't have any c++ code in Clutter and
also removes the redundant -L$ROOT_DIR/lib from LDFLAGS and
-I$ROOT_DIR/include from CPPFLAGS and CFLAGS. (These should get added by
pkg-config)
This commit is contained in:
Robert Bragg 2011-03-15 22:37:04 +00:00
parent 6340f3a24b
commit 861bda91d5

View File

@ -325,10 +325,8 @@ find_compiler;
add_env PKG_CONFIG_PATH "$ROOT_DIR/lib/pkgconfig:\$PKG_CONFIG_PATH"; add_env PKG_CONFIG_PATH "$ROOT_DIR/lib/pkgconfig:\$PKG_CONFIG_PATH";
add_env LDFLAGS "-L$ROOT_DIR/lib -mno-cygwin \$LDFLAGS" add_env LDFLAGS "-mno-cygwin \$LDFLAGS"
add_env CPPFLAGS "-I$ROOT_DIR/include \$CPPFLAGS" add_env CFLAGS "-mno-cygwin -mms-bitfields \$CFLAGS"
add_env CFLAGS "-I$ROOT_DIR/include -mno-cygwin -mms-bitfields -march=i686 \${CFLAGS:-"-g"}"
add_env CXXFLAGS "-I$ROOT_DIR/include -mno-cygwin -mms-bitfields -march=i686 \${CFLAGS:-"-g"}"
cat >> "$env_file" <<EOF cat >> "$env_file" <<EOF
export ROOT_DIR="$ROOT_DIR"; export ROOT_DIR="$ROOT_DIR";