Skip to content

V
vlc
Commit 90969570 authored by KO Myung-Hun's avatar KO Myung-Hun Committed by Rémi Denis-Courmont
Browse files
Options

src: fix fourcc_gen build on OS/2 

Signed-off-by: default avatarRémi Denis-Courmont <remi@remlab.net>
parent 76e10cf1
Show whitespace changes
Inline Side-by-side
Showing with 9 additions and 4 deletions
configure.ac
View file @ 90969570
...@@ -299,9 +299,13 @@ case "${build_os}" in ...@@ -299,9 +299,13 @@ case "${build_os}" in
cygwin|msys) cygwin|msys)
ac_executable_extensions=".exe" ac_executable_extensions=".exe"
;; ;;
os2*)
BUILDEXEEXT=".exe"
;;
*) *)
;; ;;
esac esac
AC_SUBST(BUILDEXEEXT)
dnl Android is linux, but a bit different dnl Android is linux, but a bit different
AS_IF([test "$SYS" = linux],[ AS_IF([test "$SYS" = linux],[
......
extras/package/os2/configure.sh
View file @ 90969570
...@@ -44,5 +44,6 @@ OPTIONS=" ...@@ -44,5 +44,6 @@ OPTIONS="
export ARCHFLAGS=${ARCHFLAGS-"-march=i486"} export ARCHFLAGS=${ARCHFLAGS-"-march=i486"}
export CFLAGS="${CFLAGS} ${ARCHFLAGS}" export CFLAGS="${CFLAGS} ${ARCHFLAGS}"
export CXXFLAGS="${CXXFLAGS} ${ARCHFLAGS}" export CXXFLAGS="${CXXFLAGS} ${ARCHFLAGS}"
export BUILDCC="gcc -std=c99"
sh "$(dirname $0)"/../../../configure ${OPTIONS} $* sh "$(dirname $0)"/../../../configure ${OPTIONS} "$@"
src/Makefile.am
View file @ 90969570
...@@ -512,13 +512,13 @@ SOURCES_libvlc = \ ...@@ -512,13 +512,13 @@ SOURCES_libvlc = \
# FourCC tables # FourCC tables
BUILT_SOURCES += fourcc_tables.h BUILT_SOURCES += fourcc_tables.h
EXTRA_DIST += misc/fourcc_gen.c EXTRA_DIST += misc/fourcc_gen.c
MOSTLYCLEANFILES = fourcc_gen MOSTLYCLEANFILES = fourcc_gen$(BUILDEXEEXT)
fourcc_gen: misc/fourcc_gen.c misc/fourcc_list.h ../include/vlc_fourcc.h fourcc_gen$(BUILDEXEEXT): misc/fourcc_gen.c misc/fourcc_list.h ../include/vlc_fourcc.h
$(AM_V_at)rm -f -- $@ $(AM_V_at)rm -f -- $@
$(AM_V_CC)$(BUILDCC) -I$(srcdir) -o $@ $< $(AM_V_CC)$(BUILDCC) -I$(srcdir) -o $@ $<
fourcc_tables.h: fourcc_gen fourcc_tables.h: fourcc_gen$(BUILDEXEEXT)
$(AM_V_at)rm -f -- $@.tmp $(AM_V_at)rm -f -- $@.tmp
$(AM_V_GEN)$(builddir)/fourcc_gen > $@.tmp $(AM_V_GEN)$(builddir)/fourcc_gen > $@.tmp
$(AM_V_at)mv -f -- $@.tmp $@ $(AM_V_at)mv -f -- $@.tmp $@
......
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