2015-03-19 16:09:08 -04:00
|
|
|
# =========================================================================
|
|
|
|
|
# This makefile was generated by
|
2017-10-21 11:42:30 -04:00
|
|
|
# Bakefile 0.2.11 (http://www.bakefile.org)
|
2015-03-19 16:09:08 -04:00
|
|
|
# Do not modify, all changes will be overwritten!
|
|
|
|
|
# =========================================================================
|
|
|
|
|
|
|
|
|
|
.autodepend
|
|
|
|
|
|
|
|
|
|
!ifndef BCCDIR
|
|
|
|
|
!ifndef MAKEDIR
|
|
|
|
|
!error Your Borland compiler does not define MAKEDIR. Please define the BCCDIR variable, e.g. BCCDIR=d:\bc4
|
|
|
|
|
!endif
|
|
|
|
|
BCCDIR = $(MAKEDIR)\..
|
|
|
|
|
!endif
|
|
|
|
|
|
|
|
|
|
!include ../build/msw/config.bcc
|
|
|
|
|
|
|
|
|
|
# -------------------------------------------------------------------------
|
|
|
|
|
# Do not modify the rest of this file!
|
|
|
|
|
# -------------------------------------------------------------------------
|
|
|
|
|
|
|
|
|
|
### Variables: ###
|
|
|
|
|
|
|
|
|
|
MAKEARGS = -DCC="$(CC)" -DCXX="$(CXX)" -DCFLAGS="$(CFLAGS)" \
|
|
|
|
|
-DCXXFLAGS="$(CXXFLAGS)" -DCPPFLAGS="$(CPPFLAGS)" -DLDFLAGS="$(LDFLAGS)" \
|
|
|
|
|
-DCPP="$(CPP)" -DSHARED="$(SHARED)" -DTOOLKIT_VERSION="$(TOOLKIT_VERSION)" \
|
|
|
|
|
-DWXUNIV="$(WXUNIV)" -DUNICODE="$(UNICODE)" -DBUILD="$(BUILD)" \
|
|
|
|
|
-DDEBUG_INFO="$(DEBUG_INFO)" -DDEBUG_FLAG="$(DEBUG_FLAG)" \
|
|
|
|
|
-DMONOLITHIC="$(MONOLITHIC)" -DUSE_GUI="$(USE_GUI)" \
|
|
|
|
|
-DUSE_HTML="$(USE_HTML)" -DUSE_WEBVIEW="$(USE_WEBVIEW)" \
|
|
|
|
|
-DUSE_MEDIA="$(USE_MEDIA)" -DUSE_XRC="$(USE_XRC)" -DUSE_AUI="$(USE_AUI)" \
|
|
|
|
|
-DUSE_RIBBON="$(USE_RIBBON)" -DUSE_PROPGRID="$(USE_PROPGRID)" \
|
|
|
|
|
-DUSE_RICHTEXT="$(USE_RICHTEXT)" -DUSE_STC="$(USE_STC)" \
|
|
|
|
|
-DUSE_OPENGL="$(USE_OPENGL)" -DUSE_QA="$(USE_QA)" \
|
|
|
|
|
-DUSE_EXCEPTIONS="$(USE_EXCEPTIONS)" -DUSE_RTTI="$(USE_RTTI)" \
|
2019-10-29 19:02:08 -04:00
|
|
|
-DUSE_DPI_AWARE_MANIFEST="$(USE_DPI_AWARE_MANIFEST)" \
|
2015-03-19 16:09:08 -04:00
|
|
|
-DUSE_THREADS="$(USE_THREADS)" -DUSE_CAIRO="$(USE_CAIRO)" \
|
|
|
|
|
-DOFFICIAL_BUILD="$(OFFICIAL_BUILD)" -DVENDOR="$(VENDOR)" \
|
|
|
|
|
-DWX_FLAVOUR="$(WX_FLAVOUR)" -DWX_LIB_FLAVOUR="$(WX_LIB_FLAVOUR)" \
|
Replace CppUnit with Catch for unit tests
Drop the legacy CppUnit testing framework used for the unit tests.
Replacing it with Catch has the advantage of not requiring CppUnit
libraries to be installed on the system in order to be able to run
tests (Catch is header-only and a copy of it is now included in the
main repository itself) and, in the future, of being able to write
the tests in a much more natural way.
For now, however, avoid changing the existing tests code as much as
[reasonably] possible to avoid introducing bugs in them and provide
the CppUnit compatibility macros in the new wx/catch_cppunit.h header
which allow to preserve the 99% of the existing code unchanged. Some
of the required changes are:
- Decompose asserts using "a && b" conditions into multiple asserts
checking "a" and "b" independently. This would have been better
even with CppUnit (to know which part of condition exactly failed)
and is required with Catch.
- Use extra parentheses around such conditions when they can't be
easily decomposed in the arrays test, due to the use of macros.
This is not ideal from the point of view of messages given when
the tests fail but will do for now.
- Rewrite asserts using "a || b" as a combination of condition
checks and assert macros. Again, this is better anyhow, and is
required with Catch. Incidentally, this allowed to fix a bug in
the "exec" unit test which didn't leave enough time for the new
process to be launched before trying to kill it.
- Remove multiple CPPUNIT_TEST_SUITE_NAMED_REGISTRATION() macros,
our emulation of this macro can be used only once.
- Provide string conversions using Catch-specific StringMaker for
a couple of types.
- Replace custom wxImage comparison with a Catch-specific matcher
class.
- Remove most of test running logic from test.cpp, in particular don't
parse command line ourselves any longer but use Catch built-in
command line parser. This is a source of a minor regression:
previously, both "Foo" and "FooTestCase" could be used as the name of
the test to run, but now only the latter is accepted.
2017-11-01 14:15:24 -04:00
|
|
|
-DCFG="$(CFG)" -DRUNTIME_LIBS="$(RUNTIME_LIBS)"
|
2015-03-19 16:09:08 -04:00
|
|
|
|
|
|
|
|
### Conditionally set variables: ###
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
### Targets: ###
|
|
|
|
|
|
|
|
|
|
all: bombs forty fractal life poem
|
|
|
|
|
|
|
|
|
|
clean:
|
|
|
|
|
-if exist .\*.obj del .\*.obj
|
|
|
|
|
-if exist .\*.res del .\*.res
|
|
|
|
|
-if exist .\*.csm del .\*.csm
|
|
|
|
|
@echo cd bombs >bombs.bat
|
|
|
|
|
@echo $(MAKE) -f makefile.bcc $(MAKEARGS) clean >>bombs.bat
|
|
|
|
|
call bombs.bat
|
|
|
|
|
@del bombs.bat
|
|
|
|
|
@echo cd forty >forty.bat
|
|
|
|
|
@echo $(MAKE) -f makefile.bcc $(MAKEARGS) clean >>forty.bat
|
|
|
|
|
call forty.bat
|
|
|
|
|
@del forty.bat
|
|
|
|
|
@echo cd fractal >fractal.bat
|
|
|
|
|
@echo $(MAKE) -f makefile.bcc $(MAKEARGS) clean >>fractal.bat
|
|
|
|
|
call fractal.bat
|
|
|
|
|
@del fractal.bat
|
|
|
|
|
@echo cd life >life.bat
|
|
|
|
|
@echo $(MAKE) -f makefile.bcc $(MAKEARGS) clean >>life.bat
|
|
|
|
|
call life.bat
|
|
|
|
|
@del life.bat
|
|
|
|
|
@echo cd poem >poem.bat
|
|
|
|
|
@echo $(MAKE) -f makefile.bcc $(MAKEARGS) clean >>poem.bat
|
|
|
|
|
call poem.bat
|
|
|
|
|
@del poem.bat
|
|
|
|
|
|
|
|
|
|
bombs:
|
|
|
|
|
@echo cd bombs >bombs.bat
|
|
|
|
|
@echo $(MAKE) -f makefile.bcc $(MAKEARGS) all >>bombs.bat
|
|
|
|
|
call bombs.bat
|
|
|
|
|
@del bombs.bat
|
|
|
|
|
|
|
|
|
|
forty:
|
|
|
|
|
@echo cd forty >forty.bat
|
|
|
|
|
@echo $(MAKE) -f makefile.bcc $(MAKEARGS) all >>forty.bat
|
|
|
|
|
call forty.bat
|
|
|
|
|
@del forty.bat
|
|
|
|
|
|
|
|
|
|
fractal:
|
|
|
|
|
@echo cd fractal >fractal.bat
|
|
|
|
|
@echo $(MAKE) -f makefile.bcc $(MAKEARGS) all >>fractal.bat
|
|
|
|
|
call fractal.bat
|
|
|
|
|
@del fractal.bat
|
|
|
|
|
|
|
|
|
|
life:
|
|
|
|
|
@echo cd life >life.bat
|
|
|
|
|
@echo $(MAKE) -f makefile.bcc $(MAKEARGS) all >>life.bat
|
|
|
|
|
call life.bat
|
|
|
|
|
@del life.bat
|
|
|
|
|
|
|
|
|
|
poem:
|
|
|
|
|
@echo cd poem >poem.bat
|
|
|
|
|
@echo $(MAKE) -f makefile.bcc $(MAKEARGS) all >>poem.bat
|
|
|
|
|
call poem.bat
|
|
|
|
|
@del poem.bat
|
|
|
|
|
|