fix build

This commit is contained in:
Pavol Rusnak 2011-11-17 00:12:01 +01:00
parent 6578c091a9
commit 4b37602c43
2 changed files with 11 additions and 17 deletions

View file

@ -1,5 +1,5 @@
CFLAGS=$(shell sdl-config --cflags) -Wall CFLAGS=$(shell sdl-config --cflags) -Wall
LDFLAGS=$(shell sdl-config --libs) LDFLAGS=$(shell sdl-config --libs) -lm
all: ledbar all: ledbar

View file

@ -256,12 +256,10 @@ void programS(int i, int t, double *r, double *g, double *b)
*g = (sin(((double)t/200)*(2*M_PI))+1)/2; *g = (sin(((double)t/200)*(2*M_PI))+1)/2;
*b = 0; *b = 0;
} else { } else {
*r = (sin(((double)t/400)*(2*M_PI))+1)/2; *r = (sin(((double)t/400)*(2*M_PI))+1)/2;
*g = (sin(((double)(t-200)/400)*(2*M_PI))+1)/2; *g = (sin(((double)(t-200)/400)*(2*M_PI))+1)/2;
*b = 0; *b = 0;
} }
} }
// crossfade gb // crossfade gb
@ -272,12 +270,10 @@ void programD(int i, int t, double *r, double *g, double *b)
*g = (sin(((double)t/200)*(2*M_PI))+1)/2; *g = (sin(((double)t/200)*(2*M_PI))+1)/2;
*b = (sin(((double)(t-100)/200)*(2*M_PI))+1)/2; *b = (sin(((double)(t-100)/200)*(2*M_PI))+1)/2;
} else { } else {
*r = 0; *r = 0;
*g = (sin(((double)(t-200)/400)*(2*M_PI))+1)/2; *g = (sin(((double)(t-200)/400)*(2*M_PI))+1)/2;
*b = (sin(((double)t/400)*(2*M_PI))+1)/2; *b = (sin(((double)t/400)*(2*M_PI))+1)/2;
} }
} }
// crossfade rb // crossfade rb
@ -288,12 +284,10 @@ void programF(int i, int t, double *r, double *g, double *b)
*g =0; *g =0;
*b = (sin(((double)(t-100)/200)*(2*M_PI))+1)/2; *b = (sin(((double)(t-100)/200)*(2*M_PI))+1)/2;
} else { } else {
*r = (sin(((double)(t-200)/400)*(2*M_PI))+1)/2; *r = (sin(((double)(t-200)/400)*(2*M_PI))+1)/2;
*g = 0; *g = 0;
*b = (sin(((double)t/400)*(2*M_PI))+1)/2; *b = (sin(((double)t/400)*(2*M_PI))+1)/2;
} }
} }
void drawScreen(SDL_Surface* screen, int t, FILE* fp) void drawScreen(SDL_Surface* screen, int t, FILE* fp)
@ -383,10 +377,10 @@ int main(int argc, char* argv[])
case SDLK_i: program = programI; break; case SDLK_i: program = programI; break;
case SDLK_o: program = programO; break; case SDLK_o: program = programO; break;
case SDLK_p: program = programP; break; case SDLK_p: program = programP; break;
case SDLK_a: program = programA; break; case SDLK_a: program = programA; break;
case SDLK_s: program = programS; break; case SDLK_s: program = programS; break;
case SDLK_d: program = programD; break; case SDLK_d: program = programD; break;
case SDLK_f: program = programF; break; case SDLK_f: program = programF; break;
case SDLK_ESCAPE: quit = 1; break; case SDLK_ESCAPE: quit = 1; break;
default: break; default: break;
} }