AuroraMiddleware/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

added support for building eVC projects (not yet tested)

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@26572 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Václav Slavík 2004-04-01 20:20:57 +00:00
parent 3fe61e8ece
commit af594ecaf1
8 changed files with 129 additions and 40 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
build/bakefiles/Bakefiles.bkgen
View File

@ -16,6 +16,7 @@
Reasons why these formats are disabled (and so not in CVS):
dmars - In beta testing, will be added when it stabilizes.
msevc4prj - ditto
cbuilderx - Generated projects are too bad to be included in CVS. Please
*do not* enable this format until FIXMEs in .bkl files related
to cbuilderx are addressed. In particular, the project must
@ -24,7 +25,7 @@
cbx_unix - Doesn't intergrate well and won't be used by most Unix people.
-->
<disable-formats>dmars,cbx_unix,cbuilderx</disable-formats>
<disable-formats>dmars,cbx_unix,cbuilderx,msevc4prj</disable-formats>
<!-- These wildcards match all .bkl files in wxWindows tree: -->
@ -49,26 +50,26 @@
<!-- List of output formats to generate: -->
<add-formats>
autoconf,borland,dmars,mingw,msvc,msvc6prj,watcom,cbuilderx,cbx_unix
autoconf,borland,dmars,mingw,msvc,msvc6prj,msevc4prj,watcom,cbuilderx,cbx_unix
</add-formats>
<del-formats files="../../samples/*.bkl">
autoconf,msvc6prj,cbuilderx,cbx_unix
autoconf,msvc6prj,msevc4prj,cbuilderx,cbx_unix
</del-formats>
<del-formats files="../../demos/*.bkl">
msvc6prj,cbuilderx,cbx_unix
msvc6prj,msevc4prj,cbuilderx,cbx_unix
</del-formats>
<del-formats files="../../samples/html/html_samples.bkl">
msvc6prj,cbuilderx,cbx_unix
msvc6prj,msevc4prj,cbuilderx,cbx_unix
</del-formats>
<del-formats files="../../samples/mobile/mobile_samples.bkl">
msvc6prj,cbuilderx,cbx_unix
msvc6prj,msevc4prj,cbuilderx,cbx_unix
</del-formats>
<del-formats files="../../samples/opengl/opengl_samples.bkl">
msvc6prj,cbuilderx,cbx_unix
msvc6prj,msevc4prj,cbuilderx,cbx_unix
</del-formats>
<del-formats files="../../utils/*.bkl">
msvc6prj,cbuilderx,cbx_unix
msvc6prj,msevc4prj,cbuilderx,cbx_unix
</del-formats>
@ -98,6 +99,9 @@
<add-flags files="wx.bkl" formats="msvc6prj">
-o../msw/wx.dsw
</add-flags>
<add-flags files="wx.bkl" formats="msevc4prj">
-o../wince/wx.vcw
</add-flags>
<add-flags files="wx.bkl" formats="cbuilderx">
-o../../wx.cbx
</add-flags>
@ -112,7 +116,7 @@
-o../../contrib/src/$(INPUT_FILE_BASENAME_NOEXT)/$(INPUT_FILE_BASENAME_NOEXT).cbx
</add-flags>
<add-flags files="../../contrib/build/*/*.bkl"
formats="mingw,borland,dmars,watcom,msvc,msvc6prj">
formats="mingw,borland,dmars,watcom,msvc,msvc6prj,msevc4prj">
-DSRCDIR=../../src/$(INPUT_FILE_BASENAME_NOEXT)
</add-flags>

2
build/bakefiles/build_cfg.bkl
View File

@ -8,7 +8,7 @@
the library.
-->
<if cond="FORMAT!='autoconf' and TOOLKIT=='MSW' and FORMAT!='msvc6prj' and FORMAT!='cbuilderx'">
<if cond="FORMAT!='autoconf' and TOOLKIT=='MSW' and FORMAT!='msvc6prj' and FORMAT!='msevc4prj' and FORMAT!='cbuilderx'">
<set var="BUILD_CFG_FILE" make_var="1">
$(SETUPHDIR)$(DIRSEP)build.cfg

51
build/bakefiles/common.bkl
View File

@ -70,7 +70,8 @@
<if cond="DEBUG_FLAG=='1'">d</if>
</set>
<set var="WXUNICODEFLAG">
<if cond="UNICODE=='1'">u</if>
<!-- WinCE is Unicode-only platform: -->
<if cond="UNICODE=='1' and FORMAT!='msevc4prj'">u</if>
</set>
<set var="WXNAMESUFFIX">
$(WXUNICODEFLAG)$(WXDEBUGFLAG)
@ -154,6 +155,9 @@
<!-- Where to store built libraries and objects: -->
<!-- =============================================================== -->
<set var="DIR_SUFFIX_CPU">
<if cond="FORMAT=='msevc4prj'">_$(CPU)</if>
</set>
<if cond="FORMAT!='autoconf'">
<set var="WXDLLFLAG">
@ -163,7 +167,9 @@
$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)
</set>
<set var="OBJS" make_var="1">
<if cond="FORMAT!='cbuilderx'">$(COMPILER)_$(CFG_NAME_PART)</if>
<if cond="FORMAT!='cbuilderx'">
$(COMPILER)_$(CFG_NAME_PART)$(DIR_SUFFIX_CPU)
</if>
<!-- FIXME: waiting for removal after CBX has better ../ dirs
support -->
<if cond="FORMAT=='cbuilderx'">build_cbx_$(CFG_NAME_PART)</if>
@ -175,10 +181,10 @@
<set var="LIBDIRNAME" make_var="1">
<if cond="FORMAT=='autoconf'">$(top_builddir)lib</if>
<if cond="FORMAT!='autoconf' and SHARED=='0'">
$(nativePaths(TOP_SRCDIR))lib$(DIRSEP)$(COMPILER)_lib$(CFG)
$(nativePaths(TOP_SRCDIR))lib$(DIRSEP)$(COMPILER)$(DIR_SUFFIX_CPU)_lib$(CFG)
</if>
<if cond="FORMAT!='autoconf' and SHARED=='1'">
$(nativePaths(TOP_SRCDIR))lib$(DIRSEP)$(COMPILER)_dll$(CFG)
$(nativePaths(TOP_SRCDIR))lib$(DIRSEP)$(COMPILER)$(DIR_SUFFIX_CPU)_dll$(CFG)
</if>
</set>
@ -257,13 +263,16 @@
version of wxWindows; otherwise they are embedded in shared libs:
-->
<install-if>SHARED=='0'</install-if>
<pic>$(substituteFromDict(SHARED, {'0':'off', '1':'on'}))</pic>
</template>
<!-- deal with the need to copy setup.h here: -->
<set var="IS_MSVC_PRJ">$(FORMAT in ['msvc6prj','msevc4prj'])</set>
<define-tag name="msvc-headers" rules="dll,lib">
<if cond="FORMAT=='msvc6prj'">
<if cond="IS_MSVC_PRJ">
<msvc-project-files>
$(addPrefixToList('include\', wxwin.headersOnly(value)))
</msvc-project-files>
@ -271,18 +280,36 @@
</define-tag>
<define-tag name="msvc-copy-setup-h" rules="dll,lib">
<if cond="FORMAT=='msvc6prj'">
<if cond="FORMAT=='msevc4prj'">
<msvc-headers>wx/msw/wince/setup.h</msvc-headers>
<set var="vc_setup_h">wince\setup.h</set>
<set var="vc_setup_h_rule">wince_setup_h</set>
</if>
<if cond="FORMAT!='msevc4prj'">
<msvc-headers>wx/msw/setup.h</msvc-headers>
<set var="__custom_build_files" append="1">
include\wx\msw\setup.h
<set var="vc_setup_h">setup.h</set>
<set var="vc_setup_h_rule">setup_h</set>
</if>
<if cond="IS_MSVC_PRJ">
<set var="_custom_build_files" append="1">
include\wx\msw\$(vc_setup_h)
</set>
<set var="__custom_build_include_wx_msw_setup_h">
<set var="_custom_build_include_wx_msw_$(vc_setup_h_rule)">
Creating $(SETUPHDIR)\wx\setup.h
InputPath=..\include\wx\msw\setup.h
InputPath=..\include\wx\msw\$(vc_setup_h)
"$(SETUPHDIR)\wx\setup.h" : $(DOLLAR)(SOURCE) "$(DOLLAR)(INTDIR)" "$(DOLLAR)(OUTDIR)"
$(TAB)copy "$(DOLLAR)(InputPath)" $(SETUPHDIR)\wx\setup.h
</set>
<!-- FIXME: temporary kludge! remove after upgrade to 0.1.4 -->
<if cond="FORMAT=='msvc6prj'">
<set var="__custom_build_files">
$(_custom_build_files)
</set>
<set var="__custom_build_include_wx_msw_setup_h">
$(_custom_build_include_wx_msw_setup_h)
</set>
</if>
</if>
</define-tag>
@ -405,7 +432,7 @@ $(TAB)copy "$(DOLLAR)(InputPath)" $(SETUPHDIR)\wx\setup.h
</precomp-headers-exclude>
</if>
<if cond="FORMAT=='msvc6prj' and BUILDING_LIB=='1'">
<if cond="IS_MSVC_PRJ and BUILDING_LIB=='1'">
<msvc-file-group>Common Sources:src/common/*</msvc-file-group>
<msvc-file-group>MSW Sources:src/msw/*</msvc-file-group>
<msvc-file-group>Generic Sources:src/generic/*</msvc-file-group>
@ -534,7 +561,7 @@ $(TAB)copy "$(DOLLAR)(InputPath)" $(SETUPHDIR)\wx\setup.h
<define-tag name="wx-lib" rules="exe,dll,module">
<sys-lib>$(wxwin.libToLink(value))</sys-lib>
<ldlibs>$(wxwin.extraLdflags(value))</ldlibs>
<if cond="FORMAT=='msvc6prj' and MONOLITHIC=='0'">
<if cond="IS_MSVC_PRJ and MONOLITHIC=='0'">
<depends-on-dsp>$(wxwin.makeDspDependency(value))</depends-on-dsp>
</if>
</define-tag>

16
build/bakefiles/config.bkl
View File

@ -244,7 +244,10 @@ it if SHARED=1 unless you know what you are doing.
<set var="WXTOPDIR"/> <!-- to be overriden on bakefile cmd line -->
<set var="TOOLKIT">MSW</set>
<set var="TOOLKIT">
<if cond="FORMAT!='msevc4prj'">MSW</if>
<if cond="FORMAT=='msevc4prj'">WINCE</if>
</set>
<set var="TOOLKIT_LOWERCASE">$(TOOLKIT.lower())</set>
<set var="TOOLKIT_VERSION"/>
<set var="HOST_SUFFIX"/>
@ -256,7 +259,7 @@ it if SHARED=1 unless you know what you are doing.
<set var="EXTRALIBS_GUI"/>
<set var="EXTRALIBS_OPENGL">
<if cond="COMPILER=='wat'">opengl32.lib glu32.lib</if>
<if cond="COMPILER=='vc'">opengl32.lib glu32.lib</if>
<if cond="COMPILER in ['vc','evc']">opengl32.lib glu32.lib</if>
<if cond="COMPILER=='gcc'">-lopengl32 -lglu32</if>
</set>
<set var="EXTRALIBS_SDL"/>
@ -309,6 +312,8 @@ Set the version of your Mingw installation here.
<set var="DEBUG_INFO">default</set>
<set var="DEBUG_FLAG">default</set>
<set var="MSLU">0</set>
<set var="CPPUNIT_CFLAGS"/>
<set var="CPPUNIT_LIBS"/>
</if>
@ -335,4 +340,11 @@ Set the version of your Mingw installation here.
<set var="UNICODE">0</set>
</if>
<!-- No need for wxUniv on embedded devices (yet): -->
<if cond="FORMAT=='msevc4prj'">
<set var="WXUNIV">0</set>
<set var="UNICODE">1</set>
<set var="MONOLITHIC">1</set> <!-- sic! -->
</if>
</makefile>

47
build/bakefiles/files.bkl
View File

@ -78,6 +78,9 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
src/msw/mslu.cpp
src/msw/volume.cpp
</set>
<set var="BASE_WINCE_SRC" hints="files">
<if cond="TOOLKIT=='WINCE'">src/msw/wince/time.cpp</if>
</set>
<set var="BASE_WIN32_HDR" hints="files">
wx/msw/apptrait.h
wx/msw/apptbase.h
@ -90,6 +93,9 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
wx/msw/wrapcctl.h
wx/msw/wrapwin.h
</set>
<set var="BASE_WINCE_HDR" hints="files">
<if cond="TOOLKIT=='WINCE'">wx/msw/wince/time.h</if>
</set>
<set var="BASE_DARWIN_SRC" hints="files">
src/unix/baseunix.cpp
@ -315,6 +321,13 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
wx/msw/gsockmsw.h
</set>
<set var="NET_WINCE_SRC" hints="files">
<if cond="TOOLKIT=='WINCE'">src/msw/wince/net.cpp</if>
</set>
<set var="NET_WINCE_HDR" hints="files">
<if cond="TOOLKIT=='WINCE'">wx/msw/wince/net.h</if>
</set>
<set var="NET_DARWIN_SRC" hints="files">
src/unix/gsocket.c
</set>
@ -1286,6 +1299,17 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
wx/msw/warning.ico
</set>
<set var="WINCE_SRC" hints="files">
src/msw/wince/filedlgwce.cpp
src/msw/wince/helpwce.cpp
src/msw/wince/tbarwce.cpp
</set>
<set var="WINCE_HDR" hints="files">
wx/msw/wince/helpwce.h
wx/msw/wince/missing.h
wx/msw/wince/tbarwce.h
</set>
<!-- ====================================================================== -->
<!-- wxMGL -->
@ -2137,6 +2161,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
<if cond="TOOLKIT=='MAC'">src/mac/carbon/glcanvas.cpp</if>
<if cond="TOOLKIT=='GTK'">src/gtk/glcanvas.cpp</if>
<if cond="TOOLKIT=='MSW'">src/msw/glcanvas.cpp</if>
<if cond="TOOLKIT=='WINCE'">src/msw/glcanvas.cpp</if>
<if cond="TOOLKIT=='MOTIF'">src/x11/glcanvas.cpp</if>
<if cond="TOOLKIT=='X11'">src/x11/glcanvas.cpp</if>
<if cond="TOOLKIT=='PM'">src/os2/glcanvas.cpp</if>
@ -2146,6 +2171,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
<if cond="TOOLKIT=='MAC'">wx/mac/carbon/glcanvas.h</if>
<if cond="TOOLKIT=='GTK'">wx/gtk/glcanvas.h</if>
<if cond="TOOLKIT=='MSW'">wx/msw/glcanvas.h</if>
<if cond="TOOLKIT=='WINCE'">wx/msw/glcanvas.h</if>
<if cond="TOOLKIT=='MOTIF'">wx/x11/glcanvas.h</if>
<if cond="TOOLKIT=='X11'">wx/x11/glcanvas.h</if>
<if cond="TOOLKIT=='PM'">wx/os2/glcanvas.h</if>
@ -2154,7 +2180,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
<!-- ====================================================================== -->
<!-- ODBD classes -->
<!-- ODBC classes -->
<!-- ====================================================================== -->
<set var="ODBC_SRC" hints="files">
@ -2198,7 +2224,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
</set>
<set var="BASE_PLATFORM_SRC" hints="files">
<if cond="PLATFORM_UNIX=='1'">$(BASE_UNIX_SRC)</if>
<if cond="PLATFORM_WIN32=='1'">$(BASE_WIN32_SRC)</if>
<if cond="PLATFORM_WIN32=='1'">$(BASE_WIN32_SRC) $(BASE_WINCE_SRC)</if>
<if cond="PLATFORM_MACOSX=='1'">$(BASE_MACOSX_SRC)</if>
<if cond="PLATFORM_OS2=='1'">$(BASE_OS2_SRC)</if>
</set>
@ -2212,7 +2238,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
</set>
<set var="BASE_PLATFORM_HDR" hints="files">
<if cond="PLATFORM_UNIX=='1'">$(BASE_UNIX_HDR)</if>
<if cond="PLATFORM_WIN32=='1'">$(BASE_WIN32_HDR)</if>
<if cond="PLATFORM_WIN32=='1'">$(BASE_WIN32_HDR) $(BASE_WINCE_HDR)</if>
<if cond="TOOLKIT=='MAC'">$(BASE_MAC_HDR)</if>
<if cond="TOOLKIT=='COCOA'">$(BASE_DARWIN_HDR)</if>
</set>
@ -2229,13 +2255,13 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
<!-- wxNet files: -->
<set var="NET_PLATFORM_SRC" hints="files">
<if cond="PLATFORM_UNIX=='1'">$(NET_UNIX_SRC)</if>
<if cond="PLATFORM_WIN32=='1'">$(NET_WIN32_SRC)</if>
<if cond="PLATFORM_WIN32=='1'">$(NET_WIN32_SRC) $(NET_WINCE_SRC)</if>
<if cond="PLATFORM_MACOSX=='1'">$(NET_DARWIN_SRC)</if>
<if cond="PLATFORM_OS2=='1'">$(NET_OS2_SRC)</if>
</set>
<set var="NET_PLATFORM_HDR" hints="files">
<if cond="PLATFORM_UNIX=='1'">$(NET_UNIX_HDR)</if>
<if cond="PLATFORM_WIN32=='1'">$(NET_WIN32_HDR)</if>
<if cond="PLATFORM_WIN32=='1'">$(NET_WIN32_HDR) $(NET_WINCE_HDR)</if>
<if cond="PLATFORM_OS2=='1'">$(NET_OS2_HDR)</if>
<if cond="PLATFORM_MACOSX=='1'">$(NET_DARWIN_HDR)</if>
</set>
@ -2251,6 +2277,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
<if cond="TOOLKIT=='GTK'">$(GTK_LOWLEVEL_SRC)</if>
<if cond="TOOLKIT=='MOTIF'">$(MOTIF_LOWLEVEL_SRC)</if>
<if cond="TOOLKIT=='MSW'">$(MSW_LOWLEVEL_SRC)</if>
<if cond="TOOLKIT=='WINCE'">$(MSW_LOWLEVEL_SRC)</if>
<if cond="TOOLKIT=='MAC'">$(MAC_LOWLEVEL_SRC)</if>
<if cond="TOOLKIT=='COCOA'">$(COCOA_LOWLEVEL_SRC)</if>
<if cond="TOOLKIT=='PM'">$(OS2_LOWLEVEL_SRC)</if>
@ -2261,6 +2288,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
<if cond="TOOLKIT=='GTK'">$(GTK_LOWLEVEL_HDR)</if>
<if cond="TOOLKIT=='MOTIF'">$(MOTIF_LOWLEVEL_HDR)</if>
<if cond="TOOLKIT=='MSW'">$(MSW_LOWLEVEL_HDR)</if>
<if cond="TOOLKIT=='WINCE'">$(MSW_LOWLEVEL_HDR)</if>
<if cond="TOOLKIT=='MAC'">$(MAC_LOWLEVEL_HDR)</if>
<if cond="TOOLKIT=='COCOA'">$(COCOA_LOWLEVEL_HDR)</if>
<if cond="TOOLKIT=='PM'">$(OS2_LOWLEVEL_HDR)</if>
@ -2272,6 +2300,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
<if cond="TOOLKIT=='GTK'">$(GTK_SRC)</if>
<if cond="TOOLKIT=='MOTIF'">$(MOTIF_SRC)</if>
<if cond="TOOLKIT=='MSW'">$(MSW_SRC)</if>
<if cond="TOOLKIT=='WINCE'">$(MSW_SRC) $(WINCE_SRC)</if>
<if cond="TOOLKIT=='MAC'">$(MAC_SRC)</if>
<if cond="TOOLKIT=='COCOA'">$(COCOA_SRC)</if>
<if cond="TOOLKIT=='PM'">$(OS2_SRC)</if>
@ -2280,6 +2309,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
<if cond="TOOLKIT=='GTK'">$(GTK_HDR)</if>
<if cond="TOOLKIT=='MOTIF'">$(MOTIF_HDR)</if>
<if cond="TOOLKIT=='MSW'">$(MSW_HDR)</if>
<if cond="TOOLKIT=='WINCE'">$(MSW_HDR) $(WINCE_HDR)</if>
<if cond="TOOLKIT=='MAC'">$(MAC_HDR)</if>
<if cond="TOOLKIT=='COCOA'">$(COCOA_HDR)</if>
<if cond="TOOLKIT=='PM'">$(OS2_HDR)</if>
@ -2297,6 +2327,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
<!-- wxAdvanced files: -->
<set var="ADVANCED_PLATFORM_SRC" hints="files">
<if cond="TOOLKIT=='MSW'">$(ADVANCED_MSW_SRC)</if>
<if cond="TOOLKIT=='WINCE'">$(ADVANCED_MSW_SRC)</if>
<if cond="TOOLKIT=='MAC'">$(ADVANCED_MAC_SRC)</if>
<if cond="TOOLKIT=='MOTIF'">$(ADVANCED_UNIX_SRC)</if>
<if cond="TOOLKIT=='GTK'">$(ADVANCED_UNIX_SRC)</if>
@ -2305,6 +2336,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
</set>
<set var="ADVANCED_PLATFORM_HDR" hints="files">
<if cond="TOOLKIT=='MSW'">$(ADVANCED_MSW_HDR)</if>
<if cond="TOOLKIT=='WINCE'">$(ADVANCED_MSW_HDR)</if>
<if cond="TOOLKIT=='MAC'">$(ADVANCED_MAC_HDR)</if>
<if cond="TOOLKIT=='MOTIF'">$(ADVANCED_UNIX_HDR)</if>
<if cond="TOOLKIT=='GTK'">$(ADVANCED_UNIX_HDR)</if>
@ -2344,14 +2376,15 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
<set var="ALL_BASE_SOURCES" make_var="1" hints="files">
$(BASE_CMN_SRC)
$(BASE_UNIX_SRC) $(BASE_WIN32_SRC) $(BASE_MAC_SRC) $(BASE_DARWIN_SRC)
$(BASE_UNIX_SRC) $(BASE_WIN32_SRC) $(BASE_WINCE_SRC)
$(BASE_MAC_SRC) $(BASE_DARWIN_SRC)
$(BASE_OS2_SRC)
$(BASE_AND_GUI_CMN_SRC)
$(BASE_AND_GUI_UNIX_SRC)
$(BASE_AND_GUI_MAC_SRC)
$(BASE_AND_GUI_DARWIN_SRC)
$(BASE_AND_GUI_WIN32_SRC)
$(NET_CMN_SRC) $(NET_UNIX_SRC) $(NET_WIN32_SRC)
$(NET_CMN_SRC) $(NET_UNIX_SRC) $(NET_WIN32_SRC) $(NET_WINCE_SRC)
$(XML_SRC) $(ODBC_SRC)
</set>

5
build/bakefiles/monolithic.bkl
View File

@ -29,5 +29,10 @@
<sources>$(MONOLIB_SRC) $(PLUGIN_MONOLIB_SRC)</sources>
<msvc-headers>$(ALL_HEADERS)</msvc-headers>
</lib>
<set var="MSVC6PRJ_MERGED_TARGETS_MONOLIB" append="1">mono=monolib+monodll</set>
<!-- included by wx.bkl from opengl.bkl -->
<set var="MSVC6PRJ_MERGED_TARGETS_MONOLIB" append="1">gl=gllib+gldll</set>
</makefile>

18
build/bakefiles/multilib.bkl
View File

@ -22,7 +22,7 @@
<msvc-headers>$(BASE_CMN_HDR) $(BASE_PLATFORM_HDR)</msvc-headers>
</lib>
<set var="MSVC6PRJ_MERGED_TARGETS" append="1">base=baselib+basedll</set>
<set var="MSVC6PRJ_MERGED_TARGETS_MULTILIB" append="1">base=baselib+basedll</set>
<!-- ================================================================= -->
@ -44,7 +44,7 @@
<msvc-headers>$(NET_CMN_HDR) $(NET_PLATFORM_HDR)</msvc-headers>
</lib>
<set var="MSVC6PRJ_MERGED_TARGETS" append="1">net=netlib+netdll</set>
<set var="MSVC6PRJ_MERGED_TARGETS_MULTILIB" append="1">net=netlib+netdll</set>
<!-- ================================================================= -->
@ -68,7 +68,7 @@
<msvc-headers>$(ALL_GUI_HEADERS)</msvc-headers>
</lib>
<set var="MSVC6PRJ_MERGED_TARGETS" append="1">core=corelib+coredll</set>
<set var="MSVC6PRJ_MERGED_TARGETS_MULTILIB" append="1">core=corelib+coredll</set>
<!-- ================================================================= -->
@ -92,7 +92,7 @@
<msvc-headers>$(ADVANCED_HDR)</msvc-headers>
</lib>
<set var="MSVC6PRJ_MERGED_TARGETS" append="1">adv=advlib+advdll</set>
<set var="MSVC6PRJ_MERGED_TARGETS_MULTILIB" append="1">adv=advlib+advdll</set>
<!-- ================================================================= -->
@ -134,8 +134,8 @@
<msvc-headers>$(DBGRID_HDR)</msvc-headers>
</lib>
<set var="MSVC6PRJ_MERGED_TARGETS" append="1">odbc=odbclib+odbcdll</set>
<set var="MSVC6PRJ_MERGED_TARGETS" append="1">dbgrid=dbgridlib+dbgriddll</set>
<set var="MSVC6PRJ_MERGED_TARGETS_MULTILIB" append="1">odbc=odbclib+odbcdll</set>
<set var="MSVC6PRJ_MERGED_TARGETS_MULTILIB" append="1">dbgrid=dbgridlib+dbgriddll</set>
<!-- ================================================================ -->
@ -159,7 +159,7 @@
<msvc-headers>$(HTML_HDR)</msvc-headers>
</lib>
<set var="MSVC6PRJ_MERGED_TARGETS" append="1">html=htmllib+htmldll</set>
<set var="MSVC6PRJ_MERGED_TARGETS_MULTILIB" append="1">html=htmllib+htmldll</set>
<!-- ================================================================ -->
<!-- OpenGL -->
@ -167,7 +167,7 @@
<!-- included by wx.bkl from opengl.bkl -->
<set var="MSVC6PRJ_MERGED_TARGETS" append="1">gl=gllib+gldll</set>
<set var="MSVC6PRJ_MERGED_TARGETS_MULTILIB" append="1">gl=gllib+gldll</set>
<!-- ================================================================ -->
@ -190,6 +190,6 @@
<msvc-headers>$(XML_HDR)</msvc-headers>
</lib>
<set var="MSVC6PRJ_MERGED_TARGETS" append="1">xml=xmllib+xmldll</set>
<set var="MSVC6PRJ_MERGED_TARGETS_MULTILIB" append="1">xml=xmllib+xmldll</set>
</makefile>

8
build/bakefiles/wx.bkl
View File

@ -23,6 +23,14 @@
<include file="monolithic.bkl"/>
<!-- ...and when there are multiple libraries: -->
<include file="multilib.bkl"/>
<if cond="FORMAT in ['msvc6prj','msevc4prj']">
<set var="MSVC6PRJ_MERGED_TARGETS">
<if cond="MONOLITHIC=='0'">$(MSVC6PRJ_MERGED_TARGETS_MULTILIB)</if>
<if cond="MONOLITHIC=='1'">$(MSVC6PRJ_MERGED_TARGETS_MONOLIB)</if>
</set>
</if>
<!-- OpenGL canvas is built as separate library in both cases: -->
<include file="opengl.bkl"/>
<!-- Dynamically loadable plugins: -->