projects / packages / argante.git / blame
| Commit | Line | Data |
|---|---|---|
| 349ce904 AM |
1 | diff -urN Argante.org/build Argante/build |
| 2 | --- Argante.org/build Thu Nov 23 21:09:12 2000 | |
| 3 | +++ Argante/build Thu Nov 23 21:29:46 2000 | |
| 4 | @@ -20,7 +20,12 @@ | |
| 5 | if [ "$SYS" = "Linux" ]; then | |
| 6 | if [ -f /usr/include/readline/readline.h ]; then | |
| 7 | CFLAGS="-DHAVE_READLINE -D__USE_TERMCAP" | |
| 8 | - LIBS="-lreadline -ltermcap" | |
| 9 | + LIBS="-lreadline" | |
| 10 | + if [ -f /usr/lib/libtinfo.so ]; then | |
| 11 | + LIBS="$LIBS -ltinfo" | |
| 12 | + else | |
| 13 | + LIBS="$LIBS -ltermcap" | |
| 14 | + fi | |
| 15 | echo "NOTE: libreadline detected, using it." | |
| 16 | else | |
| 17 | echo "NOTE: libreadline *NOT* detected, using old-style compilation." | |
| 18 | @@ -32,7 +37,7 @@ | |
| 19 | unset CFLAGS LIBS | |
| 20 | fi | |
| 21 | test "$NOREADLINE" = "" || unset CFLAGS LIBS | |
| 22 | - CFLAGS="$CFLAGS $ADDFLAGS" | |
| 23 | + CFLAGS="$CFLAGS $ADDFLAGS $OPT" | |
| 24 | export CFLAGS LIBS | |
| 25 | ||
| 26 | echo ">>> Performing svgalib compatibility test..." | |
| 27 | @@ -49,7 +54,7 @@ | |
| 28 | -fcaller-saves -fstrength-reduce -fthread-jumps -funroll-loops \ | |
| 29 | -fcse-follow-jumps -fcse-skip-blocks -frerun-cse-after-loop \ | |
| 30 | -fexpensive-optimizations -fschedule-insns2 -m486 -ldl -rdynamic -lm \ | |
| 31 | - -lvga .ctest.c -o .ctest &>/dev/null | |
| 32 | + -lvga .ctest.c -o .ctest >/dev/null 2>&1 | |
| 33 | ||
| 34 | if [ ! -x .ctest ]; then | |
| 35 | echo ">>> Test failed, compiling without gfx module." | |
| 36 | diff -urN Argante.org/sysdep/Makefile.lnx Argante/sysdep/Makefile.lnx | |
| 37 | --- Argante.org/sysdep/Makefile.lnx Thu Nov 23 21:09:12 2000 | |
| 38 | +++ Argante/sysdep/Makefile.lnx Thu Nov 23 21:19:36 2000 | |
| 39 | @@ -25,7 +25,7 @@ | |
| 40 | MAIN = kernel/main-boot.c | |
| 41 | ||
| 42 | OFILE = argante | |
| 43 | -CFLAGS += -Iinclude -Imodules -fomit-frame-pointer -O9 -ffast-math -Wall -fforce-mem -fforce-addr -fcaller-saves -fstrength-reduce -fthread-jumps -funroll-loops -fcse-follow-jumps -fcse-skip-blocks -frerun-cse-after-loop -fexpensive-optimizations -fschedule-insns2 -m486 | |
| 44 | +CFLAGS += -Iinclude -Imodules -fomit-frame-pointer -ffast-math -Wall -fforce-mem -fforce-addr -fcaller-saves -fstrength-reduce -fthread-jumps -funroll-loops -fcse-follow-jumps -fcse-skip-blocks -frerun-cse-after-loop -fexpensive-optimizations -fschedule-insns2 | |
| 45 | LIBS += -ldl -rdynamic -lm -lvga | |
| 46 | CC = gcc | |
| 47 |