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@37856 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Włodzimierz Skiba
2006-03-07 15:01:59 +00:00
parent 654056ee40
commit 03575f9bd3
7 changed files with 15 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
samples/splash/Makefile.in
View File

@@ -99,9 +99,9 @@ COND_PLATFORM_OS2_1___splash___os2_emxbindcmd = $(NM) splash$(EXEEXT) | if grep
@COND_TOOLKIT_COCOA@ splash.app/Contents/PkgInfo
@COND_TOOLKIT_MAC@____splash_BUNDLE_TGT_REF_DEP = \
@COND_TOOLKIT_MAC@ splash.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_ADV_p = \
-lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_adv-$(WX_RELEASE)$(HOST_SUFFIX)
@COND_MONOLITHIC_0@__WXLIB_ADV_p = $(COND_MONOLITHIC_0___WXLIB_ADV_p)

2
samples/splash/makefile.bcc
View File

@@ -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

2
samples/splash/makefile.gcc
View File

@@ -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_ADV_p = \
-lwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_adv

2
samples/splash/makefile.vc
View File

@@ -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

2
samples/splash/makefile.wat
View File

@@ -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_ADV_p =
!ifeq MONOLITHIC 0
__WXLIB_ADV_p = &