Don't link with media lib with USE_MEDIA==0.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@37857 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/autoconf_inc.m4 b/autoconf_inc.m4
index e650312bbc259a894396b54bf9795fc8e6a3a8aa..0fa6986547f7a7e6252c7031e80b34018b86bc94 100644 (file)
--- a/autoconf_inc.m4
+++ b/autoconf_inc.m4
@@ -206,7 +206,7 @@ dnl ### begin block 20_COND_MONOLITHIC_0_SHARED_1_USE_XRC_1[wx.bkl] ###
         COND_MONOLITHIC_0_SHARED_1_USE_XRC_1=""
     fi
     AC_SUBST(COND_MONOLITHIC_0_SHARED_1_USE_XRC_1)
-dnl ### begin block 20_COND_MONOLITHIC_0_USE_MEDIA_1[../../samples/splash/splash.bkl] ###
+dnl ### begin block 20_COND_MONOLITHIC_0_USE_MEDIA_1[../../samples/mediaplayer/mediaplayer.bkl,../../samples/splash/splash.bkl,wx.bkl] ###
     COND_MONOLITHIC_0_USE_MEDIA_1="#"
     if test "x$MONOLITHIC" = "x0" -a "x$USE_MEDIA" = "x1" ; then
         COND_MONOLITHIC_0_USE_MEDIA_1=""

diff --git a/samples/mediaplayer/Makefile.in b/samples/mediaplayer/Makefile.in
index 814497ad08792f6f146ef086b90486109fa9f7ae..71496e9b8297940e24e9253f5312f65d9ec043ac 100644 (file)
--- a/samples/mediaplayer/Makefile.in
+++ b/samples/mediaplayer/Makefile.in
@@ -97,9 +97,9 @@ COND_PLATFORM_OS2_1___mediaplayer___os2_emxbindcmd = $(NM) \
 @COND_TOOLKIT_COCOA@   = mediaplayer.app/Contents/PkgInfo
 @COND_TOOLKIT_MAC@____mediaplayer_BUNDLE_TGT_REF_DEP = \
 @COND_TOOLKIT_MAC@     mediaplayer.app/Contents/PkgInfo
-COND_MONOLITHIC_0___WXLIB_MEDIA_p = \
+COND_MONOLITHIC_0_USE_MEDIA_1___WXLIB_MEDIA_p = \
        -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_media-$(WX_RELEASE)$(HOST_SUFFIX)
-@COND_MONOLITHIC_0@__WXLIB_MEDIA_p = $(COND_MONOLITHIC_0___WXLIB_MEDIA_p)
+@COND_MONOLITHIC_0_USE_MEDIA_1@__WXLIB_MEDIA_p = $(COND_MONOLITHIC_0_USE_MEDIA_1___WXLIB_MEDIA_p)
 COND_MONOLITHIC_0___WXLIB_CORE_p = \
        -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core-$(WX_RELEASE)$(HOST_SUFFIX)
 @COND_MONOLITHIC_0@__WXLIB_CORE_p = $(COND_MONOLITHIC_0___WXLIB_CORE_p)

diff --git a/samples/mediaplayer/makefile.bcc b/samples/mediaplayer/makefile.bcc
index 36fd493e31a17e0c6ed039e4383b0705761412ce..e233cec681b266d71077f53ca1c6ebb4056614a8 100644 (file)
--- a/samples/mediaplayer/makefile.bcc
+++ b/samples/mediaplayer/makefile.bcc
@@ -155,7 +155,7 @@ __DLLFLAG_p = -DWXUSINGDLL
 !if "$(SHARED)" == "1"
 __DLLFLAG_p_1 = -dWXUSINGDLL
 !endif
-!if "$(MONOLITHIC)" == "0"
+!if "$(MONOLITHIC)" == "0" && "$(USE_MEDIA)" == "1"
 __WXLIB_MEDIA_p = \
        wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_media.lib
 !endif

diff --git a/samples/mediaplayer/makefile.gcc b/samples/mediaplayer/makefile.gcc
index 1cd7cd73437232d742cb80302b584cf19229e80b..37d1857bd1f5f45450f6107a827f83099edd23ab 100644 (file)
--- a/samples/mediaplayer/makefile.gcc
+++ b/samples/mediaplayer/makefile.gcc
@@ -147,9 +147,11 @@ ifeq ($(SHARED),1)
 __DLLFLAG_p_1 = --define WXUSINGDLL
 endif
 ifeq ($(MONOLITHIC),0)
+ifeq ($(USE_MEDIA),1)
 __WXLIB_MEDIA_p = \
        -lwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_media
 endif
+endif
 ifeq ($(MONOLITHIC),0)
 __WXLIB_CORE_p = \
        -lwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core

diff --git a/samples/mediaplayer/makefile.vc b/samples/mediaplayer/makefile.vc
index 7999912bef89838ad82e0df077fb697f17afa165..a91d533e4ca506dc2e97a0f7067ee5134992c693 100644 (file)
--- a/samples/mediaplayer/makefile.vc
+++ b/samples/mediaplayer/makefile.vc
@@ -245,7 +245,7 @@ __DLLFLAG_p = /DWXUSINGDLL
 !if "$(SHARED)" == "1"
 __DLLFLAG_p_1 = /d WXUSINGDLL
 !endif
-!if "$(MONOLITHIC)" == "0"
+!if "$(MONOLITHIC)" == "0" && "$(USE_MEDIA)" == "1"
 __WXLIB_MEDIA_p = \
        wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_media.lib
 !endif

diff --git a/samples/mediaplayer/makefile.wat b/samples/mediaplayer/makefile.wat
index f999f44ab5417b5c3e8f6dc48c337e3de53413a6..1abc8c7e5f0d6d7dca83e1a6501a13704d76796e 100644 (file)
--- a/samples/mediaplayer/makefile.wat
+++ b/samples/mediaplayer/makefile.wat
@@ -140,9 +140,11 @@ __EXCEPTIONSFLAG_8 = -xs
 !endif
 __WXLIB_MEDIA_p =
 !ifeq MONOLITHIC 0
+!ifeq USE_MEDIA 1
 __WXLIB_MEDIA_p = &
        wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_media.lib
 !endif
+!endif
 __WXLIB_CORE_p =
 !ifeq MONOLITHIC 0
 __WXLIB_CORE_p = &