* configure.ac, Makefile.am: fixes for WinCE build.

diff --git a/Makefile.am b/Makefile.am
index 79cec5f44418f53067a04584786a896a40d1be39..58f743adcb530feb2ff5a1a8b8658313b1b1df58 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -421,6 +421,11 @@ vlc_LDFLAGS = `$(VLC_CONFIG) --libs vlc builtin`
 vlc_LDADD = lib/libvlc.a $(DATA_win32_rc) $(LIB_intl)
 vlc_CFLAGS = `$(VLC_CONFIG) --cflags vlc`
 
+# Work around a bug in the arm-wince-pe linker
+if HAVE_WINCE
+vlc_LDFLAGS += lib/libvlc.a
+endif
+
 # We use DEPENDENCIES_vlc instead of vlc_DEPENDENCIES because of an
 # old automake-1.5 bug (automake/279).
 DEPENDENCIES_vlc = lib/libvlc.a $(DATA_win32_rc) $(LIB_intl)

diff --git a/configure.ac b/configure.ac
index cf2790aa4ddfb77d1d0456f5d4d637e113697c60..a920d03075a36da09059a638ea1785510fafd396 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -3661,12 +3661,12 @@ if test "${SYS}" = "mingwce"; then
   VLC_ADD_CXXFLAGS([wince],[])
   VLC_ADD_LDFLAGS([wince],[-lcommctrl -lcommdlg -laygshell])
   dnl Gross hack
-  VLC_ADD_LDFLAGS([wince],[modules/gui/wince/wince_rc.o])
+  VLC_ADD_LDFLAGS([wince],[\\\${top_builddir}modules/gui/wince/wince_rc.o])
 elif test "${SYS}" = "mingw32"; then
   VLC_ADD_CXXFLAGS([wince],[])
   VLC_ADD_LDFLAGS([wince],[-lcomctl32 -lcomdlg32 -lgdi32 -lole32])
   dnl Gross hack
-  VLC_ADD_LDFLAGS([wince],[modules/gui/wince/wince_rc.o])
+  VLC_ADD_LDFLAGS([wince],[\\\${top_builddir}modules/gui/wince/wince_rc.o])
 fi
 
 dnl