mirrors
/
non
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Clean up make.conf format.

This commit is contained in:
Jonathan Moore Liles 2008-05-16 16:06:15 -05:00
parent ed23544065
commit 7075a9a2e1
2 changed files with 11 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Timeline/Timeline.C
View File

@ -500,8 +500,10 @@ Timeline::draw_measure_lines ( int X, int Y, int W, int H, Fl_Color color )
if ( ! draw_with_measure_lines ) if ( ! draw_with_measure_lines )
return; return;
Fl_Color colors[] = { fl_color_average( FL_RED, color, 0.65f ), Fl_Color colors[2];
fl_color_average( FL_BLACK, color, 0.65f ) };
colors[1] = fl_color_average( FL_BLACK, color, 0.65f );
colors[0] = fl_color_average( FL_RED, colors[1], 0.65f );
const nframes_t start = x_to_offset( X ); const nframes_t start = x_to_offset( X );
const nframes_t length = x_to_ts( W ); const nframes_t length = x_to_ts( W );

14
configure vendored
View File

@ -21,7 +21,7 @@ ask ()
{ {
echo -n "$1 [$BOLD$3$SGR0] " echo -n "$1 [$BOLD$3$SGR0] "
read R read R
echo "$2 := ${R:-$3}" >> make.conf echo "${2}=${R:-$3}" >> make.conf
} }
ok () ok ()
@ -60,7 +60,7 @@ else
ok ok
fi fi
echo "FLTK_LIBS := `fltk-config --use-images --ldflags`" >> make.conf echo "FLTK_LIBS=`fltk-config --use-images --ldflags`" >> make.conf
# #
@ -77,12 +77,12 @@ check ()
return 0 return 0
} }
check JACK 0.103.0 jack && echo "JACK_LIBS := `pkg-config --libs jack`" >> make.conf check JACK 0.103.0 jack && echo "JACK_LIBS=`pkg-config --libs jack`" >> make.conf
check libSNDFILE 1.0.17 sndfile && echo "SNDFILE_LIBS := `pkg-config --libs sndfile`" >> make.conf check libSNDFILE 1.0.17 sndfile && echo "SNDFILE_LIBS=`pkg-config --libs sndfile`" >> make.conf
grep -q 'USE_LASH := yes' make.conf && grep -q 'USE_LASH=yes' make.conf &&
check LASH 0.5.4 lash-1.0 && check LASH 0.5.4 lash-1.0 &&
( echo "LASH_LIBS := `pkg-config --libs lash-1.0`" >> make.conf ( echo "LASH_LIBS=`pkg-config --libs lash-1.0`" >> make.conf
echo "LASH_CFLAGS := -DUSE_LASH `pkg-config --cflags lash-1.0`" >> make.conf ) echo "LASH_CFLAGS=-DUSE_LASH `pkg-config --cflags lash-1.0`" >> make.conf )
echo "-- Configuration complete." echo "-- Configuration complete."