From 810fa43f5e672af03ffa763d932ee45e03551e32 Mon Sep 17 00:00:00 2001 From: martin-s Date: Thu, 20 May 2010 07:56:49 +0000 Subject: Fix:Build:Removed unneeded libraries for wince git-svn-id: http://svn.code.sf.net/p/navit/code/trunk/navit@3290 ffa7fe5e-494d-0410-b361-a75ebd5db220 --- navit/graphics/win32/Makefile.am | 5 ++++- navit/speech/espeak/Makefile.am | 6 +++++- 2 files changed, 9 insertions(+), 2 deletions(-) (limited to 'navit') diff --git a/navit/graphics/win32/Makefile.am b/navit/graphics/win32/Makefile.am index 7b4de7270..15ec2441c 100644 --- a/navit/graphics/win32/Makefile.am +++ b/navit/graphics/win32/Makefile.am @@ -1,7 +1,10 @@ include $(top_srcdir)/Makefile.inc AM_CPPFLAGS = @NAVIT_CFLAGS@ @ZLIB_CFLAGS@ -I$(top_srcdir)/navit -DMODULE=graphics_win32 libgraphics_win32_la_SOURCES = graphics_win32.c xpm2bmp.c -libgraphics_win32_la_LDFLAGS = -module -avoid-version @NAVIT_MODULE_LDFLAGS@ -Wl,-lgdi32 +libgraphics_win32_la_LDFLAGS = -module -avoid-version @NAVIT_MODULE_LDFLAGS@ +if !SUPPORT_WIN32CE +libgraphics_win32_la_LDFLAGS += -Wl,-lgdi32 +endif if PLUGINS modulegraphics_LTLIBRARIES = libgraphics_win32.la else diff --git a/navit/speech/espeak/Makefile.am b/navit/speech/espeak/Makefile.am index b48150a55..ecdb50324 100644 --- a/navit/speech/espeak/Makefile.am +++ b/navit/speech/espeak/Makefile.am @@ -6,4 +6,8 @@ else noinst_LTLIBRARIES = libspeech_espeak.la endif libspeech_espeak_la_SOURCES = speak.c -libspeech_espeak_la_LDFLAGS = -module -avoid-version @NAVIT_MODULE_LDFLAGS@ -L$(top_builddir)/navit/support/espeak -lsupport_espeak -Wl,-lwinmm +libspeech_espeak_la_LDFLAGS = -module -avoid-version @NAVIT_MODULE_LDFLAGS@ -L$(top_builddir)/navit/support/espeak -lsupport_espeak +if !SUPPORT_WIN32CE +libspeech_espeak_la_LDFLAGS += -Wl,-lwinmm +endif + -- cgit v1.2.1