Skip to content

Commit

Permalink
Fix compiler warnings
Browse files Browse the repository at this point in the history
  • Loading branch information
detomon committed May 4, 2024
1 parent 20e61f8 commit 8701a16
Show file tree
Hide file tree
Showing 4 changed files with 11 additions and 11 deletions.
4 changes: 2 additions & 2 deletions examples/Makefile.am
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
AM_CFLAGS = @AM_CFLAGS@ -I$(srcdir)/../src -L$(srcdir)/../src @SDL_CFLAGS@
BK_LDADD = ../src/libblipkit.a @SDL_CFLAGS@ -lm
AM_CFLAGS = @AM_CFLAGS@ -I$(srcdir)/../src @SDL_CFLAGS@
BK_LDADD = ../src/libblipkit.a @SDL_LDADD@ -lm

EXTRA_PROGRAMS = \
tone \
Expand Down
10 changes: 6 additions & 4 deletions m4/common.m4
Original file line number Diff line number Diff line change
Expand Up @@ -55,9 +55,10 @@ AC_RUN_IFELSE([AC_LANG_SOURCE([[
# -----------
# Search for installed SDL libraries or frameworks.
# Choose the latest version if found.
# Outputs SDL_CFLAGS, SDL_CONFIG_NAME and SDL_VERSION.
# Outputs SDL_CFLAGS, SDL_LDADD, SDL_CONFIG_NAME and SDL_VERSION.
m4_define([CHECK_SDL], [dnl
SDL_CFLAGS="$SDL_CFLAGS"
SDL_LDADD="$SDL_LDADD"
SDL_CONFIG_NAME=
SDL_VERSION=
Expand All @@ -75,18 +76,19 @@ if test "x$SDL_CFLAGS" = x; then
# Set SDL flags from sdl-config if found.
if test "x$SDL_CONFIG_NAME" != x; then
SDL_CFLAGS="`${SDL_CONFIG_NAME} --cflags` `${SDL_CONFIG_NAME} --libs`"
SDL_CFLAGS="`${SDL_CONFIG_NAME} --cflags`"
SDL_LDADD="`${SDL_CONFIG_NAME} --libs`"
fi
# Output SDL_CFLAGS.
if test "x$SDL_CFLAGS" != x; then
echo "using SDL linking flags: $SDL_CFLAGS"
echo "using SDL linking flags: $SDL_CFLAGS $SDL_LDADD"
else
AC_MSG_ERROR([SDL was requested with --with-sdl, but SDL was not found. Use --without-sdl to disable usage of SDL])
fi
AC_SUBST(SDL_CFLAGS)
AC_SUBST(SDL_CONFIG_NAME)
AC_SUBST(SDL_LDADD)
AC_SUBST(SDL_VERSION)
else
echo "using user defined SDL linking flags: $SDL_CFLAGS"
Expand Down
2 changes: 1 addition & 1 deletion src/Makefile.am
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
AM_CFLAGS = @AM_CFLAGS@ -lm
AM_CFLAGS = @AM_CFLAGS@

lib_LIBRARIES = libblipkit.a

Expand Down
6 changes: 2 additions & 4 deletions test/Makefile.am
Original file line number Diff line number Diff line change
@@ -1,7 +1,5 @@
AM_CFLAGS = @AM_CFLAGS@ \
-I$(srcdir)/../src

BK_LDADD = ../src/libblipkit.a @SDL_CFLAGS@ -lm
AM_CFLAGS = @AM_CFLAGS@ -I$(srcdir)/../src
BK_LDADD = ../src/libblipkit.a @SDL_LDADD@ -lm

check_PROGRAMS = \
context \
Expand Down

0 comments on commit 8701a16

Please sign in to comment.