Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@37857 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Włodzimierz Skiba
2006-03-07 15:15:59 +00:00
parent 03575f9bd3
commit e0b15ca795
6 changed files with 9 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
autoconf_inc.m4
View File

@@ -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="" COND_MONOLITHIC_0_SHARED_1_USE_XRC_1=""
fi fi
AC_SUBST(COND_MONOLITHIC_0_SHARED_1_USE_XRC_1) 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="#" COND_MONOLITHIC_0_USE_MEDIA_1="#"
if test "x$MONOLITHIC" = "x0" -a "x$USE_MEDIA" = "x1" ; then if test "x$MONOLITHIC" = "x0" -a "x$USE_MEDIA" = "x1" ; then
COND_MONOLITHIC_0_USE_MEDIA_1="" COND_MONOLITHIC_0_USE_MEDIA_1=""

4
samples/mediaplayer/Makefile.in
View File

@@ -97,9 +97,9 @@ COND_PLATFORM_OS2_1___mediaplayer___os2_emxbindcmd = $(NM) \
@COND_TOOLKIT_COCOA@ = mediaplayer.app/Contents/PkgInfo @COND_TOOLKIT_COCOA@ = mediaplayer.app/Contents/PkgInfo
@COND_TOOLKIT_MAC@____mediaplayer_BUNDLE_TGT_REF_DEP = \ @COND_TOOLKIT_MAC@____mediaplayer_BUNDLE_TGT_REF_DEP = \
@COND_TOOLKIT_MAC@ mediaplayer.app/Contents/PkgInfo @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) -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 = \ COND_MONOLITHIC_0___WXLIB_CORE_p = \
-lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core-$(WX_RELEASE)$(HOST_SUFFIX) -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) @COND_MONOLITHIC_0@__WXLIB_CORE_p = $(COND_MONOLITHIC_0___WXLIB_CORE_p)

2
samples/mediaplayer/makefile.bcc
View File

@@ -155,7 +155,7 @@ __DLLFLAG_p = -DWXUSINGDLL
!if "$(SHARED)" == "1" !if "$(SHARED)" == "1"
__DLLFLAG_p_1 = -dWXUSINGDLL __DLLFLAG_p_1 = -dWXUSINGDLL
!endif !endif
!if "$(MONOLITHIC)" == "0" !if "$(MONOLITHIC)" == "0" && "$(USE_MEDIA)" == "1"
__WXLIB_MEDIA_p = \ __WXLIB_MEDIA_p = \
wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_media.lib wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_media.lib
!endif !endif

2
samples/mediaplayer/makefile.gcc
View File

@@ -147,9 +147,11 @@ ifeq ($(SHARED),1)
__DLLFLAG_p_1 = --define WXUSINGDLL __DLLFLAG_p_1 = --define WXUSINGDLL
endif endif
ifeq ($(MONOLITHIC),0) ifeq ($(MONOLITHIC),0)
ifeq ($(USE_MEDIA),1)
__WXLIB_MEDIA_p = \ __WXLIB_MEDIA_p = \
-lwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_media -lwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_media
endif endif
endif
ifeq ($(MONOLITHIC),0) ifeq ($(MONOLITHIC),0)
__WXLIB_CORE_p = \ __WXLIB_CORE_p = \
-lwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core -lwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core

2
samples/mediaplayer/makefile.vc
View File

@@ -245,7 +245,7 @@ __DLLFLAG_p = /DWXUSINGDLL
!if "$(SHARED)" == "1" !if "$(SHARED)" == "1"
__DLLFLAG_p_1 = /d WXUSINGDLL __DLLFLAG_p_1 = /d WXUSINGDLL
!endif !endif
!if "$(MONOLITHIC)" == "0" !if "$(MONOLITHIC)" == "0" && "$(USE_MEDIA)" == "1"
__WXLIB_MEDIA_p = \ __WXLIB_MEDIA_p = \
wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_media.lib wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_media.lib
!endif !endif

2
samples/mediaplayer/makefile.wat
View File

@@ -140,9 +140,11 @@ __EXCEPTIONSFLAG_8 = -xs
!endif !endif
__WXLIB_MEDIA_p = __WXLIB_MEDIA_p =
!ifeq MONOLITHIC 0 !ifeq MONOLITHIC 0
!ifeq USE_MEDIA 1
__WXLIB_MEDIA_p = & __WXLIB_MEDIA_p = &
wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_media.lib wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_media.lib
!endif !endif
!endif
__WXLIB_CORE_p = __WXLIB_CORE_p =
!ifeq MONOLITHIC 0 !ifeq MONOLITHIC 0
__WXLIB_CORE_p = & __WXLIB_CORE_p = &