From 4a079e44b0e4f1f8513abb269aeac8f1c3110fe8 Mon Sep 17 00:00:00 2001 From: Peter Veenstra Date: Thu, 28 Jun 2007 14:55:43 +0000 Subject: [PATCH] fix a few warning on mac os x. Imported-from: https://svn.code.sf.net/p/dosbox/code-0/dosbox/trunk@2900 --- src/Makefile.am | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/src/Makefile.am b/src/Makefile.am index bccc59a1..870a0db5 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -4,13 +4,15 @@ SUBDIRS = cpu debug dos fpu gui hardware libs ints misc shell platform bin_PROGRAMS = dosbox +if HAVE_WINDRES +ico_stuff = dosbox_ico.o +endif + + dosbox_SOURCES = dosbox.cpp dosbox_LDADD = cpu/libcpu.a debug/libdebug.a dos/libdos.a fpu/libfpu.a hardware/libhardware.a gui/libgui.a \ - ints/libints.a misc/libmisc.a shell/libshell.a hardware/serialport/libserial.a - -if HAVE_WINDRES -dosbox_LDADD += dosbox_ico.o -endif + ints/libints.a misc/libmisc.a shell/libshell.a hardware/serialport/libserial.a \ + $(ico_stuff) EXTRA_DIST = dosbox.rc dosbox.ico dosbox_ico.o: dosbox.rc dosbox.ico