Merge pull request #62 from myelin/sf/allegro5-pp-macos-build-fix

Minor changes to get b-em/sf/allegro5 to build on latest macOS
stardot · May 28, 2018 · f1dd7d2 · f1dd7d2
2 parents 1f11031 + 09f23cf
commit f1dd7d2
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/configure.ac b/configure.ac
@@ -23,7 +23,7 @@ AC_ARG_ENABLE(debug,
 	      AC_HELP_STRING([--enable-debug], [build debug executable]))
 
 CF_WARNINGS="-Wall -Wno-format-security"
-CFLAGS="$CFLAGS $CF_WARNINGS -std=gnu99 -D_GNU_SOURCE"
+CFLAGS="$CFLAGS $CF_WARNINGS -std=gnu11 -D_GNU_SOURCE"
 if test "$enable_debug" = "yes"; then
    CFLAGS="$CFLAGS -O3 -ggdb -D_DEBUG"
    LDFLAGS="$LDFLAGS -L/usr/local/lib"

diff --git a/src/Makefile.am b/src/Makefile.am
@@ -20,7 +20,7 @@ b_em_CFLAGS = $(allegro_CFLAGS) -DBEM -DINCLUDE_DEBUGGER -DUSE_MEMORY_POINTER
 if OS_WIN
 b_em_LDADD = -lallegro_audio -lallegro_acodec -lallegro_primitives -lallegro_dialog -lallegro_image -lallegro_font -lallegro -lz -lm
 else
-b_em_LDADD = -lallegro_audio -lallegro_acodec -lallegro_primitives -lallegro_dialog -lallegro_image -lallegro_font -lallegro -lz -lm -lpthread
+b_em_LDADD = -lallegro_audio -lallegro_acodec -lallegro_primitives -lallegro_dialog -lallegro_image -lallegro_font -lallegro_main -lallegro -lz -lm -lpthread
 endif
 
 b_em_SOURCES = \
@@ -122,4 +122,4 @@ endif
 
 jstest_SOURCES = jstest.c
 
-jstest_LDADD = -lallegro
+jstest_LDADD = -lallegro -lallegro_main