From a0062502d183d5d526c1f801b1206234b664898b Mon Sep 17 00:00:00 2001
From: Simon Howard
Date: Tue, 9 Dec 2008 19:56:43 +0000
Subject: Add SDL_CFLAGS, SDL_LDFLAGS to default compile flags, and check for
 SDL in configure before checking for libraries and headers, to fix Windows.

Subversion-branch: /trunk/chocolate-doom
Subversion-revision: 1412
---
 src/Makefile.am | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

(limited to 'src/Makefile.am')

diff --git a/src/Makefile.am b/src/Makefile.am
index e43cb7f0..63ddc98f 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -3,7 +3,7 @@ gamesdir = $(prefix)/games
 
 games_PROGRAMS = chocolate-doom chocolate-server
 
-AM_CFLAGS = -I../textscreen -I../pcsound @SDL_CFLAGS@ @SDLMIXER_CFLAGS@ @SDLNET_CFLAGS@
+AM_CFLAGS = -I../textscreen -I../pcsound @SDLMIXER_CFLAGS@ @SDLNET_CFLAGS@
 
 DEDSERV_FILES=\
 d_dedicated.c                              \
@@ -21,7 +21,7 @@ net_structrw.c       net_structrw.h        \
 z_native.c           z_zone.h
 
 chocolate_server_SOURCES=$(DEDSERV_FILES)
-chocolate_server_LDADD = @LDFLAGS@ @SDL_LIBS@ @SDLNET_LIBS@ 
+chocolate_server_LDADD = @LDFLAGS@ @SDLNET_LIBS@ 
 
 MAIN_SOURCE_FILES=\
 am_map.c             am_map.h              \
@@ -169,7 +169,12 @@ else
 chocolate_doom_SOURCES=$(SOURCE_FILES)
 endif
 
-chocolate_doom_LDADD = ../textscreen/libtextscreen.a ../pcsound/libpcsound.a @LDFLAGS@ @SDL_LIBS@ @SDLMIXER_LIBS@ @SDLNET_LIBS@ 
+chocolate_doom_LDADD =                               \
+                       ../textscreen/libtextscreen.a \
+                       ../pcsound/libpcsound.a       \
+                       @LDFLAGS@                     \
+                       @SDLMIXER_LIBS@               \
+                       @SDLNET_LIBS@
 
 EXTRA_DIST =                        \
         icon.c                      \
-- 
cgit v1.2.3