Skip to content

Commit

Permalink
Remove MSVC6 support.
Browse files Browse the repository at this point in the history
Don't support this compiler any more, this allows to get rid of tons of
MSVC6-specific workarounds, in particular we can now use Bind() and natural
template functions calls in the library code.

Also remove MSVC6 project and solution files and don't generate them when
bakefile_gen is ran any more (removing the remaining occurrences of msvc6prj
from the bakefiles results in weird bake-time errors, so it's simpler to just
leave them there).

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@76532 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
  • Loading branch information
vadz committed May 15, 2014
1 parent 28f9670 commit f4b80e5
Show file tree
Hide file tree
Showing 289 changed files with 394 additions and 38,949 deletions.
3 changes: 2 additions & 1 deletion build/bakefiles/Bakefiles.bkgen
Original file line number Diff line number Diff line change
Expand Up @@ -16,9 +16,10 @@
dmars, dmars_smake, msevc4prj - These are generated at release time and
we don't want to clutter the source tree with these files.
msvc6prj - wxWidgets doesn't build with MSVC 6 any longer.
-->

<disable-formats>dmars,dmars_smake,msevc4prj</disable-formats>
<disable-formats>dmars,dmars_smake,msevc4prj,msvc6prj</disable-formats>


<!-- These wildcards match all .bkl files in wxWidgets tree: -->
Expand Down
2 changes: 1 addition & 1 deletion build/bakefiles/README
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ Bakefiles.local.bkgen (same format as Bakefiles.bkgen) with further settings.
For example, you may disable output for compilers you don't use:
<?xml version="1.0" ?>
<bakefile-gen>
<disable-formats>msvc,msvc6prj</disable-formats>
<disable-formats>msvc,msvs2003prj</disable-formats>
</bakefile-gen>

Note: bakefile_gen creates file .bakefile_gen.state with dependencies
Expand Down
2 changes: 1 addition & 1 deletion build/bakefiles/multilib.bkl
Original file line number Diff line number Diff line change
Expand Up @@ -305,7 +305,7 @@
<wxshortcut id="wxaui" cond="MONOLITHIC=='0' and USE_AUI=='1'"/>

<set var="MSVC6PRJ_MERGED_TARGETS_MULTILIB" append="1">aui=auilib+auidll</set>

<!-- ================================================================ -->
<!-- RIBBON -->
<!-- ================================================================ -->
Expand Down
1 change: 0 additions & 1 deletion build/bakefiles/wxpresets/bakefile_quickstart.txt
Original file line number Diff line number Diff line change
Expand Up @@ -117,7 +117,6 @@ would like to build, separated by commas. Valid values are:
mingw MinGW makefiles (mingw32-make)
msevc4prj MS eMbedded Visual C++ 4 project files
msvc MS Visual C++ nmake makefiles
msvc6prj MS Visual C++ 6.0 project files
watcom OpenWatcom makefiles

TIP: autoconf Project Type
Expand Down
2 changes: 1 addition & 1 deletion build/bakefiles/wxpresets/presets/wx_win32.bkl
Original file line number Diff line number Diff line change
Expand Up @@ -302,7 +302,7 @@
</if>

<!-- Libs common to both borland and MSVC -->
<if cond="FORMAT=='msvc' or FORMAT=='msvc6prj' or FORMAT=='borland'">
<if cond="FORMAT=='msvc' or FORMAT=='borland'">
<sys-lib>oleacc</sys-lib>
</if>
</define-tag>
Expand Down
4 changes: 2 additions & 2 deletions build/bakefiles/wxpresets/presets/wx_xrc.bkl
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ file:
<set var="_wxrc_options">-c -n InitXMLResource_$(_xrc_base)</set>

<sources>$(_xrc_cpp)</sources>
<if cond="FORMAT not in ['msvc6prj','msvs2003prj','msvs2005prj']">
<if cond="FORMAT not in ['msvs2003prj','msvs2005prj']">
<clean-files>$(_xrc_cpp)</clean-files>
<add-target target="$(_xrc_cpp)" type="action"/>
<modify-target target="$(_xrc_cpp)">
Expand All @@ -49,7 +49,7 @@ file:
</command>
</modify-target>
</if>
<if cond="FORMAT in ['msvc6prj','msvs2003prj','msvs2005prj']">
<if cond="FORMAT in ['msvs2003prj','msvs2005prj']">
<sources>$(_xrc_file)</sources>
<!--
A hack to add XRC compilation step to MSVC projects.
Expand Down
24 changes: 0 additions & 24 deletions build/buildbot/config/xp_vc.xml
Original file line number Diff line number Diff line change
Expand Up @@ -56,18 +56,6 @@
<run-tests/>
</steps>
</build>
<build>
<name>XPSP2 VC6 wxMSW trunk release</name>
<builddir>XPSP2_VC6_wxMSW_trunk_release</builddir>
<scheduler>trunk_quick</scheduler>
<sandbox>VC6</sandbox>
<make>nmake /nologo /f makefile.vc BUILD=release SHARED=1 CPPUNIT_CFLAGS=-Ik:/buildbot/VC6libs/cppunit-1.12.1/include CPPUNIT_LIBS=k:/buildbot/VC6libs/cppunit-1.12.1/lib/cppunit.lib</make>
<steps>
<checkout/>
<compile-all tests="true"/>
<run-tests/>
</steps>
</build>
<build>
<name>XPSP2 VC6 wxMSW stable release</name>
<builddir>XPSP2_VC6_wxMSW_stable_release</builddir>
Expand All @@ -80,18 +68,6 @@
<run-tests/>
</steps>
</build>
<build>
<name>XPSP2 VC6 wxMSW trunk debug</name>
<builddir>XPSP2_VC6_wxMSW_trunk_debug</builddir>
<scheduler>daily_0600</scheduler>
<sandbox>VC6</sandbox>
<make>nmake /nologo /f makefile.vc BUILD=debug SHARED=1 CPPUNIT_CFLAGS=-Ik:/buildbot/VC6libs/cppunit-1.12.1/include CPPUNIT_LIBS=k:/buildbot/VC6libs/cppunit-1.12.1/lib/cppunitd.lib</make>
<steps>
<checkout/>
<compile-all tests="true"/>
<run-tests/>
</steps>
</build>
<build>
<name>XPSP2 VC6 wxMSW stable debug</name>
<builddir>XPSP2_VC6_wxMSW_stable_debug</builddir>
Expand Down
283 changes: 0 additions & 283 deletions build/msw/wx.dsw

This file was deleted.

Loading

0 comments on commit f4b80e5

Please sign in to comment.