5 files changed, 14 insertions, 3 deletions
diff --git a/src/Makefile.am b/src/Makefile.am
index bdb46ee..504afb6 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -1,20 +1,27 @@
 # set the include path found by configure
 AM_CPPFLAGS = $(DEBUG_CFLAGS) $(WARN_CFLAGS) $(all_includes)
-SUBDIRS = math sys filesystem core server render client game
+SUFFIXES = .rc
+.rc.o:
+	windres $< -o $@
 
+SUBDIRS = math sys filesystem core server render client game
 noinst_HEADERS = config.h
 bin_PROGRAMS = osiriond osirion
 
 # dedicated server
 osiriond_SOURCES = osiriond.cc
-osiriond_LDADD = $(top_builddir)/src/game/libgame.la \
+EXTRA_osiriond_SOURCES = osiriond-res.rc
+osiriond_DEPENDENCIES = $(ICON_SERVER)
+osiriond_LDADD = $(ICON_SERVER) $(top_builddir)/src/game/libgame.la \
 	$(top_builddir)/src/core/libcore.la $(top_builddir)/src/server/libserver.la \
 	$(HOST_LIBS)
 
 # client
 osirion_SOURCES = osirion.cc
+EXTRA_osirion_SOURCES = osirion-res.rc
+osirion_DEPENDENCIES = $(ICON_CLIENT)
 osirion_CFLAGS = $(LIBSDL_CFLAGS) $(GL_CFLAGS) $(GLUT_CFLAGS)
-osirion_LDADD = $(top_builddir)/src/game/libgame.la \
+osirion_LDADD = $(ICON_CLIENT) $(top_builddir)/src/game/libgame.la \
 	$(top_builddir)/src/core/libcore.la $(top_builddir)/src/client/libclient.la \
 	$(HOST_LIBS) $(GL_LIBS)
 osirion_LDFLAGS = $(LIBSDL_LIBS)
diff --git a/src/osirion-res.rc b/src/osirion-res.rc
new file mode 100644
index 0000000..f4eb11e
--- /dev/null
+++ b/src/osirion-res.rc
@@ -0,0 +1,2 @@
+101 ICON osirion.ico
+
diff --git a/src/osirion.ico b/src/osirion.ico
new file mode 100644
index 0000000..ce6735c
--- /dev/null
+++ b/src/osirion.ico
diff --git a/src/osiriond-res.rc b/src/osiriond-res.rc
new file mode 100644
index 0000000..31a5158
--- /dev/null
+++ b/src/osiriond-res.rc
@@ -0,0 +1,2 @@
+101 ICON osiriond.ico
+
diff --git a/src/osiriond.ico b/src/osiriond.ico
new file mode 100644
index 0000000..170c1a1
--- /dev/null
+++ b/src/osiriond.ico