Commit c37c7fd5 authored by Gildas Bazin's avatar Gildas Bazin

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

parent a8bf646b
...@@ -421,6 +421,11 @@ vlc_LDFLAGS = `$(VLC_CONFIG) --libs vlc builtin` ...@@ -421,6 +421,11 @@ vlc_LDFLAGS = `$(VLC_CONFIG) --libs vlc builtin`
vlc_LDADD = lib/libvlc.a $(DATA_win32_rc) $(LIB_intl) vlc_LDADD = lib/libvlc.a $(DATA_win32_rc) $(LIB_intl)
vlc_CFLAGS = `$(VLC_CONFIG) --cflags vlc` 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 # We use DEPENDENCIES_vlc instead of vlc_DEPENDENCIES because of an
# old automake-1.5 bug (automake/279). # old automake-1.5 bug (automake/279).
DEPENDENCIES_vlc = lib/libvlc.a $(DATA_win32_rc) $(LIB_intl) DEPENDENCIES_vlc = lib/libvlc.a $(DATA_win32_rc) $(LIB_intl)
......
...@@ -3661,12 +3661,12 @@ if test "${SYS}" = "mingwce"; then ...@@ -3661,12 +3661,12 @@ if test "${SYS}" = "mingwce"; then
VLC_ADD_CXXFLAGS([wince],[]) VLC_ADD_CXXFLAGS([wince],[])
VLC_ADD_LDFLAGS([wince],[-lcommctrl -lcommdlg -laygshell]) VLC_ADD_LDFLAGS([wince],[-lcommctrl -lcommdlg -laygshell])
dnl Gross hack 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 elif test "${SYS}" = "mingw32"; then
VLC_ADD_CXXFLAGS([wince],[]) VLC_ADD_CXXFLAGS([wince],[])
VLC_ADD_LDFLAGS([wince],[-lcomctl32 -lcomdlg32 -lgdi32 -lole32]) VLC_ADD_LDFLAGS([wince],[-lcomctl32 -lcomdlg32 -lgdi32 -lole32])
dnl Gross hack 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 fi
dnl dnl
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment