Remove (Open)Watcom support.
This compiler is not being developed since several years and almost certainly can't be used to build the current wxWidgets sources anyhow, so remove all support for it, including a lot of extremely ugly workarounds for its bugs with template functions. git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@76546 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
@@ -16,10 +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.
|
||||
msvc6prj,watcom - wxWidgets doesn't build with these compilers any longer.
|
||||
-->
|
||||
|
||||
<disable-formats>dmars,dmars_smake,msevc4prj,msvc6prj</disable-formats>
|
||||
<disable-formats>dmars,dmars_smake,msevc4prj,msvc6prj,watcom</disable-formats>
|
||||
|
||||
|
||||
<!-- These wildcards match all .bkl files in wxWidgets tree: -->
|
||||
|
||||
@@ -10,8 +10,8 @@ that are not up to date.
|
||||
Use "bakefile_gen -c" to clean generated files.
|
||||
|
||||
You can generate or clean only subset of files by specifying -f or -b flags
|
||||
when invoking bakefile_gen. For example, "bakefile_gen -fborland,watcom" will
|
||||
only regenerate Borland C++ and OpenWatcom makefiles. -b flag limits
|
||||
when invoking bakefile_gen. For example, "bakefile_gen -fborland,msvc" will
|
||||
only regenerate Borland C++ and MSVC makefiles. -b flag limits
|
||||
regeneration only to specified bakefiles. For example,
|
||||
"bakefile_gen -b wx.bkl" will only regenerate main library makefiles.
|
||||
"bakefile_gen -b "../../samples/html/*/*.bkl" will regenerate makefiles for
|
||||
|
||||
@@ -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
|
||||
watcom OpenWatcom makefiles
|
||||
|
||||
TIP: autoconf Project Type
|
||||
---------------------------
|
||||
|
||||
@@ -137,16 +137,6 @@
|
||||
1
|
||||
</set>
|
||||
|
||||
<!-- this is a temporary variable until there is non general -->
|
||||
<!-- function in bakefiles for returning native markup for -->
|
||||
<!-- reading envrionment variables -->
|
||||
<set var="ENV_VAR">
|
||||
<if cond="FORMAT=='watcom'">%</if>
|
||||
<if cond="FORMAT!='watcom'"></if>
|
||||
</set>
|
||||
|
||||
|
||||
|
||||
<!-- OPTIONS -->
|
||||
<!-- -->
|
||||
<!-- These are essentially the configurations you -->
|
||||
@@ -250,7 +240,7 @@
|
||||
|
||||
<!-- The directory where wxWidgets is installed: -->
|
||||
<if cond="not isdefined('WX_DIR')">
|
||||
<set var="WX_DIR_DEFAULT" overwrite="0">$(DOLLAR)($(ENV_VAR)WXWIN)</set>
|
||||
<set var="WX_DIR_DEFAULT" overwrite="0">$(DOLLAR)(WXWIN)</set>
|
||||
<option name="WX_DIR" category="path" never_empty="1">
|
||||
<default-value>$(WX_DIR_DEFAULT)</default-value>
|
||||
<description>
|
||||
|
||||
@@ -1,146 +0,0 @@
|
||||
# =========================================================================
|
||||
# This configuration file was generated by
|
||||
# Bakefile 0.2.9 (http://www.bakefile.org)
|
||||
# Beware that all changes made to this file will be overwritten next
|
||||
# time you run Bakefile!
|
||||
# =========================================================================
|
||||
|
||||
|
||||
# -------------------------------------------------------------------------
|
||||
# These are configurable options:
|
||||
# -------------------------------------------------------------------------
|
||||
|
||||
# C compiler
|
||||
CC = wcc386
|
||||
|
||||
# C++ compiler
|
||||
CXX = wpp386
|
||||
|
||||
# Standard flags for CC
|
||||
CFLAGS =
|
||||
|
||||
# Standard flags for C++
|
||||
CXXFLAGS =
|
||||
|
||||
# Standard preprocessor flags (common for CC and CXX)
|
||||
CPPFLAGS =
|
||||
|
||||
# Standard linker flags
|
||||
LDFLAGS =
|
||||
|
||||
# The C preprocessor
|
||||
CPP = $(CC) -p
|
||||
|
||||
# What type of library to build? [0,1]
|
||||
# 1 - DLL
|
||||
SHARED = 0
|
||||
|
||||
# GTK+ toolkit version [,2]
|
||||
TOOLKIT_VERSION =
|
||||
|
||||
# Build wxUniversal instead of native port? [0,1]
|
||||
# 1 - Universal
|
||||
WXUNIV = 0
|
||||
|
||||
# Compile Unicode build of wxWidgets? [0,1]
|
||||
# 1 - Unicode
|
||||
UNICODE = 1
|
||||
|
||||
# Type of compiled binaries [debug,release]
|
||||
BUILD = debug
|
||||
|
||||
# Should debugging info be included in the executables? The default value
|
||||
# "default" means that debug info will be included if BUILD=debug
|
||||
# and not included if BUILD=release. [0,1,default]
|
||||
DEBUG_INFO = default
|
||||
|
||||
# Value of wxDEBUG_LEVEL. The default value is the same as 1 and means that all
|
||||
# but expensive assert checks are enabled, use 0 to completely remove debugging
|
||||
# code. [0,1,default]
|
||||
DEBUG_FLAG = 1
|
||||
|
||||
# Multiple libraries or single huge monolithic one? [0,1]
|
||||
# 0 - Multilib
|
||||
# 1 - Monolithic
|
||||
MONOLITHIC = 1
|
||||
|
||||
# Build GUI libraries? [0,1]
|
||||
# 0 - Base
|
||||
# 1 - GUI
|
||||
USE_GUI = 1
|
||||
|
||||
# Build wxHTML library (USE_GUI must be 1)? [0,1]
|
||||
USE_HTML = 1
|
||||
|
||||
# Build wxWebView library (USE_GUI must be 1)? [0,1]
|
||||
USE_WEBVIEW = 1
|
||||
|
||||
# Build multimedia library (USE_GUI must be 1)? [0,1]
|
||||
USE_MEDIA = 1
|
||||
|
||||
# Build wxXRC library (USE_GUI must be 1)? [0,1]
|
||||
USE_XRC = 1
|
||||
|
||||
# Build wxAUI library (USE_GUI must be 1)? [0,1]
|
||||
USE_AUI = 1
|
||||
|
||||
# Build wxRibbon library (USE_GUI must be 1)? [0,1]
|
||||
USE_RIBBON = 1
|
||||
|
||||
# Build wxPropertyGrid library (USE_GUI must be 1)? [0,1]
|
||||
USE_PROPGRID = 1
|
||||
|
||||
# Build wxRichTextCtrl library (USE_GUI must be 1)? [0,1]
|
||||
USE_RICHTEXT = 1
|
||||
|
||||
# Build wxStyledTextCtrl library (USE_GUI must be 1)? [0,1]
|
||||
USE_STC = 1
|
||||
|
||||
# Build OpenGL canvas library (USE_GUI must be 1)? [0,1]
|
||||
USE_OPENGL = 1
|
||||
|
||||
# Build quality assurance classes library (USE_GUI must be 1)? [0,1]
|
||||
USE_QA = 0
|
||||
|
||||
# Enable exceptions in compiled code. [0,1]
|
||||
USE_EXCEPTIONS = 1
|
||||
|
||||
# Enable run-time type information (RTTI) in compiled code. [0,1]
|
||||
USE_RTTI = 1
|
||||
|
||||
# Enable threading in compiled code. [0,1]
|
||||
USE_THREADS = 1
|
||||
|
||||
# Enable wxCairoContext for platforms other than Linux/GTK. [0,1]
|
||||
USE_CAIRO = 0
|
||||
|
||||
# Is this official build by wxWidgets developers? [0,1]
|
||||
OFFICIAL_BUILD = 0
|
||||
|
||||
# Use this to name your customized DLLs differently
|
||||
VENDOR = custom
|
||||
|
||||
#
|
||||
WX_FLAVOUR =
|
||||
|
||||
#
|
||||
WX_LIB_FLAVOUR =
|
||||
|
||||
# Name of your custom configuration. This affects directory
|
||||
# where object files are stored as well as the location of
|
||||
# compiled .lib files and setup.h under the lib/ toplevel directory.
|
||||
CFG =
|
||||
|
||||
# Compiler flags needed to compile test suite in tests directory. If you want
|
||||
# to run the tests, set it so that the compiler can find CppUnit headers.
|
||||
CPPUNIT_CFLAGS =
|
||||
|
||||
# Linker flags needed to link test suite in tests directory. If you want
|
||||
# to run the tests, include CppUnit library here.
|
||||
CPPUNIT_LIBS =
|
||||
|
||||
# Version of C runtime library to use. You can change this to
|
||||
# static if SHARED=0, but it is highly recommended to not do
|
||||
# it if SHARED=1 unless you know what you are doing. [dynamic,static]
|
||||
RUNTIME_LIBS = dynamic
|
||||
|
||||
16610
build/msw/makefile.wat
16610
build/msw/makefile.wat
File diff suppressed because it is too large
Load Diff
@@ -58,7 +58,6 @@ package_makefiles()
|
||||
do_package tar gnu makefile.unx
|
||||
do_package zip mingw makefile.gcc config.gcc
|
||||
do_package zip dmars makefile.dmc config.dmc makefile.dms config.dms
|
||||
do_package zip watcom_msw makefile.wat config.wat
|
||||
do_package zip msvc makefile.vc config.vc
|
||||
do_package zip msvc6prj '*.dsp' '*.dsw'
|
||||
do_package zip msvc7-8prj '*.vcproj' '*.sln'
|
||||
|
||||
Reference in New Issue
Block a user