ref: 32762cc65dffd9c9e0733c968d609613b7e0e5a5
parent: a85cd11ee1b220c6928eac077e0fa9ec6abab42a
author: Simon Howard <[email protected]>
date: Fri Feb 23 21:19:45 EST 2007
Fix library ordering for libtextscreen.a; fixes windows compile. Subversion-branch: /trunk/chocolate-doom Subversion-revision: 841
--- a/setup/Makefile.am
+++ b/setup/Makefile.am
@@ -5,7 +5,7 @@
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 \
--- a/textscreen/examples/Makefile.am
+++ b/textscreen/examples/Makefile.am
@@ -3,9 +3,9 @@
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