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

Remove all mentions of msevc4prj from bakefiles

Browse Source 
Neither eVC nor wxWinCE port it was used for are supported any longer, so
simplify the bakefiles by removing the checks for it.
This commit is contained in:
Vadim Zeitlin
2015-10-07 02:06:38 +02:00
parent bde287ba81
commit aa970c3da3
6 changed files with 22 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
build/bakefiles/Bakefiles.bkgen
View File

@@ -6,7 +6,7 @@
The formats below are disabled because wxWidgets doesn't support these The formats below are disabled because wxWidgets doesn't support these
compilers any longer (although bakefile still does). compilers any longer (although bakefile still does).
--> -->
<disable-formats>dmars,dmars_smake,msevc4prj,msvc6prj,watcom</disable-formats> <disable-formats>dmars,dmars_smake,msvc6prj,watcom</disable-formats>
<!-- These wildcards match all .bkl files in wxWidgets tree: --> <!-- These wildcards match all .bkl files in wxWidgets tree: -->
@@ -27,7 +27,7 @@
<!-- List of output formats to generate: --> <!-- List of output formats to generate: -->
<add-formats> <add-formats>
autoconf,borland,dmars_smake,dmars,mingw,msvc,msvc6prj,msevc4prj,msvs2003prj,msvs2005prj,msvs2008prj,watcom autoconf,borland,dmars_smake,dmars,mingw,msvc,msvc6prj,msvs2003prj,msvs2005prj,msvs2008prj,watcom
</add-formats> </add-formats>
<!-- MSVC projects for the library itself (but not the samples etc) are now <!-- MSVC projects for the library itself (but not the samples etc) are now
@@ -37,29 +37,29 @@
</del-formats> </del-formats>
<del-formats files="../../samples/*.bkl"> <del-formats files="../../samples/*.bkl">
autoconf,msvc6prj,msevc4prj,msvs2003prj,msvs2005prj,msvs2008prj autoconf,msvc6prj,msvs2003prj,msvs2005prj,msvs2008prj
</del-formats> </del-formats>
<del-formats files="../../demos/*.bkl"> <del-formats files="../../demos/*.bkl">
msvc6prj,msevc4prj,msvs2003prj,msvs2005prj,msvs2008prj msvc6prj,msvs2003prj,msvs2005prj,msvs2008prj
</del-formats> </del-formats>
<del-formats files="../../samples/html/html_samples.bkl"> <del-formats files="../../samples/html/html_samples.bkl">
msvc6prj,msevc4prj,msvs2003prj,msvs2005prj,msvs2008prj msvc6prj,msvs2003prj,msvs2005prj,msvs2008prj
</del-formats> </del-formats>
<del-formats files="../../samples/opengl/opengl_samples.bkl"> <del-formats files="../../samples/opengl/opengl_samples.bkl">
msvc6prj,msevc4prj,msvs2003prj,msvs2005prj,msvs2008prj msvc6prj,msvs2003prj,msvs2005prj,msvs2008prj
</del-formats> </del-formats>
<del-formats files="../../utils/*.bkl"> <del-formats files="../../utils/*.bkl">
msvc6prj,msevc4prj,msvs2003prj,msvs2005prj,msvs2008prj msvc6prj,msvs2003prj,msvs2005prj,msvs2008prj
</del-formats> </del-formats>
<!-- HtmlCtrl sample is Cocoa only (autoconf format) --> <!-- HtmlCtrl sample is Cocoa only (autoconf format) -->
<del-formats files="../../samples/html/htmlctrl/htmlctrl.bkl"> <del-formats files="../../samples/html/htmlctrl/htmlctrl.bkl">
borland,dmars_smake,dmars,mingw,msvc,msvc6prj,msevc4prj,msvs2003prj,msvs2005prj,msvs2008prj,watcom borland,dmars_smake,dmars,mingw,msvc,msvc6prj,msvs2003prj,msvs2005prj,msvs2008prj,watcom
</del-formats> </del-formats>
<!-- Some samples use MSVC-specific stuff --> <!-- Some samples use MSVC-specific stuff -->
<del-formats files="../../samples/flash/flash.bkl,../../samples/mfc/mfc.bkl"> <del-formats files="../../samples/flash/flash.bkl,../../samples/mfc/mfc.bkl">
autoconf,borland,dmars_smake,dmars,mingw,msevc4prj,watcom autoconf,borland,dmars_smake,dmars,mingw,watcom
</del-formats> </del-formats>
<!-- Default flags (for all formats and bakefiles): --> <!-- Default flags (for all formats and bakefiles): -->
@@ -100,9 +100,6 @@
<add-flags files="wx.bkl" formats="msvs2008prj"> <add-flags files="wx.bkl" formats="msvs2008prj">
-o../msw/wx_vc9.sln -o../msw/wx_vc9.sln
</add-flags> </add-flags>
<add-flags files="wx.bkl" formats="msevc4prj">
-o../wince/wx.vcw
</add-flags>

2
build/bakefiles/build_cfg.bkl
View File

@@ -7,7 +7,7 @@
the library. the library.
--> -->
<if cond="FORMAT not in ['autoconf','msvc6prj','msevc4prj','msvs2003prj','msvs2005prj','msvs2008prj']"> <if cond="FORMAT not in ['autoconf','msvc6prj','msvs2003prj','msvs2005prj','msvs2008prj']">
<set var="BUILD_CFG_FILE" make_var="1"> <set var="BUILD_CFG_FILE" make_var="1">
$(SETUPHDIR)$(DIRSEP)build.cfg $(SETUPHDIR)$(DIRSEP)build.cfg

24
build/bakefiles/common.bkl
View File

@@ -33,7 +33,6 @@
<include file="version.bkl"/> <include file="version.bkl"/>
<set var="ARCH_SUFFIX"> <set var="ARCH_SUFFIX">
<if cond="FORMAT=='msevc4prj'">_$(CPU)</if>
<if cond="FORMAT=='msvs2005prj' and MSVS_PLATFORM=='win64'">_x64</if> <if cond="FORMAT=='msvs2005prj' and MSVS_PLATFORM=='win64'">_x64</if>
<if cond="FORMAT=='msvs2008prj' and MSVS_PLATFORM=='win64'">_x64</if> <if cond="FORMAT=='msvs2008prj' and MSVS_PLATFORM=='win64'">_x64</if>
<if cond="TARGET_CPU=='amd64'">_x64</if> <if cond="TARGET_CPU=='amd64'">_x64</if>
@@ -393,14 +392,14 @@
</define-tag> </define-tag>
<set var="msvc_copy_setup_h_script"> <set var="msvc_copy_setup_h_script">
<if cond="IS_MSVC_PRJ=='1' and FORMAT not in ['msvc6prj','msevc4prj']"> <if cond="IS_MSVC_PRJ=='1' and FORMAT!='msvc6prj'">
Creating $(SETUPHDIR)\wx\setup.h Creating $(SETUPHDIR)\wx\setup.h
InputPath=..\..\include\wx\%s InputPath=..\..\include\wx\%s
"$(SETUPHDIR)\wx\setup.h" : "$(SETUPHDIR)\wx\setup.h" :
$(TAB)copy "$(DOLLAR)(InputPath)" $(SETUPHDIR)\wx\setup.h $(TAB)copy "$(DOLLAR)(InputPath)" $(SETUPHDIR)\wx\setup.h
</if> </if>
<if cond="IS_MSVC_PRJ=='1' and FORMAT in ['msvc6prj','msevc4prj']"> <if cond="IS_MSVC_PRJ=='1' and FORMAT=='msvc6prj'">
Creating $(SETUPHDIR)\wx\setup.h Creating $(SETUPHDIR)\wx\setup.h
InputPath=..\..\include\wx\%s InputPath=..\..\include\wx\%s
@@ -449,17 +448,12 @@ $(TAB)copy "$(DOLLAR)(InputPath)" $(SETUPHDIR)\wx\setup.h
<msvc-headers-setup-h> <msvc-headers-setup-h>
msw/genrcdefs.h msw/genrcdefs.h
</msvc-headers-setup-h> </msvc-headers-setup-h>
<!-- FIXME: we need another way to get the compiler name -->
<set var="VC_COMPILER">
<if cond="FORMAT=='msevc4prj'">$(_COMPILER)</if>
<if cond="FORMAT!='msevc4prj'">cl</if>
</set>
<set var="_custom_build_include_wx_msw_genrcdefs_h"> <set var="_custom_build_include_wx_msw_genrcdefs_h">
Creating $(SETUPHDIR)\wx\msw\rcdefs.h Creating $(SETUPHDIR)\wx\msw\rcdefs.h
InputPath=..\..\include\wx\msw\genrcdefs.h InputPath=..\..\include\wx\msw\genrcdefs.h
"$(SETUPHDIR)\wx\msw\rcdefs.h" : "$(DOLLAR)(SOURCE)" "$(SETUPHDIR)\wx\msw" "$(SETUPHDIR)\wx\msw\rcdefs.h" : "$(DOLLAR)(SOURCE)" "$(SETUPHDIR)\wx\msw"
$(TAB)$(VC_COMPILER) /EP /nologo "$(DOLLAR)(InputPath)" > "$(SETUPHDIR)\wx\msw\rcdefs.h" $(TAB)cl /EP /nologo "$(DOLLAR)(InputPath)" > "$(SETUPHDIR)\wx\msw\rcdefs.h"
</set> </set>
</if> </if>
</define-tag> </define-tag>
@@ -551,15 +545,7 @@ $(TAB)$(VC_COMPILER) /EP /nologo "$(DOLLAR)(InputPath)" > "$(SETUPHDIR)\wx\msw\r
<if cond="FORMAT=='borland'"> <if cond="FORMAT=='borland'">
<sys-lib>ole2w32</sys-lib> <sys-lib>ole2w32</sys-lib>
</if> </if>
<if cond="FORMAT=='msevc4prj'"> <if cond="FORMAT!='borland'">
<sys-lib>ole32</sys-lib>
<sys-lib>oleaut32</sys-lib>
<sys-lib>uuid</sys-lib>
<sys-lib>commctrl</sys-lib>
<sys-lib>winsock</sys-lib>
<sys-lib>wininet</sys-lib>
</if>
<if cond="FORMAT!='borland' and FORMAT!='msevc4prj'">
<sys-lib>kernel32</sys-lib> <sys-lib>kernel32</sys-lib>
<sys-lib>user32</sys-lib> <sys-lib>user32</sys-lib>
<sys-lib>gdi32</sys-lib> <sys-lib>gdi32</sys-lib>
@@ -793,7 +779,7 @@ $(TAB)$(VC_COMPILER) /EP /nologo "$(DOLLAR)(InputPath)" > "$(SETUPHDIR)\wx\msw\r
<sys-lib>$(wxwin.libToLink(value))</sys-lib> <sys-lib>$(wxwin.libToLink(value))</sys-lib>
<ldlibs>$(wxwin.extraLdflags(value))</ldlibs> <ldlibs>$(wxwin.extraLdflags(value))</ldlibs>
<!-- msvs200?prj 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'"> <if cond="FORMAT=='msvc6prj' and MONOLITHIC=='0'">
<depends-on-dsp>$(wxwin.makeDspDependency(value))</depends-on-dsp> <depends-on-dsp>$(wxwin.makeDspDependency(value))</depends-on-dsp>
</if> </if>
</define-tag> </define-tag>

8
build/bakefiles/config.bkl
View File

@@ -3,7 +3,7 @@
<makefile> <makefile>
<set var="IS_MSVC_PRJ"> <set var="IS_MSVC_PRJ">
$(FORMAT in ['msvc6prj','msevc4prj','msvs2003prj','msvs2005prj','msvs2008prj']) $(FORMAT in ['msvc6prj','msvs2003prj','msvs2005prj','msvs2008prj'])
</set> </set>
<set var="IS_MSVC"> <set var="IS_MSVC">
$(IS_MSVC_PRJ=='1' or FORMAT=='msvc') $(IS_MSVC_PRJ=='1' or FORMAT=='msvc')
@@ -54,7 +54,7 @@
</description> </description>
</option> </option>
<if cond="FORMAT not in ['autoconf','msvc6prj','msevc4prj','msvs2003prj','msvs2005prj','msvs2008prj']"> <if cond="FORMAT not in ['autoconf','msvc6prj','msvs2003prj','msvs2005prj','msvs2008prj']">
<option name="TOOLKIT_VERSION"> <option name="TOOLKIT_VERSION">
<values>,2</values> <values>,2</values>
<values-description>,2</values-description> <values-description>,2</values-description>
@@ -462,12 +462,12 @@ it if SHARED=1 unless you know what you are doing.
<set var="TOOLKIT" overwrite="0"> <set var="TOOLKIT" overwrite="0">
<if cond="FORMAT=='msvs2005prj' and MSVS_PLATFORMS=='win32,win64'">$(WIN32_TOOLKIT)</if> <if cond="FORMAT=='msvs2005prj' and MSVS_PLATFORMS=='win32,win64'">$(WIN32_TOOLKIT)</if>
<if cond="FORMAT=='msvs2008prj' and MSVS_PLATFORMS=='win32,win64'">$(WIN32_TOOLKIT)</if> <if cond="FORMAT=='msvs2008prj' and MSVS_PLATFORMS=='win32,win64'">$(WIN32_TOOLKIT)</if>
<if cond="FORMAT not in ['msevc4prj','msvs2005prj','msvs2008prj'] and PLATFORM_WIN32=='1'">$(WIN32_TOOLKIT)</if> <if cond="FORMAT not in ['msvs2005prj','msvs2008prj'] and PLATFORM_WIN32=='1'">$(WIN32_TOOLKIT)</if>
</set> </set>
<set var="TOOLKIT_LOWERCASE"> <set var="TOOLKIT_LOWERCASE">
<if cond="FORMAT=='msvs2005prj' and MSVS_PLATFORMS=='win32,win64'">$(WIN32_TOOLKIT_LOWERCASE)</if> <if cond="FORMAT=='msvs2005prj' and MSVS_PLATFORMS=='win32,win64'">$(WIN32_TOOLKIT_LOWERCASE)</if>
<if cond="FORMAT=='msvs2008prj' and MSVS_PLATFORMS=='win32,win64'">$(WIN32_TOOLKIT_LOWERCASE)</if> <if cond="FORMAT=='msvs2008prj' and MSVS_PLATFORMS=='win32,win64'">$(WIN32_TOOLKIT_LOWERCASE)</if>
<if cond="FORMAT not in ['msevc4prj','msvs2005prj','msvs2008prj'] and PLATFORM_WIN32=='1'">$(WIN32_TOOLKIT_LOWERCASE)</if> <if cond="FORMAT not in ['msvs2005prj','msvs2008prj'] and PLATFORM_WIN32=='1'">$(WIN32_TOOLKIT_LOWERCASE)</if>
</set> </set>
<if cond="FORMAT in ['msvc6prj','msvs2003prj','msvs2005prj','msvs2008prj']"> <if cond="FORMAT in ['msvc6prj','msvs2003prj','msvs2005prj','msvs2008prj']">
<set var="TOOLKIT_VERSION"> <set var="TOOLKIT_VERSION">

7
build/bakefiles/wxpresets/presets/wx_win32.bkl
View File

@@ -98,7 +98,6 @@
</set> </set>
<set var="WXCPU"> <set var="WXCPU">
<if cond="FORMAT=='msevc4prj'">_$(CPU)</if>
<if cond="FORMAT_SUPPORTS_MULTIPLE_ARCHITECTURES=='1' and TARGET_CPU=='AMD64'">_x64</if> <if cond="FORMAT_SUPPORTS_MULTIPLE_ARCHITECTURES=='1' and TARGET_CPU=='AMD64'">_x64</if>
<if cond="FORMAT_SUPPORTS_MULTIPLE_ARCHITECTURES=='1' and TARGET_CPU=='IA64'">_ia64</if> <if cond="FORMAT_SUPPORTS_MULTIPLE_ARCHITECTURES=='1' and TARGET_CPU=='IA64'">_ia64</if>
</set> </set>
@@ -264,14 +263,14 @@
after __wx-libs-point: --> after __wx-libs-point: -->
<define-tag name="__wx-syslibs" rules="exe,dll,module"> <define-tag name="__wx-syslibs" rules="exe,dll,module">
<!-- wx 3rd party libs, always use them: --> <!-- wx 3rd party libs, always use them: -->
<sys-lib cond="FORMAT!='msevc4prj'">wxtiff$(WX3RDPARTYLIBPOSTFIX)</sys-lib> <sys-lib>wxtiff$(WX3RDPARTYLIBPOSTFIX)</sys-lib>
<sys-lib>wxjpeg$(WX3RDPARTYLIBPOSTFIX)</sys-lib> <sys-lib>wxjpeg$(WX3RDPARTYLIBPOSTFIX)</sys-lib>
<sys-lib>wxpng$(WX3RDPARTYLIBPOSTFIX)</sys-lib> <sys-lib>wxpng$(WX3RDPARTYLIBPOSTFIX)</sys-lib>
<sys-lib>wxzlib$(WX3RDPARTYLIBPOSTFIX)</sys-lib> <sys-lib>wxzlib$(WX3RDPARTYLIBPOSTFIX)</sys-lib>
<!-- For regex we won't use the WX3RDPARTYLIBPOSTIX postfix: <!-- For regex we won't use the WX3RDPARTYLIBPOSTIX postfix:
unliked tiff, jpeg, png, zlib, expat, when building unliked tiff, jpeg, png, zlib, expat, when building
in Unicode mode, the "u" suffix is appended to regex --> in Unicode mode, the "u" suffix is appended to regex -->
<sys-lib cond="FORMAT!='msevc4prj'">wxregex$(WXLIBPOSTFIX)</sys-lib> <sys-lib>wxregex$(WXLIBPOSTFIX)</sys-lib>
<sys-lib>wxexpat$(WX3RDPARTYLIBPOSTFIX)</sys-lib> <sys-lib>wxexpat$(WX3RDPARTYLIBPOSTFIX)</sys-lib>
<!-- link-in system libs that wx depends on: --> <!-- link-in system libs that wx depends on: -->
@@ -281,7 +280,7 @@
</if> </if>
<!-- Non-borland, on the other hand... --> <!-- Non-borland, on the other hand... -->
<if cond="FORMAT not in ['borland','msevc4prj']"> <if cond="FORMAT!='borland'">
<sys-lib>kernel32</sys-lib> <sys-lib>kernel32</sys-lib>
<sys-lib>user32</sys-lib> <sys-lib>user32</sys-lib>
<sys-lib>gdi32</sys-lib> <sys-lib>gdi32</sys-lib>

3
build/bakefiles/zlib.bkl
View File

@@ -27,9 +27,6 @@
<cflags-borland> <cflags-borland>
-w-8004 -w-8008 -w-8012 -w-8057 -w-8066 -w-8004 -w-8008 -w-8012 -w-8057 -w-8066
</cflags-borland> </cflags-borland>
<if cond="FORMAT=='msevc4prj'">
<define>NO_ERRNO_H</define>
</if>
<if cond="IS_MSVC"> <if cond="IS_MSVC">
<!-- <!--
Define this to get rid of many warnings about using open(), Define this to get rid of many warnings about using open(),