summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSimon Howard2007-02-24 02:19:45 +0000
committerSimon Howard2007-02-24 02:19:45 +0000
commit32762cc65dffd9c9e0733c968d609613b7e0e5a5 (patch)
tree0dfad67ab4f8442eb25c68ef350e081d919f0ab9
parenta85cd11ee1b220c6928eac077e0fa9ec6abab42a (diff)
downloadchocolate-doom-32762cc65dffd9c9e0733c968d609613b7e0e5a5.tar.gz
chocolate-doom-32762cc65dffd9c9e0733c968d609613b7e0e5a5.tar.bz2
chocolate-doom-32762cc65dffd9c9e0733c968d609613b7e0e5a5.zip
Fix library ordering for libtextscreen.a; fixes windows compile.
Subversion-branch: /trunk/chocolate-doom Subversion-revision: 841
-rw-r--r--setup/Makefile.am2
-rw-r--r--textscreen/examples/Makefile.am4
2 files changed, 3 insertions, 3 deletions
diff --git a/setup/Makefile.am b/setup/Makefile.am
index f4c37cce..76120822 100644
--- a/setup/Makefile.am
+++ b/setup/Makefile.am
@@ -5,7 +5,7 @@ AM_CFLAGS = @SDL_CFLAGS@ -I../textscreen -I../src -DINSTALL_DIR="\"$(gamesdir)\"
games_PROGRAMS = chocolate-setup
-chocolate_setup_LDADD = @LDFLAGS@ @SDL_LIBS@ ../textscreen/libtextscreen.a
+chocolate_setup_LDADD = ../textscreen/libtextscreen.a @LDFLAGS@ @SDL_LIBS@
SOURCE_FILES = \
compatibility.c compatibility.h \
configfile.c configfile.h \
diff --git a/textscreen/examples/Makefile.am b/textscreen/examples/Makefile.am
index 001416c5..f6d247ea 100644
--- a/textscreen/examples/Makefile.am
+++ b/textscreen/examples/Makefile.am
@@ -3,9 +3,9 @@ AM_CFLAGS = @SDL_CFLAGS@ -I.. -I../../src
noinst_PROGRAMS=guitest calculator
-guitest_LDADD = @LDFLAGS@ @SDL_LIBS@ ../libtextscreen.a
+guitest_LDADD = ../libtextscreen.a @LDFLAGS@ @SDL_LIBS@
guitest_SOURCES = guitest.c
-calculator_LDADD = @LDFLAGS@ @SDL_LIBS@ ../libtextscreen.a
+calculator_LDADD = ../libtextscreen.a @LDFLAGS@ @SDL_LIBS@
calculator_SOURCES = calculator.c