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

Added support for Visual C++ 2003 project files (still disabled until Bakefile 0.2.3 release

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@50065 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Václav Slavík 2007-11-18 21:54:54 +00:00
parent 9a3a5e5eea
commit 7a4fa5692d
5 changed files with 27 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
build/bakefiles/Bakefiles.bkgen
View File

@ -19,7 +19,7 @@
we don't want to clutter the source tree with these files.
-->
<disable-formats>dmars,dmars_smake,msevc4prj</disable-formats>
<disable-formats>dmars,dmars_smake,msevc4prj,msvs2003prj</disable-formats>
<!-- These wildcards match all .bkl files in wxWidgets tree: -->
@ -44,26 +44,26 @@
<!-- List of output formats to generate: -->
<add-formats>
autoconf,borland,dmars_smake,dmars,mingw,msvc,msvc6prj,msevc4prj,msvs2005prj,watcom
autoconf,borland,dmars_smake,dmars,mingw,msvc,msvc6prj,msevc4prj,msvs2003prj,msvs2005prj,watcom
</add-formats>
<del-formats files="../../samples/*.bkl">
autoconf,msvc6prj,msevc4prj,msvs2005prj
autoconf,msvc6prj,msevc4prj,msvs2003prj,msvs2005prj
</del-formats>
<del-formats files="../../demos/*.bkl">
msvc6prj,msevc4prj,msvs2005prj
msvc6prj,msevc4prj,msvs2003prj,msvs2005prj
</del-formats>
<del-formats files="../../samples/html/html_samples.bkl">
msvc6prj,msevc4prj,msvs2005prj
msvc6prj,msevc4prj,msvs2003prj,msvs2005prj
</del-formats>
<del-formats files="../../samples/mobile/mobile_samples.bkl">
msvc6prj,msevc4prj,msvs2005prj
msvc6prj,msevc4prj,msvs2003prj,msvs2005prj
</del-formats>
<del-formats files="../../samples/opengl/opengl_samples.bkl">
msvc6prj,msevc4prj,msvs2005prj
msvc6prj,msevc4prj,msvs2003prj,msvs2005prj
</del-formats>
<del-formats files="../../utils/*.bkl">
msvc6prj,msevc4prj,msvs2005prj
msvc6prj,msevc4prj,msvs2003prj,msvs2005prj
</del-formats>
<!-- WinCE can't have console apps: -->
@ -75,7 +75,7 @@
<!-- HtmlCtrl sample is Cocoa only (autoconf format) -->
<del-formats files="../../samples/html/htmlctrl/htmlctrl.bkl">
borland,dmars_smake,dmars,mingw,msvc,msvc6prj,msevc4prj,msvs2005prj,watcom
borland,dmars_smake,dmars,mingw,msvc,msvc6prj,msevc4prj,msvs2003prj,msvs2005prj,watcom
</del-formats>
@ -111,6 +111,9 @@
<add-flags files="wx.bkl" formats="msvs2005prj">
-o../msw/wx.sln
</add-flags>
<add-flags files="wx.bkl" formats="msvs2003prj">
-o../msw/wx_vc7.sln
</add-flags>
<add-flags files="wx.bkl" formats="msevc4prj">
-o../wince/wx.vcw
</add-flags>
@ -118,7 +121,7 @@
-o../../contrib/src/$(INPUT_FILE_BASENAME_NOEXT)/Makefile.in
</add-flags>
<add-flags files="../../contrib/build/*/*.bkl"
formats="mingw,borland,dmars_smake,dmars,watcom,msvc,msvc6prj,msevc4prj,msvs2005prj">
formats="mingw,borland,dmars_smake,dmars,watcom,msvc,msvc6prj,msevc4prj,msvs2003prj,msvs2005prj">
-DSRCDIR=../../src/$(INPUT_FILE_BASENAME_NOEXT)
</add-flags>
@ -131,6 +134,12 @@
<add-formats files="wx.bkl">rpmspec</add-formats>
<!-- Use different names for Visual C++ 2003 project files: -->
<add-flags files="../../samples/*/*,../../samples/*/*/*,../../demos/*/*,../../utils/*/*,../../utils/*/*/*,../../tests/*"
formats="msvs2003prj">
-o$(INPUT_FILE_DIR)/$(INPUT_FILE_BASENAME_NOEXT)_vc7.sln
</add-flags>
<!-- Makefile specific settings: -->

2
build/bakefiles/build_cfg.bkl
View File

@ -8,7 +8,7 @@
the library.
-->
<if cond="FORMAT not in ['autoconf','msvc6prj','msevc4prj','msvs2005prj'] and
<if cond="FORMAT not in ['autoconf','msvc6prj','msevc4prj','msvs2003prj','msvs2005prj'] and
TOOLKIT in ['PM','MSW','MGL','MOTIF']">
<set var="BUILD_CFG_FILE" make_var="1">

4
build/bakefiles/common.bkl
View File

@ -343,7 +343,7 @@
<!-- deal with the need to copy setup.h here: -->
<set var="IS_MSVC_PRJ">
$(FORMAT in ['msvc6prj','msevc4prj','msvs2005prj'])
$(FORMAT in ['msvc6prj','msevc4prj','msvs2003prj','msvs2005prj'])
</set>
<define-tag name="msvc-headers" rules="dll,lib">
@ -753,7 +753,7 @@ $(TAB)$(VC_COMPILER) /EP /nologo "$(DOLLAR)(InputPath)" > "$(SETUPHDIR)\wx\msw\r
<define-tag name="wx-lib" rules="exe,dll,module">
<sys-lib>$(wxwin.libToLink(value))</sys-lib>
<ldlibs>$(wxwin.extraLdflags(value))</ldlibs>
<!-- msvs2005x* formats don't support external dependencies yet: -->
<!-- msvs200?prj formats don't support external dependencies yet: -->
<if cond="FORMAT in ['msvc6prj','msevc4prj'] and MONOLITHIC=='0'">
<depends-on-dsp>$(wxwin.makeDspDependency(value))</depends-on-dsp>
</if>

8
build/bakefiles/config.bkl
View File

@ -98,8 +98,8 @@ Accepted values: AMD64, IA64.
<!-- FIXME: restore this once bakefile is fixed to not use
/Gm /GZ (incompatible with /O2) w/ debug-info -->
<set var="DEBUG_INFO_DEFAULT">
<if cond="FORMAT in ['msvc','msvc6prj','msevc4prj','msvs2005prj']">1</if>
<if cond="FORMAT not in ['msvc','msvc6prj','msevc4prj','msvs2005prj']">default</if>
<if cond="FORMAT in ['msvc','msvc6prj','msevc4prj','msvs2003prj','msvs2005prj']">1</if>
<if cond="FORMAT not in ['msvc','msvc6prj','msevc4prj','msvs2003prj','msvs2005prj']">default</if>
</set>
-->
<set var="DEBUG_INFO_DEFAULT">default</set>
@ -231,8 +231,8 @@ Acts according to BUILD by default.
<!-- currently only VC++ can compile wxDebugReport which is in QA lib -->
<set var="USE_QA_DEFAULT">
<if cond="FORMAT in ['msvc','msvc6prj','msvs2005prj']">1</if>
<if cond="FORMAT not in ['msvc','msvc6prj','msvs2005prj']">0</if>
<if cond="FORMAT in ['msvc','msvc6prj','msvs2003prj','msvs2005prj']">1</if>
<if cond="FORMAT not in ['msvc','msvc6prj','msvs2003prj','msvs2005prj']">0</if>
</set>
<option name="USE_QA">
<values>0,1</values>

2
build/bakefiles/wx.bkl
View File

@ -24,7 +24,7 @@
<!-- ...and when there are multiple libraries: -->
<include file="multilib.bkl"/>
<if cond="FORMAT in ['msvc6prj','msevc4prj','msvs2005prj']">
<if cond="FORMAT in ['msvc6prj','msevc4prj','msvs2003prj','msvs2005prj']">
<set var="MSVC6PRJ_MERGED_TARGETS">
<if cond="MONOLITHIC=='0'">$(MSVC6PRJ_MERGED_TARGETS_MULTILIB)</if>
<if cond="MONOLITHIC=='1'">$(MSVC6PRJ_MERGED_TARGETS_MONOLIB)</if>