]>
Commit | Line | Data |
---|---|---|
82746743 JB |
1 | --- glfw-2.7.1/compile.sh.orig 2011-06-28 05:55:28.000000000 +0200 |
2 | +++ glfw-2.7.1/compile.sh 2011-07-30 18:04:01.660628707 +0200 | |
3 | @@ -107,35 +107,8 @@ | |
5782df7c | 4 | ########################################################################## |
82746743 | 5 | echo -n "Checking for X11 libraries location... " 1>&6 |
5782df7c | 6 | |
5782df7c | 7 | -if [ -r "/usr/X11/lib" ]; then |
82746743 JB |
8 | - GLFW_LFLAGS="$GLFW_LFLAGS -L/usr/X11/lib" |
9 | - GLFW_CFLAGS="-I/usr/X11/include $GLFW_CFLAGS" | |
10 | - echo "/usr/X11/lib" 1>&6 | |
11 | -elif [ -r "/usr/X11R7/lib" ]; then | |
12 | - GLFW_LFLAGS="$GLFW_LFLAGS -L/usr/X11R7/lib" | |
13 | - GLFW_CFLAGS="-I/usr/X11R7/include $GLFW_CFLAGS" | |
14 | - echo "/usr/X11R7/lib" 1>&6 | |
5782df7c | 15 | -elif [ -r "/usr/X11R6/lib" ]; then |
82746743 JB |
16 | - GLFW_LFLAGS="$GLFW_LFLAGS -L/usr/X11R6/lib" |
17 | - GLFW_CFLAGS="-I/usr/X11R6/include $GLFW_CFLAGS" | |
18 | - echo "/usr/X11R6/lib" 1>&6 | |
5782df7c | 19 | -elif [ -r "/usr/X11R5/lib" ]; then |
82746743 JB |
20 | - GLFW_LFLAGS="$GLFW_LFLAGS -L/usr/X11R5/lib" |
21 | - GLFW_CFLAGS="-I/usr/X11R5/include $GLFW_CFLAGS" | |
22 | - echo "/usr/X11R5/lib" 1>&6 | |
5782df7c | 23 | -elif [ -r "/opt/X11R6/lib" ]; then |
82746743 JB |
24 | - # This location is used on QNX |
25 | - GLFW_LFLAGS="$GLFW_LFLAGS -L/opt/X11R6/lib" | |
26 | - GLFW_CFLAGS="-I/opt/X11R6/include $GLFW_CFLAGS" | |
27 | - echo "/opt/X11R6/lib" 1>&6 | |
5782df7c | 28 | -elif [ -r "/usr/X/lib" ]; then |
82746743 JB |
29 | - GLFW_LFLAGS="$GLFW_LFLAGS -L/usr/X/lib" |
30 | - GLFW_CFLAGS="-I/usr/X/include $GLFW_CFLAGS" | |
31 | - echo "/usr/X/lib" 1>&6 | |
5782df7c | 32 | -else |
82746743 JB |
33 | # TODO: Detect and report X11R7 in /usr/lib |
34 | echo "unknown (assuming linker will find them)" 1>&6 | |
5782df7c | 35 | -fi |
5782df7c | 36 | |
5782df7c | 37 | |
5782df7c | 38 | ########################################################################## |
82746743 JB |
39 | @@ -571,9 +544,7 @@ |
40 | ||
41 | if [ "x$CFLAGS" = x ]; then | |
42 | if [ "x$use_gcc" = xyes ]; then | |
43 | - GLFW_CFLAGS="$GLFW_CFLAGS -O2 -Wall" | |
44 | - else | |
45 | - GLFW_CFLAGS="$GLFW_CFLAGS -O" | |
46 | + GLFW_CFLAGS="$GLFW_CFLAGS -Wall" | |
47 | fi | |
5782df7c | 48 | fi |
82746743 | 49 |