ref: d8762759774d667becfaca6c3054531cfa921b35
parent: be8b6547d1634c24206c9723cfd847665f293b8a
author: Marshall Banana <djcj@gmx.de>
date: Sun May 3 03:11:27 EDT 2015
Use windres on Windows builds
--- /dev/null
+++ b/Game/Makefile.am
@@ -1,0 +1,4 @@
+if WITH_WIN_ICON
+chocolateDukeResources.o: chocolateDukeResources.rc
+ @WINDRES@ $^ -o $@
+endif
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,4 +1,4 @@
-SUBDIRS = Game/src Engine/src
+SUBDIRS = Game/src Engine/src Game
bin_PROGRAMS = chocolate-duke3d
chocolate_duke3d_SOURCES =
@@ -8,6 +8,9 @@
Game/src/midi/libmidi.a \
Engine/src/libEngine.a \
$(SDL_LIBS) $(SDL_MIXER_LIBS)
+if WITH_WIN_ICON
+chocolate_duke3d_LDADD += Game/chocolateDukeResources.o
+endif
doc_DATA = README.md
--- a/configure.ac
+++ b/configure.ac
@@ -13,6 +13,12 @@
# Checks for programs.
AC_PROG_CC
AC_PROG_RANLIB
+case "$host" in
+ *cygwin*|*mingw*)
+ AC_CHECK_TOOL([WINDRES], [windres], [])
+ ;;
+esac
+AM_CONDITIONAL([WITH_WIN_ICON], [test "$WINDRES" != ""])
# Checks for libraries.
PKG_CHECK_MODULES([SDL], [sdl], [], [
@@ -34,5 +40,6 @@
Game/src/Makefile
Game/src/audiolib/Makefile
Game/src/midi/Makefile
+ Game/Makefile
Makefile])
AC_OUTPUT