diff options
| author | Simon Howard | 2008-12-09 19:56:43 +0000 |
|---|---|---|
| committer | Simon Howard | 2008-12-09 19:56:43 +0000 |
| commit | a0062502d183d5d526c1f801b1206234b664898b (patch) | |
| tree | 723825bd213891b37dbf5cddd11a304b9c91cd55 /setup | |
| parent | 3fd9acf6e0d664858162ac369ae8670f40edea11 (diff) | |
| download | chocolate-doom-a0062502d183d5d526c1f801b1206234b664898b.tar.gz chocolate-doom-a0062502d183d5d526c1f801b1206234b664898b.tar.bz2 chocolate-doom-a0062502d183d5d526c1f801b1206234b664898b.zip | |
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
Diffstat (limited to 'setup')
| -rw-r--r-- | setup/Makefile.am | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/setup/Makefile.am b/setup/Makefile.am index f845f853..b7b05520 100644 --- a/setup/Makefile.am +++ b/setup/Makefile.am @@ -1,11 +1,10 @@ gamesdir = $(prefix)/games -AM_CFLAGS = @SDL_CFLAGS@ -I../textscreen -I../src -DINSTALL_DIR="\"$(gamesdir)\"" +AM_CFLAGS = -I../textscreen -I../src -DINSTALL_DIR="\"$(gamesdir)\"" games_PROGRAMS = chocolate-setup -chocolate_setup_LDADD = ../textscreen/libtextscreen.a @LDFLAGS@ @SDL_LIBS@ SOURCE_FILES = \ compatibility.c compatibility.h \ configfile.c configfile.h \ @@ -32,6 +31,8 @@ else chocolate_setup_SOURCES=$(SOURCE_FILES) endif +chocolate_setup_LDADD = ../textscreen/libtextscreen.a @LDFLAGS@ + .rc.o: $(WINDRES) $^ -o $@ %.o : %.rc |