We are currently migrating Bugzilla to GitHub issues.
Any changes made to the bug tracker now will be lost, so please do not post new bugs or make changes to them.
When we're done, all bug URLs will redirect to their equivalent location on the new bug tracker.

[patch] Automated tests compilation fixes

automated_tests_fix.diff (text/plain), 2.29 KB, created by Gabriel Jacobo on 2012-02-08 14:04:28 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Gabriel Jacobo

Created: 2012-02-08 14:04:28 UTC

Size: 2.29 KB

patch

obsolete

>diff -r 7d097f543601 test/automated/Makefile
>--- a/test/automated/Makefile	mar ene 31 10:07:19 2012 -0300
>+++ b/test/automated/Makefile	miÃ© feb 08 19:02:30 2012 -0300
>@@ -1,10 +1,10 @@
> 
> 
>-CFLAGS  := -W -Wall -Wextra -g `sdl-config --prefix=/usr/local --cflags` -DSDL_NO_COMPAT
>-LDFLAGS := `sdl-config --prefix=/usr/local --libs`
>+CFLAGS  := -W -Wall -Wextra -g `sdl2-config --prefix=/usr/local --cflags` -DSDL_NO_COMPAT
>+LDFLAGS := `sdl2-config --prefix=/usr/local --libs`
> 
> # If it doesn't pick up defaults
>-#CFLAGS  := -D_GNU_SOURCE=1 -D_REENTRANT -I/usr/local/include/SDL
>+#CFLAGS  := -D_GNU_SOURCE=1 -D_REENTRANT -I/usr/local/include/SDL2
> #LDFLAGS := -lm -ldl -lesd -lpthread
> 
> SRC         	:= testsdl.c \
>@@ -36,25 +36,25 @@
> 	@./testsdl
> 
> testsdl: $(SRC) $(RWOPS_SRC) $(COMMON_SRC)
>-	$(CC) $(CFLAGS) $(LDFLAGS) -o $@ $(SRC) $(RWOPS_SRC) $(COMMON_SRC)
>+	$(CC) $(CFLAGS) -o $@ $(SRC) $(RWOPS_SRC) $(COMMON_SRC) $(LDFLAGS)
> 
> platform/platform: platform/platform.c $(COMMON_INCLUDE) $(COMMON_SRC)
>-	$(CC) $(CFLAGS) $(LDFLAGS) -o $@ platform/platform.c $(COMMON_SRC) -DTEST_STANDALONE
>+	$(CC) $(CFLAGS) -o $@ platform/platform.c $(COMMON_SRC) -DTEST_STANDALONE $(LDFLAGS)
> 
> rwops/rwops: $(RWOPS_SRC) $(COMMON_INCLUDE) $(COMMON_SRC)
>-	$(CC) $(CFLAGS) $(LDFLAGS) -o $@ $(RWOPS_SRC) $(COMMON_SRC) -DTEST_STANDALONE
>+	$(CC) $(CFLAGS) -o $@ $(RWOPS_SRC) $(COMMON_SRC) -DTEST_STANDALONE $(LDFLAGS)
> 
> rect/rect: rect/rect.c $(COMMON_INCLUDE) $(COMMON_SRC)
>-	$(CC) $(CFLAGS) $(LDFLAGS) -o $@ rect/rect.c $(COMMON_SRC) -DTEST_STANDALONE
>+	$(CC) $(CFLAGS) -o $@ rect/rect.c $(COMMON_SRC) -DTEST_STANDALONE $(LDFLAGS)
> 
> surface/surface: surface/surface.c $(COMMON_INCLUDE) $(COMMON_SRC)
>-	$(CC) $(CFLAGS) $(LDFLAGS) -o $@ surface/surface.c $(COMMON_SRC) -DTEST_STANDALONE
>+	$(CC) $(CFLAGS) -o $@ surface/surface.c $(COMMON_SRC) -DTEST_STANDALONE $(LDFLAGS)
> 
> render/render: render/render.c $(COMMON_INCLUDE) $(COMMON_SRC)
>-	$(CC) $(CFLAGS) $(LDFLAGS) -o $@ render/render.c $(COMMON_SRC) -DTEST_STANDALONE
>+	$(CC) $(CFLAGS) -o $@ render/render.c $(COMMON_SRC) -DTEST_STANDALONE $(LDFLAGS)
> 
> audio/audio: audio/audio.c $(COMMON_INCLUDE) $(COMMON_SRC)
>-	$(CC) $(CFLAGS) $(LDFLAGS) -o $@ audio/audio.c $(COMMON_SRC) -DTEST_STANDALONE
>+	$(CC) $(CFLAGS) -o $@ audio/audio.c $(COMMON_SRC) -DTEST_STANDALONE $(LDFLAGS)
> 
> clean:
> 	$(RM) $(TESTS_ALL)

Actions: View | Diff

Attachments on bug 1415: 818

We are currently migrating Bugzilla to GitHub issues.Any changes made to the bug tracker now will be lost, so please do not post new bugs or make changes to them.When we're done, all bug URLs will redirect to their equivalent location on the new bug tracker.

We are currently migrating Bugzilla to GitHub issues.
Any changes made to the bug tracker now will be lost, so please do not post new bugs or make changes to them.
When we're done, all bug URLs will redirect to their equivalent location on the new bug tracker.