From 32762cc65dffd9c9e0733c968d609613b7e0e5a5 Mon Sep 17 00:00:00 2001
From: Simon Howard
Date: Sat, 24 Feb 2007 02:19:45 +0000
Subject: Fix library ordering for libtextscreen.a; fixes windows compile.

Subversion-branch: /trunk/chocolate-doom
Subversion-revision: 841
---
 setup/Makefile.am               | 2 +-
 textscreen/examples/Makefile.am | 4 ++--
 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
 
-- 
cgit v1.2.3