Automated tests fixes
authorGabriel Jacobo
Thu, 21 Jun 2012 12:12:11 -0300
changeset 63393f5867d48dcc
parent 6338 079ecfd1cde7
child 6340 eadb3790009f
Automated tests fixes
test/automated/Makefile
     1.1 --- a/test/automated/Makefile	Thu Jun 21 10:41:25 2012 -0400
     1.2 +++ b/test/automated/Makefile	Thu Jun 21 12:12:11 2012 -0300
     1.3 @@ -1,10 +1,10 @@
     1.4  
     1.5  
     1.6 -CFLAGS  := -W -Wall -Wextra -g `sdl-config --prefix=/usr/local --cflags` -DSDL_NO_COMPAT
     1.7 -LDFLAGS := `sdl-config --prefix=/usr/local --libs`
     1.8 +CFLAGS  := -W -Wall -Wextra -g `sdl2-config --prefix=/usr/local --cflags` -DSDL_NO_COMPAT
     1.9 +LDFLAGS := `sdl2-config --prefix=/usr/local --libs`
    1.10  
    1.11  # If it doesn't pick up defaults
    1.12 -#CFLAGS  := -D_GNU_SOURCE=1 -D_REENTRANT -I/usr/local/include/SDL
    1.13 +#CFLAGS  := -D_GNU_SOURCE=1 -D_REENTRANT -I/usr/local/include/SDL2
    1.14  #LDFLAGS := -lm -ldl -lesd -lpthread
    1.15  
    1.16  SRC         	:= testsdl.c \
    1.17 @@ -36,25 +36,25 @@
    1.18  	@./testsdl
    1.19  
    1.20  testsdl: $(SRC) $(RWOPS_SRC) $(COMMON_SRC)
    1.21 -	$(CC) $(CFLAGS) $(LDFLAGS) -o $@ $(SRC) $(RWOPS_SRC) $(COMMON_SRC)
    1.22 +	$(CC) $(CFLAGS) -o $@ $(SRC) $(RWOPS_SRC) $(COMMON_SRC) $(LDFLAGS)
    1.23  
    1.24  platform/platform: platform/platform.c $(COMMON_INCLUDE) $(COMMON_SRC)
    1.25 -	$(CC) $(CFLAGS) $(LDFLAGS) -o $@ platform/platform.c $(COMMON_SRC) -DTEST_STANDALONE
    1.26 +	$(CC) $(CFLAGS) -o $@ platform/platform.c $(COMMON_SRC) -DTEST_STANDALONE $(LDFLAGS)
    1.27  
    1.28  rwops/rwops: $(RWOPS_SRC) $(COMMON_INCLUDE) $(COMMON_SRC)
    1.29 -	$(CC) $(CFLAGS) $(LDFLAGS) -o $@ $(RWOPS_SRC) $(COMMON_SRC) -DTEST_STANDALONE
    1.30 +	$(CC) $(CFLAGS) -o $@ $(RWOPS_SRC) $(COMMON_SRC) -DTEST_STANDALONE $(LDFLAGS)
    1.31  
    1.32  rect/rect: rect/rect.c $(COMMON_INCLUDE) $(COMMON_SRC)
    1.33 -	$(CC) $(CFLAGS) $(LDFLAGS) -o $@ rect/rect.c $(COMMON_SRC) -DTEST_STANDALONE
    1.34 +	$(CC) $(CFLAGS) -o $@ rect/rect.c $(COMMON_SRC) -DTEST_STANDALONE $(LDFLAGS)
    1.35  
    1.36  surface/surface: surface/surface.c $(COMMON_INCLUDE) $(COMMON_SRC)
    1.37 -	$(CC) $(CFLAGS) $(LDFLAGS) -o $@ surface/surface.c $(COMMON_SRC) -DTEST_STANDALONE
    1.38 +	$(CC) $(CFLAGS) -o $@ surface/surface.c $(COMMON_SRC) -DTEST_STANDALONE $(LDFLAGS)
    1.39  
    1.40  render/render: render/render.c $(COMMON_INCLUDE) $(COMMON_SRC)
    1.41 -	$(CC) $(CFLAGS) $(LDFLAGS) -o $@ render/render.c $(COMMON_SRC) -DTEST_STANDALONE
    1.42 +	$(CC) $(CFLAGS) -o $@ render/render.c $(COMMON_SRC) -DTEST_STANDALONE $(LDFLAGS)
    1.43  
    1.44  audio/audio: audio/audio.c $(COMMON_INCLUDE) $(COMMON_SRC)
    1.45 -	$(CC) $(CFLAGS) $(LDFLAGS) -o $@ audio/audio.c $(COMMON_SRC) -DTEST_STANDALONE
    1.46 +	$(CC) $(CFLAGS) -o $@ audio/audio.c $(COMMON_SRC) -DTEST_STANDALONE $(LDFLAGS)
    1.47  
    1.48  clean:
    1.49  	$(RM) $(TESTS_ALL)