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

media lib bakefiles

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@30444 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Ryan Norton
2004-11-11 05:30:21 +00:00
parent 1a680109ac
commit 2ae3b602b1
5 changed files with 110 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
build/bakefiles/common.bkl
View File

@@ -151,6 +151,9 @@
<set var="WXLIB_ADV">
<if cond="MONOLITHIC=='0'">$(mk.evalExpr(wxwin.mkLibName('adv')))</if>
</set>
<set var="WXLIB_MEDIA">
<if cond="MONOLITHIC=='0'">$(mk.evalExpr(wxwin.mkLibName('media')))</if>
</set>
<set var="WXLIB_HTML">
<if cond="MONOLITHIC=='0'">$(mk.evalExpr(wxwin.mkLibName('html')))</if>
</set>

73
build/bakefiles/files.bkl
View File

@@ -2297,6 +2297,54 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
src/gtk/eggtrayicon.c
</set>
<!-- ====================================================================== -->
<!-- wxMedia -->
<!-- ====================================================================== -->
<set var="MEDIA_CMN_SRC" hints="files">
</set>
<set var="MEDIA_CMN_HDR" hints="files">
wx/mediactrl.h
</set>
<set var="MEDIA_MSW_SRC" hints="files">
src/msw/mediactrl.cpp
</set>
<set var="MEDIA_MSW_HDR" hints="files">
wx/msw/mediactrl.h
</set>
<!-- not built on WindowsCE: -->
<set var="MEDIA_MSW_ONLY_SRC" hints="files">
</set>
<set var="MEDIA_MSW_ONLY_HDR" hints="files">
</set>
<set var="MEDIA_MAC_SRC" hints="files">
src/mac/carbon/mediactrl.cpp
</set>
<set var="MEDIA_MAC_HDR" hints="files">
include/mac/carbon/mediactrl.h
</set>
<set var="MEDIA_COCOA_SRC" hints="files">
</set>
<set var="MEDIA_COCOA_HDR" hints="files">
</set>
<set var="MEDIA_OS2_SRC" hints="files">
</set>
<set var="MEDIA_OS2_HDR" hints="files">
</set>
<set var="MEDIA_UNIX_SRC" hints="files">
</set>
<set var="MEDIA_UNIX_HDR" hints="files">
</set>
<set var="MEDIA_GTK_SRC" hints="files">
</set>
<!-- ====================================================================== -->
<!-- wxHTML -->
<!-- ====================================================================== -->
@@ -2676,6 +2724,29 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
<set var="ADVANCED_SRC">$(ADVANCED_CMN_SRC) $(ADVANCED_PLATFORM_SRC)</set>
<set var="ADVANCED_HDR">$(ADVANCED_CMN_HDR) $(ADVANCED_PLATFORM_HDR)</set>
<!-- wxMedia files: -->
<set var="MEDIA_PLATFORM_SRC" hints="files">
<if cond="TOOLKIT=='MSW'">$(MEDIA_MSW_SRC) $(MEDIA_MSW_ONLY_SRC)</if>
<if cond="TOOLKIT=='WINCE'">$(MEDIA_MSW_SRC)</if>
<if cond="TOOLKIT=='MAC'">$(MEDIA_MAC_SRC)</if>
<if cond="TOOLKIT=='COCOA'">$(MEDIA_COCOA_SRC)</if>
<if cond="TOOLKIT=='MOTIF'">$(MEDIA_UNIX_SRC)</if>
<if cond="TOOLKIT=='GTK'">$(MEDIA_UNIX_SRC) $(MEDIA_GTK_SRC)</if>
<if cond="TOOLKIT=='X11'">$(MEDIA_UNIX_SRC)</if>
<if cond="TOOLKIT=='PM'">$(MEDIA_OS2_SRC)</if>
</set>
<set var="MEDIA_PLATFORM_HDR" hints="files">
<if cond="TOOLKIT=='MSW'">$(MEDIA_MSW_HDR) $(MEDIA_MSW_ONLY_HDR)</if>
<if cond="TOOLKIT=='WINCE'">$(MEDIA_MSW_HDR)</if>
<if cond="TOOLKIT=='MAC'">$(MEDIA_MAC_HDR)</if>
<if cond="TOOLKIT=='COCOA'">$(MEDIA_COCOA_HDR)</if>
<if cond="TOOLKIT=='MOTIF'">$(MEDIA_UNIX_HDR)</if>
<if cond="TOOLKIT=='GTK'">$(MEDIA_UNIX_HDR)</if>
<if cond="TOOLKIT=='X11'">$(MEDIA_UNIX_HDR)</if>
<if cond="TOOLKIT=='PM'">$(MEDIA_OS2_HDR)</if>
</set>
<set var="MEDIA_SRC">$(MEDIA_CMN_SRC) $(MEDIA_PLATFORM_SRC)</set>
<set var="MEDIA_HDR">$(MEDIA_CMN_HDR) $(MEDIA_PLATFORM_HDR)</set>
<set var="GUI_CORE_HEADERS" hints="files">
@@ -2688,7 +2759,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
$(GUI_CMN_HDR)
$(LOWLEVEL_HDR)
$(GUI_CORE_HEADERS)
$(ADVANCED_HDR) $(HTML_HDR)
$(ADVANCED_HDR) $(MEDIA_HDR) $(HTML_HDR)
$(OPENGL_HDR) $(DBGRID_HDR) $(XRC_HDR)
</if>
</set>

4
build/bakefiles/monolithic.bkl
View File

@@ -4,8 +4,8 @@
<set var="MONOLIB_GUI_SRC">
<if cond="USE_GUI=='1'">
$(CORE_SRC) $(ADVANCED_SRC) $(HTML_SRC) $(ODBC_SRC) $(DBGRID_SRC)
$(XRC_SRC)
$(CORE_SRC) $(ADVANCED_SRC) $(MEDIA_SRC) $(HTML_SRC) $(ODBC_SRC) $(DBGRID_SRC)
$(XRC_SRC)
</if>
</set>
<set var="MONOLIB_SRC">

31
build/bakefiles/multilib.bkl
View File

@@ -95,6 +95,37 @@
<set var="MSVC6PRJ_MERGED_TARGETS_MULTILIB" append="1">adv=advlib+advdll</set>
<!-- ================================================================= -->
<!-- wxMedia classes library -->
<!-- ================================================================= -->
<dll id="mediadll" template="wx_dll"
cond="SHARED=='1' and USE_GUI=='1' and MONOLITHIC=='0'">
<define>WXUSINGDLL</define>
<define>WXMAKINGDLL_MEDIA</define>
<sources>$(MEDIA_SRC)</sources>
<msvc-headers>$(MEDIA_HDR)</msvc-headers>
<library>coredll</library>
<library>basedll</library>
<!--
<if cond="FORMAT!='autoconf'">
<if cond="FORMAT!='borland' and FORMAT!='msevc4prj'">
<sys-lib>strmiids</sys-lib>
</if>
</if>
-->
</dll>
<lib id="medialib" template="wx_lib"
cond="SHARED=='0' and USE_GUI=='1' and MONOLITHIC=='0'">
<sources>$(MEDIA_SRC)</sources>
<msvc-headers>$(MEDIA_HDR)</msvc-headers>
</lib>
<set var="MSVC6PRJ_MERGED_TARGETS_MULTILIB" append="1">media=medialib+mediadll</set>
<!-- ================================================================= -->
<!-- DB classes library -->
<!-- ================================================================= -->

4
build/bakefiles/wxwin.py
View File

@@ -40,10 +40,10 @@ def mk_wxid(id):
# All libs that are part of the main library (i.e. non-contrib):
MAIN_LIBS = ['mono', 'base', 'core', 'adv', 'html', 'xml', 'net',
'odbc', 'dbgrid', 'xrc']
'media', 'odbc', 'dbgrid', 'xrc']
# List of library names/ids for categories with different names:
LIBS_NOGUI = ['xml', 'net', 'odbc']
LIBS_GUI = ['core', 'adv', 'html', 'gl', 'dbgrid', 'xrc']
LIBS_GUI = ['core', 'adv', 'html', 'gl', 'dbgrid', 'xrc', 'media']
# Additional libraries that must be linked in:
EXTRALIBS = {
'gl' : '$(EXTRALIBS_OPENGL)',