diff options
| author | marha <marha@users.sourceforge.net> | 2011-01-25 08:05:26 +0000 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2011-01-25 08:05:26 +0000 |
| commit | 815075ae9c51f21f6c3f0806f40bc9070701fd56 (patch) | |
| tree | 814267bbf3c6007bbe3088987cc733d566dae7d8 /mesalib/src/glsl | |
| parent | 62221868dadd02868a6b2f2d5d837d57c51bcf86 (diff) | |
| parent | db83ae15824cd5a710d61684733f3dc09517748b (diff) | |
| download | vcxsrv-815075ae9c51f21f6c3f0806f40bc9070701fd56.tar.gz vcxsrv-815075ae9c51f21f6c3f0806f40bc9070701fd56.tar.bz2 vcxsrv-815075ae9c51f21f6c3f0806f40bc9070701fd56.zip | |
svn merge ^/branches/released .
Diffstat (limited to 'mesalib/src/glsl')
| -rw-r--r-- | mesalib/src/glsl/SConscript | 1 | ||||
| -rw-r--r-- | mesalib/src/glsl/configure.ac | 69 |
2 files changed, 1 insertions, 69 deletions
diff --git a/mesalib/src/glsl/SConscript b/mesalib/src/glsl/SConscript index 88a83fdb6..5885e4b4f 100644 --- a/mesalib/src/glsl/SConscript +++ b/mesalib/src/glsl/SConscript @@ -91,6 +91,7 @@ if env['platform'] == common.host_platform: env.Prepend(CPPPATH = ['#src/talloc']) env.Prepend(LIBS = [talloc]) else: + env.Prepend(CPPPATH = ['#include']) env.Prepend(LIBS = ['talloc']) builtin_compiler = env.Program( diff --git a/mesalib/src/glsl/configure.ac b/mesalib/src/glsl/configure.ac deleted file mode 100644 index cd75fc8c1..000000000 --- a/mesalib/src/glsl/configure.ac +++ /dev/null @@ -1,69 +0,0 @@ -# -*- Autoconf -*-
-# Process this file with autoconf to produce a configure script.
-
-AC_PREREQ(2.61)
-AC_INIT(glsl, XXXXX, idr@freedesktop.org, glsl)
-AC_CONFIG_SRCDIR([Makefile.am])
-AM_CONFIG_HEADER([config.h])
-AC_CONFIG_FILES([glcpp/Makefile])
-
-AM_INIT_AUTOMAKE
-LT_INIT
-
-AM_MAINTAINER_MODE
-
-# Checks for programs.
-AC_PROG_CXX
-AC_PROG_CC
-AC_PROG_MAKE_SET
-AC_PROG_YACC
-AC_PROG_LEX
-
-m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])])
-
-# Checks for libraries.
-
-# Checks for header files.
-
-# Checks for typedefs, structures, and compiler characteristics.
-
-# Checks for library functions.
-AC_HEADER_STDC
-
-AH_TOP([#ifndef GLSL_CONFIG_H
-#define GLSL_CONFIG_H])
-AH_BOTTOM([#endif /* GLSL_CONFIG_H */])
-
-PKG_CHECK_MODULES([talloc], [talloc >= 2.0])
-
-AC_ARG_ENABLE([debug],
- [AS_HELP_STRING([--enable-debug],
- [use debug compiler flags and macros @<:@default=disabled@:>@])],
- [enable_debug="$enableval"],
- [enable_debug=no]
-)
-if test "x$enable_debug" = xyes; then
- DEFINES="$DEFINES -DDEBUG"
- if test "x$GCC" = xyes; then
- # Remove any -g or -O flags from the command line
- CFLAGS=[`echo $CFLAGS | sed 's/-g[^ \t]*[ \t]*//g;s/-O[^ \t]*[ \t]*//g'`]
- CFLAGS="$CFLAGS -O0 -ggdb3 -fstack-protector -D_FORTIFY_SOURCE=2"
- fi
- if test "x$GXX" = xyes; then
- # Remove any -g flags from the command line
- CXXFLAGS=[`echo $CXXFLAGS | sed 's/-g[^ \t]*[ \t]*//g;s/-O[^ \t]*[ \t]*//g'`]
- CXXFLAGS="$CXXFLAGS -O0 -ggdb3 -fstack-protector -D_FORTIFY_SOURCE=2"
- fi
-fi
-
-if test "x$GXX" = xyes ; then
- WARN="-Wall -Wextra -Wunsafe-loop-optimizations -Wstack-protector"
-else
- WARN=""
-fi
-
-CFLAGS="$CFLAGS $WARN"
-CXXFLAGS="$CXXFLAGS $WARN"
-YFLAGS="-d -v"
-
-AC_OUTPUT([Makefile])
|