Project::OSiRiON - Git repositories
Project::OSiRiON
News . About . Screenshots . Downloads . Forum . Wiki . Tracker . Git
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStijn Buys <ingar@osirion.org>2008-05-18 11:41:21 +0000
committerStijn Buys <ingar@osirion.org>2008-05-18 11:41:21 +0000
commit9ce3a1e6aa40713db5dd11aba3595fb0ad75cc60 (patch)
treec076f8814be2ab2051de1ed13e948e85dd81c578 /src/Makefile.am
parent4a2bad92171ff8a9a248599f47087cfe39e93653 (diff)
win32 build updates
Diffstat (limited to 'src/Makefile.am')
-rw-r--r--src/Makefile.am11
1 files changed, 5 insertions, 6 deletions
diff --git a/src/Makefile.am b/src/Makefile.am
index 6ad49f8..37e1b2e 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -4,7 +4,7 @@ SUFFIXES = .rc
.rc.o:
windres $< -o $@
-SUBDIRS = sys math auxiliary filesystem core model server audio render client \
+SUBDIRS = sys math auxiliary filesystem model core server audio render client \
game
noinst_HEADERS = config.h
bin_PROGRAMS = osiriond osirion
@@ -18,9 +18,9 @@ osiriond_DEPENDENCIES = $(ICON_SERVER) $(top_builddir)/src/core/libcore.la \
$(top_builddir)/src/sys/libsys.la $(top_builddir)/src/auxiliary/libauxiliary.la
osiriond_LDADD = $(top_builddir)/src/auxiliary/libauxiliary.la \
$(top_builddir)/src/core/libcore.la $(top_builddir)/src/filesystem/libfilesystem.la \
- $(top_builddir)/src/game/libgame.la $(top_builddir)/src/math/libmath.la \
+ $(top_builddir)/src/game/libgame.la \
$(top_builddir)/src/model/libmodel.la $(top_builddir)/src/server/libserver.la \
- $(top_builddir)/src/sys/libsys.la $(HOST_LIBS) $(ICON_SERVER)
+ $(top_builddir)/src/math/libmath.la $(top_builddir)/src/sys/libsys.la $(HOST_LIBS) $(ICON_SERVER)
# client
osirion_SOURCES = osirion.cc
@@ -37,7 +37,6 @@ osirion_LDADD = $(top_builddir)/src/game/libgame.la \
$(top_builddir)/src/render/librender.la $(top_builddir)/src/core/libcore.la \
$(top_builddir)/src/filesystem/libfilesystem.la $(top_builddir)/src/model/libmodel.la \
$(top_builddir)/src/math/libmath.la $(top_builddir)/src/auxiliary/libauxiliary.la \
- $(top_builddir)/src/sys/libsys.la
$(top_builddir)/src/filesystem/libfilesystem.la $(top_builddir)/src/sys/libsys.la \
- $(top_builddir)/src/auxiliary/libauxiliary.la $(GL_LIBS) $(HOST_LIBS) $(ICON_CLIENT)
-osirion_LDFLAGS = $(LIBSDL_LIBS) $(GL_LIBS) $(AL_LIBS)
+ $(top_builddir)/src/auxiliary/libauxiliary.la $(AL_LIBS) $(GL_LIBS) $(HOST_LIBS) $(ICON_CLIENT)
+osirion_LDFLAGS = $(LIBSDL_LIBS)