projects / packages / LiVES.git / blame
| Commit | Line | Data |
|---|---|---|
| f3041c75 SS |
1 | --- lives-0.9.8.3/lives-plugins/weed-plugins/Makefile.am 2007-02-08 16:19:12.000000000 +0000 |
| 2 | +++ LiVES-wp-Makefile.am 2007-03-17 14:55:47.000000000 +0000 | |
| 3 | @@ -20,8 +20,8 @@ | |
| 4 | libvis_PROGRAMS = libvis.wo | |
| 5 | libvisdir = $(fxdir) | |
| 6 | ||
| 7 | -libvis_wo_LDFLAGS = @VISUAL_LIBS@ | |
| 8 | -libvis_wo_CFLAGS = @VISUAL_CFLAGS@ $(AM_CFLAGS) | |
| 9 | +libvis_wo_LDFLAGS = $(shared_ldflags) @VISUAL_LIBS@ | |
| 10 | +libvis_wo_CFLAGS = $(shared_cflags) @VISUAL_CFLAGS@ $(AM_CFLAGS) | |
| 11 | ||
| 12 | endif | |
| 13 | ||
| 14 | --- lives-0.9.8.3/lives-plugins/plugins/playback/video/Makefile.am.orig 2007-03-17 12:34:43.000000000 +0000 | |
| 15 | +++ lives-0.9.8.3/lives-plugins/plugins/playback/video/Makefile.am 2007-03-17 14:35:56.000000000 +0000 | |
| 16 | @@ -10,17 +10,15 @@ | |
| 17 | endif | |
| 18 | ||
| 19 | if HAVE_SDL | |
| 20 | -SDL_progs = SDL | |
| 21 | -SDL_SOURCE = SDL.c | |
| 22 | -CFLAGS_SDL = @SDL_CFLAGS@ | |
| 23 | -LDFLAGS_SDL = @SDL_LIBS@ | |
| 24 | +SDL_progs = SDLp | |
| 25 | +SDLp_SOURCES = SDL.c | |
| 87a39696 | 26 | +SDLp_CFLAGS = $(shared_cflags) @GTK_CFLAGS@ @SDL_CFLAGS@ -g -Wall |
| f3041c75 SS |
27 | +SDLp_LDFLAGS = $(shared_ldflags) @GTK_LIBS@ @SDL_LIBS@ |
| 28 | ||
| 29 | else | |
| 30 | if FORCE_SDL | |
| 31 | -SDL_progs = SDL | |
| 32 | -SDL_SOURCE = SDL.c | |
| 33 | -CFLAGS_SDL = -I $(SDL_PREFIX) | |
| 34 | -LDFLAGS_SDL = -lSDL | |
| 35 | +SDL_progs = SDLp | |
| 36 | +SDLp_SOURCES = SDL.c | |
| 37 | endif | |
| 38 | endif | |
| 39 | ||
| 192b3047 SS |
40 | @@ -38,5 +36,3 @@ |
| 41 | yuv4mpeg_stream_CFLAGS = @GTK_CFLAGS@ @MJPEG_CFLAGS@ $(shared_cflags) | |
| 42 | yuv4mpeg_stream_LDFLAGS = $(shared_ldflags) @GTK_LIBS@ @MJPEG_LIBS@ | |
| f3041c75 | 43 | |
| 192b3047 SS |
44 | -SDL_CFLAGS = $(shared_cflags) @GTK_CFLAGS@ $(CFLAGS_SDL) |
| 45 | -SDL_LDFLAGS = $(shared_ldflags) @GTK_LIBS@ $(LDFLAGS_SDL) |