Skip to content

V
vlc-2-2
Commit d25dc67d authored by Pierre d'Herbemont's avatar Pierre d'Herbemont
Browse files
Options

contrib: Factorize the win targets.

parent b9b7edc6
Show whitespace changes
Inline Side-by-side
Showing with 3 additions and 5 deletions
extras/contrib/bootstrap
View file @ d25dc67d
...@@ -251,18 +251,15 @@ case $TARGET in ...@@ -251,18 +251,15 @@ case $TARGET in
fi fi
;; ;;
*mingw32ce) *mingw32ce)
add_makefile_cfg "PKG_CONFIG_PATH = \$(PREFIX)/lib/pkgconfig"
EXTRA_CPPFLAGS=" -D_WIN32_WCE=0x0500" EXTRA_CPPFLAGS=" -D_WIN32_WCE=0x0500"
hint_distro wince hint_distro wince
;; ;;
*64-*mingw*) *64-*mingw*)
add_enabled_makefile_cfg "HAVE_WIN32" add_enabled_makefile_cfg "HAVE_WIN32"
add_makefile_cfg "PKG_CONFIG_PATH = \$(PREFIX)/lib/pkgconfig"
EXTRA_CFLAGS="-O3" EXTRA_CFLAGS="-O3"
hint_distro win64 hint_distro win64
;; ;;
*mingw32*) *mingw32*)
add_makefile_cfg "PKG_CONFIG_PATH = \$(PREFIX)/lib/pkgconfig"
EXTRA_CFLAGS=" -O3 -march=i686 -mtune=generic" EXTRA_CFLAGS=" -O3 -march=i686 -mtune=generic"
hint_distro win32 hint_distro win32
;; ;;
...@@ -274,11 +271,9 @@ case $TARGET in ...@@ -274,11 +271,9 @@ case $TARGET in
EXTRA_CFLAGS=" -mno-cygwin -isystem /usr/include/mingw" EXTRA_CFLAGS=" -mno-cygwin -isystem /usr/include/mingw"
EXTRA_CPPFLAGS=" -mno-cygwin -isystem /usr/include/mingw" EXTRA_CPPFLAGS=" -mno-cygwin -isystem /usr/include/mingw"
EXTRA_LDFLAGS=" -mno-cygwin" EXTRA_LDFLAGS=" -mno-cygwin"
add_makefile_cfg "PKG_CONFIG_PATH = \$(PREFIX)/lib/pkgconfig"
hint_distro win32 hint_distro win32
;; ;;
arm-wince-pe) arm-wince-pe)
add_makefile_cfg "PKG_CONFIG_PATH = \$(PREFIX)/lib/pkgconfig"
EXTRA_CPPFLAGS=" -D_WIN32_WCE" EXTRA_CPPFLAGS=" -D_WIN32_WCE"
hint_distro wince hint_distro wince
;; ;;
...@@ -366,6 +361,9 @@ case "$DISTRO" in ...@@ -366,6 +361,9 @@ case "$DISTRO" in
exit 1 exit 1
fi fi
;; ;;
win*)
add_makefile_cfg "PKG_CONFIG_PATH = \$(PREFIX)/lib/pkgconfig"
;;
esac esac
# Save passed flags # Save passed flags
......
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