diff options
| author | Simon Howard | 2006-03-17 18:36:50 +0000 |
|---|---|---|
| committer | Simon Howard | 2006-03-17 18:36:50 +0000 |
| commit | e4170a7597488317112809874051d7ac82ac987e (patch) | |
| tree | f8e5d21c523c92101d7c864143f5bbc5e9552272 | |
| parent | 9f1245d39e792a9c37d0b7e06184dfff54394154 (diff) | |
| download | chocolate-doom-e4170a7597488317112809874051d7ac82ac987e.tar.gz chocolate-doom-e4170a7597488317112809874051d7ac82ac987e.tar.bz2 chocolate-doom-e4170a7597488317112809874051d7ac82ac987e.zip | |
Fix windres detection
Subversion-branch: /trunk/chocolate-doom
Subversion-revision: 423
| -rw-r--r-- | configure.in | 4 | ||||
| -rw-r--r-- | src/Makefile.am | 4 |
2 files changed, 5 insertions, 3 deletions
diff --git a/configure.in b/configure.in index 5c1b04d7..1d19deae 100644 --- a/configure.in +++ b/configure.in @@ -28,7 +28,9 @@ AC_CHECK_LIB(SDL_net,SDLNet_UDP_Send,[ ],echo "*** Compiling without SDL_net installed probably won't work" ,$SDL_LIBS $SDLNET_LIBS) -AM_CONDITIONAL(HAVE_WINDRES, windres > /dev/null) +AC_CHECK_TOOL(WINDRES, windres, ) + +AM_CONDITIONAL(HAVE_WINDRES, test "$WINDRES" != "") AM_INIT_AUTOMAKE(AC_PACKAGE_TARNAME,AC_PACKAGE_VERSION) diff --git a/src/Makefile.am b/src/Makefile.am index 53aad1b6..c9c3619b 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -117,9 +117,9 @@ endif EXTRA_DIST = convert-icon chocolate_doom_icon.c .rc.o: - windres $^ -o $@ + $(WINDRES) $^ -o $@ %.o : %.rc - windres $^ -o $@ + $(WINDRES) $^ -o $@ chocolate_doom_icon.c : ../data/chocolate-doom.png ./convert-icon $^ $@ |