[vlc-commits] configure: provide a HAVE_WIN32_DESKTOP
Jean-Baptiste Kempf
git at videolan.org
Mon May 16 11:45:42 CEST 2016
vlc | branch: master | Jean-Baptiste Kempf <jb at videolan.org> | Mon May 16 11:27:55 2016 +0200| [21fa1cb48b633f78042ea676b68c40d0a7e4d19e] | committer: Jean-Baptiste Kempf
configure: provide a HAVE_WIN32_DESKTOP
> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=21fa1cb48b633f78042ea676b68c40d0a7e4d19e
---
configure.ac | 1 +
modules/access/Makefile.am | 12 +++---------
modules/audio_output/Makefile.am | 2 +-
modules/control/Makefile.am | 4 +---
modules/services_discovery/Makefile.am | 4 +---
modules/text_renderer/Makefile.am | 4 +---
modules/video_output/Makefile.am | 14 +++++---------
modules/video_splitter/Makefile.am | 4 +---
8 files changed, 14 insertions(+), 31 deletions(-)
diff --git a/configure.ac b/configure.ac
index 9d3f658..2ab4802 100644
--- a/configure.ac
+++ b/configure.ac
@@ -328,6 +328,7 @@ AM_CONDITIONAL(HAVE_TVOS, test "${HAVE_TVOS}" = "1")
AM_CONDITIONAL(HAVE_WIN32, test "${SYS}" = "mingw32")
AM_CONDITIONAL(HAVE_WIN64, test "${HAVE_WIN64}" = "1") dnl Only used for the packaging
AM_CONDITIONAL([HAVE_WINSTORE], [test "$vlc_winstore_app" = "1"])
+AM_CONDITIONAL([HAVE_WIN32_DESKTOP], [test "${SYS}" = "mingw32" -a "$vlc_winstore_app" = "0"])
dnl
dnl Sadly autoconf does not think about testing foo.exe when ask to test
diff --git a/modules/access/Makefile.am b/modules/access/Makefile.am
index 5598476..891b1eb 100644
--- a/modules/access/Makefile.am
+++ b/modules/access/Makefile.am
@@ -188,11 +188,9 @@ endif
libdshow_plugin_la_SOURCES = access/dshow/vlc_dshow.h access/dshow/dshow.cpp access/dshow/access.h \
access/dshow/filter.cpp access/dshow/filter.h access/dshow/crossbar.cpp
libdshow_plugin_la_LIBADD = -lole32 -loleaut32 -luuid -lstrmiids -lksuser
-if HAVE_WIN32
-if !HAVE_WINSTORE
+if HAVE_WIN32_DESKTOP
access_LTLIBRARIES += libdshow_plugin.la
endif
-endif
### Screen grab ###
@@ -222,13 +220,11 @@ endif
libscreen_plugin_la_SOURCES = access/screen/screen.c access/screen/screen.h
libscreen_plugin_la_LDFLAGS = $(AM_LDFLAGS)
-if HAVE_WIN32
-if !HAVE_WINSTORE
+if HAVE_WIN32_DESKTOP
libscreen_plugin_la_SOURCES += access/screen/win32.c
libscreen_plugin_la_LIBADD = -lgdi32
access_LTLIBRARIES += libscreen_plugin.la
endif
-endif
if HAVE_MAC_SCREEN
libscreen_plugin_la_SOURCES += access/screen/mac.c
libscreen_plugin_la_LDFLAGS += "-Wl,-framework,OpenGL,-framework,ApplicationServices"
@@ -319,8 +315,7 @@ libdtv_plugin_la_CFLAGS += -DHAVE_LINUX_DVB
access_LTLIBRARIES += libdtv_plugin.la
endif
-if HAVE_WIN32
-if !HAVE_WINSTORE
+if HAVE_WIN32_DESKTOP
# Work-around automake bug:
# Use an import library for C++ to retain C linker on other platforms.
libbda_la_SOURCES = access/dtv/bdadefs.h access/dtv/bdagraph.cpp access/dtv/bdagraph.hpp
@@ -332,7 +327,6 @@ libdtv_plugin_la_DEPENDENCIES = libbda.la
libdtv_plugin_la_LIBADD = libbda.la -lstdc++
access_LTLIBRARIES += libdtv_plugin.la
endif
-endif
# Old Linux DVB scanner
libdvb_plugin_la_SOURCES = \
diff --git a/modules/audio_output/Makefile.am b/modules/audio_output/Makefile.am
index 5850947..3c8591c 100644
--- a/modules/audio_output/Makefile.am
+++ b/modules/audio_output/Makefile.am
@@ -94,7 +94,7 @@ endif
libwaveout_plugin_la_SOURCES = audio_output/waveout.c \
audio_output/windows_audio_common.h
libwaveout_plugin_la_LIBADD = -lwinmm
-if HAVE_WIN32
+if HAVE_WIN32_DESKTOP
aout_LTLIBRARIES += libwaveout_plugin.la
endif
diff --git a/modules/control/Makefile.am b/modules/control/Makefile.am
index 91208d6..2469a86 100644
--- a/modules/control/Makefile.am
+++ b/modules/control/Makefile.am
@@ -63,9 +63,7 @@ endif
libntservice_plugin_la_SOURCES = control/ntservice.c
libwin_hotkeys_plugin_la_SOURCES = control/globalhotkeys/win32.c
libwin_msg_plugin_la_SOURCES = control/win_msg.c
-if HAVE_WIN32
-if !HAVE_WINSTORE
+if HAVE_WIN32_DESKTOP
control_LTLIBRARIES += libntservice_plugin.la
control_LTLIBRARIES += libwin_hotkeys_plugin.la libwin_msg_plugin.la
endif
-endif
diff --git a/modules/services_discovery/Makefile.am b/modules/services_discovery/Makefile.am
index ca35c63..2bdc75f 100644
--- a/modules/services_discovery/Makefile.am
+++ b/modules/services_discovery/Makefile.am
@@ -60,11 +60,9 @@ sd_LTLIBRARIES += libxcb_apps_plugin.la
endif
libwindrive_plugin_la_SOURCES = services_discovery/windrive.c
-if HAVE_WIN32
-if !HAVE_WINSTORE
+if HAVE_WIN32_DESKTOP
sd_LTLIBRARIES += libwindrive_plugin.la
endif
-endif
libos2drive_plugin_la_SOURCES = services_discovery/os2drive.c
if HAVE_OS2
diff --git a/modules/text_renderer/Makefile.am b/modules/text_renderer/Makefile.am
index 2af3bd3..a6ac52b 100644
--- a/modules/text_renderer/Makefile.am
+++ b/modules/text_renderer/Makefile.am
@@ -12,12 +12,10 @@ libfreetype_plugin_la_CPPFLAGS = $(AM_CPPFLAGS) $(FREETYPE_CFLAGS)
libfreetype_plugin_la_LIBADD = $(LIBM) $(FREETYPE_LIBS)
libfreetype_plugin_la_LDFLAGS = $(AM_LDFLAGS) $(FREETYPE_LDFLAGS) -rpath '$(textdir)'
-if HAVE_WIN32
-if !HAVE_WINSTORE
+if HAVE_WIN32_DESKTOP
libfreetype_plugin_la_SOURCES += text_renderer/freetype/fonts/win32.c
libfreetype_plugin_la_LIBADD += -liconv -lz -lgdi32 -lusp10
endif
-endif
if HAVE_FONTCONFIG
libfreetype_plugin_la_SOURCES += text_renderer/freetype/fonts/fontconfig.c
libfreetype_plugin_la_CPPFLAGS += -DHAVE_FONTCONFIG
diff --git a/modules/video_output/Makefile.am b/modules/video_output/Makefile.am
index d76af5b..3e3333e 100644
--- a/modules/video_output/Makefile.am
+++ b/modules/video_output/Makefile.am
@@ -165,7 +165,7 @@ libdirect2d_plugin_la_CPPFLAGS = $(AM_CPPFLAGS) \
-DMODULE_NAME_IS_direct2d
libdirect2d_plugin_la_LIBADD = -lgdi32 -lole32 -luuid
libdirect2d_plugin_la_LDFLAGS = $(AM_LDFLAGS) -rpath '$(voutdir)'
-if !HAVE_WINSTORE
+if HAVE_WIN32_DESKTOP
vout_LTLIBRARIES += $(LTLIBdirect2d)
EXTRA_LTLIBRARIES += libdirect2d_plugin.la
endif
@@ -179,7 +179,7 @@ libdirect3d9_plugin_la_CPPFLAGS = $(AM_CPPFLAGS) \
-DMODULE_NAME_IS_direct3d9
libdirect3d9_plugin_la_LIBADD = -lgdi32 -lole32 -luuid
libdirect3d9_plugin_la_LDFLAGS = $(AM_LDFLAGS) -rpath '$(voutdir)'
-if !HAVE_WINSTORE
+if HAVE_WIN32_DESKTOP
vout_LTLIBRARIES += $(LTLIBdirect3d9)
EXTRA_LTLIBRARIES += libdirect3d9_plugin.la
endif
@@ -208,11 +208,9 @@ libdirectdraw_plugin_la_SOURCES = video_output/win32/directdraw.c \
libdirectdraw_plugin_la_CPPFLAGS = $(AM_CPPFLAGS) \
-DMODULE_NAME_IS_directdraw
libdirectdraw_plugin_la_LIBADD = -luser32 -lgdi32 -lole32 -luuid
-if !HAVE_WINSTORE
-if HAVE_DIRECTX
+if HAVE_WIN32_DESKTOP
vout_LTLIBRARIES += libdirectdraw_plugin.la
endif
-endif
libglwin32_plugin_la_SOURCES = video_output/win32/glwin32.c \
video_output/opengl.c video_output/opengl.h \
@@ -223,7 +221,7 @@ libglwin32_plugin_la_CPPFLAGS = $(AM_CPPFLAGS) \
-DMODULE_NAME_IS_glwin32
libglwin32_plugin_la_LIBADD = -lopengl32 -lgdi32 -lole32 -luuid
libglwin32_plugin_la_LDFLAGS = $(AM_LDFLAGS) -rpath '$(voutdir)'
-if !HAVE_WINSTORE
+if HAVE_WIN32_DESKTOP
vout_LTLIBRARIES += $(LTLIBglwin32)
EXTRA_LTLIBRARIES += libglwin32_plugin.la
endif
@@ -235,11 +233,9 @@ libwingdi_plugin_la_SOURCES = video_output/win32/wingdi.c \
libwingdi_plugin_la_CPPFLAGS = $(AM_CPPFLAGS) \
-DMODULE_NAME_IS_wingdi
libwingdi_plugin_la_LIBADD = -lgdi32 -lole32 -luuid
-if HAVE_WIN32
-if !HAVE_WINSTORE
+if HAVE_WIN32_DESKTOP
vout_LTLIBRARIES += libwingdi_plugin.la
endif
-endif
libegl_win32_plugin_la_SOURCES = video_output/egl.c
libegl_win32_plugin_la_CPPFLAGS = $(AM_CPPFLAGS) -DUSE_PLATFORM_WIN32=1
diff --git a/modules/video_splitter/Makefile.am b/modules/video_splitter/Makefile.am
index f6f952b..da32c52 100644
--- a/modules/video_splitter/Makefile.am
+++ b/modules/video_splitter/Makefile.am
@@ -11,10 +11,8 @@ libwall_plugin_la_SOURCES = video_splitter/wall.c
libpanoramix_plugin_la_SOURCES = video_splitter/panoramix.c
libpanoramix_plugin_la_CFLAGS = $(AM_CFLAGS)
libpanoramix_plugin_la_LIBADD = $(LIBM)
-if HAVE_WIN32
-if !HAVE_WINSTORE
+if HAVE_WIN32_DESKTOP
splitter_LTLIBRARIES += libpanoramix_plugin.la
-endif
else
if HAVE_XCB_RANDR
libpanoramix_plugin_la_CFLAGS += $(XCB_RANDR_CFLAGS)
More information about the vlc-commits
mailing list