diff options
| author | Simon Howard | 2008-12-20 20:25:22 +0000 |
|---|---|---|
| committer | Simon Howard | 2008-12-20 20:25:22 +0000 |
| commit | b9b0c2abfbe194baf6d497f1c4a2165769f64ab3 (patch) | |
| tree | a82b96f274bd7427b963964f37242607a27c593d /src/Makefile.am | |
| parent | 0ec9859ec8cf39ce1223516161fb39ea44ed5c33 (diff) | |
| parent | acd1a13a4f70973d7616df3f6de43f8f79b8e392 (diff) | |
| download | chocolate-doom-b9b0c2abfbe194baf6d497f1c4a2165769f64ab3.tar.gz chocolate-doom-b9b0c2abfbe194baf6d497f1c4a2165769f64ab3.tar.bz2 chocolate-doom-b9b0c2abfbe194baf6d497f1c4a2165769f64ab3.zip | |
Merge from trunk.
Subversion-branch: /branches/raven-branch
Subversion-revision: 1423
Diffstat (limited to 'src/Makefile.am')
| -rw-r--r-- | src/Makefile.am | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/Makefile.am b/src/Makefile.am index 5a2267b9..10f9c2c5 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -9,7 +9,7 @@ games_PROGRAMS = chocolate-doom \ chocolate-server \ chocolate-setup -AM_CFLAGS = -Idoom -I../textscreen -I../pcsound @SDL_CFLAGS@ @SDLMIXER_CFLAGS@ @SDLNET_CFLAGS@ +AM_CFLAGS = -I../textscreen -I../pcsound @SDLMIXER_CFLAGS@ @SDLNET_CFLAGS@ # Common source files used by absolutely everything: @@ -35,7 +35,7 @@ net_structrw.c net_structrw.h \ z_native.c z_zone.h chocolate_server_SOURCES=$(COMMON_SOURCE_FILES) $(DEDSERV_FILES) -chocolate_server_LDADD = @LDFLAGS@ @SDL_LIBS@ @SDLNET_LIBS@ +chocolate_server_LDADD = @LDFLAGS@ @SDLNET_LIBS@ # Source files used by the game binaries (chocolate-doom, etc.) |