diff --git a/tests/benchmarks/bench.vcproj b/tests/benchmarks/bench.vcproj
index c59a05fc0e..605f65ac95 100644
--- a/tests/benchmarks/bench.vcproj
+++ b/tests/benchmarks/bench.vcproj
@@ -1,824 +1,824 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/tests/benchmarks/bench_vc7.sln b/tests/benchmarks/bench_vc7.sln
index 4f3162bd5b..b4e22d0e69 100644
--- a/tests/benchmarks/bench_vc7.sln
+++ b/tests/benchmarks/bench_vc7.sln
@@ -1,35 +1,35 @@
-Microsoft Visual Studio Solution File, Format Version 8.00
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "bench", "bench_vc7_bench.vcproj", "{737049A0-9449-5B95-B173-0C906929CCD3}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "bench_gui", "bench_vc7_bench_gui.vcproj", "{B5CBA605-D60A-5254-8137-1BBF4F5D9538}"
-EndProject
-Global
- GlobalSection(SolutionConfigurationPlatforms) = preSolution
- Debug|Win32 = Debug|Win32
- Release|Win32 = Release|Win32
- DLL Debug|Win32 = DLL Debug|Win32
- DLL Release|Win32 = DLL Release|Win32
- EndGlobalSection
- GlobalSection(ProjectConfigurationPlatforms) = postSolution
- {737049A0-9449-5B95-B173-0C906929CCD3}.Debug|Win32.ActiveCfg = Debug|Win32
- {737049A0-9449-5B95-B173-0C906929CCD3}.Debug|Win32.Build.0 = Debug|Win32
- {737049A0-9449-5B95-B173-0C906929CCD3}.Release|Win32.ActiveCfg = Release|Win32
- {737049A0-9449-5B95-B173-0C906929CCD3}.Release|Win32.Build.0 = Release|Win32
- {737049A0-9449-5B95-B173-0C906929CCD3}.DLL Debug|Win32.ActiveCfg = DLL Debug|Win32
- {737049A0-9449-5B95-B173-0C906929CCD3}.DLL Debug|Win32.Build.0 = DLL Debug|Win32
- {737049A0-9449-5B95-B173-0C906929CCD3}.DLL Release|Win32.ActiveCfg = DLL Release|Win32
- {737049A0-9449-5B95-B173-0C906929CCD3}.DLL Release|Win32.Build.0 = DLL Release|Win32
- {B5CBA605-D60A-5254-8137-1BBF4F5D9538}.Debug|Win32.ActiveCfg = Debug|Win32
- {B5CBA605-D60A-5254-8137-1BBF4F5D9538}.Debug|Win32.Build.0 = Debug|Win32
- {B5CBA605-D60A-5254-8137-1BBF4F5D9538}.Release|Win32.ActiveCfg = Release|Win32
- {B5CBA605-D60A-5254-8137-1BBF4F5D9538}.Release|Win32.Build.0 = Release|Win32
- {B5CBA605-D60A-5254-8137-1BBF4F5D9538}.DLL Debug|Win32.ActiveCfg = DLL Debug|Win32
- {B5CBA605-D60A-5254-8137-1BBF4F5D9538}.DLL Debug|Win32.Build.0 = DLL Debug|Win32
- {B5CBA605-D60A-5254-8137-1BBF4F5D9538}.DLL Release|Win32.ActiveCfg = DLL Release|Win32
- {B5CBA605-D60A-5254-8137-1BBF4F5D9538}.DLL Release|Win32.Build.0 = DLL Release|Win32
- EndGlobalSection
- GlobalSection(SolutionProperties) = preSolution
- HideSolutionNode = FALSE
- EndGlobalSection
-EndGlobal
-
+Microsoft Visual Studio Solution File, Format Version 8.00
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "bench", "bench_vc7_bench.vcproj", "{737049A0-9449-5B95-B173-0C906929CCD3}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "bench_gui", "bench_vc7_bench_gui.vcproj", "{B5CBA605-D60A-5254-8137-1BBF4F5D9538}"
+EndProject
+Global
+ GlobalSection(SolutionConfigurationPlatforms) = preSolution
+ Debug|Win32 = Debug|Win32
+ Release|Win32 = Release|Win32
+ DLL Debug|Win32 = DLL Debug|Win32
+ DLL Release|Win32 = DLL Release|Win32
+ EndGlobalSection
+ GlobalSection(ProjectConfigurationPlatforms) = postSolution
+ {737049A0-9449-5B95-B173-0C906929CCD3}.Debug|Win32.ActiveCfg = Debug|Win32
+ {737049A0-9449-5B95-B173-0C906929CCD3}.Debug|Win32.Build.0 = Debug|Win32
+ {737049A0-9449-5B95-B173-0C906929CCD3}.Release|Win32.ActiveCfg = Release|Win32
+ {737049A0-9449-5B95-B173-0C906929CCD3}.Release|Win32.Build.0 = Release|Win32
+ {737049A0-9449-5B95-B173-0C906929CCD3}.DLL Debug|Win32.ActiveCfg = DLL Debug|Win32
+ {737049A0-9449-5B95-B173-0C906929CCD3}.DLL Debug|Win32.Build.0 = DLL Debug|Win32
+ {737049A0-9449-5B95-B173-0C906929CCD3}.DLL Release|Win32.ActiveCfg = DLL Release|Win32
+ {737049A0-9449-5B95-B173-0C906929CCD3}.DLL Release|Win32.Build.0 = DLL Release|Win32
+ {B5CBA605-D60A-5254-8137-1BBF4F5D9538}.Debug|Win32.ActiveCfg = Debug|Win32
+ {B5CBA605-D60A-5254-8137-1BBF4F5D9538}.Debug|Win32.Build.0 = Debug|Win32
+ {B5CBA605-D60A-5254-8137-1BBF4F5D9538}.Release|Win32.ActiveCfg = Release|Win32
+ {B5CBA605-D60A-5254-8137-1BBF4F5D9538}.Release|Win32.Build.0 = Release|Win32
+ {B5CBA605-D60A-5254-8137-1BBF4F5D9538}.DLL Debug|Win32.ActiveCfg = DLL Debug|Win32
+ {B5CBA605-D60A-5254-8137-1BBF4F5D9538}.DLL Debug|Win32.Build.0 = DLL Debug|Win32
+ {B5CBA605-D60A-5254-8137-1BBF4F5D9538}.DLL Release|Win32.ActiveCfg = DLL Release|Win32
+ {B5CBA605-D60A-5254-8137-1BBF4F5D9538}.DLL Release|Win32.Build.0 = DLL Release|Win32
+ EndGlobalSection
+ GlobalSection(SolutionProperties) = preSolution
+ HideSolutionNode = FALSE
+ EndGlobalSection
+EndGlobal
+
diff --git a/tests/benchmarks/bench_vc7_bench.vcproj b/tests/benchmarks/bench_vc7_bench.vcproj
index 03e782c7c0..4872ee067f 100644
--- a/tests/benchmarks/bench_vc7_bench.vcproj
+++ b/tests/benchmarks/bench_vc7_bench.vcproj
@@ -1,322 +1,322 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/tests/benchmarks/bench_vc7_bench_gui.vcproj b/tests/benchmarks/bench_vc7_bench_gui.vcproj
index 5cb91dccc7..10595f2768 100644
--- a/tests/benchmarks/bench_vc7_bench_gui.vcproj
+++ b/tests/benchmarks/bench_vc7_bench_gui.vcproj
@@ -1,306 +1,306 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/tests/benchmarks/bench_vc8.sln b/tests/benchmarks/bench_vc8.sln
index c62e87c65b..4ab26b0b52 100644
--- a/tests/benchmarks/bench_vc8.sln
+++ b/tests/benchmarks/bench_vc8.sln
@@ -1,56 +1,56 @@
-Microsoft Visual Studio Solution File, Format Version 9.00
-# Visual Studio 2005
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "bench", "bench_vc8_bench.vcproj", "{6DD4A887-C3C2-5C7D-9C00-8A250C1856D6}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "bench_gui", "bench_vc8_bench_gui.vcproj", "{4BBE5BC1-5EE7-5792-84D5-A2611CE91B42}"
-EndProject
-Global
- GlobalSection(SolutionConfigurationPlatforms) = preSolution
- Debug|Win32 = Debug|Win32
- Debug|x64 = Debug|x64
- Release|Win32 = Release|Win32
- Release|x64 = Release|x64
- DLL Debug|Win32 = DLL Debug|Win32
- DLL Debug|x64 = DLL Debug|x64
- DLL Release|Win32 = DLL Release|Win32
- DLL Release|x64 = DLL Release|x64
- EndGlobalSection
- GlobalSection(ProjectConfigurationPlatforms) = postSolution
- {6DD4A887-C3C2-5C7D-9C00-8A250C1856D6}.Debug|Win32.ActiveCfg = Debug|Win32
- {6DD4A887-C3C2-5C7D-9C00-8A250C1856D6}.Debug|Win32.Build.0 = Debug|Win32
- {6DD4A887-C3C2-5C7D-9C00-8A250C1856D6}.Debug|x64.ActiveCfg = Debug|x64
- {6DD4A887-C3C2-5C7D-9C00-8A250C1856D6}.Debug|x64.Build.0 = Debug|x64
- {6DD4A887-C3C2-5C7D-9C00-8A250C1856D6}.Release|Win32.ActiveCfg = Release|Win32
- {6DD4A887-C3C2-5C7D-9C00-8A250C1856D6}.Release|Win32.Build.0 = Release|Win32
- {6DD4A887-C3C2-5C7D-9C00-8A250C1856D6}.Release|x64.ActiveCfg = Release|x64
- {6DD4A887-C3C2-5C7D-9C00-8A250C1856D6}.Release|x64.Build.0 = Release|x64
- {6DD4A887-C3C2-5C7D-9C00-8A250C1856D6}.DLL Debug|Win32.ActiveCfg = DLL Debug|Win32
- {6DD4A887-C3C2-5C7D-9C00-8A250C1856D6}.DLL Debug|Win32.Build.0 = DLL Debug|Win32
- {6DD4A887-C3C2-5C7D-9C00-8A250C1856D6}.DLL Debug|x64.ActiveCfg = DLL Debug|x64
- {6DD4A887-C3C2-5C7D-9C00-8A250C1856D6}.DLL Debug|x64.Build.0 = DLL Debug|x64
- {6DD4A887-C3C2-5C7D-9C00-8A250C1856D6}.DLL Release|Win32.ActiveCfg = DLL Release|Win32
- {6DD4A887-C3C2-5C7D-9C00-8A250C1856D6}.DLL Release|Win32.Build.0 = DLL Release|Win32
- {6DD4A887-C3C2-5C7D-9C00-8A250C1856D6}.DLL Release|x64.ActiveCfg = DLL Release|x64
- {6DD4A887-C3C2-5C7D-9C00-8A250C1856D6}.DLL Release|x64.Build.0 = DLL Release|x64
- {4BBE5BC1-5EE7-5792-84D5-A2611CE91B42}.Debug|Win32.ActiveCfg = Debug|Win32
- {4BBE5BC1-5EE7-5792-84D5-A2611CE91B42}.Debug|Win32.Build.0 = Debug|Win32
- {4BBE5BC1-5EE7-5792-84D5-A2611CE91B42}.Debug|x64.ActiveCfg = Debug|x64
- {4BBE5BC1-5EE7-5792-84D5-A2611CE91B42}.Debug|x64.Build.0 = Debug|x64
- {4BBE5BC1-5EE7-5792-84D5-A2611CE91B42}.Release|Win32.ActiveCfg = Release|Win32
- {4BBE5BC1-5EE7-5792-84D5-A2611CE91B42}.Release|Win32.Build.0 = Release|Win32
- {4BBE5BC1-5EE7-5792-84D5-A2611CE91B42}.Release|x64.ActiveCfg = Release|x64
- {4BBE5BC1-5EE7-5792-84D5-A2611CE91B42}.Release|x64.Build.0 = Release|x64
- {4BBE5BC1-5EE7-5792-84D5-A2611CE91B42}.DLL Debug|Win32.ActiveCfg = DLL Debug|Win32
- {4BBE5BC1-5EE7-5792-84D5-A2611CE91B42}.DLL Debug|Win32.Build.0 = DLL Debug|Win32
- {4BBE5BC1-5EE7-5792-84D5-A2611CE91B42}.DLL Debug|x64.ActiveCfg = DLL Debug|x64
- {4BBE5BC1-5EE7-5792-84D5-A2611CE91B42}.DLL Debug|x64.Build.0 = DLL Debug|x64
- {4BBE5BC1-5EE7-5792-84D5-A2611CE91B42}.DLL Release|Win32.ActiveCfg = DLL Release|Win32
- {4BBE5BC1-5EE7-5792-84D5-A2611CE91B42}.DLL Release|Win32.Build.0 = DLL Release|Win32
- {4BBE5BC1-5EE7-5792-84D5-A2611CE91B42}.DLL Release|x64.ActiveCfg = DLL Release|x64
- {4BBE5BC1-5EE7-5792-84D5-A2611CE91B42}.DLL Release|x64.Build.0 = DLL Release|x64
- EndGlobalSection
- GlobalSection(SolutionProperties) = preSolution
- HideSolutionNode = FALSE
- EndGlobalSection
-EndGlobal
-
+Microsoft Visual Studio Solution File, Format Version 9.00
+# Visual Studio 2005
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "bench", "bench_vc8_bench.vcproj", "{6DD4A887-C3C2-5C7D-9C00-8A250C1856D6}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "bench_gui", "bench_vc8_bench_gui.vcproj", "{4BBE5BC1-5EE7-5792-84D5-A2611CE91B42}"
+EndProject
+Global
+ GlobalSection(SolutionConfigurationPlatforms) = preSolution
+ Debug|Win32 = Debug|Win32
+ Debug|x64 = Debug|x64
+ Release|Win32 = Release|Win32
+ Release|x64 = Release|x64
+ DLL Debug|Win32 = DLL Debug|Win32
+ DLL Debug|x64 = DLL Debug|x64
+ DLL Release|Win32 = DLL Release|Win32
+ DLL Release|x64 = DLL Release|x64
+ EndGlobalSection
+ GlobalSection(ProjectConfigurationPlatforms) = postSolution
+ {6DD4A887-C3C2-5C7D-9C00-8A250C1856D6}.Debug|Win32.ActiveCfg = Debug|Win32
+ {6DD4A887-C3C2-5C7D-9C00-8A250C1856D6}.Debug|Win32.Build.0 = Debug|Win32
+ {6DD4A887-C3C2-5C7D-9C00-8A250C1856D6}.Debug|x64.ActiveCfg = Debug|x64
+ {6DD4A887-C3C2-5C7D-9C00-8A250C1856D6}.Debug|x64.Build.0 = Debug|x64
+ {6DD4A887-C3C2-5C7D-9C00-8A250C1856D6}.Release|Win32.ActiveCfg = Release|Win32
+ {6DD4A887-C3C2-5C7D-9C00-8A250C1856D6}.Release|Win32.Build.0 = Release|Win32
+ {6DD4A887-C3C2-5C7D-9C00-8A250C1856D6}.Release|x64.ActiveCfg = Release|x64
+ {6DD4A887-C3C2-5C7D-9C00-8A250C1856D6}.Release|x64.Build.0 = Release|x64
+ {6DD4A887-C3C2-5C7D-9C00-8A250C1856D6}.DLL Debug|Win32.ActiveCfg = DLL Debug|Win32
+ {6DD4A887-C3C2-5C7D-9C00-8A250C1856D6}.DLL Debug|Win32.Build.0 = DLL Debug|Win32
+ {6DD4A887-C3C2-5C7D-9C00-8A250C1856D6}.DLL Debug|x64.ActiveCfg = DLL Debug|x64
+ {6DD4A887-C3C2-5C7D-9C00-8A250C1856D6}.DLL Debug|x64.Build.0 = DLL Debug|x64
+ {6DD4A887-C3C2-5C7D-9C00-8A250C1856D6}.DLL Release|Win32.ActiveCfg = DLL Release|Win32
+ {6DD4A887-C3C2-5C7D-9C00-8A250C1856D6}.DLL Release|Win32.Build.0 = DLL Release|Win32
+ {6DD4A887-C3C2-5C7D-9C00-8A250C1856D6}.DLL Release|x64.ActiveCfg = DLL Release|x64
+ {6DD4A887-C3C2-5C7D-9C00-8A250C1856D6}.DLL Release|x64.Build.0 = DLL Release|x64
+ {4BBE5BC1-5EE7-5792-84D5-A2611CE91B42}.Debug|Win32.ActiveCfg = Debug|Win32
+ {4BBE5BC1-5EE7-5792-84D5-A2611CE91B42}.Debug|Win32.Build.0 = Debug|Win32
+ {4BBE5BC1-5EE7-5792-84D5-A2611CE91B42}.Debug|x64.ActiveCfg = Debug|x64
+ {4BBE5BC1-5EE7-5792-84D5-A2611CE91B42}.Debug|x64.Build.0 = Debug|x64
+ {4BBE5BC1-5EE7-5792-84D5-A2611CE91B42}.Release|Win32.ActiveCfg = Release|Win32
+ {4BBE5BC1-5EE7-5792-84D5-A2611CE91B42}.Release|Win32.Build.0 = Release|Win32
+ {4BBE5BC1-5EE7-5792-84D5-A2611CE91B42}.Release|x64.ActiveCfg = Release|x64
+ {4BBE5BC1-5EE7-5792-84D5-A2611CE91B42}.Release|x64.Build.0 = Release|x64
+ {4BBE5BC1-5EE7-5792-84D5-A2611CE91B42}.DLL Debug|Win32.ActiveCfg = DLL Debug|Win32
+ {4BBE5BC1-5EE7-5792-84D5-A2611CE91B42}.DLL Debug|Win32.Build.0 = DLL Debug|Win32
+ {4BBE5BC1-5EE7-5792-84D5-A2611CE91B42}.DLL Debug|x64.ActiveCfg = DLL Debug|x64
+ {4BBE5BC1-5EE7-5792-84D5-A2611CE91B42}.DLL Debug|x64.Build.0 = DLL Debug|x64
+ {4BBE5BC1-5EE7-5792-84D5-A2611CE91B42}.DLL Release|Win32.ActiveCfg = DLL Release|Win32
+ {4BBE5BC1-5EE7-5792-84D5-A2611CE91B42}.DLL Release|Win32.Build.0 = DLL Release|Win32
+ {4BBE5BC1-5EE7-5792-84D5-A2611CE91B42}.DLL Release|x64.ActiveCfg = DLL Release|x64
+ {4BBE5BC1-5EE7-5792-84D5-A2611CE91B42}.DLL Release|x64.Build.0 = DLL Release|x64
+ EndGlobalSection
+ GlobalSection(SolutionProperties) = preSolution
+ HideSolutionNode = FALSE
+ EndGlobalSection
+EndGlobal
+
diff --git a/tests/benchmarks/bench_vc8_bench.vcproj b/tests/benchmarks/bench_vc8_bench.vcproj
index 80706f3e97..d5179119e3 100644
--- a/tests/benchmarks/bench_vc8_bench.vcproj
+++ b/tests/benchmarks/bench_vc8_bench.vcproj
@@ -1,855 +1,855 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/tests/benchmarks/bench_vc8_bench_gui.vcproj b/tests/benchmarks/bench_vc8_bench_gui.vcproj
index 6073d6e7b7..0b430c245e 100644
--- a/tests/benchmarks/bench_vc8_bench_gui.vcproj
+++ b/tests/benchmarks/bench_vc8_bench_gui.vcproj
@@ -1,833 +1,833 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/tests/benchmarks/bench_vc9.sln b/tests/benchmarks/bench_vc9.sln
index 5399cc9f5e..62af33024b 100644
--- a/tests/benchmarks/bench_vc9.sln
+++ b/tests/benchmarks/bench_vc9.sln
@@ -1,56 +1,56 @@
-Microsoft Visual Studio Solution File, Format Version 10.00
-# Visual Studio 2008
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "bench", "bench_vc9_bench.vcproj", "{B5A0DEAC-4B91-5F56-9192-C86A1ED7DA2F}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "bench_gui", "bench_vc9_bench_gui.vcproj", "{9B5F97AF-C174-572F-9134-D2E56F7810BE}"
-EndProject
-Global
- GlobalSection(SolutionConfigurationPlatforms) = preSolution
- Debug|Win32 = Debug|Win32
- Debug|x64 = Debug|x64
- Release|Win32 = Release|Win32
- Release|x64 = Release|x64
- DLL Debug|Win32 = DLL Debug|Win32
- DLL Debug|x64 = DLL Debug|x64
- DLL Release|Win32 = DLL Release|Win32
- DLL Release|x64 = DLL Release|x64
- EndGlobalSection
- GlobalSection(ProjectConfigurationPlatforms) = postSolution
- {B5A0DEAC-4B91-5F56-9192-C86A1ED7DA2F}.Debug|Win32.ActiveCfg = Debug|Win32
- {B5A0DEAC-4B91-5F56-9192-C86A1ED7DA2F}.Debug|Win32.Build.0 = Debug|Win32
- {B5A0DEAC-4B91-5F56-9192-C86A1ED7DA2F}.Debug|x64.ActiveCfg = Debug|x64
- {B5A0DEAC-4B91-5F56-9192-C86A1ED7DA2F}.Debug|x64.Build.0 = Debug|x64
- {B5A0DEAC-4B91-5F56-9192-C86A1ED7DA2F}.Release|Win32.ActiveCfg = Release|Win32
- {B5A0DEAC-4B91-5F56-9192-C86A1ED7DA2F}.Release|Win32.Build.0 = Release|Win32
- {B5A0DEAC-4B91-5F56-9192-C86A1ED7DA2F}.Release|x64.ActiveCfg = Release|x64
- {B5A0DEAC-4B91-5F56-9192-C86A1ED7DA2F}.Release|x64.Build.0 = Release|x64
- {B5A0DEAC-4B91-5F56-9192-C86A1ED7DA2F}.DLL Debug|Win32.ActiveCfg = DLL Debug|Win32
- {B5A0DEAC-4B91-5F56-9192-C86A1ED7DA2F}.DLL Debug|Win32.Build.0 = DLL Debug|Win32
- {B5A0DEAC-4B91-5F56-9192-C86A1ED7DA2F}.DLL Debug|x64.ActiveCfg = DLL Debug|x64
- {B5A0DEAC-4B91-5F56-9192-C86A1ED7DA2F}.DLL Debug|x64.Build.0 = DLL Debug|x64
- {B5A0DEAC-4B91-5F56-9192-C86A1ED7DA2F}.DLL Release|Win32.ActiveCfg = DLL Release|Win32
- {B5A0DEAC-4B91-5F56-9192-C86A1ED7DA2F}.DLL Release|Win32.Build.0 = DLL Release|Win32
- {B5A0DEAC-4B91-5F56-9192-C86A1ED7DA2F}.DLL Release|x64.ActiveCfg = DLL Release|x64
- {B5A0DEAC-4B91-5F56-9192-C86A1ED7DA2F}.DLL Release|x64.Build.0 = DLL Release|x64
- {9B5F97AF-C174-572F-9134-D2E56F7810BE}.Debug|Win32.ActiveCfg = Debug|Win32
- {9B5F97AF-C174-572F-9134-D2E56F7810BE}.Debug|Win32.Build.0 = Debug|Win32
- {9B5F97AF-C174-572F-9134-D2E56F7810BE}.Debug|x64.ActiveCfg = Debug|x64
- {9B5F97AF-C174-572F-9134-D2E56F7810BE}.Debug|x64.Build.0 = Debug|x64
- {9B5F97AF-C174-572F-9134-D2E56F7810BE}.Release|Win32.ActiveCfg = Release|Win32
- {9B5F97AF-C174-572F-9134-D2E56F7810BE}.Release|Win32.Build.0 = Release|Win32
- {9B5F97AF-C174-572F-9134-D2E56F7810BE}.Release|x64.ActiveCfg = Release|x64
- {9B5F97AF-C174-572F-9134-D2E56F7810BE}.Release|x64.Build.0 = Release|x64
- {9B5F97AF-C174-572F-9134-D2E56F7810BE}.DLL Debug|Win32.ActiveCfg = DLL Debug|Win32
- {9B5F97AF-C174-572F-9134-D2E56F7810BE}.DLL Debug|Win32.Build.0 = DLL Debug|Win32
- {9B5F97AF-C174-572F-9134-D2E56F7810BE}.DLL Debug|x64.ActiveCfg = DLL Debug|x64
- {9B5F97AF-C174-572F-9134-D2E56F7810BE}.DLL Debug|x64.Build.0 = DLL Debug|x64
- {9B5F97AF-C174-572F-9134-D2E56F7810BE}.DLL Release|Win32.ActiveCfg = DLL Release|Win32
- {9B5F97AF-C174-572F-9134-D2E56F7810BE}.DLL Release|Win32.Build.0 = DLL Release|Win32
- {9B5F97AF-C174-572F-9134-D2E56F7810BE}.DLL Release|x64.ActiveCfg = DLL Release|x64
- {9B5F97AF-C174-572F-9134-D2E56F7810BE}.DLL Release|x64.Build.0 = DLL Release|x64
- EndGlobalSection
- GlobalSection(SolutionProperties) = preSolution
- HideSolutionNode = FALSE
- EndGlobalSection
-EndGlobal
-
+Microsoft Visual Studio Solution File, Format Version 10.00
+# Visual Studio 2008
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "bench", "bench_vc9_bench.vcproj", "{B5A0DEAC-4B91-5F56-9192-C86A1ED7DA2F}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "bench_gui", "bench_vc9_bench_gui.vcproj", "{9B5F97AF-C174-572F-9134-D2E56F7810BE}"
+EndProject
+Global
+ GlobalSection(SolutionConfigurationPlatforms) = preSolution
+ Debug|Win32 = Debug|Win32
+ Debug|x64 = Debug|x64
+ Release|Win32 = Release|Win32
+ Release|x64 = Release|x64
+ DLL Debug|Win32 = DLL Debug|Win32
+ DLL Debug|x64 = DLL Debug|x64
+ DLL Release|Win32 = DLL Release|Win32
+ DLL Release|x64 = DLL Release|x64
+ EndGlobalSection
+ GlobalSection(ProjectConfigurationPlatforms) = postSolution
+ {B5A0DEAC-4B91-5F56-9192-C86A1ED7DA2F}.Debug|Win32.ActiveCfg = Debug|Win32
+ {B5A0DEAC-4B91-5F56-9192-C86A1ED7DA2F}.Debug|Win32.Build.0 = Debug|Win32
+ {B5A0DEAC-4B91-5F56-9192-C86A1ED7DA2F}.Debug|x64.ActiveCfg = Debug|x64
+ {B5A0DEAC-4B91-5F56-9192-C86A1ED7DA2F}.Debug|x64.Build.0 = Debug|x64
+ {B5A0DEAC-4B91-5F56-9192-C86A1ED7DA2F}.Release|Win32.ActiveCfg = Release|Win32
+ {B5A0DEAC-4B91-5F56-9192-C86A1ED7DA2F}.Release|Win32.Build.0 = Release|Win32
+ {B5A0DEAC-4B91-5F56-9192-C86A1ED7DA2F}.Release|x64.ActiveCfg = Release|x64
+ {B5A0DEAC-4B91-5F56-9192-C86A1ED7DA2F}.Release|x64.Build.0 = Release|x64
+ {B5A0DEAC-4B91-5F56-9192-C86A1ED7DA2F}.DLL Debug|Win32.ActiveCfg = DLL Debug|Win32
+ {B5A0DEAC-4B91-5F56-9192-C86A1ED7DA2F}.DLL Debug|Win32.Build.0 = DLL Debug|Win32
+ {B5A0DEAC-4B91-5F56-9192-C86A1ED7DA2F}.DLL Debug|x64.ActiveCfg = DLL Debug|x64
+ {B5A0DEAC-4B91-5F56-9192-C86A1ED7DA2F}.DLL Debug|x64.Build.0 = DLL Debug|x64
+ {B5A0DEAC-4B91-5F56-9192-C86A1ED7DA2F}.DLL Release|Win32.ActiveCfg = DLL Release|Win32
+ {B5A0DEAC-4B91-5F56-9192-C86A1ED7DA2F}.DLL Release|Win32.Build.0 = DLL Release|Win32
+ {B5A0DEAC-4B91-5F56-9192-C86A1ED7DA2F}.DLL Release|x64.ActiveCfg = DLL Release|x64
+ {B5A0DEAC-4B91-5F56-9192-C86A1ED7DA2F}.DLL Release|x64.Build.0 = DLL Release|x64
+ {9B5F97AF-C174-572F-9134-D2E56F7810BE}.Debug|Win32.ActiveCfg = Debug|Win32
+ {9B5F97AF-C174-572F-9134-D2E56F7810BE}.Debug|Win32.Build.0 = Debug|Win32
+ {9B5F97AF-C174-572F-9134-D2E56F7810BE}.Debug|x64.ActiveCfg = Debug|x64
+ {9B5F97AF-C174-572F-9134-D2E56F7810BE}.Debug|x64.Build.0 = Debug|x64
+ {9B5F97AF-C174-572F-9134-D2E56F7810BE}.Release|Win32.ActiveCfg = Release|Win32
+ {9B5F97AF-C174-572F-9134-D2E56F7810BE}.Release|Win32.Build.0 = Release|Win32
+ {9B5F97AF-C174-572F-9134-D2E56F7810BE}.Release|x64.ActiveCfg = Release|x64
+ {9B5F97AF-C174-572F-9134-D2E56F7810BE}.Release|x64.Build.0 = Release|x64
+ {9B5F97AF-C174-572F-9134-D2E56F7810BE}.DLL Debug|Win32.ActiveCfg = DLL Debug|Win32
+ {9B5F97AF-C174-572F-9134-D2E56F7810BE}.DLL Debug|Win32.Build.0 = DLL Debug|Win32
+ {9B5F97AF-C174-572F-9134-D2E56F7810BE}.DLL Debug|x64.ActiveCfg = DLL Debug|x64
+ {9B5F97AF-C174-572F-9134-D2E56F7810BE}.DLL Debug|x64.Build.0 = DLL Debug|x64
+ {9B5F97AF-C174-572F-9134-D2E56F7810BE}.DLL Release|Win32.ActiveCfg = DLL Release|Win32
+ {9B5F97AF-C174-572F-9134-D2E56F7810BE}.DLL Release|Win32.Build.0 = DLL Release|Win32
+ {9B5F97AF-C174-572F-9134-D2E56F7810BE}.DLL Release|x64.ActiveCfg = DLL Release|x64
+ {9B5F97AF-C174-572F-9134-D2E56F7810BE}.DLL Release|x64.Build.0 = DLL Release|x64
+ EndGlobalSection
+ GlobalSection(SolutionProperties) = preSolution
+ HideSolutionNode = FALSE
+ EndGlobalSection
+EndGlobal
+
diff --git a/tests/benchmarks/bench_vc9_bench.vcproj b/tests/benchmarks/bench_vc9_bench.vcproj
index 6b2cf489a5..bcb2ac7672 100644
--- a/tests/benchmarks/bench_vc9_bench.vcproj
+++ b/tests/benchmarks/bench_vc9_bench.vcproj
@@ -1,827 +1,827 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/tests/benchmarks/bench_vc9_bench_gui.vcproj b/tests/benchmarks/bench_vc9_bench_gui.vcproj
index f4a094b289..2b36e297f0 100644
--- a/tests/benchmarks/bench_vc9_bench_gui.vcproj
+++ b/tests/benchmarks/bench_vc9_bench_gui.vcproj
@@ -1,805 +1,805 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/tests/benchmarks/makefile.bcc b/tests/benchmarks/makefile.bcc
index a795cd27f1..632e8c76c1 100644
--- a/tests/benchmarks/makefile.bcc
+++ b/tests/benchmarks/makefile.bcc
@@ -1,321 +1,321 @@
-# =========================================================================
-# This makefile was generated by
-# Bakefile 0.2.9 (http://www.bakefile.org)
-# 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: ###
-
-WX_RELEASE_NODOT = 31
-COMPILER_PREFIX = bcc
-OBJS = \
- $(COMPILER_PREFIX)$(COMPILER_VERSION)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)
-LIBDIRNAME = \
- .\..\..\lib\$(COMPILER_PREFIX)$(COMPILER_VERSION)_$(LIBTYPE_SUFFIX)$(CFG)
-SETUPHDIR = \
- $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)
-BENCH_CXXFLAGS = $(__RUNTIME_LIBS) -I$(BCCDIR)\include $(__DEBUGINFO) \
- $(__OPTIMIZEFLAG) $(__THREADSFLAG_0) -D__WXMSW__ $(__WXUNIV_DEFINE_p) \
- $(__DEBUG_DEFINE_p) $(__NDEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) \
- $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) \
- -I$(SETUPHDIR) -I.\..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES) -I. \
- $(__DLLFLAG_p) -DwxUSE_GUI=0 $(CPPFLAGS) $(CXXFLAGS)
-BENCH_OBJECTS = \
- $(OBJS)\bench_bench.obj \
- $(OBJS)\bench_datetime.obj \
- $(OBJS)\bench_htmlpars.obj \
- $(OBJS)\bench_htmltag.obj \
- $(OBJS)\bench_ipcclient.obj \
- $(OBJS)\bench_log.obj \
- $(OBJS)\bench_mbconv.obj \
- $(OBJS)\bench_strings.obj \
- $(OBJS)\bench_tls.obj \
- $(OBJS)\bench_printfbench.obj
-BENCH_GUI_CXXFLAGS = $(__RUNTIME_LIBS) -I$(BCCDIR)\include $(__DEBUGINFO) \
- $(__OPTIMIZEFLAG) $(__THREADSFLAG_0) -D__WXMSW__ $(__WXUNIV_DEFINE_p) \
- $(__DEBUG_DEFINE_p) $(__NDEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) \
- $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) \
- -I$(SETUPHDIR) -I.\..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES) -I. \
- $(__DLLFLAG_p) -I.\..\..\samples -DNOPCH $(CPPFLAGS) $(CXXFLAGS)
-BENCH_GUI_OBJECTS = \
- $(OBJS)\bench_gui_bench.obj \
- $(OBJS)\bench_gui_image.obj
-
-### Conditionally set variables: ###
-
-!if "$(USE_GUI)" == "0"
-PORTNAME = base
-!endif
-!if "$(USE_GUI)" == "1"
-PORTNAME = msw$(TOOLKIT_VERSION)
-!endif
-!if "$(OFFICIAL_BUILD)" == "1"
-COMPILER_VERSION = ERROR-COMPILER-VERSION-MUST-BE-SET-FOR-OFFICIAL-BUILD
-!endif
-!if "$(BUILD)" == "debug"
-WXDEBUGFLAG = d
-!endif
-!if "$(UNICODE)" == "1"
-WXUNICODEFLAG = u
-!endif
-!if "$(WXUNIV)" == "1"
-WXUNIVNAME = univ
-!endif
-!if "$(SHARED)" == "1"
-WXDLLFLAG = dll
-!endif
-!if "$(SHARED)" == "0"
-LIBTYPE_SUFFIX = lib
-!endif
-!if "$(SHARED)" == "1"
-LIBTYPE_SUFFIX = dll
-!endif
-!if "$(MONOLITHIC)" == "0"
-EXTRALIBS_FOR_BASE =
-!endif
-!if "$(MONOLITHIC)" == "1"
-EXTRALIBS_FOR_BASE =
-!endif
-!if "$(MONOLITHIC)" == "0"
-__WXLIB_NET_p = \
- wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_net.lib
-!endif
-!if "$(MONOLITHIC)" == "1"
-__LIB_PNG_IF_MONO_p = $(__LIB_PNG_p)
-!endif
-!if "$(USE_GUI)" == "1"
-__bench_gui___depname = $(OBJS)\bench_gui.exe
-!endif
-!if "$(WXUNIV)" == "1"
-__WXUNIV_DEFINE_p_3 = -d__WXUNIVERSAL__
-!endif
-!if "$(DEBUG_FLAG)" == "0"
-__DEBUG_DEFINE_p_3 = -dwxDEBUG_LEVEL=0
-!endif
-!if "$(BUILD)" == "release"
-__NDEBUG_DEFINE_p_3 = -dNDEBUG
-!endif
-!if "$(USE_EXCEPTIONS)" == "0"
-__EXCEPTIONS_DEFINE_p_3 = -dwxNO_EXCEPTIONS
-!endif
-!if "$(USE_RTTI)" == "0"
-__RTTI_DEFINE_p_3 = -dwxNO_RTTI
-!endif
-!if "$(USE_THREADS)" == "0"
-__THREAD_DEFINE_p_3 = -dwxNO_THREADS
-!endif
-!if "$(UNICODE)" == "0"
-__UNICODE_DEFINE_p_3 = -dwxUSE_UNICODE=0
-!endif
-!if "$(UNICODE)" == "1"
-__UNICODE_DEFINE_p_3 = -d_UNICODE
-!endif
-!if "$(USE_CAIRO)" == "1"
-____CAIRO_INCLUDEDIR_FILENAMES_3_p = -i$(CAIRO_ROOT)\include\cairo
-!endif
-!if "$(SHARED)" == "1"
-__DLLFLAG_p_3 = -dWXUSINGDLL
-!endif
-!if "$(MONOLITHIC)" == "0"
-__WXLIB_CORE_p = \
- wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib
-!endif
-!if "$(MONOLITHIC)" == "1" && "$(USE_STC)" == "1"
-__LIB_SCINTILLA_IF_MONO_p = wxscintilla$(WXDEBUGFLAG).lib
-!endif
-!if "$(USE_GUI)" == "1"
-__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib
-!endif
-!if "$(USE_GUI)" == "1"
-__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib
-!endif
-!if "$(BUILD)" == "debug"
-__OPTIMIZEFLAG = -Od
-!endif
-!if "$(BUILD)" == "release"
-__OPTIMIZEFLAG = -O2
-!endif
-!if "$(USE_THREADS)" == "0"
-__THREADSFLAG =
-!endif
-!if "$(USE_THREADS)" == "1"
-__THREADSFLAG = mt
-!endif
-!if "$(USE_THREADS)" == "0"
-__THREADSFLAG_0 =
-!endif
-!if "$(USE_THREADS)" == "1"
-__THREADSFLAG_0 = -tWM
-!endif
-!if "$(RUNTIME_LIBS)" == "dynamic"
-__RUNTIME_LIBS = -tWR
-!endif
-!if "$(RUNTIME_LIBS)" == "static"
-__RUNTIME_LIBS =
-!endif
-!if "$(RUNTIME_LIBS)" == "dynamic"
-__RUNTIME_LIBS_0 = i
-!endif
-!if "$(RUNTIME_LIBS)" == "static"
-__RUNTIME_LIBS_0 =
-!endif
-!if "$(WXUNIV)" == "1"
-__WXUNIV_DEFINE_p = -D__WXUNIVERSAL__
-!endif
-!if "$(DEBUG_FLAG)" == "0"
-__DEBUG_DEFINE_p = -DwxDEBUG_LEVEL=0
-!endif
-!if "$(BUILD)" == "release"
-__NDEBUG_DEFINE_p = -DNDEBUG
-!endif
-!if "$(USE_EXCEPTIONS)" == "0"
-__EXCEPTIONS_DEFINE_p = -DwxNO_EXCEPTIONS
-!endif
-!if "$(USE_RTTI)" == "0"
-__RTTI_DEFINE_p = -DwxNO_RTTI
-!endif
-!if "$(USE_THREADS)" == "0"
-__THREAD_DEFINE_p = -DwxNO_THREADS
-!endif
-!if "$(UNICODE)" == "0"
-__UNICODE_DEFINE_p = -DwxUSE_UNICODE=0
-!endif
-!if "$(UNICODE)" == "1"
-__UNICODE_DEFINE_p = -D_UNICODE
-!endif
-!if "$(USE_CAIRO)" == "1"
-____CAIRO_INCLUDEDIR_FILENAMES = -I$(CAIRO_ROOT)\include\cairo
-!endif
-!if "$(SHARED)" == "1"
-__DLLFLAG_p = -DWXUSINGDLL
-!endif
-!if "$(MONOLITHIC)" == "0"
-__WXLIB_BASE_p = \
- wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib
-!endif
-!if "$(MONOLITHIC)" == "1"
-__WXLIB_MONO_p = \
- wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib
-!endif
-!if "$(USE_GUI)" == "1"
-__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib
-!endif
-!if "$(USE_CAIRO)" == "1"
-__CAIRO_LIB_p = cairo.lib
-!endif
-!if "$(USE_CAIRO)" == "1"
-____CAIRO_LIBDIR_FILENAMES = -L$(CAIRO_ROOT)\lib
-!endif
-!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default"
-__DEBUGINFO = -v
-!endif
-!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default"
-__DEBUGINFO = -v-
-!endif
-!if "$(DEBUG_INFO)" == "0"
-__DEBUGINFO = -v-
-!endif
-!if "$(DEBUG_INFO)" == "1"
-__DEBUGINFO = -v
-!endif
-
-
-all: $(OBJS)
-$(OBJS):
- -if not exist $(OBJS) mkdir $(OBJS)
-
-### Targets: ###
-
-all: $(OBJS)\bench.exe data $(__bench_gui___depname) data-image
-
-clean:
- -if exist $(OBJS)\*.obj del $(OBJS)\*.obj
- -if exist $(OBJS)\*.res del $(OBJS)\*.res
- -if exist $(OBJS)\*.csm del $(OBJS)\*.csm
- -if exist $(OBJS)\bench.exe del $(OBJS)\bench.exe
- -if exist $(OBJS)\bench.tds del $(OBJS)\bench.tds
- -if exist $(OBJS)\bench.ilc del $(OBJS)\bench.ilc
- -if exist $(OBJS)\bench.ild del $(OBJS)\bench.ild
- -if exist $(OBJS)\bench.ilf del $(OBJS)\bench.ilf
- -if exist $(OBJS)\bench.ils del $(OBJS)\bench.ils
- -if exist $(OBJS)\bench_gui.exe del $(OBJS)\bench_gui.exe
- -if exist $(OBJS)\bench_gui.tds del $(OBJS)\bench_gui.tds
- -if exist $(OBJS)\bench_gui.ilc del $(OBJS)\bench_gui.ilc
- -if exist $(OBJS)\bench_gui.ild del $(OBJS)\bench_gui.ild
- -if exist $(OBJS)\bench_gui.ilf del $(OBJS)\bench_gui.ilf
- -if exist $(OBJS)\bench_gui.ils del $(OBJS)\bench_gui.ils
-
-$(OBJS)\bench.exe: $(BENCH_OBJECTS)
- ilink32 -Tpe -q -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUGINFO) -L$(LIBDIRNAME) -ap $(____CAIRO_LIBDIR_FILENAMES) $(LDFLAGS) @&&|
- c0x32.obj $(BENCH_OBJECTS),$@,, $(__WXLIB_NET_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_PNG_IF_MONO_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__CAIRO_LIB_p) ole2w32.lib oleacc.lib import32.lib cw32$(__THREADSFLAG)$(__RUNTIME_LIBS_0).lib,,
-|
-
-data:
- if not exist $(OBJS) mkdir $(OBJS)
- for %f in (htmltest.html) do if not exist $(OBJS)\%f copy .\%f $(OBJS)
-
-!if "$(USE_GUI)" == "1"
-$(OBJS)\bench_gui.exe: $(BENCH_GUI_OBJECTS) $(OBJS)\bench_gui_sample.res
- ilink32 -Tpe -q -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUGINFO) -L$(LIBDIRNAME) -ap $(____CAIRO_LIBDIR_FILENAMES) $(LDFLAGS) @&&|
- c0x32.obj $(BENCH_GUI_OBJECTS),$@,, $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_SCINTILLA_IF_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__CAIRO_LIB_p) ole2w32.lib oleacc.lib import32.lib cw32$(__THREADSFLAG)$(__RUNTIME_LIBS_0).lib,, $(OBJS)\bench_gui_sample.res
-|
-!endif
-
-data-image:
- if not exist $(OBJS) mkdir $(OBJS)
- for %f in (../../samples/image/horse.bmp ../../samples/image/horse.jpg ../../samples/image/horse.png ../../samples/image/horse.tif) do if not exist $(OBJS)\%f copy .\%f $(OBJS)
-
-$(OBJS)\bench_bench.obj: .\bench.cpp
- $(CXX) -q -c -P -o$@ $(BENCH_CXXFLAGS) .\bench.cpp
-
-$(OBJS)\bench_datetime.obj: .\datetime.cpp
- $(CXX) -q -c -P -o$@ $(BENCH_CXXFLAGS) .\datetime.cpp
-
-$(OBJS)\bench_htmlpars.obj: .\htmlparser\htmlpars.cpp
- $(CXX) -q -c -P -o$@ $(BENCH_CXXFLAGS) .\htmlparser\htmlpars.cpp
-
-$(OBJS)\bench_htmltag.obj: .\htmlparser\htmltag.cpp
- $(CXX) -q -c -P -o$@ $(BENCH_CXXFLAGS) .\htmlparser\htmltag.cpp
-
-$(OBJS)\bench_ipcclient.obj: .\ipcclient.cpp
- $(CXX) -q -c -P -o$@ $(BENCH_CXXFLAGS) .\ipcclient.cpp
-
-$(OBJS)\bench_log.obj: .\log.cpp
- $(CXX) -q -c -P -o$@ $(BENCH_CXXFLAGS) .\log.cpp
-
-$(OBJS)\bench_mbconv.obj: .\mbconv.cpp
- $(CXX) -q -c -P -o$@ $(BENCH_CXXFLAGS) .\mbconv.cpp
-
-$(OBJS)\bench_strings.obj: .\strings.cpp
- $(CXX) -q -c -P -o$@ $(BENCH_CXXFLAGS) .\strings.cpp
-
-$(OBJS)\bench_tls.obj: .\tls.cpp
- $(CXX) -q -c -P -o$@ $(BENCH_CXXFLAGS) .\tls.cpp
-
-$(OBJS)\bench_printfbench.obj: .\printfbench.cpp
- $(CXX) -q -c -P -o$@ $(BENCH_CXXFLAGS) .\printfbench.cpp
-
-$(OBJS)\bench_gui_sample.res: .\..\..\samples\sample.rc
- brcc32 -32 -r -fo$@ -i$(BCCDIR)\include -d__WXMSW__ $(__WXUNIV_DEFINE_p_3) $(__DEBUG_DEFINE_p_3) $(__NDEBUG_DEFINE_p_3) $(__EXCEPTIONS_DEFINE_p_3) $(__RTTI_DEFINE_p_3) $(__THREAD_DEFINE_p_3) $(__UNICODE_DEFINE_p_3) -i$(SETUPHDIR) -i.\..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES_3_p) -i. $(__DLLFLAG_p_3) -i.\..\..\samples -i$(BCCDIR)\include\windows\sdk -dNOPCH .\..\..\samples\sample.rc
-
-$(OBJS)\bench_gui_bench.obj: .\bench.cpp
- $(CXX) -q -c -P -o$@ $(BENCH_GUI_CXXFLAGS) .\bench.cpp
-
-$(OBJS)\bench_gui_image.obj: .\image.cpp
- $(CXX) -q -c -P -o$@ $(BENCH_GUI_CXXFLAGS) .\image.cpp
-
+# =========================================================================
+# This makefile was generated by
+# Bakefile 0.2.9 (http://www.bakefile.org)
+# 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: ###
+
+WX_RELEASE_NODOT = 31
+COMPILER_PREFIX = bcc
+OBJS = \
+ $(COMPILER_PREFIX)$(COMPILER_VERSION)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)
+LIBDIRNAME = \
+ .\..\..\lib\$(COMPILER_PREFIX)$(COMPILER_VERSION)_$(LIBTYPE_SUFFIX)$(CFG)
+SETUPHDIR = \
+ $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)
+BENCH_CXXFLAGS = $(__RUNTIME_LIBS) -I$(BCCDIR)\include $(__DEBUGINFO) \
+ $(__OPTIMIZEFLAG) $(__THREADSFLAG_0) -D__WXMSW__ $(__WXUNIV_DEFINE_p) \
+ $(__DEBUG_DEFINE_p) $(__NDEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) \
+ $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) \
+ -I$(SETUPHDIR) -I.\..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES) -I. \
+ $(__DLLFLAG_p) -DwxUSE_GUI=0 $(CPPFLAGS) $(CXXFLAGS)
+BENCH_OBJECTS = \
+ $(OBJS)\bench_bench.obj \
+ $(OBJS)\bench_datetime.obj \
+ $(OBJS)\bench_htmlpars.obj \
+ $(OBJS)\bench_htmltag.obj \
+ $(OBJS)\bench_ipcclient.obj \
+ $(OBJS)\bench_log.obj \
+ $(OBJS)\bench_mbconv.obj \
+ $(OBJS)\bench_strings.obj \
+ $(OBJS)\bench_tls.obj \
+ $(OBJS)\bench_printfbench.obj
+BENCH_GUI_CXXFLAGS = $(__RUNTIME_LIBS) -I$(BCCDIR)\include $(__DEBUGINFO) \
+ $(__OPTIMIZEFLAG) $(__THREADSFLAG_0) -D__WXMSW__ $(__WXUNIV_DEFINE_p) \
+ $(__DEBUG_DEFINE_p) $(__NDEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) \
+ $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) \
+ -I$(SETUPHDIR) -I.\..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES) -I. \
+ $(__DLLFLAG_p) -I.\..\..\samples -DNOPCH $(CPPFLAGS) $(CXXFLAGS)
+BENCH_GUI_OBJECTS = \
+ $(OBJS)\bench_gui_bench.obj \
+ $(OBJS)\bench_gui_image.obj
+
+### Conditionally set variables: ###
+
+!if "$(USE_GUI)" == "0"
+PORTNAME = base
+!endif
+!if "$(USE_GUI)" == "1"
+PORTNAME = msw$(TOOLKIT_VERSION)
+!endif
+!if "$(OFFICIAL_BUILD)" == "1"
+COMPILER_VERSION = ERROR-COMPILER-VERSION-MUST-BE-SET-FOR-OFFICIAL-BUILD
+!endif
+!if "$(BUILD)" == "debug"
+WXDEBUGFLAG = d
+!endif
+!if "$(UNICODE)" == "1"
+WXUNICODEFLAG = u
+!endif
+!if "$(WXUNIV)" == "1"
+WXUNIVNAME = univ
+!endif
+!if "$(SHARED)" == "1"
+WXDLLFLAG = dll
+!endif
+!if "$(SHARED)" == "0"
+LIBTYPE_SUFFIX = lib
+!endif
+!if "$(SHARED)" == "1"
+LIBTYPE_SUFFIX = dll
+!endif
+!if "$(MONOLITHIC)" == "0"
+EXTRALIBS_FOR_BASE =
+!endif
+!if "$(MONOLITHIC)" == "1"
+EXTRALIBS_FOR_BASE =
+!endif
+!if "$(MONOLITHIC)" == "0"
+__WXLIB_NET_p = \
+ wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_net.lib
+!endif
+!if "$(MONOLITHIC)" == "1"
+__LIB_PNG_IF_MONO_p = $(__LIB_PNG_p)
+!endif
+!if "$(USE_GUI)" == "1"
+__bench_gui___depname = $(OBJS)\bench_gui.exe
+!endif
+!if "$(WXUNIV)" == "1"
+__WXUNIV_DEFINE_p_3 = -d__WXUNIVERSAL__
+!endif
+!if "$(DEBUG_FLAG)" == "0"
+__DEBUG_DEFINE_p_3 = -dwxDEBUG_LEVEL=0
+!endif
+!if "$(BUILD)" == "release"
+__NDEBUG_DEFINE_p_3 = -dNDEBUG
+!endif
+!if "$(USE_EXCEPTIONS)" == "0"
+__EXCEPTIONS_DEFINE_p_3 = -dwxNO_EXCEPTIONS
+!endif
+!if "$(USE_RTTI)" == "0"
+__RTTI_DEFINE_p_3 = -dwxNO_RTTI
+!endif
+!if "$(USE_THREADS)" == "0"
+__THREAD_DEFINE_p_3 = -dwxNO_THREADS
+!endif
+!if "$(UNICODE)" == "0"
+__UNICODE_DEFINE_p_3 = -dwxUSE_UNICODE=0
+!endif
+!if "$(UNICODE)" == "1"
+__UNICODE_DEFINE_p_3 = -d_UNICODE
+!endif
+!if "$(USE_CAIRO)" == "1"
+____CAIRO_INCLUDEDIR_FILENAMES_3_p = -i$(CAIRO_ROOT)\include\cairo
+!endif
+!if "$(SHARED)" == "1"
+__DLLFLAG_p_3 = -dWXUSINGDLL
+!endif
+!if "$(MONOLITHIC)" == "0"
+__WXLIB_CORE_p = \
+ wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib
+!endif
+!if "$(MONOLITHIC)" == "1" && "$(USE_STC)" == "1"
+__LIB_SCINTILLA_IF_MONO_p = wxscintilla$(WXDEBUGFLAG).lib
+!endif
+!if "$(USE_GUI)" == "1"
+__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib
+!endif
+!if "$(USE_GUI)" == "1"
+__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib
+!endif
+!if "$(BUILD)" == "debug"
+__OPTIMIZEFLAG = -Od
+!endif
+!if "$(BUILD)" == "release"
+__OPTIMIZEFLAG = -O2
+!endif
+!if "$(USE_THREADS)" == "0"
+__THREADSFLAG =
+!endif
+!if "$(USE_THREADS)" == "1"
+__THREADSFLAG = mt
+!endif
+!if "$(USE_THREADS)" == "0"
+__THREADSFLAG_0 =
+!endif
+!if "$(USE_THREADS)" == "1"
+__THREADSFLAG_0 = -tWM
+!endif
+!if "$(RUNTIME_LIBS)" == "dynamic"
+__RUNTIME_LIBS = -tWR
+!endif
+!if "$(RUNTIME_LIBS)" == "static"
+__RUNTIME_LIBS =
+!endif
+!if "$(RUNTIME_LIBS)" == "dynamic"
+__RUNTIME_LIBS_0 = i
+!endif
+!if "$(RUNTIME_LIBS)" == "static"
+__RUNTIME_LIBS_0 =
+!endif
+!if "$(WXUNIV)" == "1"
+__WXUNIV_DEFINE_p = -D__WXUNIVERSAL__
+!endif
+!if "$(DEBUG_FLAG)" == "0"
+__DEBUG_DEFINE_p = -DwxDEBUG_LEVEL=0
+!endif
+!if "$(BUILD)" == "release"
+__NDEBUG_DEFINE_p = -DNDEBUG
+!endif
+!if "$(USE_EXCEPTIONS)" == "0"
+__EXCEPTIONS_DEFINE_p = -DwxNO_EXCEPTIONS
+!endif
+!if "$(USE_RTTI)" == "0"
+__RTTI_DEFINE_p = -DwxNO_RTTI
+!endif
+!if "$(USE_THREADS)" == "0"
+__THREAD_DEFINE_p = -DwxNO_THREADS
+!endif
+!if "$(UNICODE)" == "0"
+__UNICODE_DEFINE_p = -DwxUSE_UNICODE=0
+!endif
+!if "$(UNICODE)" == "1"
+__UNICODE_DEFINE_p = -D_UNICODE
+!endif
+!if "$(USE_CAIRO)" == "1"
+____CAIRO_INCLUDEDIR_FILENAMES = -I$(CAIRO_ROOT)\include\cairo
+!endif
+!if "$(SHARED)" == "1"
+__DLLFLAG_p = -DWXUSINGDLL
+!endif
+!if "$(MONOLITHIC)" == "0"
+__WXLIB_BASE_p = \
+ wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib
+!endif
+!if "$(MONOLITHIC)" == "1"
+__WXLIB_MONO_p = \
+ wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib
+!endif
+!if "$(USE_GUI)" == "1"
+__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib
+!endif
+!if "$(USE_CAIRO)" == "1"
+__CAIRO_LIB_p = cairo.lib
+!endif
+!if "$(USE_CAIRO)" == "1"
+____CAIRO_LIBDIR_FILENAMES = -L$(CAIRO_ROOT)\lib
+!endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default"
+__DEBUGINFO = -v
+!endif
+!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default"
+__DEBUGINFO = -v-
+!endif
+!if "$(DEBUG_INFO)" == "0"
+__DEBUGINFO = -v-
+!endif
+!if "$(DEBUG_INFO)" == "1"
+__DEBUGINFO = -v
+!endif
+
+
+all: $(OBJS)
+$(OBJS):
+ -if not exist $(OBJS) mkdir $(OBJS)
+
+### Targets: ###
+
+all: $(OBJS)\bench.exe data $(__bench_gui___depname) data-image
+
+clean:
+ -if exist $(OBJS)\*.obj del $(OBJS)\*.obj
+ -if exist $(OBJS)\*.res del $(OBJS)\*.res
+ -if exist $(OBJS)\*.csm del $(OBJS)\*.csm
+ -if exist $(OBJS)\bench.exe del $(OBJS)\bench.exe
+ -if exist $(OBJS)\bench.tds del $(OBJS)\bench.tds
+ -if exist $(OBJS)\bench.ilc del $(OBJS)\bench.ilc
+ -if exist $(OBJS)\bench.ild del $(OBJS)\bench.ild
+ -if exist $(OBJS)\bench.ilf del $(OBJS)\bench.ilf
+ -if exist $(OBJS)\bench.ils del $(OBJS)\bench.ils
+ -if exist $(OBJS)\bench_gui.exe del $(OBJS)\bench_gui.exe
+ -if exist $(OBJS)\bench_gui.tds del $(OBJS)\bench_gui.tds
+ -if exist $(OBJS)\bench_gui.ilc del $(OBJS)\bench_gui.ilc
+ -if exist $(OBJS)\bench_gui.ild del $(OBJS)\bench_gui.ild
+ -if exist $(OBJS)\bench_gui.ilf del $(OBJS)\bench_gui.ilf
+ -if exist $(OBJS)\bench_gui.ils del $(OBJS)\bench_gui.ils
+
+$(OBJS)\bench.exe: $(BENCH_OBJECTS)
+ ilink32 -Tpe -q -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUGINFO) -L$(LIBDIRNAME) -ap $(____CAIRO_LIBDIR_FILENAMES) $(LDFLAGS) @&&|
+ c0x32.obj $(BENCH_OBJECTS),$@,, $(__WXLIB_NET_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_PNG_IF_MONO_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__CAIRO_LIB_p) ole2w32.lib oleacc.lib import32.lib cw32$(__THREADSFLAG)$(__RUNTIME_LIBS_0).lib,,
+|
+
+data:
+ if not exist $(OBJS) mkdir $(OBJS)
+ for %f in (htmltest.html) do if not exist $(OBJS)\%f copy .\%f $(OBJS)
+
+!if "$(USE_GUI)" == "1"
+$(OBJS)\bench_gui.exe: $(BENCH_GUI_OBJECTS) $(OBJS)\bench_gui_sample.res
+ ilink32 -Tpe -q -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUGINFO) -L$(LIBDIRNAME) -ap $(____CAIRO_LIBDIR_FILENAMES) $(LDFLAGS) @&&|
+ c0x32.obj $(BENCH_GUI_OBJECTS),$@,, $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_SCINTILLA_IF_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__CAIRO_LIB_p) ole2w32.lib oleacc.lib import32.lib cw32$(__THREADSFLAG)$(__RUNTIME_LIBS_0).lib,, $(OBJS)\bench_gui_sample.res
+|
+!endif
+
+data-image:
+ if not exist $(OBJS) mkdir $(OBJS)
+ for %f in (../../samples/image/horse.bmp ../../samples/image/horse.jpg ../../samples/image/horse.png ../../samples/image/horse.tif) do if not exist $(OBJS)\%f copy .\%f $(OBJS)
+
+$(OBJS)\bench_bench.obj: .\bench.cpp
+ $(CXX) -q -c -P -o$@ $(BENCH_CXXFLAGS) .\bench.cpp
+
+$(OBJS)\bench_datetime.obj: .\datetime.cpp
+ $(CXX) -q -c -P -o$@ $(BENCH_CXXFLAGS) .\datetime.cpp
+
+$(OBJS)\bench_htmlpars.obj: .\htmlparser\htmlpars.cpp
+ $(CXX) -q -c -P -o$@ $(BENCH_CXXFLAGS) .\htmlparser\htmlpars.cpp
+
+$(OBJS)\bench_htmltag.obj: .\htmlparser\htmltag.cpp
+ $(CXX) -q -c -P -o$@ $(BENCH_CXXFLAGS) .\htmlparser\htmltag.cpp
+
+$(OBJS)\bench_ipcclient.obj: .\ipcclient.cpp
+ $(CXX) -q -c -P -o$@ $(BENCH_CXXFLAGS) .\ipcclient.cpp
+
+$(OBJS)\bench_log.obj: .\log.cpp
+ $(CXX) -q -c -P -o$@ $(BENCH_CXXFLAGS) .\log.cpp
+
+$(OBJS)\bench_mbconv.obj: .\mbconv.cpp
+ $(CXX) -q -c -P -o$@ $(BENCH_CXXFLAGS) .\mbconv.cpp
+
+$(OBJS)\bench_strings.obj: .\strings.cpp
+ $(CXX) -q -c -P -o$@ $(BENCH_CXXFLAGS) .\strings.cpp
+
+$(OBJS)\bench_tls.obj: .\tls.cpp
+ $(CXX) -q -c -P -o$@ $(BENCH_CXXFLAGS) .\tls.cpp
+
+$(OBJS)\bench_printfbench.obj: .\printfbench.cpp
+ $(CXX) -q -c -P -o$@ $(BENCH_CXXFLAGS) .\printfbench.cpp
+
+$(OBJS)\bench_gui_sample.res: .\..\..\samples\sample.rc
+ brcc32 -32 -r -fo$@ -i$(BCCDIR)\include -d__WXMSW__ $(__WXUNIV_DEFINE_p_3) $(__DEBUG_DEFINE_p_3) $(__NDEBUG_DEFINE_p_3) $(__EXCEPTIONS_DEFINE_p_3) $(__RTTI_DEFINE_p_3) $(__THREAD_DEFINE_p_3) $(__UNICODE_DEFINE_p_3) -i$(SETUPHDIR) -i.\..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES_3_p) -i. $(__DLLFLAG_p_3) -i.\..\..\samples -i$(BCCDIR)\include\windows\sdk -dNOPCH .\..\..\samples\sample.rc
+
+$(OBJS)\bench_gui_bench.obj: .\bench.cpp
+ $(CXX) -q -c -P -o$@ $(BENCH_GUI_CXXFLAGS) .\bench.cpp
+
+$(OBJS)\bench_gui_image.obj: .\image.cpp
+ $(CXX) -q -c -P -o$@ $(BENCH_GUI_CXXFLAGS) .\image.cpp
+
diff --git a/tests/benchmarks/makefile.gcc b/tests/benchmarks/makefile.gcc
index ad320396de..21b8110194 100644
--- a/tests/benchmarks/makefile.gcc
+++ b/tests/benchmarks/makefile.gcc
@@ -1,311 +1,311 @@
-# =========================================================================
-# This makefile was generated by
-# Bakefile 0.2.9 (http://www.bakefile.org)
-# Do not modify, all changes will be overwritten!
-# =========================================================================
-
-include ../../build/msw/config.gcc
-
-# -------------------------------------------------------------------------
-# Do not modify the rest of this file!
-# -------------------------------------------------------------------------
-
-### Variables: ###
-
-CPPDEPS = -MT$@ -MF$@.d -MD -MP
-WX_RELEASE_NODOT = 31
-COMPILER_PREFIX = gcc
-OBJS = \
- $(COMPILER_PREFIX)$(COMPILER_VERSION)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)
-LIBDIRNAME = \
- .\..\..\lib\$(COMPILER_PREFIX)$(COMPILER_VERSION)_$(LIBTYPE_SUFFIX)$(CFG)
-SETUPHDIR = \
- $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)
-BENCH_CXXFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG) $(__THREADSFLAG) $(GCCFLAGS) \
- -DHAVE_W32API_H -D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \
- $(__NDEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \
- $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) -I$(SETUPHDIR) -I.\..\..\include \
- $(____CAIRO_INCLUDEDIR_FILENAMES) -W -Wall -I. $(__DLLFLAG_p) -DwxUSE_GUI=0 \
- $(__RTTIFLAG) $(__EXCEPTIONSFLAG) -Wno-ctor-dtor-privacy $(CPPFLAGS) \
- $(CXXFLAGS)
-BENCH_OBJECTS = \
- $(OBJS)\bench_bench.o \
- $(OBJS)\bench_datetime.o \
- $(OBJS)\bench_htmlpars.o \
- $(OBJS)\bench_htmltag.o \
- $(OBJS)\bench_ipcclient.o \
- $(OBJS)\bench_log.o \
- $(OBJS)\bench_mbconv.o \
- $(OBJS)\bench_strings.o \
- $(OBJS)\bench_tls.o \
- $(OBJS)\bench_printfbench.o
-BENCH_GUI_CXXFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG) $(__THREADSFLAG) \
- $(GCCFLAGS) -DHAVE_W32API_H -D__WXMSW__ $(__WXUNIV_DEFINE_p) \
- $(__DEBUG_DEFINE_p) $(__NDEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) \
- $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) \
- -I$(SETUPHDIR) -I.\..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES) -W -Wall \
- -I. $(__DLLFLAG_p) -I.\..\..\samples -DNOPCH $(__RTTIFLAG) \
- $(__EXCEPTIONSFLAG) -Wno-ctor-dtor-privacy $(CPPFLAGS) $(CXXFLAGS)
-BENCH_GUI_OBJECTS = \
- $(OBJS)\bench_gui_sample_rc.o \
- $(OBJS)\bench_gui_bench.o \
- $(OBJS)\bench_gui_image.o
-
-### Conditionally set variables: ###
-
-ifeq ($(GCC_VERSION),2.95)
-GCCFLAGS = -fvtable-thunks
-endif
-ifeq ($(USE_GUI),0)
-PORTNAME = base
-endif
-ifeq ($(USE_GUI),1)
-PORTNAME = msw$(TOOLKIT_VERSION)
-endif
-ifeq ($(OFFICIAL_BUILD),1)
-COMPILER_VERSION = ERROR-COMPILER-VERSION-MUST-BE-SET-FOR-OFFICIAL-BUILD
-endif
-ifeq ($(BUILD),debug)
-WXDEBUGFLAG = d
-endif
-ifeq ($(UNICODE),1)
-WXUNICODEFLAG = u
-endif
-ifeq ($(WXUNIV),1)
-WXUNIVNAME = univ
-endif
-ifeq ($(SHARED),1)
-WXDLLFLAG = dll
-endif
-ifeq ($(SHARED),0)
-LIBTYPE_SUFFIX = lib
-endif
-ifeq ($(SHARED),1)
-LIBTYPE_SUFFIX = dll
-endif
-ifeq ($(MONOLITHIC),0)
-EXTRALIBS_FOR_BASE =
-endif
-ifeq ($(MONOLITHIC),1)
-EXTRALIBS_FOR_BASE =
-endif
-ifeq ($(MONOLITHIC),0)
-__WXLIB_NET_p = \
- -lwxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_net
-endif
-ifeq ($(MONOLITHIC),1)
-__LIB_PNG_IF_MONO_p = $(__LIB_PNG_p)
-endif
-ifeq ($(USE_GUI),1)
-__bench_gui___depname = $(OBJS)\bench_gui.exe
-endif
-ifeq ($(WXUNIV),1)
-__WXUNIV_DEFINE_p_3 = --define __WXUNIVERSAL__
-endif
-ifeq ($(DEBUG_FLAG),0)
-__DEBUG_DEFINE_p_3 = --define wxDEBUG_LEVEL=0
-endif
-ifeq ($(BUILD),release)
-__NDEBUG_DEFINE_p_3 = --define NDEBUG
-endif
-ifeq ($(USE_EXCEPTIONS),0)
-__EXCEPTIONS_DEFINE_p_3 = --define wxNO_EXCEPTIONS
-endif
-ifeq ($(USE_RTTI),0)
-__RTTI_DEFINE_p_3 = --define wxNO_RTTI
-endif
-ifeq ($(USE_THREADS),0)
-__THREAD_DEFINE_p_3 = --define wxNO_THREADS
-endif
-ifeq ($(UNICODE),0)
-__UNICODE_DEFINE_p_3 = --define wxUSE_UNICODE=0
-endif
-ifeq ($(UNICODE),1)
-__UNICODE_DEFINE_p_3 = --define _UNICODE
-endif
-ifeq ($(USE_CAIRO),1)
-__CAIRO_INCLUDEDIR_p_1 = --include-dir $(CAIRO_ROOT)/include/cairo
-endif
-ifeq ($(SHARED),1)
-__DLLFLAG_p_3 = --define WXUSINGDLL
-endif
-ifeq ($(MONOLITHIC),0)
-__WXLIB_CORE_p = \
- -lwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core
-endif
-ifeq ($(MONOLITHIC),1)
-ifeq ($(USE_STC),1)
-__LIB_SCINTILLA_IF_MONO_p = -lwxscintilla$(WXDEBUGFLAG)
-endif
-endif
-ifeq ($(USE_GUI),1)
-__LIB_TIFF_p = -lwxtiff$(WXDEBUGFLAG)
-endif
-ifeq ($(USE_GUI),1)
-__LIB_JPEG_p = -lwxjpeg$(WXDEBUGFLAG)
-endif
-ifeq ($(BUILD),debug)
-__OPTIMIZEFLAG = -O0
-endif
-ifeq ($(BUILD),release)
-__OPTIMIZEFLAG = -O2
-endif
-ifeq ($(USE_RTTI),0)
-__RTTIFLAG = -fno-rtti
-endif
-ifeq ($(USE_RTTI),1)
-__RTTIFLAG =
-endif
-ifeq ($(USE_EXCEPTIONS),0)
-__EXCEPTIONSFLAG = -fno-exceptions
-endif
-ifeq ($(USE_EXCEPTIONS),1)
-__EXCEPTIONSFLAG =
-endif
-ifeq ($(WXUNIV),1)
-__WXUNIV_DEFINE_p = -D__WXUNIVERSAL__
-endif
-ifeq ($(DEBUG_FLAG),0)
-__DEBUG_DEFINE_p = -DwxDEBUG_LEVEL=0
-endif
-ifeq ($(BUILD),release)
-__NDEBUG_DEFINE_p = -DNDEBUG
-endif
-ifeq ($(USE_EXCEPTIONS),0)
-__EXCEPTIONS_DEFINE_p = -DwxNO_EXCEPTIONS
-endif
-ifeq ($(USE_RTTI),0)
-__RTTI_DEFINE_p = -DwxNO_RTTI
-endif
-ifeq ($(USE_THREADS),0)
-__THREAD_DEFINE_p = -DwxNO_THREADS
-endif
-ifeq ($(UNICODE),0)
-__UNICODE_DEFINE_p = -DwxUSE_UNICODE=0
-endif
-ifeq ($(UNICODE),1)
-__UNICODE_DEFINE_p = -D_UNICODE
-endif
-ifeq ($(USE_CAIRO),1)
-____CAIRO_INCLUDEDIR_FILENAMES = -I$(CAIRO_ROOT)\include\cairo
-endif
-ifeq ($(SHARED),1)
-__DLLFLAG_p = -DWXUSINGDLL
-endif
-ifeq ($(MONOLITHIC),0)
-__WXLIB_BASE_p = \
- -lwxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)
-endif
-ifeq ($(MONOLITHIC),1)
-__WXLIB_MONO_p = \
- -lwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)
-endif
-ifeq ($(USE_GUI),1)
-__LIB_PNG_p = -lwxpng$(WXDEBUGFLAG)
-endif
-ifeq ($(USE_CAIRO),1)
-__CAIRO_LIB_p = -lcairo
-endif
-ifeq ($(USE_CAIRO),1)
-____CAIRO_LIBDIR_FILENAMES = -L$(CAIRO_ROOT)\lib
-endif
-ifeq ($(BUILD),debug)
-ifeq ($(DEBUG_INFO),default)
-__DEBUGINFO = -g
-endif
-endif
-ifeq ($(BUILD),release)
-ifeq ($(DEBUG_INFO),default)
-__DEBUGINFO =
-endif
-endif
-ifeq ($(DEBUG_INFO),0)
-__DEBUGINFO =
-endif
-ifeq ($(DEBUG_INFO),1)
-__DEBUGINFO = -g
-endif
-ifeq ($(USE_THREADS),0)
-__THREADSFLAG =
-endif
-ifeq ($(USE_THREADS),1)
-__THREADSFLAG = -mthreads
-endif
-
-
-all: $(OBJS)
-$(OBJS):
- -if not exist $(OBJS) mkdir $(OBJS)
-
-### Targets: ###
-
-all: $(OBJS)\bench.exe data $(__bench_gui___depname) data-image
-
-clean:
- -if exist $(OBJS)\*.o del $(OBJS)\*.o
- -if exist $(OBJS)\*.d del $(OBJS)\*.d
- -if exist $(OBJS)\bench.exe del $(OBJS)\bench.exe
- -if exist $(OBJS)\bench_gui.exe del $(OBJS)\bench_gui.exe
-
-$(OBJS)\bench.exe: $(BENCH_OBJECTS)
- $(CXX) -o $@ $(BENCH_OBJECTS) $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) $(____CAIRO_LIBDIR_FILENAMES) $(LDFLAGS) $(__WXLIB_NET_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_PNG_IF_MONO_p) -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(EXTRALIBS_FOR_BASE) $(__CAIRO_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32 -lwininet
-
-data:
- if not exist $(OBJS) mkdir $(OBJS)
- for %%f in (htmltest.html) do if not exist $(OBJS)\%%f copy .\%%f $(OBJS)
-
-ifeq ($(USE_GUI),1)
-$(OBJS)\bench_gui.exe: $(BENCH_GUI_OBJECTS) $(OBJS)\bench_gui_sample_rc.o
- $(CXX) -o $@ $(BENCH_GUI_OBJECTS) $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) $(____CAIRO_LIBDIR_FILENAMES) $(LDFLAGS) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_SCINTILLA_IF_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(EXTRALIBS_FOR_BASE) $(__CAIRO_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32 -lwininet
-endif
-
-data-image:
- if not exist $(OBJS) mkdir $(OBJS)
- for %%f in (../../samples/image/horse.bmp ../../samples/image/horse.jpg ../../samples/image/horse.png ../../samples/image/horse.tif) do if not exist $(OBJS)\%%f copy .\%%f $(OBJS)
-
-$(OBJS)\bench_bench.o: ./bench.cpp
- $(CXX) -c -o $@ $(BENCH_CXXFLAGS) $(CPPDEPS) $<
-
-$(OBJS)\bench_datetime.o: ./datetime.cpp
- $(CXX) -c -o $@ $(BENCH_CXXFLAGS) $(CPPDEPS) $<
-
-$(OBJS)\bench_htmlpars.o: ./htmlparser/htmlpars.cpp
- $(CXX) -c -o $@ $(BENCH_CXXFLAGS) $(CPPDEPS) $<
-
-$(OBJS)\bench_htmltag.o: ./htmlparser/htmltag.cpp
- $(CXX) -c -o $@ $(BENCH_CXXFLAGS) $(CPPDEPS) $<
-
-$(OBJS)\bench_ipcclient.o: ./ipcclient.cpp
- $(CXX) -c -o $@ $(BENCH_CXXFLAGS) $(CPPDEPS) $<
-
-$(OBJS)\bench_log.o: ./log.cpp
- $(CXX) -c -o $@ $(BENCH_CXXFLAGS) $(CPPDEPS) $<
-
-$(OBJS)\bench_mbconv.o: ./mbconv.cpp
- $(CXX) -c -o $@ $(BENCH_CXXFLAGS) $(CPPDEPS) $<
-
-$(OBJS)\bench_strings.o: ./strings.cpp
- $(CXX) -c -o $@ $(BENCH_CXXFLAGS) $(CPPDEPS) $<
-
-$(OBJS)\bench_tls.o: ./tls.cpp
- $(CXX) -c -o $@ $(BENCH_CXXFLAGS) $(CPPDEPS) $<
-
-$(OBJS)\bench_printfbench.o: ./printfbench.cpp
- $(CXX) -c -o $@ $(BENCH_CXXFLAGS) $(CPPDEPS) $<
-
-$(OBJS)\bench_gui_sample_rc.o: ./../../samples/sample.rc
- $(WINDRES) -i$< -o$@ --define __WXMSW__ $(__WXUNIV_DEFINE_p_3) $(__DEBUG_DEFINE_p_3) $(__NDEBUG_DEFINE_p_3) $(__EXCEPTIONS_DEFINE_p_3) $(__RTTI_DEFINE_p_3) $(__THREAD_DEFINE_p_3) $(__UNICODE_DEFINE_p_3) --include-dir $(SETUPHDIR) --include-dir ./../../include $(__CAIRO_INCLUDEDIR_p_1) --include-dir . $(__DLLFLAG_p_3) --include-dir ./../../samples --define NOPCH
-
-$(OBJS)\bench_gui_bench.o: ./bench.cpp
- $(CXX) -c -o $@ $(BENCH_GUI_CXXFLAGS) $(CPPDEPS) $<
-
-$(OBJS)\bench_gui_image.o: ./image.cpp
- $(CXX) -c -o $@ $(BENCH_GUI_CXXFLAGS) $(CPPDEPS) $<
-
-.PHONY: all clean data data-image
-
-
-SHELL := $(COMSPEC)
-
-# Dependencies tracking:
--include $(OBJS)/*.d
+# =========================================================================
+# This makefile was generated by
+# Bakefile 0.2.9 (http://www.bakefile.org)
+# Do not modify, all changes will be overwritten!
+# =========================================================================
+
+include ../../build/msw/config.gcc
+
+# -------------------------------------------------------------------------
+# Do not modify the rest of this file!
+# -------------------------------------------------------------------------
+
+### Variables: ###
+
+CPPDEPS = -MT$@ -MF$@.d -MD -MP
+WX_RELEASE_NODOT = 31
+COMPILER_PREFIX = gcc
+OBJS = \
+ $(COMPILER_PREFIX)$(COMPILER_VERSION)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)
+LIBDIRNAME = \
+ .\..\..\lib\$(COMPILER_PREFIX)$(COMPILER_VERSION)_$(LIBTYPE_SUFFIX)$(CFG)
+SETUPHDIR = \
+ $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)
+BENCH_CXXFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG) $(__THREADSFLAG) $(GCCFLAGS) \
+ -DHAVE_W32API_H -D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \
+ $(__NDEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \
+ $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) -I$(SETUPHDIR) -I.\..\..\include \
+ $(____CAIRO_INCLUDEDIR_FILENAMES) -W -Wall -I. $(__DLLFLAG_p) -DwxUSE_GUI=0 \
+ $(__RTTIFLAG) $(__EXCEPTIONSFLAG) -Wno-ctor-dtor-privacy $(CPPFLAGS) \
+ $(CXXFLAGS)
+BENCH_OBJECTS = \
+ $(OBJS)\bench_bench.o \
+ $(OBJS)\bench_datetime.o \
+ $(OBJS)\bench_htmlpars.o \
+ $(OBJS)\bench_htmltag.o \
+ $(OBJS)\bench_ipcclient.o \
+ $(OBJS)\bench_log.o \
+ $(OBJS)\bench_mbconv.o \
+ $(OBJS)\bench_strings.o \
+ $(OBJS)\bench_tls.o \
+ $(OBJS)\bench_printfbench.o
+BENCH_GUI_CXXFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG) $(__THREADSFLAG) \
+ $(GCCFLAGS) -DHAVE_W32API_H -D__WXMSW__ $(__WXUNIV_DEFINE_p) \
+ $(__DEBUG_DEFINE_p) $(__NDEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) \
+ $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) \
+ -I$(SETUPHDIR) -I.\..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES) -W -Wall \
+ -I. $(__DLLFLAG_p) -I.\..\..\samples -DNOPCH $(__RTTIFLAG) \
+ $(__EXCEPTIONSFLAG) -Wno-ctor-dtor-privacy $(CPPFLAGS) $(CXXFLAGS)
+BENCH_GUI_OBJECTS = \
+ $(OBJS)\bench_gui_sample_rc.o \
+ $(OBJS)\bench_gui_bench.o \
+ $(OBJS)\bench_gui_image.o
+
+### Conditionally set variables: ###
+
+ifeq ($(GCC_VERSION),2.95)
+GCCFLAGS = -fvtable-thunks
+endif
+ifeq ($(USE_GUI),0)
+PORTNAME = base
+endif
+ifeq ($(USE_GUI),1)
+PORTNAME = msw$(TOOLKIT_VERSION)
+endif
+ifeq ($(OFFICIAL_BUILD),1)
+COMPILER_VERSION = ERROR-COMPILER-VERSION-MUST-BE-SET-FOR-OFFICIAL-BUILD
+endif
+ifeq ($(BUILD),debug)
+WXDEBUGFLAG = d
+endif
+ifeq ($(UNICODE),1)
+WXUNICODEFLAG = u
+endif
+ifeq ($(WXUNIV),1)
+WXUNIVNAME = univ
+endif
+ifeq ($(SHARED),1)
+WXDLLFLAG = dll
+endif
+ifeq ($(SHARED),0)
+LIBTYPE_SUFFIX = lib
+endif
+ifeq ($(SHARED),1)
+LIBTYPE_SUFFIX = dll
+endif
+ifeq ($(MONOLITHIC),0)
+EXTRALIBS_FOR_BASE =
+endif
+ifeq ($(MONOLITHIC),1)
+EXTRALIBS_FOR_BASE =
+endif
+ifeq ($(MONOLITHIC),0)
+__WXLIB_NET_p = \
+ -lwxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_net
+endif
+ifeq ($(MONOLITHIC),1)
+__LIB_PNG_IF_MONO_p = $(__LIB_PNG_p)
+endif
+ifeq ($(USE_GUI),1)
+__bench_gui___depname = $(OBJS)\bench_gui.exe
+endif
+ifeq ($(WXUNIV),1)
+__WXUNIV_DEFINE_p_3 = --define __WXUNIVERSAL__
+endif
+ifeq ($(DEBUG_FLAG),0)
+__DEBUG_DEFINE_p_3 = --define wxDEBUG_LEVEL=0
+endif
+ifeq ($(BUILD),release)
+__NDEBUG_DEFINE_p_3 = --define NDEBUG
+endif
+ifeq ($(USE_EXCEPTIONS),0)
+__EXCEPTIONS_DEFINE_p_3 = --define wxNO_EXCEPTIONS
+endif
+ifeq ($(USE_RTTI),0)
+__RTTI_DEFINE_p_3 = --define wxNO_RTTI
+endif
+ifeq ($(USE_THREADS),0)
+__THREAD_DEFINE_p_3 = --define wxNO_THREADS
+endif
+ifeq ($(UNICODE),0)
+__UNICODE_DEFINE_p_3 = --define wxUSE_UNICODE=0
+endif
+ifeq ($(UNICODE),1)
+__UNICODE_DEFINE_p_3 = --define _UNICODE
+endif
+ifeq ($(USE_CAIRO),1)
+__CAIRO_INCLUDEDIR_p_1 = --include-dir $(CAIRO_ROOT)/include/cairo
+endif
+ifeq ($(SHARED),1)
+__DLLFLAG_p_3 = --define WXUSINGDLL
+endif
+ifeq ($(MONOLITHIC),0)
+__WXLIB_CORE_p = \
+ -lwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core
+endif
+ifeq ($(MONOLITHIC),1)
+ifeq ($(USE_STC),1)
+__LIB_SCINTILLA_IF_MONO_p = -lwxscintilla$(WXDEBUGFLAG)
+endif
+endif
+ifeq ($(USE_GUI),1)
+__LIB_TIFF_p = -lwxtiff$(WXDEBUGFLAG)
+endif
+ifeq ($(USE_GUI),1)
+__LIB_JPEG_p = -lwxjpeg$(WXDEBUGFLAG)
+endif
+ifeq ($(BUILD),debug)
+__OPTIMIZEFLAG = -O0
+endif
+ifeq ($(BUILD),release)
+__OPTIMIZEFLAG = -O2
+endif
+ifeq ($(USE_RTTI),0)
+__RTTIFLAG = -fno-rtti
+endif
+ifeq ($(USE_RTTI),1)
+__RTTIFLAG =
+endif
+ifeq ($(USE_EXCEPTIONS),0)
+__EXCEPTIONSFLAG = -fno-exceptions
+endif
+ifeq ($(USE_EXCEPTIONS),1)
+__EXCEPTIONSFLAG =
+endif
+ifeq ($(WXUNIV),1)
+__WXUNIV_DEFINE_p = -D__WXUNIVERSAL__
+endif
+ifeq ($(DEBUG_FLAG),0)
+__DEBUG_DEFINE_p = -DwxDEBUG_LEVEL=0
+endif
+ifeq ($(BUILD),release)
+__NDEBUG_DEFINE_p = -DNDEBUG
+endif
+ifeq ($(USE_EXCEPTIONS),0)
+__EXCEPTIONS_DEFINE_p = -DwxNO_EXCEPTIONS
+endif
+ifeq ($(USE_RTTI),0)
+__RTTI_DEFINE_p = -DwxNO_RTTI
+endif
+ifeq ($(USE_THREADS),0)
+__THREAD_DEFINE_p = -DwxNO_THREADS
+endif
+ifeq ($(UNICODE),0)
+__UNICODE_DEFINE_p = -DwxUSE_UNICODE=0
+endif
+ifeq ($(UNICODE),1)
+__UNICODE_DEFINE_p = -D_UNICODE
+endif
+ifeq ($(USE_CAIRO),1)
+____CAIRO_INCLUDEDIR_FILENAMES = -I$(CAIRO_ROOT)\include\cairo
+endif
+ifeq ($(SHARED),1)
+__DLLFLAG_p = -DWXUSINGDLL
+endif
+ifeq ($(MONOLITHIC),0)
+__WXLIB_BASE_p = \
+ -lwxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)
+endif
+ifeq ($(MONOLITHIC),1)
+__WXLIB_MONO_p = \
+ -lwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)
+endif
+ifeq ($(USE_GUI),1)
+__LIB_PNG_p = -lwxpng$(WXDEBUGFLAG)
+endif
+ifeq ($(USE_CAIRO),1)
+__CAIRO_LIB_p = -lcairo
+endif
+ifeq ($(USE_CAIRO),1)
+____CAIRO_LIBDIR_FILENAMES = -L$(CAIRO_ROOT)\lib
+endif
+ifeq ($(BUILD),debug)
+ifeq ($(DEBUG_INFO),default)
+__DEBUGINFO = -g
+endif
+endif
+ifeq ($(BUILD),release)
+ifeq ($(DEBUG_INFO),default)
+__DEBUGINFO =
+endif
+endif
+ifeq ($(DEBUG_INFO),0)
+__DEBUGINFO =
+endif
+ifeq ($(DEBUG_INFO),1)
+__DEBUGINFO = -g
+endif
+ifeq ($(USE_THREADS),0)
+__THREADSFLAG =
+endif
+ifeq ($(USE_THREADS),1)
+__THREADSFLAG = -mthreads
+endif
+
+
+all: $(OBJS)
+$(OBJS):
+ -if not exist $(OBJS) mkdir $(OBJS)
+
+### Targets: ###
+
+all: $(OBJS)\bench.exe data $(__bench_gui___depname) data-image
+
+clean:
+ -if exist $(OBJS)\*.o del $(OBJS)\*.o
+ -if exist $(OBJS)\*.d del $(OBJS)\*.d
+ -if exist $(OBJS)\bench.exe del $(OBJS)\bench.exe
+ -if exist $(OBJS)\bench_gui.exe del $(OBJS)\bench_gui.exe
+
+$(OBJS)\bench.exe: $(BENCH_OBJECTS)
+ $(CXX) -o $@ $(BENCH_OBJECTS) $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) $(____CAIRO_LIBDIR_FILENAMES) $(LDFLAGS) $(__WXLIB_NET_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_PNG_IF_MONO_p) -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(EXTRALIBS_FOR_BASE) $(__CAIRO_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32 -lwininet
+
+data:
+ if not exist $(OBJS) mkdir $(OBJS)
+ for %%f in (htmltest.html) do if not exist $(OBJS)\%%f copy .\%%f $(OBJS)
+
+ifeq ($(USE_GUI),1)
+$(OBJS)\bench_gui.exe: $(BENCH_GUI_OBJECTS) $(OBJS)\bench_gui_sample_rc.o
+ $(CXX) -o $@ $(BENCH_GUI_OBJECTS) $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) $(____CAIRO_LIBDIR_FILENAMES) $(LDFLAGS) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_SCINTILLA_IF_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(EXTRALIBS_FOR_BASE) $(__CAIRO_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32 -lwininet
+endif
+
+data-image:
+ if not exist $(OBJS) mkdir $(OBJS)
+ for %%f in (../../samples/image/horse.bmp ../../samples/image/horse.jpg ../../samples/image/horse.png ../../samples/image/horse.tif) do if not exist $(OBJS)\%%f copy .\%%f $(OBJS)
+
+$(OBJS)\bench_bench.o: ./bench.cpp
+ $(CXX) -c -o $@ $(BENCH_CXXFLAGS) $(CPPDEPS) $<
+
+$(OBJS)\bench_datetime.o: ./datetime.cpp
+ $(CXX) -c -o $@ $(BENCH_CXXFLAGS) $(CPPDEPS) $<
+
+$(OBJS)\bench_htmlpars.o: ./htmlparser/htmlpars.cpp
+ $(CXX) -c -o $@ $(BENCH_CXXFLAGS) $(CPPDEPS) $<
+
+$(OBJS)\bench_htmltag.o: ./htmlparser/htmltag.cpp
+ $(CXX) -c -o $@ $(BENCH_CXXFLAGS) $(CPPDEPS) $<
+
+$(OBJS)\bench_ipcclient.o: ./ipcclient.cpp
+ $(CXX) -c -o $@ $(BENCH_CXXFLAGS) $(CPPDEPS) $<
+
+$(OBJS)\bench_log.o: ./log.cpp
+ $(CXX) -c -o $@ $(BENCH_CXXFLAGS) $(CPPDEPS) $<
+
+$(OBJS)\bench_mbconv.o: ./mbconv.cpp
+ $(CXX) -c -o $@ $(BENCH_CXXFLAGS) $(CPPDEPS) $<
+
+$(OBJS)\bench_strings.o: ./strings.cpp
+ $(CXX) -c -o $@ $(BENCH_CXXFLAGS) $(CPPDEPS) $<
+
+$(OBJS)\bench_tls.o: ./tls.cpp
+ $(CXX) -c -o $@ $(BENCH_CXXFLAGS) $(CPPDEPS) $<
+
+$(OBJS)\bench_printfbench.o: ./printfbench.cpp
+ $(CXX) -c -o $@ $(BENCH_CXXFLAGS) $(CPPDEPS) $<
+
+$(OBJS)\bench_gui_sample_rc.o: ./../../samples/sample.rc
+ $(WINDRES) -i$< -o$@ --define __WXMSW__ $(__WXUNIV_DEFINE_p_3) $(__DEBUG_DEFINE_p_3) $(__NDEBUG_DEFINE_p_3) $(__EXCEPTIONS_DEFINE_p_3) $(__RTTI_DEFINE_p_3) $(__THREAD_DEFINE_p_3) $(__UNICODE_DEFINE_p_3) --include-dir $(SETUPHDIR) --include-dir ./../../include $(__CAIRO_INCLUDEDIR_p_1) --include-dir . $(__DLLFLAG_p_3) --include-dir ./../../samples --define NOPCH
+
+$(OBJS)\bench_gui_bench.o: ./bench.cpp
+ $(CXX) -c -o $@ $(BENCH_GUI_CXXFLAGS) $(CPPDEPS) $<
+
+$(OBJS)\bench_gui_image.o: ./image.cpp
+ $(CXX) -c -o $@ $(BENCH_GUI_CXXFLAGS) $(CPPDEPS) $<
+
+.PHONY: all clean data data-image
+
+
+SHELL := $(COMSPEC)
+
+# Dependencies tracking:
+-include $(OBJS)/*.d
diff --git a/tests/benchmarks/makefile.vc b/tests/benchmarks/makefile.vc
index c9af30d6c0..6a3488e443 100644
--- a/tests/benchmarks/makefile.vc
+++ b/tests/benchmarks/makefile.vc
@@ -1,461 +1,461 @@
-# =========================================================================
-# This makefile was generated by
-# Bakefile 0.2.9 (http://www.bakefile.org)
-# Do not modify, all changes will be overwritten!
-# =========================================================================
-
-!include <../../build/msw/config.vc>
-
-# -------------------------------------------------------------------------
-# Do not modify the rest of this file!
-# -------------------------------------------------------------------------
-
-### Variables: ###
-
-WX_RELEASE_NODOT = 31
-COMPILER_PREFIX = vc
-OBJS = \
- $(COMPILER_PREFIX)$(COMPILER_VERSION)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)$(ARCH_SUFFIX)
-LIBDIRNAME = \
- .\..\..\lib\$(COMPILER_PREFIX)$(COMPILER_VERSION)$(ARCH_SUFFIX)_$(LIBTYPE_SUFFIX)$(CFG)
-SETUPHDIR = \
- $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)
-BENCH_CXXFLAGS = /M$(__RUNTIME_LIBS_10)$(__DEBUGRUNTIME) /DWIN32 \
- $(__DEBUGINFO) /Fd$(OBJS)\bench.pdb $(____DEBUGRUNTIME) $(__OPTIMIZEFLAG) \
- /D_CRT_SECURE_NO_DEPRECATE=1 /D_CRT_NON_CONFORMING_SWPRINTFS=1 \
- /D_SCL_SECURE_NO_WARNINGS=1 $(__NO_VC_CRTDBG_p) /D__WXMSW__ \
- $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__NDEBUG_DEFINE_p) \
- $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \
- $(__UNICODE_DEFINE_p) /I$(SETUPHDIR) /I.\..\..\include \
- $(____CAIRO_INCLUDEDIR_FILENAMES) /W4 /I. $(__DLLFLAG_p) /D_CONSOLE \
- /DwxUSE_GUI=0 $(__RTTIFLAG) $(__EXCEPTIONSFLAG) $(CPPFLAGS) $(CXXFLAGS)
-BENCH_OBJECTS = \
- $(OBJS)\bench_bench.obj \
- $(OBJS)\bench_datetime.obj \
- $(OBJS)\bench_htmlpars.obj \
- $(OBJS)\bench_htmltag.obj \
- $(OBJS)\bench_ipcclient.obj \
- $(OBJS)\bench_log.obj \
- $(OBJS)\bench_mbconv.obj \
- $(OBJS)\bench_strings.obj \
- $(OBJS)\bench_tls.obj \
- $(OBJS)\bench_printfbench.obj
-BENCH_GUI_CXXFLAGS = /M$(__RUNTIME_LIBS_26)$(__DEBUGRUNTIME) /DWIN32 \
- $(__DEBUGINFO) /Fd$(OBJS)\bench_gui.pdb $(____DEBUGRUNTIME) \
- $(__OPTIMIZEFLAG) /D_CRT_SECURE_NO_DEPRECATE=1 \
- /D_CRT_NON_CONFORMING_SWPRINTFS=1 /D_SCL_SECURE_NO_WARNINGS=1 \
- $(__NO_VC_CRTDBG_p) /D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \
- $(__NDEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \
- $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) /I$(SETUPHDIR) /I.\..\..\include \
- $(____CAIRO_INCLUDEDIR_FILENAMES) /W4 /I. $(__DLLFLAG_p) /I.\..\..\samples \
- /DNOPCH /D_CONSOLE $(__RTTIFLAG) $(__EXCEPTIONSFLAG) $(CPPFLAGS) $(CXXFLAGS)
-BENCH_GUI_OBJECTS = \
- $(OBJS)\bench_gui_bench.obj \
- $(OBJS)\bench_gui_image.obj
-BENCH_GUI_RESOURCES = \
- $(OBJS)\bench_gui_sample.res
-
-### Conditionally set variables: ###
-
-!if "$(TARGET_CPU)" == "AMD64"
-ARCH_SUFFIX = _x64
-!endif
-!if "$(TARGET_CPU)" == "IA64"
-ARCH_SUFFIX = _ia64
-!endif
-!if "$(TARGET_CPU)" == "X64"
-ARCH_SUFFIX = _x64
-!endif
-!if "$(TARGET_CPU)" == "amd64"
-ARCH_SUFFIX = _x64
-!endif
-!if "$(TARGET_CPU)" == "ia64"
-ARCH_SUFFIX = _ia64
-!endif
-!if "$(TARGET_CPU)" == "x64"
-ARCH_SUFFIX = _x64
-!endif
-!if "$(USE_GUI)" == "0"
-PORTNAME = base
-!endif
-!if "$(USE_GUI)" == "1"
-PORTNAME = msw$(TOOLKIT_VERSION)
-!endif
-!if "$(OFFICIAL_BUILD)" == "1"
-COMPILER_VERSION = ERROR-COMPILER-VERSION-MUST-BE-SET-FOR-OFFICIAL-BUILD
-!endif
-!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default"
-WXDEBUGFLAG = d
-!endif
-!if "$(DEBUG_RUNTIME_LIBS)" == "1"
-WXDEBUGFLAG = d
-!endif
-!if "$(UNICODE)" == "1"
-WXUNICODEFLAG = u
-!endif
-!if "$(WXUNIV)" == "1"
-WXUNIVNAME = univ
-!endif
-!if "$(SHARED)" == "1"
-WXDLLFLAG = dll
-!endif
-!if "$(SHARED)" == "0"
-LIBTYPE_SUFFIX = lib
-!endif
-!if "$(SHARED)" == "1"
-LIBTYPE_SUFFIX = dll
-!endif
-!if "$(TARGET_CPU)" == "AMD64"
-LINK_TARGET_CPU = /MACHINE:X64
-!endif
-!if "$(TARGET_CPU)" == "IA64"
-LINK_TARGET_CPU = /MACHINE:IA64
-!endif
-!if "$(TARGET_CPU)" == "X64"
-LINK_TARGET_CPU = /MACHINE:X64
-!endif
-!if "$(TARGET_CPU)" == "amd64"
-LINK_TARGET_CPU = /MACHINE:X64
-!endif
-!if "$(TARGET_CPU)" == "ia64"
-LINK_TARGET_CPU = /MACHINE:IA64
-!endif
-!if "$(TARGET_CPU)" == "x64"
-LINK_TARGET_CPU = /MACHINE:X64
-!endif
-!if "$(MONOLITHIC)" == "0"
-EXTRALIBS_FOR_BASE =
-!endif
-!if "$(MONOLITHIC)" == "1"
-EXTRALIBS_FOR_BASE =
-!endif
-!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default"
-__DEBUGINFO_2 = $(__DEBUGRUNTIME_0)
-!endif
-!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default"
-__DEBUGINFO_2 =
-!endif
-!if "$(DEBUG_INFO)" == "0"
-__DEBUGINFO_2 =
-!endif
-!if "$(DEBUG_INFO)" == "1"
-__DEBUGINFO_2 = $(__DEBUGRUNTIME_0)
-!endif
-!if "$(RUNTIME_LIBS)" == "dynamic"
-__RUNTIME_LIBS_10 = D
-!endif
-!if "$(RUNTIME_LIBS)" == "static"
-__RUNTIME_LIBS_10 = $(__THREADSFLAG)
-!endif
-!if "$(MONOLITHIC)" == "0"
-__WXLIB_NET_p = \
- wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_net.lib
-!endif
-!if "$(MONOLITHIC)" == "1"
-__LIB_PNG_IF_MONO_p = $(__LIB_PNG_p)
-!endif
-!if "$(USE_GUI)" == "1"
-__bench_gui___depname = $(OBJS)\bench_gui.exe
-!endif
-!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default"
-__DEBUGINFO_18 = $(__DEBUGRUNTIME_0)
-!endif
-!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default"
-__DEBUGINFO_18 =
-!endif
-!if "$(DEBUG_INFO)" == "0"
-__DEBUGINFO_18 =
-!endif
-!if "$(DEBUG_INFO)" == "1"
-__DEBUGINFO_18 = $(__DEBUGRUNTIME_0)
-!endif
-!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default"
-____DEBUGRUNTIME_19_p_1 = /d _DEBUG
-!endif
-!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default"
-____DEBUGRUNTIME_19_p_1 =
-!endif
-!if "$(DEBUG_RUNTIME_LIBS)" == "0"
-____DEBUGRUNTIME_19_p_1 =
-!endif
-!if "$(DEBUG_RUNTIME_LIBS)" == "1"
-____DEBUGRUNTIME_19_p_1 = /d _DEBUG
-!endif
-!if "$(RUNTIME_LIBS)" == "dynamic"
-__RUNTIME_LIBS_26 = D
-!endif
-!if "$(RUNTIME_LIBS)" == "static"
-__RUNTIME_LIBS_26 = $(__THREADSFLAG)
-!endif
-!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "0"
-__NO_VC_CRTDBG_p_3 = /d __NO_VC_CRTDBG__
-!endif
-!if "$(BUILD)" == "release" && "$(DEBUG_FLAG)" == "1"
-__NO_VC_CRTDBG_p_3 = /d __NO_VC_CRTDBG__
-!endif
-!if "$(WXUNIV)" == "1"
-__WXUNIV_DEFINE_p_3 = /d __WXUNIVERSAL__
-!endif
-!if "$(DEBUG_FLAG)" == "0"
-__DEBUG_DEFINE_p_3 = /d wxDEBUG_LEVEL=0
-!endif
-!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default"
-__NDEBUG_DEFINE_p_3 = /d NDEBUG
-!endif
-!if "$(DEBUG_RUNTIME_LIBS)" == "0"
-__NDEBUG_DEFINE_p_3 = /d NDEBUG
-!endif
-!if "$(USE_EXCEPTIONS)" == "0"
-__EXCEPTIONS_DEFINE_p_3 = /d wxNO_EXCEPTIONS
-!endif
-!if "$(USE_RTTI)" == "0"
-__RTTI_DEFINE_p_3 = /d wxNO_RTTI
-!endif
-!if "$(USE_THREADS)" == "0"
-__THREAD_DEFINE_p_3 = /d wxNO_THREADS
-!endif
-!if "$(UNICODE)" == "0"
-__UNICODE_DEFINE_p_3 = /d wxUSE_UNICODE=0
-!endif
-!if "$(UNICODE)" == "1"
-__UNICODE_DEFINE_p_3 = /d _UNICODE
-!endif
-!if "$(USE_CAIRO)" == "1"
-____CAIRO_INCLUDEDIR_FILENAMES_3_p = /i $(CAIRO_ROOT)\include\cairo
-!endif
-!if "$(SHARED)" == "1"
-__DLLFLAG_p_3 = /d WXUSINGDLL
-!endif
-!if "$(MONOLITHIC)" == "0"
-__WXLIB_CORE_p = \
- wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib
-!endif
-!if "$(MONOLITHIC)" == "1" && "$(USE_STC)" == "1"
-__LIB_SCINTILLA_IF_MONO_p = wxscintilla$(WXDEBUGFLAG).lib
-!endif
-!if "$(USE_GUI)" == "1"
-__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib
-!endif
-!if "$(USE_GUI)" == "1"
-__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib
-!endif
-!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default"
-__DEBUGINFO = /Zi
-!endif
-!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default"
-__DEBUGINFO =
-!endif
-!if "$(DEBUG_INFO)" == "0"
-__DEBUGINFO =
-!endif
-!if "$(DEBUG_INFO)" == "1"
-__DEBUGINFO = /Zi
-!endif
-!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default"
-__DEBUGINFO_1 = /DEBUG
-!endif
-!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default"
-__DEBUGINFO_1 =
-!endif
-!if "$(DEBUG_INFO)" == "0"
-__DEBUGINFO_1 =
-!endif
-!if "$(DEBUG_INFO)" == "1"
-__DEBUGINFO_1 = /DEBUG
-!endif
-!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default"
-____DEBUGRUNTIME = /D_DEBUG
-!endif
-!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default"
-____DEBUGRUNTIME =
-!endif
-!if "$(DEBUG_RUNTIME_LIBS)" == "0"
-____DEBUGRUNTIME =
-!endif
-!if "$(DEBUG_RUNTIME_LIBS)" == "1"
-____DEBUGRUNTIME = /D_DEBUG
-!endif
-!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default"
-__DEBUGRUNTIME = d
-!endif
-!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default"
-__DEBUGRUNTIME =
-!endif
-!if "$(DEBUG_RUNTIME_LIBS)" == "0"
-__DEBUGRUNTIME =
-!endif
-!if "$(DEBUG_RUNTIME_LIBS)" == "1"
-__DEBUGRUNTIME = d
-!endif
-!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default"
-__DEBUGRUNTIME_0 =
-!endif
-!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default"
-__DEBUGRUNTIME_0 = /opt:ref /opt:icf
-!endif
-!if "$(DEBUG_RUNTIME_LIBS)" == "0"
-__DEBUGRUNTIME_0 = /opt:ref /opt:icf
-!endif
-!if "$(DEBUG_RUNTIME_LIBS)" == "1"
-__DEBUGRUNTIME_0 =
-!endif
-!if "$(BUILD)" == "debug"
-__OPTIMIZEFLAG = /Od
-!endif
-!if "$(BUILD)" == "release"
-__OPTIMIZEFLAG = /O2
-!endif
-!if "$(USE_THREADS)" == "0"
-__THREADSFLAG = L
-!endif
-!if "$(USE_THREADS)" == "1"
-__THREADSFLAG = T
-!endif
-!if "$(USE_RTTI)" == "0"
-__RTTIFLAG =
-!endif
-!if "$(USE_RTTI)" == "1"
-__RTTIFLAG = /GR
-!endif
-!if "$(USE_EXCEPTIONS)" == "0"
-__EXCEPTIONSFLAG =
-!endif
-!if "$(USE_EXCEPTIONS)" == "1"
-__EXCEPTIONSFLAG = /EHsc
-!endif
-!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "0"
-__NO_VC_CRTDBG_p = /D__NO_VC_CRTDBG__
-!endif
-!if "$(BUILD)" == "release" && "$(DEBUG_FLAG)" == "1"
-__NO_VC_CRTDBG_p = /D__NO_VC_CRTDBG__
-!endif
-!if "$(WXUNIV)" == "1"
-__WXUNIV_DEFINE_p = /D__WXUNIVERSAL__
-!endif
-!if "$(DEBUG_FLAG)" == "0"
-__DEBUG_DEFINE_p = /DwxDEBUG_LEVEL=0
-!endif
-!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default"
-__NDEBUG_DEFINE_p = /DNDEBUG
-!endif
-!if "$(DEBUG_RUNTIME_LIBS)" == "0"
-__NDEBUG_DEFINE_p = /DNDEBUG
-!endif
-!if "$(USE_EXCEPTIONS)" == "0"
-__EXCEPTIONS_DEFINE_p = /DwxNO_EXCEPTIONS
-!endif
-!if "$(USE_RTTI)" == "0"
-__RTTI_DEFINE_p = /DwxNO_RTTI
-!endif
-!if "$(USE_THREADS)" == "0"
-__THREAD_DEFINE_p = /DwxNO_THREADS
-!endif
-!if "$(UNICODE)" == "0"
-__UNICODE_DEFINE_p = /DwxUSE_UNICODE=0
-!endif
-!if "$(UNICODE)" == "1"
-__UNICODE_DEFINE_p = /D_UNICODE
-!endif
-!if "$(USE_CAIRO)" == "1"
-____CAIRO_INCLUDEDIR_FILENAMES = /I$(CAIRO_ROOT)\include\cairo
-!endif
-!if "$(SHARED)" == "1"
-__DLLFLAG_p = /DWXUSINGDLL
-!endif
-!if "$(MONOLITHIC)" == "0"
-__WXLIB_BASE_p = \
- wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib
-!endif
-!if "$(MONOLITHIC)" == "1"
-__WXLIB_MONO_p = \
- wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib
-!endif
-!if "$(USE_GUI)" == "1"
-__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib
-!endif
-!if "$(USE_CAIRO)" == "1"
-__CAIRO_LIB_p = cairo.lib
-!endif
-!if "$(USE_CAIRO)" == "1"
-____CAIRO_LIBDIR_FILENAMES = /LIBPATH:$(CAIRO_ROOT)\lib
-!endif
-
-
-all: $(OBJS)
-$(OBJS):
- -if not exist $(OBJS) mkdir $(OBJS)
-
-### Targets: ###
-
-all: $(OBJS)\bench.exe data $(__bench_gui___depname) data-image
-
-clean:
- -if exist $(OBJS)\*.obj del $(OBJS)\*.obj
- -if exist $(OBJS)\*.res del $(OBJS)\*.res
- -if exist $(OBJS)\*.pch del $(OBJS)\*.pch
- -if exist $(OBJS)\bench.exe del $(OBJS)\bench.exe
- -if exist $(OBJS)\bench.ilk del $(OBJS)\bench.ilk
- -if exist $(OBJS)\bench.pdb del $(OBJS)\bench.pdb
- -if exist $(OBJS)\bench_gui.exe del $(OBJS)\bench_gui.exe
- -if exist $(OBJS)\bench_gui.ilk del $(OBJS)\bench_gui.ilk
- -if exist $(OBJS)\bench_gui.pdb del $(OBJS)\bench_gui.pdb
-
-$(OBJS)\bench.exe: $(BENCH_OBJECTS)
- link /NOLOGO /OUT:$@ $(__DEBUGINFO_1) /pdb:"$(OBJS)\bench.pdb" $(__DEBUGINFO_2) $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:CONSOLE $(____CAIRO_LIBDIR_FILENAMES) $(LDFLAGS) @<<
- $(BENCH_OBJECTS) $(__WXLIB_NET_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_PNG_IF_MONO_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__CAIRO_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib
-<<
-
-data:
- if not exist $(OBJS) mkdir $(OBJS)
- for %f in (htmltest.html) do if not exist $(OBJS)\%f copy .\%f $(OBJS)
-
-!if "$(USE_GUI)" == "1"
-$(OBJS)\bench_gui.exe: $(BENCH_GUI_OBJECTS) $(OBJS)\bench_gui_sample.res
- link /NOLOGO /OUT:$@ $(__DEBUGINFO_1) /pdb:"$(OBJS)\bench_gui.pdb" $(__DEBUGINFO_18) $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:CONSOLE $(____CAIRO_LIBDIR_FILENAMES) $(LDFLAGS) @<<
- $(BENCH_GUI_OBJECTS) $(BENCH_GUI_RESOURCES) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_SCINTILLA_IF_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__CAIRO_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib
-<<
-!endif
-
-data-image:
- if not exist $(OBJS) mkdir $(OBJS)
- for %f in (../../samples/image/horse.bmp ../../samples/image/horse.jpg ../../samples/image/horse.png ../../samples/image/horse.tif) do if not exist $(OBJS)\%f copy .\%f $(OBJS)
-
-$(OBJS)\bench_bench.obj: .\bench.cpp
- $(CXX) /c /nologo /TP /Fo$@ $(BENCH_CXXFLAGS) .\bench.cpp
-
-$(OBJS)\bench_datetime.obj: .\datetime.cpp
- $(CXX) /c /nologo /TP /Fo$@ $(BENCH_CXXFLAGS) .\datetime.cpp
-
-$(OBJS)\bench_htmlpars.obj: .\htmlparser\htmlpars.cpp
- $(CXX) /c /nologo /TP /Fo$@ $(BENCH_CXXFLAGS) .\htmlparser\htmlpars.cpp
-
-$(OBJS)\bench_htmltag.obj: .\htmlparser\htmltag.cpp
- $(CXX) /c /nologo /TP /Fo$@ $(BENCH_CXXFLAGS) .\htmlparser\htmltag.cpp
-
-$(OBJS)\bench_ipcclient.obj: .\ipcclient.cpp
- $(CXX) /c /nologo /TP /Fo$@ $(BENCH_CXXFLAGS) .\ipcclient.cpp
-
-$(OBJS)\bench_log.obj: .\log.cpp
- $(CXX) /c /nologo /TP /Fo$@ $(BENCH_CXXFLAGS) .\log.cpp
-
-$(OBJS)\bench_mbconv.obj: .\mbconv.cpp
- $(CXX) /c /nologo /TP /Fo$@ $(BENCH_CXXFLAGS) .\mbconv.cpp
-
-$(OBJS)\bench_strings.obj: .\strings.cpp
- $(CXX) /c /nologo /TP /Fo$@ $(BENCH_CXXFLAGS) .\strings.cpp
-
-$(OBJS)\bench_tls.obj: .\tls.cpp
- $(CXX) /c /nologo /TP /Fo$@ $(BENCH_CXXFLAGS) .\tls.cpp
-
-$(OBJS)\bench_printfbench.obj: .\printfbench.cpp
- $(CXX) /c /nologo /TP /Fo$@ $(BENCH_CXXFLAGS) .\printfbench.cpp
-
-$(OBJS)\bench_gui_sample.res: .\..\..\samples\sample.rc
- rc /fo$@ /d WIN32 $(____DEBUGRUNTIME_19_p_1) /d _CRT_SECURE_NO_DEPRECATE=1 /d _CRT_NON_CONFORMING_SWPRINTFS=1 /d _SCL_SECURE_NO_WARNINGS=1 $(__NO_VC_CRTDBG_p_3) /d __WXMSW__ $(__WXUNIV_DEFINE_p_3) $(__DEBUG_DEFINE_p_3) $(__NDEBUG_DEFINE_p_3) $(__EXCEPTIONS_DEFINE_p_3) $(__RTTI_DEFINE_p_3) $(__THREAD_DEFINE_p_3) $(__UNICODE_DEFINE_p_3) /i $(SETUPHDIR) /i .\..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES_3_p) /i . $(__DLLFLAG_p_3) /i .\..\..\samples /d NOPCH /d _CONSOLE .\..\..\samples\sample.rc
-
-$(OBJS)\bench_gui_bench.obj: .\bench.cpp
- $(CXX) /c /nologo /TP /Fo$@ $(BENCH_GUI_CXXFLAGS) .\bench.cpp
-
-$(OBJS)\bench_gui_image.obj: .\image.cpp
- $(CXX) /c /nologo /TP /Fo$@ $(BENCH_GUI_CXXFLAGS) .\image.cpp
-
+# =========================================================================
+# This makefile was generated by
+# Bakefile 0.2.9 (http://www.bakefile.org)
+# Do not modify, all changes will be overwritten!
+# =========================================================================
+
+!include <../../build/msw/config.vc>
+
+# -------------------------------------------------------------------------
+# Do not modify the rest of this file!
+# -------------------------------------------------------------------------
+
+### Variables: ###
+
+WX_RELEASE_NODOT = 31
+COMPILER_PREFIX = vc
+OBJS = \
+ $(COMPILER_PREFIX)$(COMPILER_VERSION)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)$(ARCH_SUFFIX)
+LIBDIRNAME = \
+ .\..\..\lib\$(COMPILER_PREFIX)$(COMPILER_VERSION)$(ARCH_SUFFIX)_$(LIBTYPE_SUFFIX)$(CFG)
+SETUPHDIR = \
+ $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)
+BENCH_CXXFLAGS = /M$(__RUNTIME_LIBS_10)$(__DEBUGRUNTIME) /DWIN32 \
+ $(__DEBUGINFO) /Fd$(OBJS)\bench.pdb $(____DEBUGRUNTIME) $(__OPTIMIZEFLAG) \
+ /D_CRT_SECURE_NO_DEPRECATE=1 /D_CRT_NON_CONFORMING_SWPRINTFS=1 \
+ /D_SCL_SECURE_NO_WARNINGS=1 $(__NO_VC_CRTDBG_p) /D__WXMSW__ \
+ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__NDEBUG_DEFINE_p) \
+ $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \
+ $(__UNICODE_DEFINE_p) /I$(SETUPHDIR) /I.\..\..\include \
+ $(____CAIRO_INCLUDEDIR_FILENAMES) /W4 /I. $(__DLLFLAG_p) /D_CONSOLE \
+ /DwxUSE_GUI=0 $(__RTTIFLAG) $(__EXCEPTIONSFLAG) $(CPPFLAGS) $(CXXFLAGS)
+BENCH_OBJECTS = \
+ $(OBJS)\bench_bench.obj \
+ $(OBJS)\bench_datetime.obj \
+ $(OBJS)\bench_htmlpars.obj \
+ $(OBJS)\bench_htmltag.obj \
+ $(OBJS)\bench_ipcclient.obj \
+ $(OBJS)\bench_log.obj \
+ $(OBJS)\bench_mbconv.obj \
+ $(OBJS)\bench_strings.obj \
+ $(OBJS)\bench_tls.obj \
+ $(OBJS)\bench_printfbench.obj
+BENCH_GUI_CXXFLAGS = /M$(__RUNTIME_LIBS_26)$(__DEBUGRUNTIME) /DWIN32 \
+ $(__DEBUGINFO) /Fd$(OBJS)\bench_gui.pdb $(____DEBUGRUNTIME) \
+ $(__OPTIMIZEFLAG) /D_CRT_SECURE_NO_DEPRECATE=1 \
+ /D_CRT_NON_CONFORMING_SWPRINTFS=1 /D_SCL_SECURE_NO_WARNINGS=1 \
+ $(__NO_VC_CRTDBG_p) /D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \
+ $(__NDEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \
+ $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) /I$(SETUPHDIR) /I.\..\..\include \
+ $(____CAIRO_INCLUDEDIR_FILENAMES) /W4 /I. $(__DLLFLAG_p) /I.\..\..\samples \
+ /DNOPCH /D_CONSOLE $(__RTTIFLAG) $(__EXCEPTIONSFLAG) $(CPPFLAGS) $(CXXFLAGS)
+BENCH_GUI_OBJECTS = \
+ $(OBJS)\bench_gui_bench.obj \
+ $(OBJS)\bench_gui_image.obj
+BENCH_GUI_RESOURCES = \
+ $(OBJS)\bench_gui_sample.res
+
+### Conditionally set variables: ###
+
+!if "$(TARGET_CPU)" == "AMD64"
+ARCH_SUFFIX = _x64
+!endif
+!if "$(TARGET_CPU)" == "IA64"
+ARCH_SUFFIX = _ia64
+!endif
+!if "$(TARGET_CPU)" == "X64"
+ARCH_SUFFIX = _x64
+!endif
+!if "$(TARGET_CPU)" == "amd64"
+ARCH_SUFFIX = _x64
+!endif
+!if "$(TARGET_CPU)" == "ia64"
+ARCH_SUFFIX = _ia64
+!endif
+!if "$(TARGET_CPU)" == "x64"
+ARCH_SUFFIX = _x64
+!endif
+!if "$(USE_GUI)" == "0"
+PORTNAME = base
+!endif
+!if "$(USE_GUI)" == "1"
+PORTNAME = msw$(TOOLKIT_VERSION)
+!endif
+!if "$(OFFICIAL_BUILD)" == "1"
+COMPILER_VERSION = ERROR-COMPILER-VERSION-MUST-BE-SET-FOR-OFFICIAL-BUILD
+!endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default"
+WXDEBUGFLAG = d
+!endif
+!if "$(DEBUG_RUNTIME_LIBS)" == "1"
+WXDEBUGFLAG = d
+!endif
+!if "$(UNICODE)" == "1"
+WXUNICODEFLAG = u
+!endif
+!if "$(WXUNIV)" == "1"
+WXUNIVNAME = univ
+!endif
+!if "$(SHARED)" == "1"
+WXDLLFLAG = dll
+!endif
+!if "$(SHARED)" == "0"
+LIBTYPE_SUFFIX = lib
+!endif
+!if "$(SHARED)" == "1"
+LIBTYPE_SUFFIX = dll
+!endif
+!if "$(TARGET_CPU)" == "AMD64"
+LINK_TARGET_CPU = /MACHINE:X64
+!endif
+!if "$(TARGET_CPU)" == "IA64"
+LINK_TARGET_CPU = /MACHINE:IA64
+!endif
+!if "$(TARGET_CPU)" == "X64"
+LINK_TARGET_CPU = /MACHINE:X64
+!endif
+!if "$(TARGET_CPU)" == "amd64"
+LINK_TARGET_CPU = /MACHINE:X64
+!endif
+!if "$(TARGET_CPU)" == "ia64"
+LINK_TARGET_CPU = /MACHINE:IA64
+!endif
+!if "$(TARGET_CPU)" == "x64"
+LINK_TARGET_CPU = /MACHINE:X64
+!endif
+!if "$(MONOLITHIC)" == "0"
+EXTRALIBS_FOR_BASE =
+!endif
+!if "$(MONOLITHIC)" == "1"
+EXTRALIBS_FOR_BASE =
+!endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default"
+__DEBUGINFO_2 = $(__DEBUGRUNTIME_0)
+!endif
+!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default"
+__DEBUGINFO_2 =
+!endif
+!if "$(DEBUG_INFO)" == "0"
+__DEBUGINFO_2 =
+!endif
+!if "$(DEBUG_INFO)" == "1"
+__DEBUGINFO_2 = $(__DEBUGRUNTIME_0)
+!endif
+!if "$(RUNTIME_LIBS)" == "dynamic"
+__RUNTIME_LIBS_10 = D
+!endif
+!if "$(RUNTIME_LIBS)" == "static"
+__RUNTIME_LIBS_10 = $(__THREADSFLAG)
+!endif
+!if "$(MONOLITHIC)" == "0"
+__WXLIB_NET_p = \
+ wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_net.lib
+!endif
+!if "$(MONOLITHIC)" == "1"
+__LIB_PNG_IF_MONO_p = $(__LIB_PNG_p)
+!endif
+!if "$(USE_GUI)" == "1"
+__bench_gui___depname = $(OBJS)\bench_gui.exe
+!endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default"
+__DEBUGINFO_18 = $(__DEBUGRUNTIME_0)
+!endif
+!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default"
+__DEBUGINFO_18 =
+!endif
+!if "$(DEBUG_INFO)" == "0"
+__DEBUGINFO_18 =
+!endif
+!if "$(DEBUG_INFO)" == "1"
+__DEBUGINFO_18 = $(__DEBUGRUNTIME_0)
+!endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default"
+____DEBUGRUNTIME_19_p_1 = /d _DEBUG
+!endif
+!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default"
+____DEBUGRUNTIME_19_p_1 =
+!endif
+!if "$(DEBUG_RUNTIME_LIBS)" == "0"
+____DEBUGRUNTIME_19_p_1 =
+!endif
+!if "$(DEBUG_RUNTIME_LIBS)" == "1"
+____DEBUGRUNTIME_19_p_1 = /d _DEBUG
+!endif
+!if "$(RUNTIME_LIBS)" == "dynamic"
+__RUNTIME_LIBS_26 = D
+!endif
+!if "$(RUNTIME_LIBS)" == "static"
+__RUNTIME_LIBS_26 = $(__THREADSFLAG)
+!endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "0"
+__NO_VC_CRTDBG_p_3 = /d __NO_VC_CRTDBG__
+!endif
+!if "$(BUILD)" == "release" && "$(DEBUG_FLAG)" == "1"
+__NO_VC_CRTDBG_p_3 = /d __NO_VC_CRTDBG__
+!endif
+!if "$(WXUNIV)" == "1"
+__WXUNIV_DEFINE_p_3 = /d __WXUNIVERSAL__
+!endif
+!if "$(DEBUG_FLAG)" == "0"
+__DEBUG_DEFINE_p_3 = /d wxDEBUG_LEVEL=0
+!endif
+!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default"
+__NDEBUG_DEFINE_p_3 = /d NDEBUG
+!endif
+!if "$(DEBUG_RUNTIME_LIBS)" == "0"
+__NDEBUG_DEFINE_p_3 = /d NDEBUG
+!endif
+!if "$(USE_EXCEPTIONS)" == "0"
+__EXCEPTIONS_DEFINE_p_3 = /d wxNO_EXCEPTIONS
+!endif
+!if "$(USE_RTTI)" == "0"
+__RTTI_DEFINE_p_3 = /d wxNO_RTTI
+!endif
+!if "$(USE_THREADS)" == "0"
+__THREAD_DEFINE_p_3 = /d wxNO_THREADS
+!endif
+!if "$(UNICODE)" == "0"
+__UNICODE_DEFINE_p_3 = /d wxUSE_UNICODE=0
+!endif
+!if "$(UNICODE)" == "1"
+__UNICODE_DEFINE_p_3 = /d _UNICODE
+!endif
+!if "$(USE_CAIRO)" == "1"
+____CAIRO_INCLUDEDIR_FILENAMES_3_p = /i $(CAIRO_ROOT)\include\cairo
+!endif
+!if "$(SHARED)" == "1"
+__DLLFLAG_p_3 = /d WXUSINGDLL
+!endif
+!if "$(MONOLITHIC)" == "0"
+__WXLIB_CORE_p = \
+ wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib
+!endif
+!if "$(MONOLITHIC)" == "1" && "$(USE_STC)" == "1"
+__LIB_SCINTILLA_IF_MONO_p = wxscintilla$(WXDEBUGFLAG).lib
+!endif
+!if "$(USE_GUI)" == "1"
+__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib
+!endif
+!if "$(USE_GUI)" == "1"
+__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib
+!endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default"
+__DEBUGINFO = /Zi
+!endif
+!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default"
+__DEBUGINFO =
+!endif
+!if "$(DEBUG_INFO)" == "0"
+__DEBUGINFO =
+!endif
+!if "$(DEBUG_INFO)" == "1"
+__DEBUGINFO = /Zi
+!endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default"
+__DEBUGINFO_1 = /DEBUG
+!endif
+!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default"
+__DEBUGINFO_1 =
+!endif
+!if "$(DEBUG_INFO)" == "0"
+__DEBUGINFO_1 =
+!endif
+!if "$(DEBUG_INFO)" == "1"
+__DEBUGINFO_1 = /DEBUG
+!endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default"
+____DEBUGRUNTIME = /D_DEBUG
+!endif
+!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default"
+____DEBUGRUNTIME =
+!endif
+!if "$(DEBUG_RUNTIME_LIBS)" == "0"
+____DEBUGRUNTIME =
+!endif
+!if "$(DEBUG_RUNTIME_LIBS)" == "1"
+____DEBUGRUNTIME = /D_DEBUG
+!endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default"
+__DEBUGRUNTIME = d
+!endif
+!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default"
+__DEBUGRUNTIME =
+!endif
+!if "$(DEBUG_RUNTIME_LIBS)" == "0"
+__DEBUGRUNTIME =
+!endif
+!if "$(DEBUG_RUNTIME_LIBS)" == "1"
+__DEBUGRUNTIME = d
+!endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default"
+__DEBUGRUNTIME_0 =
+!endif
+!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default"
+__DEBUGRUNTIME_0 = /opt:ref /opt:icf
+!endif
+!if "$(DEBUG_RUNTIME_LIBS)" == "0"
+__DEBUGRUNTIME_0 = /opt:ref /opt:icf
+!endif
+!if "$(DEBUG_RUNTIME_LIBS)" == "1"
+__DEBUGRUNTIME_0 =
+!endif
+!if "$(BUILD)" == "debug"
+__OPTIMIZEFLAG = /Od
+!endif
+!if "$(BUILD)" == "release"
+__OPTIMIZEFLAG = /O2
+!endif
+!if "$(USE_THREADS)" == "0"
+__THREADSFLAG = L
+!endif
+!if "$(USE_THREADS)" == "1"
+__THREADSFLAG = T
+!endif
+!if "$(USE_RTTI)" == "0"
+__RTTIFLAG =
+!endif
+!if "$(USE_RTTI)" == "1"
+__RTTIFLAG = /GR
+!endif
+!if "$(USE_EXCEPTIONS)" == "0"
+__EXCEPTIONSFLAG =
+!endif
+!if "$(USE_EXCEPTIONS)" == "1"
+__EXCEPTIONSFLAG = /EHsc
+!endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "0"
+__NO_VC_CRTDBG_p = /D__NO_VC_CRTDBG__
+!endif
+!if "$(BUILD)" == "release" && "$(DEBUG_FLAG)" == "1"
+__NO_VC_CRTDBG_p = /D__NO_VC_CRTDBG__
+!endif
+!if "$(WXUNIV)" == "1"
+__WXUNIV_DEFINE_p = /D__WXUNIVERSAL__
+!endif
+!if "$(DEBUG_FLAG)" == "0"
+__DEBUG_DEFINE_p = /DwxDEBUG_LEVEL=0
+!endif
+!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default"
+__NDEBUG_DEFINE_p = /DNDEBUG
+!endif
+!if "$(DEBUG_RUNTIME_LIBS)" == "0"
+__NDEBUG_DEFINE_p = /DNDEBUG
+!endif
+!if "$(USE_EXCEPTIONS)" == "0"
+__EXCEPTIONS_DEFINE_p = /DwxNO_EXCEPTIONS
+!endif
+!if "$(USE_RTTI)" == "0"
+__RTTI_DEFINE_p = /DwxNO_RTTI
+!endif
+!if "$(USE_THREADS)" == "0"
+__THREAD_DEFINE_p = /DwxNO_THREADS
+!endif
+!if "$(UNICODE)" == "0"
+__UNICODE_DEFINE_p = /DwxUSE_UNICODE=0
+!endif
+!if "$(UNICODE)" == "1"
+__UNICODE_DEFINE_p = /D_UNICODE
+!endif
+!if "$(USE_CAIRO)" == "1"
+____CAIRO_INCLUDEDIR_FILENAMES = /I$(CAIRO_ROOT)\include\cairo
+!endif
+!if "$(SHARED)" == "1"
+__DLLFLAG_p = /DWXUSINGDLL
+!endif
+!if "$(MONOLITHIC)" == "0"
+__WXLIB_BASE_p = \
+ wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib
+!endif
+!if "$(MONOLITHIC)" == "1"
+__WXLIB_MONO_p = \
+ wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib
+!endif
+!if "$(USE_GUI)" == "1"
+__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib
+!endif
+!if "$(USE_CAIRO)" == "1"
+__CAIRO_LIB_p = cairo.lib
+!endif
+!if "$(USE_CAIRO)" == "1"
+____CAIRO_LIBDIR_FILENAMES = /LIBPATH:$(CAIRO_ROOT)\lib
+!endif
+
+
+all: $(OBJS)
+$(OBJS):
+ -if not exist $(OBJS) mkdir $(OBJS)
+
+### Targets: ###
+
+all: $(OBJS)\bench.exe data $(__bench_gui___depname) data-image
+
+clean:
+ -if exist $(OBJS)\*.obj del $(OBJS)\*.obj
+ -if exist $(OBJS)\*.res del $(OBJS)\*.res
+ -if exist $(OBJS)\*.pch del $(OBJS)\*.pch
+ -if exist $(OBJS)\bench.exe del $(OBJS)\bench.exe
+ -if exist $(OBJS)\bench.ilk del $(OBJS)\bench.ilk
+ -if exist $(OBJS)\bench.pdb del $(OBJS)\bench.pdb
+ -if exist $(OBJS)\bench_gui.exe del $(OBJS)\bench_gui.exe
+ -if exist $(OBJS)\bench_gui.ilk del $(OBJS)\bench_gui.ilk
+ -if exist $(OBJS)\bench_gui.pdb del $(OBJS)\bench_gui.pdb
+
+$(OBJS)\bench.exe: $(BENCH_OBJECTS)
+ link /NOLOGO /OUT:$@ $(__DEBUGINFO_1) /pdb:"$(OBJS)\bench.pdb" $(__DEBUGINFO_2) $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:CONSOLE $(____CAIRO_LIBDIR_FILENAMES) $(LDFLAGS) @<<
+ $(BENCH_OBJECTS) $(__WXLIB_NET_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_PNG_IF_MONO_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__CAIRO_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib
+<<
+
+data:
+ if not exist $(OBJS) mkdir $(OBJS)
+ for %f in (htmltest.html) do if not exist $(OBJS)\%f copy .\%f $(OBJS)
+
+!if "$(USE_GUI)" == "1"
+$(OBJS)\bench_gui.exe: $(BENCH_GUI_OBJECTS) $(OBJS)\bench_gui_sample.res
+ link /NOLOGO /OUT:$@ $(__DEBUGINFO_1) /pdb:"$(OBJS)\bench_gui.pdb" $(__DEBUGINFO_18) $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:CONSOLE $(____CAIRO_LIBDIR_FILENAMES) $(LDFLAGS) @<<
+ $(BENCH_GUI_OBJECTS) $(BENCH_GUI_RESOURCES) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_SCINTILLA_IF_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__CAIRO_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib
+<<
+!endif
+
+data-image:
+ if not exist $(OBJS) mkdir $(OBJS)
+ for %f in (../../samples/image/horse.bmp ../../samples/image/horse.jpg ../../samples/image/horse.png ../../samples/image/horse.tif) do if not exist $(OBJS)\%f copy .\%f $(OBJS)
+
+$(OBJS)\bench_bench.obj: .\bench.cpp
+ $(CXX) /c /nologo /TP /Fo$@ $(BENCH_CXXFLAGS) .\bench.cpp
+
+$(OBJS)\bench_datetime.obj: .\datetime.cpp
+ $(CXX) /c /nologo /TP /Fo$@ $(BENCH_CXXFLAGS) .\datetime.cpp
+
+$(OBJS)\bench_htmlpars.obj: .\htmlparser\htmlpars.cpp
+ $(CXX) /c /nologo /TP /Fo$@ $(BENCH_CXXFLAGS) .\htmlparser\htmlpars.cpp
+
+$(OBJS)\bench_htmltag.obj: .\htmlparser\htmltag.cpp
+ $(CXX) /c /nologo /TP /Fo$@ $(BENCH_CXXFLAGS) .\htmlparser\htmltag.cpp
+
+$(OBJS)\bench_ipcclient.obj: .\ipcclient.cpp
+ $(CXX) /c /nologo /TP /Fo$@ $(BENCH_CXXFLAGS) .\ipcclient.cpp
+
+$(OBJS)\bench_log.obj: .\log.cpp
+ $(CXX) /c /nologo /TP /Fo$@ $(BENCH_CXXFLAGS) .\log.cpp
+
+$(OBJS)\bench_mbconv.obj: .\mbconv.cpp
+ $(CXX) /c /nologo /TP /Fo$@ $(BENCH_CXXFLAGS) .\mbconv.cpp
+
+$(OBJS)\bench_strings.obj: .\strings.cpp
+ $(CXX) /c /nologo /TP /Fo$@ $(BENCH_CXXFLAGS) .\strings.cpp
+
+$(OBJS)\bench_tls.obj: .\tls.cpp
+ $(CXX) /c /nologo /TP /Fo$@ $(BENCH_CXXFLAGS) .\tls.cpp
+
+$(OBJS)\bench_printfbench.obj: .\printfbench.cpp
+ $(CXX) /c /nologo /TP /Fo$@ $(BENCH_CXXFLAGS) .\printfbench.cpp
+
+$(OBJS)\bench_gui_sample.res: .\..\..\samples\sample.rc
+ rc /fo$@ /d WIN32 $(____DEBUGRUNTIME_19_p_1) /d _CRT_SECURE_NO_DEPRECATE=1 /d _CRT_NON_CONFORMING_SWPRINTFS=1 /d _SCL_SECURE_NO_WARNINGS=1 $(__NO_VC_CRTDBG_p_3) /d __WXMSW__ $(__WXUNIV_DEFINE_p_3) $(__DEBUG_DEFINE_p_3) $(__NDEBUG_DEFINE_p_3) $(__EXCEPTIONS_DEFINE_p_3) $(__RTTI_DEFINE_p_3) $(__THREAD_DEFINE_p_3) $(__UNICODE_DEFINE_p_3) /i $(SETUPHDIR) /i .\..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES_3_p) /i . $(__DLLFLAG_p_3) /i .\..\..\samples /d NOPCH /d _CONSOLE .\..\..\samples\sample.rc
+
+$(OBJS)\bench_gui_bench.obj: .\bench.cpp
+ $(CXX) /c /nologo /TP /Fo$@ $(BENCH_GUI_CXXFLAGS) .\bench.cpp
+
+$(OBJS)\bench_gui_image.obj: .\image.cpp
+ $(CXX) /c /nologo /TP /Fo$@ $(BENCH_GUI_CXXFLAGS) .\image.cpp
+
diff --git a/tests/makefile.bcc b/tests/makefile.bcc
index 44b25a69cf..edf78a3199 100644
--- a/tests/makefile.bcc
+++ b/tests/makefile.bcc
@@ -1,1078 +1,1078 @@
-# =========================================================================
-# This makefile was generated by
-# Bakefile 0.2.9 (http://www.bakefile.org)
-# 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: ###
-
-WX_RELEASE_NODOT = 31
-COMPILER_PREFIX = bcc
-OBJS = \
- $(COMPILER_PREFIX)$(COMPILER_VERSION)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)
-LIBDIRNAME = \
- .\..\lib\$(COMPILER_PREFIX)$(COMPILER_VERSION)_$(LIBTYPE_SUFFIX)$(CFG)
-SETUPHDIR = \
- $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)
-TEST_CXXFLAGS = $(__RUNTIME_LIBS) -I$(BCCDIR)\include $(__DEBUGINFO) \
- $(__OPTIMIZEFLAG) $(__THREADSFLAG_2) -D__WXMSW__ $(__WXUNIV_DEFINE_p) \
- $(__DEBUG_DEFINE_p) $(__NDEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) \
- $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) \
- -I$(SETUPHDIR) -I.\..\include $(____CAIRO_INCLUDEDIR_FILENAMES) -I. \
- $(__DLLFLAG_p) -DwxUSE_GUI=0 $(CPPUNIT_CFLAGS) -Hu \
- -H=$(OBJS)\testprec_test.csm $(CPPFLAGS) $(CXXFLAGS)
-TEST_OBJECTS = \
- $(OBJS)\test_dummy.obj \
- $(OBJS)\test_test.obj \
- $(OBJS)\test_anytest.obj \
- $(OBJS)\test_archivetest.obj \
- $(OBJS)\test_ziptest.obj \
- $(OBJS)\test_tartest.obj \
- $(OBJS)\test_arrays.obj \
- $(OBJS)\test_base64.obj \
- $(OBJS)\test_cmdlinetest.obj \
- $(OBJS)\test_fileconf.obj \
- $(OBJS)\test_regconf.obj \
- $(OBJS)\test_datetimetest.obj \
- $(OBJS)\test_evthandler.obj \
- $(OBJS)\test_evtlooptest.obj \
- $(OBJS)\test_evtsource.obj \
- $(OBJS)\test_stopwatch.obj \
- $(OBJS)\test_timertest.obj \
- $(OBJS)\test_exec.obj \
- $(OBJS)\test_dir.obj \
- $(OBJS)\test_filefn.obj \
- $(OBJS)\test_filetest.obj \
- $(OBJS)\test_filekind.obj \
- $(OBJS)\test_filenametest.obj \
- $(OBJS)\test_filesystest.obj \
- $(OBJS)\test_fontmaptest.obj \
- $(OBJS)\test_formatconvertertest.obj \
- $(OBJS)\test_fswatchertest.obj \
- $(OBJS)\test_hashes.obj \
- $(OBJS)\test_output.obj \
- $(OBJS)\test_input.obj \
- $(OBJS)\test_intltest.obj \
- $(OBJS)\test_lists.obj \
- $(OBJS)\test_logtest.obj \
- $(OBJS)\test_longlongtest.obj \
- $(OBJS)\test_convautotest.obj \
- $(OBJS)\test_mbconvtest.obj \
- $(OBJS)\test_dynamiclib.obj \
- $(OBJS)\test_environ.obj \
- $(OBJS)\test_metatest.obj \
- $(OBJS)\test_misctests.obj \
- $(OBJS)\test_module.obj \
- $(OBJS)\test_pathlist.obj \
- $(OBJS)\test_typeinfotest.obj \
- $(OBJS)\test_ipc.obj \
- $(OBJS)\test_socket.obj \
- $(OBJS)\test_regextest.obj \
- $(OBJS)\test_wxregextest.obj \
- $(OBJS)\test_scopeguardtest.obj \
- $(OBJS)\test_iostream.obj \
- $(OBJS)\test_numformatter.obj \
- $(OBJS)\test_strings.obj \
- $(OBJS)\test_stdstrings.obj \
- $(OBJS)\test_tokenizer.obj \
- $(OBJS)\test_unichar.obj \
- $(OBJS)\test_unicode.obj \
- $(OBJS)\test_vararg.obj \
- $(OBJS)\test_crt.obj \
- $(OBJS)\test_vsnprintf.obj \
- $(OBJS)\test_bstream.obj \
- $(OBJS)\test_datastreamtest.obj \
- $(OBJS)\test_ffilestream.obj \
- $(OBJS)\test_fileback.obj \
- $(OBJS)\test_filestream.obj \
- $(OBJS)\test_iostreams.obj \
- $(OBJS)\test_largefile.obj \
- $(OBJS)\test_memstream.obj \
- $(OBJS)\test_socketstream.obj \
- $(OBJS)\test_sstream.obj \
- $(OBJS)\test_stdstream.obj \
- $(OBJS)\test_tempfile.obj \
- $(OBJS)\test_textstreamtest.obj \
- $(OBJS)\test_zlibstream.obj \
- $(OBJS)\test_textfiletest.obj \
- $(OBJS)\test_atomic.obj \
- $(OBJS)\test_misc.obj \
- $(OBJS)\test_queue.obj \
- $(OBJS)\test_tls.obj \
- $(OBJS)\test_ftp.obj \
- $(OBJS)\test_uris.obj \
- $(OBJS)\test_url.obj \
- $(OBJS)\test_vectors.obj \
- $(OBJS)\test_evtconnection.obj \
- $(OBJS)\test_weakref.obj \
- $(OBJS)\test_xlocale.obj \
- $(OBJS)\test_xmltest.obj
-TEST_DRAWING_CXXFLAGS = $(__RUNTIME_LIBS) -I$(BCCDIR)\include $(__DEBUGINFO) \
- $(__OPTIMIZEFLAG) $(__THREADSFLAG_2) -D__WXMSW__ $(__WXUNIV_DEFINE_p) \
- $(__DEBUG_DEFINE_p) $(__NDEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) \
- $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) \
- -I$(SETUPHDIR) -I.\..\include $(____CAIRO_INCLUDEDIR_FILENAMES) -I. \
- $(__DLLFLAG_p) -DwxUSE_GUI=0 $(CPPUNIT_CFLAGS) -Hu \
- -H=$(OBJS)\testprec_test_drawing.csm $(CPPFLAGS) $(CXXFLAGS)
-TEST_DRAWING_OBJECTS = \
- $(OBJS)\test_drawing_dummy.obj \
- $(OBJS)\test_drawing_test.obj \
- $(OBJS)\test_drawing_drawing.obj \
- $(OBJS)\test_drawing_plugindriver.obj \
- $(OBJS)\test_drawing_basictest.obj \
- $(OBJS)\test_drawing_fonttest.obj
-TEST_DRAWINGPLUGIN_CXXFLAGS = $(__RUNTIME_LIBS) -I$(BCCDIR)\include \
- $(__DEBUGINFO) $(__OPTIMIZEFLAG) $(__THREADSFLAG_2) -D__WXMSW__ \
- $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__NDEBUG_DEFINE_p) \
- $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \
- $(__UNICODE_DEFINE_p) -I$(SETUPHDIR) -I.\..\include \
- $(____CAIRO_INCLUDEDIR_FILENAMES) $(__DLLFLAG_p) $(CPPFLAGS) $(CXXFLAGS)
-TEST_DRAWINGPLUGIN_OBJECTS = \
- $(OBJS)\test_drawingplugin_pluginsample.obj
-TEST_GUI_CXXFLAGS = $(__RUNTIME_LIBS) -I$(BCCDIR)\include $(__DEBUGINFO) \
- $(__OPTIMIZEFLAG) $(__THREADSFLAG_2) -D__WXMSW__ $(__WXUNIV_DEFINE_p) \
- $(__DEBUG_DEFINE_p) $(__NDEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) \
- $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) \
- -I$(SETUPHDIR) -I.\..\include $(____CAIRO_INCLUDEDIR_FILENAMES) -I. \
- $(__DLLFLAG_p) -I.\..\samples -DNOPCH $(CPPUNIT_CFLAGS) -Hu \
- -H=$(OBJS)\testprec_test_gui.csm $(CPPFLAGS) $(CXXFLAGS)
-TEST_GUI_OBJECTS = \
- $(OBJS)\test_gui_dummy.obj \
- $(OBJS)\test_gui_asserthelper.obj \
- $(OBJS)\test_gui_test.obj \
- $(OBJS)\test_gui_testableframe.obj \
- $(OBJS)\test_gui_rect.obj \
- $(OBJS)\test_gui_size.obj \
- $(OBJS)\test_gui_point.obj \
- $(OBJS)\test_gui_region.obj \
- $(OBJS)\test_gui_bitmap.obj \
- $(OBJS)\test_gui_colour.obj \
- $(OBJS)\test_gui_ellipsization.obj \
- $(OBJS)\test_gui_measuring.obj \
- $(OBJS)\test_gui_affinematrix.obj \
- $(OBJS)\test_gui_boundingbox.obj \
- $(OBJS)\test_gui_config.obj \
- $(OBJS)\test_gui_bitmapcomboboxtest.obj \
- $(OBJS)\test_gui_bitmaptogglebuttontest.obj \
- $(OBJS)\test_gui_bookctrlbasetest.obj \
- $(OBJS)\test_gui_buttontest.obj \
- $(OBJS)\test_gui_checkboxtest.obj \
- $(OBJS)\test_gui_checklistboxtest.obj \
- $(OBJS)\test_gui_choicebooktest.obj \
- $(OBJS)\test_gui_choicetest.obj \
- $(OBJS)\test_gui_comboboxtest.obj \
- $(OBJS)\test_gui_dataviewctrltest.obj \
- $(OBJS)\test_gui_datepickerctrltest.obj \
- $(OBJS)\test_gui_frametest.obj \
- $(OBJS)\test_gui_gaugetest.obj \
- $(OBJS)\test_gui_gridtest.obj \
- $(OBJS)\test_gui_headerctrltest.obj \
- $(OBJS)\test_gui_htmllboxtest.obj \
- $(OBJS)\test_gui_hyperlinkctrltest.obj \
- $(OBJS)\test_gui_itemcontainertest.obj \
- $(OBJS)\test_gui_label.obj \
- $(OBJS)\test_gui_listbasetest.obj \
- $(OBJS)\test_gui_listbooktest.obj \
- $(OBJS)\test_gui_listboxtest.obj \
- $(OBJS)\test_gui_listctrltest.obj \
- $(OBJS)\test_gui_listviewtest.obj \
- $(OBJS)\test_gui_markuptest.obj \
- $(OBJS)\test_gui_notebooktest.obj \
- $(OBJS)\test_gui_ownerdrawncomboboxtest.obj \
- $(OBJS)\test_gui_pickerbasetest.obj \
- $(OBJS)\test_gui_pickertest.obj \
- $(OBJS)\test_gui_radioboxtest.obj \
- $(OBJS)\test_gui_radiobuttontest.obj \
- $(OBJS)\test_gui_rearrangelisttest.obj \
- $(OBJS)\test_gui_richtextctrltest.obj \
- $(OBJS)\test_gui_searchctrltest.obj \
- $(OBJS)\test_gui_simplebooktest.obj \
- $(OBJS)\test_gui_slidertest.obj \
- $(OBJS)\test_gui_spinctrldbltest.obj \
- $(OBJS)\test_gui_spinctrltest.obj \
- $(OBJS)\test_gui_textctrltest.obj \
- $(OBJS)\test_gui_textentrytest.obj \
- $(OBJS)\test_gui_togglebuttontest.obj \
- $(OBJS)\test_gui_toolbooktest.obj \
- $(OBJS)\test_gui_treebooktest.obj \
- $(OBJS)\test_gui_treectrltest.obj \
- $(OBJS)\test_gui_treelistctrltest.obj \
- $(OBJS)\test_gui_virtlistctrltest.obj \
- $(OBJS)\test_gui_webtest.obj \
- $(OBJS)\test_gui_windowtest.obj \
- $(OBJS)\test_gui_dialogtest.obj \
- $(OBJS)\test_gui_clone.obj \
- $(OBJS)\test_gui_evtlooptest.obj \
- $(OBJS)\test_gui_propagation.obj \
- $(OBJS)\test_gui_keyboard.obj \
- $(OBJS)\test_gui_exec.obj \
- $(OBJS)\test_gui_fonttest.obj \
- $(OBJS)\test_gui_image.obj \
- $(OBJS)\test_gui_rawbmp.obj \
- $(OBJS)\test_gui_htmlparser.obj \
- $(OBJS)\test_gui_htmlwindow.obj \
- $(OBJS)\test_gui_accelentry.obj \
- $(OBJS)\test_gui_menu.obj \
- $(OBJS)\test_gui_guifuncs.obj \
- $(OBJS)\test_gui_selstoretest.obj \
- $(OBJS)\test_gui_garbage.obj \
- $(OBJS)\test_gui_safearrayconverttest.obj \
- $(OBJS)\test_gui_settings.obj \
- $(OBJS)\test_gui_socket.obj \
- $(OBJS)\test_gui_boxsizer.obj \
- $(OBJS)\test_gui_wrapsizer.obj \
- $(OBJS)\test_gui_toplevel.obj \
- $(OBJS)\test_gui_valnum.obj \
- $(OBJS)\test_gui_clientsize.obj \
- $(OBJS)\test_gui_setsize.obj \
- $(OBJS)\test_gui_xrctest.obj
-
-### Conditionally set variables: ###
-
-!if "$(USE_GUI)" == "0"
-PORTNAME = base
-!endif
-!if "$(USE_GUI)" == "1"
-PORTNAME = msw$(TOOLKIT_VERSION)
-!endif
-!if "$(OFFICIAL_BUILD)" == "1"
-COMPILER_VERSION = ERROR-COMPILER-VERSION-MUST-BE-SET-FOR-OFFICIAL-BUILD
-!endif
-!if "$(BUILD)" == "debug"
-WXDEBUGFLAG = d
-!endif
-!if "$(UNICODE)" == "1"
-WXUNICODEFLAG = u
-!endif
-!if "$(WXUNIV)" == "1"
-WXUNIVNAME = univ
-!endif
-!if "$(SHARED)" == "1"
-WXDLLFLAG = dll
-!endif
-!if "$(SHARED)" == "0"
-LIBTYPE_SUFFIX = lib
-!endif
-!if "$(SHARED)" == "1"
-LIBTYPE_SUFFIX = dll
-!endif
-!if "$(MONOLITHIC)" == "0"
-EXTRALIBS_FOR_BASE =
-!endif
-!if "$(MONOLITHIC)" == "1"
-EXTRALIBS_FOR_BASE =
-!endif
-!if "$(MONOLITHIC)" == "1"
-__LIB_PNG_IF_MONO_p = $(__LIB_PNG_p)
-!endif
-!if "$(USE_GUI)" == "1"
-__test_drawing___depname = $(OBJS)\test_drawing.exe
-!endif
-!if "$(SHARED)" == "1" && "$(USE_GUI)" == "1"
-__test_drawingplugin___depname = $(OBJS)\test_drawingplugin.dll
-!endif
-!if "$(USE_GUI)" == "1"
-__test_gui___depname = $(OBJS)\test_gui.exe
-!endif
-!if "$(WXUNIV)" == "1"
-__WXUNIV_DEFINE_p_7 = -d__WXUNIVERSAL__
-!endif
-!if "$(DEBUG_FLAG)" == "0"
-__DEBUG_DEFINE_p_7 = -dwxDEBUG_LEVEL=0
-!endif
-!if "$(BUILD)" == "release"
-__NDEBUG_DEFINE_p_7 = -dNDEBUG
-!endif
-!if "$(USE_EXCEPTIONS)" == "0"
-__EXCEPTIONS_DEFINE_p_7 = -dwxNO_EXCEPTIONS
-!endif
-!if "$(USE_RTTI)" == "0"
-__RTTI_DEFINE_p_7 = -dwxNO_RTTI
-!endif
-!if "$(USE_THREADS)" == "0"
-__THREAD_DEFINE_p_7 = -dwxNO_THREADS
-!endif
-!if "$(UNICODE)" == "0"
-__UNICODE_DEFINE_p_7 = -dwxUSE_UNICODE=0
-!endif
-!if "$(UNICODE)" == "1"
-__UNICODE_DEFINE_p_7 = -d_UNICODE
-!endif
-!if "$(USE_CAIRO)" == "1"
-____CAIRO_INCLUDEDIR_FILENAMES_7_p = -i$(CAIRO_ROOT)\include\cairo
-!endif
-!if "$(SHARED)" == "1"
-__DLLFLAG_p_7 = -dWXUSINGDLL
-!endif
-!if "$(MONOLITHIC)" == "0" && "$(USE_WEBVIEW)" == "1"
-__WXLIB_WEBVIEW_p = \
- wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_webview.lib
-!endif
-!if "$(MONOLITHIC)" == "0"
-__WXLIB_RICHTEXT_p = \
- wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_richtext.lib
-!endif
-!if "$(MONOLITHIC)" == "0" && "$(USE_MEDIA)" == "1"
-__WXLIB_MEDIA_p = \
- wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_media.lib
-!endif
-!if "$(MONOLITHIC)" == "0"
-__WXLIB_XRC_p = \
- wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xrc.lib
-!endif
-!if "$(MONOLITHIC)" == "0"
-__WXLIB_ADV_p = \
- wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_adv.lib
-!endif
-!if "$(MONOLITHIC)" == "0"
-__WXLIB_HTML_p = \
- wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_html.lib
-!endif
-!if "$(MONOLITHIC)" == "0"
-__WXLIB_XML_p = \
- wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xml.lib
-!endif
-!if "$(MONOLITHIC)" == "0"
-__WXLIB_NET_p = \
- wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_net.lib
-!endif
-!if "$(BUILD)" == "debug"
-__OPTIMIZEFLAG = -Od
-!endif
-!if "$(BUILD)" == "release"
-__OPTIMIZEFLAG = -O2
-!endif
-!if "$(USE_THREADS)" == "0"
-__THREADSFLAG =
-!endif
-!if "$(USE_THREADS)" == "1"
-__THREADSFLAG = mt
-!endif
-!if "$(USE_THREADS)" == "0"
-__THREADSFLAG_2 =
-!endif
-!if "$(USE_THREADS)" == "1"
-__THREADSFLAG_2 = -tWM
-!endif
-!if "$(RUNTIME_LIBS)" == "dynamic"
-__RUNTIME_LIBS = -tWR
-!endif
-!if "$(RUNTIME_LIBS)" == "static"
-__RUNTIME_LIBS =
-!endif
-!if "$(RUNTIME_LIBS)" == "dynamic"
-__RUNTIME_LIBS_2 = i
-!endif
-!if "$(RUNTIME_LIBS)" == "static"
-__RUNTIME_LIBS_2 =
-!endif
-!if "$(WXUNIV)" == "1"
-__WXUNIV_DEFINE_p = -D__WXUNIVERSAL__
-!endif
-!if "$(DEBUG_FLAG)" == "0"
-__DEBUG_DEFINE_p = -DwxDEBUG_LEVEL=0
-!endif
-!if "$(BUILD)" == "release"
-__NDEBUG_DEFINE_p = -DNDEBUG
-!endif
-!if "$(USE_EXCEPTIONS)" == "0"
-__EXCEPTIONS_DEFINE_p = -DwxNO_EXCEPTIONS
-!endif
-!if "$(USE_RTTI)" == "0"
-__RTTI_DEFINE_p = -DwxNO_RTTI
-!endif
-!if "$(USE_THREADS)" == "0"
-__THREAD_DEFINE_p = -DwxNO_THREADS
-!endif
-!if "$(UNICODE)" == "0"
-__UNICODE_DEFINE_p = -DwxUSE_UNICODE=0
-!endif
-!if "$(UNICODE)" == "1"
-__UNICODE_DEFINE_p = -D_UNICODE
-!endif
-!if "$(USE_CAIRO)" == "1"
-____CAIRO_INCLUDEDIR_FILENAMES = -I$(CAIRO_ROOT)\include\cairo
-!endif
-!if "$(SHARED)" == "1"
-__DLLFLAG_p = -DWXUSINGDLL
-!endif
-!if "$(MONOLITHIC)" == "0"
-__WXLIB_CORE_p = \
- wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib
-!endif
-!if "$(MONOLITHIC)" == "0"
-__WXLIB_BASE_p = \
- wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib
-!endif
-!if "$(MONOLITHIC)" == "1"
-__WXLIB_MONO_p = \
- wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib
-!endif
-!if "$(MONOLITHIC)" == "1" && "$(USE_STC)" == "1"
-__LIB_SCINTILLA_IF_MONO_p = wxscintilla$(WXDEBUGFLAG).lib
-!endif
-!if "$(USE_GUI)" == "1"
-__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib
-!endif
-!if "$(USE_GUI)" == "1"
-__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib
-!endif
-!if "$(USE_GUI)" == "1"
-__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib
-!endif
-!if "$(USE_CAIRO)" == "1"
-__CAIRO_LIB_p = cairo.lib
-!endif
-!if "$(USE_CAIRO)" == "1"
-____CAIRO_LIBDIR_FILENAMES = -L$(CAIRO_ROOT)\lib
-!endif
-!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default"
-__DEBUGINFO = -v
-!endif
-!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default"
-__DEBUGINFO = -v-
-!endif
-!if "$(DEBUG_INFO)" == "0"
-__DEBUGINFO = -v-
-!endif
-!if "$(DEBUG_INFO)" == "1"
-__DEBUGINFO = -v
-!endif
-
-
-all: $(OBJS)
-$(OBJS):
- -if not exist $(OBJS) mkdir $(OBJS)
-
-### Targets: ###
-
-all: $(OBJS)\test.exe $(__test_drawing___depname) $(__test_drawingplugin___depname) $(__test_gui___depname) data data-images fr
-
-clean:
- -if exist $(OBJS)\*.obj del $(OBJS)\*.obj
- -if exist $(OBJS)\*.res del $(OBJS)\*.res
- -if exist $(OBJS)\*.csm del $(OBJS)\*.csm
- -if exist $(OBJS)\test.exe del $(OBJS)\test.exe
- -if exist $(OBJS)\test.tds del $(OBJS)\test.tds
- -if exist $(OBJS)\test.ilc del $(OBJS)\test.ilc
- -if exist $(OBJS)\test.ild del $(OBJS)\test.ild
- -if exist $(OBJS)\test.ilf del $(OBJS)\test.ilf
- -if exist $(OBJS)\test.ils del $(OBJS)\test.ils
- -if exist $(OBJS)\test_drawing.exe del $(OBJS)\test_drawing.exe
- -if exist $(OBJS)\test_drawing.tds del $(OBJS)\test_drawing.tds
- -if exist $(OBJS)\test_drawing.ilc del $(OBJS)\test_drawing.ilc
- -if exist $(OBJS)\test_drawing.ild del $(OBJS)\test_drawing.ild
- -if exist $(OBJS)\test_drawing.ilf del $(OBJS)\test_drawing.ilf
- -if exist $(OBJS)\test_drawing.ils del $(OBJS)\test_drawing.ils
- -if exist $(OBJS)\test_drawingplugin.dll del $(OBJS)\test_drawingplugin.dll
- -if exist $(OBJS)\test_drawingplugin.tds del $(OBJS)\test_drawingplugin.tds
- -if exist $(OBJS)\test_drawingplugin.ilc del $(OBJS)\test_drawingplugin.ilc
- -if exist $(OBJS)\test_drawingplugin.ild del $(OBJS)\test_drawingplugin.ild
- -if exist $(OBJS)\test_drawingplugin.ilf del $(OBJS)\test_drawingplugin.ilf
- -if exist $(OBJS)\test_drawingplugin.ils del $(OBJS)\test_drawingplugin.ils
- -if exist $(OBJS)\test_gui.exe del $(OBJS)\test_gui.exe
- -if exist $(OBJS)\test_gui.tds del $(OBJS)\test_gui.tds
- -if exist $(OBJS)\test_gui.ilc del $(OBJS)\test_gui.ilc
- -if exist $(OBJS)\test_gui.ild del $(OBJS)\test_gui.ild
- -if exist $(OBJS)\test_gui.ilf del $(OBJS)\test_gui.ilf
- -if exist $(OBJS)\test_gui.ils del $(OBJS)\test_gui.ils
-
-$(OBJS)\test.exe: $(OBJS)\test_dummy.obj $(TEST_OBJECTS)
- ilink32 -Tpe -q -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUGINFO) -L$(LIBDIRNAME) -ap $(CPPUNIT_LIBS) $(____CAIRO_LIBDIR_FILENAMES) $(LDFLAGS) @&&|
- c0x32.obj $(TEST_OBJECTS),$@,, $(__WXLIB_NET_p) $(__WXLIB_XML_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_PNG_IF_MONO_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__CAIRO_LIB_p) ole2w32.lib oleacc.lib import32.lib cw32$(__THREADSFLAG)$(__RUNTIME_LIBS_2).lib,,
-|
-
-!if "$(USE_GUI)" == "1"
-$(OBJS)\test_drawing.exe: $(OBJS)\test_drawing_dummy.obj $(TEST_DRAWING_OBJECTS)
- ilink32 -Tpe -q -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUGINFO) -L$(LIBDIRNAME) -ap $(CPPUNIT_LIBS) $(____CAIRO_LIBDIR_FILENAMES) $(LDFLAGS) @&&|
- c0x32.obj $(TEST_DRAWING_OBJECTS),$@,, $(__WXLIB_CORE_p) $(__WXLIB_NET_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_SCINTILLA_IF_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__CAIRO_LIB_p) ole2w32.lib oleacc.lib import32.lib cw32$(__THREADSFLAG)$(__RUNTIME_LIBS_2).lib,,
-|
-!endif
-
-!if "$(SHARED)" == "1" && "$(USE_GUI)" == "1"
-$(OBJS)\test_drawingplugin.dll: $(TEST_DRAWINGPLUGIN_OBJECTS)
- ilink32 -Tpd -q -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUGINFO) -L$(LIBDIRNAME) $(____CAIRO_LIBDIR_FILENAMES) $(LDFLAGS) @&&|
- c0d32.obj $(TEST_DRAWINGPLUGIN_OBJECTS),$@,, $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_SCINTILLA_IF_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__CAIRO_LIB_p) ole2w32.lib oleacc.lib import32.lib cw32$(__THREADSFLAG)$(__RUNTIME_LIBS_2).lib,,
-|
-!endif
-
-!if "$(USE_GUI)" == "1"
-$(OBJS)\test_gui.exe: $(OBJS)\test_gui_dummy.obj $(TEST_GUI_OBJECTS) $(OBJS)\test_gui_sample.res
- ilink32 -Tpe -q -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUGINFO) -L$(LIBDIRNAME) $(CPPUNIT_LIBS) -ap $(____CAIRO_LIBDIR_FILENAMES) $(LDFLAGS) @&&|
- c0x32.obj $(TEST_GUI_OBJECTS),$@,, $(__WXLIB_WEBVIEW_p) $(__WXLIB_RICHTEXT_p) $(__WXLIB_MEDIA_p) $(__WXLIB_XRC_p) $(__WXLIB_XML_p) $(__WXLIB_ADV_p) $(__WXLIB_HTML_p) $(__WXLIB_CORE_p) $(__WXLIB_NET_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_SCINTILLA_IF_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__CAIRO_LIB_p) ole2w32.lib oleacc.lib import32.lib cw32$(__THREADSFLAG)$(__RUNTIME_LIBS_2).lib,, $(OBJS)\test_gui_sample.res
-|
-!endif
-
-data:
- if not exist $(OBJS) mkdir $(OBJS)
- for %f in (horse.ani horse.bmp horse.cur horse.gif horse.ico horse.jpg horse.pcx horse.png horse.pnm horse.tga horse.tif horse.xpm) do if not exist $(OBJS)\%f copy .\%f $(OBJS)
-
-data-images:
- if not exist image mkdir image
- for %f in (horse_grey.bmp horse_grey_flipped.bmp horse_rle4.bmp horse_rle4_flipped.bmp horse_rle8.bmp horse_rle8_flipped.bmp horse_bicubic_50x50.png horse_bicubic_100x100.png horse_bicubic_150x150.png horse_bicubic_300x300.png horse_bilinear_50x50.png horse_bilinear_100x100.png horse_bilinear_150x150.png horse_bilinear_300x300.png horse_box_average_50x50.png horse_box_average_100x100.png horse_box_average_150x150.png horse_box_average_300x300.png) do if not exist image\%f copy .\image\%f image
-
-fr:
- if not exist $(OBJS)\intl\fr mkdir $(OBJS)\intl\fr
- for %f in (internat.po internat.mo) do if not exist $(OBJS)\intl\fr\%f copy .\intl\fr\%f $(OBJS)\intl\fr
-
-$(OBJS)\test_dummy.obj: .\dummy.cpp
- $(CXX) -q -c -P -o$@ $(TEST_CXXFLAGS) -H .\dummy.cpp
-
-$(OBJS)\test_test.obj: .\test.cpp
- $(CXX) -q -c -P -o$@ $(TEST_CXXFLAGS) .\test.cpp
-
-$(OBJS)\test_anytest.obj: .\any\anytest.cpp
- $(CXX) -q -c -P -o$@ $(TEST_CXXFLAGS) .\any\anytest.cpp
-
-$(OBJS)\test_archivetest.obj: .\archive\archivetest.cpp
- $(CXX) -q -c -P -o$@ $(TEST_CXXFLAGS) .\archive\archivetest.cpp
-
-$(OBJS)\test_ziptest.obj: .\archive\ziptest.cpp
- $(CXX) -q -c -P -o$@ $(TEST_CXXFLAGS) .\archive\ziptest.cpp
-
-$(OBJS)\test_tartest.obj: .\archive\tartest.cpp
- $(CXX) -q -c -P -o$@ $(TEST_CXXFLAGS) .\archive\tartest.cpp
-
-$(OBJS)\test_arrays.obj: .\arrays\arrays.cpp
- $(CXX) -q -c -P -o$@ $(TEST_CXXFLAGS) .\arrays\arrays.cpp
-
-$(OBJS)\test_base64.obj: .\base64\base64.cpp
- $(CXX) -q -c -P -o$@ $(TEST_CXXFLAGS) .\base64\base64.cpp
-
-$(OBJS)\test_cmdlinetest.obj: .\cmdline\cmdlinetest.cpp
- $(CXX) -q -c -P -o$@ $(TEST_CXXFLAGS) .\cmdline\cmdlinetest.cpp
-
-$(OBJS)\test_fileconf.obj: .\config\fileconf.cpp
- $(CXX) -q -c -P -o$@ $(TEST_CXXFLAGS) .\config\fileconf.cpp
-
-$(OBJS)\test_regconf.obj: .\config\regconf.cpp
- $(CXX) -q -c -P -o$@ $(TEST_CXXFLAGS) .\config\regconf.cpp
-
-$(OBJS)\test_datetimetest.obj: .\datetime\datetimetest.cpp
- $(CXX) -q -c -P -o$@ $(TEST_CXXFLAGS) .\datetime\datetimetest.cpp
-
-$(OBJS)\test_evthandler.obj: .\events\evthandler.cpp
- $(CXX) -q -c -P -o$@ $(TEST_CXXFLAGS) .\events\evthandler.cpp
-
-$(OBJS)\test_evtlooptest.obj: .\events\evtlooptest.cpp
- $(CXX) -q -c -P -o$@ $(TEST_CXXFLAGS) .\events\evtlooptest.cpp
-
-$(OBJS)\test_evtsource.obj: .\events\evtsource.cpp
- $(CXX) -q -c -P -o$@ $(TEST_CXXFLAGS) .\events\evtsource.cpp
-
-$(OBJS)\test_stopwatch.obj: .\events\stopwatch.cpp
- $(CXX) -q -c -P -o$@ $(TEST_CXXFLAGS) .\events\stopwatch.cpp
-
-$(OBJS)\test_timertest.obj: .\events\timertest.cpp
- $(CXX) -q -c -P -o$@ $(TEST_CXXFLAGS) .\events\timertest.cpp
-
-$(OBJS)\test_exec.obj: .\exec\exec.cpp
- $(CXX) -q -c -P -o$@ $(TEST_CXXFLAGS) .\exec\exec.cpp
-
-$(OBJS)\test_dir.obj: .\file\dir.cpp
- $(CXX) -q -c -P -o$@ $(TEST_CXXFLAGS) .\file\dir.cpp
-
-$(OBJS)\test_filefn.obj: .\file\filefn.cpp
- $(CXX) -q -c -P -o$@ $(TEST_CXXFLAGS) .\file\filefn.cpp
-
-$(OBJS)\test_filetest.obj: .\file\filetest.cpp
- $(CXX) -q -c -P -o$@ $(TEST_CXXFLAGS) .\file\filetest.cpp
-
-$(OBJS)\test_filekind.obj: .\filekind\filekind.cpp
- $(CXX) -q -c -P -o$@ $(TEST_CXXFLAGS) .\filekind\filekind.cpp
-
-$(OBJS)\test_filenametest.obj: .\filename\filenametest.cpp
- $(CXX) -q -c -P -o$@ $(TEST_CXXFLAGS) .\filename\filenametest.cpp
-
-$(OBJS)\test_filesystest.obj: .\filesys\filesystest.cpp
- $(CXX) -q -c -P -o$@ $(TEST_CXXFLAGS) .\filesys\filesystest.cpp
-
-$(OBJS)\test_fontmaptest.obj: .\fontmap\fontmaptest.cpp
- $(CXX) -q -c -P -o$@ $(TEST_CXXFLAGS) .\fontmap\fontmaptest.cpp
-
-$(OBJS)\test_formatconvertertest.obj: .\formatconverter\formatconvertertest.cpp
- $(CXX) -q -c -P -o$@ $(TEST_CXXFLAGS) .\formatconverter\formatconvertertest.cpp
-
-$(OBJS)\test_fswatchertest.obj: .\fswatcher\fswatchertest.cpp
- $(CXX) -q -c -P -o$@ $(TEST_CXXFLAGS) .\fswatcher\fswatchertest.cpp
-
-$(OBJS)\test_hashes.obj: .\hashes\hashes.cpp
- $(CXX) -q -c -P -o$@ $(TEST_CXXFLAGS) .\hashes\hashes.cpp
-
-$(OBJS)\test_output.obj: .\interactive\output.cpp
- $(CXX) -q -c -P -o$@ $(TEST_CXXFLAGS) .\interactive\output.cpp
-
-$(OBJS)\test_input.obj: .\interactive\input.cpp
- $(CXX) -q -c -P -o$@ $(TEST_CXXFLAGS) .\interactive\input.cpp
-
-$(OBJS)\test_intltest.obj: .\intl\intltest.cpp
- $(CXX) -q -c -P -o$@ $(TEST_CXXFLAGS) .\intl\intltest.cpp
-
-$(OBJS)\test_lists.obj: .\lists\lists.cpp
- $(CXX) -q -c -P -o$@ $(TEST_CXXFLAGS) .\lists\lists.cpp
-
-$(OBJS)\test_logtest.obj: .\log\logtest.cpp
- $(CXX) -q -c -P -o$@ $(TEST_CXXFLAGS) .\log\logtest.cpp
-
-$(OBJS)\test_longlongtest.obj: .\longlong\longlongtest.cpp
- $(CXX) -q -c -P -o$@ $(TEST_CXXFLAGS) .\longlong\longlongtest.cpp
-
-$(OBJS)\test_convautotest.obj: .\mbconv\convautotest.cpp
- $(CXX) -q -c -P -o$@ $(TEST_CXXFLAGS) .\mbconv\convautotest.cpp
-
-$(OBJS)\test_mbconvtest.obj: .\mbconv\mbconvtest.cpp
- $(CXX) -q -c -P -o$@ $(TEST_CXXFLAGS) .\mbconv\mbconvtest.cpp
-
-$(OBJS)\test_dynamiclib.obj: .\misc\dynamiclib.cpp
- $(CXX) -q -c -P -o$@ $(TEST_CXXFLAGS) .\misc\dynamiclib.cpp
-
-$(OBJS)\test_environ.obj: .\misc\environ.cpp
- $(CXX) -q -c -P -o$@ $(TEST_CXXFLAGS) .\misc\environ.cpp
-
-$(OBJS)\test_metatest.obj: .\misc\metatest.cpp
- $(CXX) -q -c -P -o$@ $(TEST_CXXFLAGS) .\misc\metatest.cpp
-
-$(OBJS)\test_misctests.obj: .\misc\misctests.cpp
- $(CXX) -q -c -P -o$@ $(TEST_CXXFLAGS) .\misc\misctests.cpp
-
-$(OBJS)\test_module.obj: .\misc\module.cpp
- $(CXX) -q -c -P -o$@ $(TEST_CXXFLAGS) .\misc\module.cpp
-
-$(OBJS)\test_pathlist.obj: .\misc\pathlist.cpp
- $(CXX) -q -c -P -o$@ $(TEST_CXXFLAGS) .\misc\pathlist.cpp
-
-$(OBJS)\test_typeinfotest.obj: .\misc\typeinfotest.cpp
- $(CXX) -q -c -P -o$@ $(TEST_CXXFLAGS) .\misc\typeinfotest.cpp
-
-$(OBJS)\test_ipc.obj: .\net\ipc.cpp
- $(CXX) -q -c -P -o$@ $(TEST_CXXFLAGS) .\net\ipc.cpp
-
-$(OBJS)\test_socket.obj: .\net\socket.cpp
- $(CXX) -q -c -P -o$@ $(TEST_CXXFLAGS) .\net\socket.cpp
-
-$(OBJS)\test_regextest.obj: .\regex\regextest.cpp
- $(CXX) -q -c -P -o$@ $(TEST_CXXFLAGS) .\regex\regextest.cpp
-
-$(OBJS)\test_wxregextest.obj: .\regex\wxregextest.cpp
- $(CXX) -q -c -P -o$@ $(TEST_CXXFLAGS) .\regex\wxregextest.cpp
-
-$(OBJS)\test_scopeguardtest.obj: .\scopeguard\scopeguardtest.cpp
- $(CXX) -q -c -P -o$@ $(TEST_CXXFLAGS) .\scopeguard\scopeguardtest.cpp
-
-$(OBJS)\test_iostream.obj: .\strings\iostream.cpp
- $(CXX) -q -c -P -o$@ $(TEST_CXXFLAGS) .\strings\iostream.cpp
-
-$(OBJS)\test_numformatter.obj: .\strings\numformatter.cpp
- $(CXX) -q -c -P -o$@ $(TEST_CXXFLAGS) .\strings\numformatter.cpp
-
-$(OBJS)\test_strings.obj: .\strings\strings.cpp
- $(CXX) -q -c -P -o$@ $(TEST_CXXFLAGS) .\strings\strings.cpp
-
-$(OBJS)\test_stdstrings.obj: .\strings\stdstrings.cpp
- $(CXX) -q -c -P -o$@ $(TEST_CXXFLAGS) .\strings\stdstrings.cpp
-
-$(OBJS)\test_tokenizer.obj: .\strings\tokenizer.cpp
- $(CXX) -q -c -P -o$@ $(TEST_CXXFLAGS) .\strings\tokenizer.cpp
-
-$(OBJS)\test_unichar.obj: .\strings\unichar.cpp
- $(CXX) -q -c -P -o$@ $(TEST_CXXFLAGS) .\strings\unichar.cpp
-
-$(OBJS)\test_unicode.obj: .\strings\unicode.cpp
- $(CXX) -q -c -P -o$@ $(TEST_CXXFLAGS) .\strings\unicode.cpp
-
-$(OBJS)\test_vararg.obj: .\strings\vararg.cpp
- $(CXX) -q -c -P -o$@ $(TEST_CXXFLAGS) .\strings\vararg.cpp
-
-$(OBJS)\test_crt.obj: .\strings\crt.cpp
- $(CXX) -q -c -P -o$@ $(TEST_CXXFLAGS) .\strings\crt.cpp
-
-$(OBJS)\test_vsnprintf.obj: .\strings\vsnprintf.cpp
- $(CXX) -q -c -P -o$@ $(TEST_CXXFLAGS) .\strings\vsnprintf.cpp
-
-$(OBJS)\test_bstream.obj: .\streams\bstream.cpp
- $(CXX) -q -c -P -o$@ $(TEST_CXXFLAGS) .\streams\bstream.cpp
-
-$(OBJS)\test_datastreamtest.obj: .\streams\datastreamtest.cpp
- $(CXX) -q -c -P -o$@ $(TEST_CXXFLAGS) .\streams\datastreamtest.cpp
-
-$(OBJS)\test_ffilestream.obj: .\streams\ffilestream.cpp
- $(CXX) -q -c -P -o$@ $(TEST_CXXFLAGS) .\streams\ffilestream.cpp
-
-$(OBJS)\test_fileback.obj: .\streams\fileback.cpp
- $(CXX) -q -c -P -o$@ $(TEST_CXXFLAGS) .\streams\fileback.cpp
-
-$(OBJS)\test_filestream.obj: .\streams\filestream.cpp
- $(CXX) -q -c -P -o$@ $(TEST_CXXFLAGS) .\streams\filestream.cpp
-
-$(OBJS)\test_iostreams.obj: .\streams\iostreams.cpp
- $(CXX) -q -c -P -o$@ $(TEST_CXXFLAGS) .\streams\iostreams.cpp
-
-$(OBJS)\test_largefile.obj: .\streams\largefile.cpp
- $(CXX) -q -c -P -o$@ $(TEST_CXXFLAGS) .\streams\largefile.cpp
-
-$(OBJS)\test_memstream.obj: .\streams\memstream.cpp
- $(CXX) -q -c -P -o$@ $(TEST_CXXFLAGS) .\streams\memstream.cpp
-
-$(OBJS)\test_socketstream.obj: .\streams\socketstream.cpp
- $(CXX) -q -c -P -o$@ $(TEST_CXXFLAGS) .\streams\socketstream.cpp
-
-$(OBJS)\test_sstream.obj: .\streams\sstream.cpp
- $(CXX) -q -c -P -o$@ $(TEST_CXXFLAGS) .\streams\sstream.cpp
-
-$(OBJS)\test_stdstream.obj: .\streams\stdstream.cpp
- $(CXX) -q -c -P -o$@ $(TEST_CXXFLAGS) .\streams\stdstream.cpp
-
-$(OBJS)\test_tempfile.obj: .\streams\tempfile.cpp
- $(CXX) -q -c -P -o$@ $(TEST_CXXFLAGS) .\streams\tempfile.cpp
-
-$(OBJS)\test_textstreamtest.obj: .\streams\textstreamtest.cpp
- $(CXX) -q -c -P -o$@ $(TEST_CXXFLAGS) .\streams\textstreamtest.cpp
-
-$(OBJS)\test_zlibstream.obj: .\streams\zlibstream.cpp
- $(CXX) -q -c -P -o$@ $(TEST_CXXFLAGS) .\streams\zlibstream.cpp
-
-$(OBJS)\test_textfiletest.obj: .\textfile\textfiletest.cpp
- $(CXX) -q -c -P -o$@ $(TEST_CXXFLAGS) .\textfile\textfiletest.cpp
-
-$(OBJS)\test_atomic.obj: .\thread\atomic.cpp
- $(CXX) -q -c -P -o$@ $(TEST_CXXFLAGS) .\thread\atomic.cpp
-
-$(OBJS)\test_misc.obj: .\thread\misc.cpp
- $(CXX) -q -c -P -o$@ $(TEST_CXXFLAGS) .\thread\misc.cpp
-
-$(OBJS)\test_queue.obj: .\thread\queue.cpp
- $(CXX) -q -c -P -o$@ $(TEST_CXXFLAGS) .\thread\queue.cpp
-
-$(OBJS)\test_tls.obj: .\thread\tls.cpp
- $(CXX) -q -c -P -o$@ $(TEST_CXXFLAGS) .\thread\tls.cpp
-
-$(OBJS)\test_ftp.obj: .\uris\ftp.cpp
- $(CXX) -q -c -P -o$@ $(TEST_CXXFLAGS) .\uris\ftp.cpp
-
-$(OBJS)\test_uris.obj: .\uris\uris.cpp
- $(CXX) -q -c -P -o$@ $(TEST_CXXFLAGS) .\uris\uris.cpp
-
-$(OBJS)\test_url.obj: .\uris\url.cpp
- $(CXX) -q -c -P -o$@ $(TEST_CXXFLAGS) .\uris\url.cpp
-
-$(OBJS)\test_vectors.obj: .\vectors\vectors.cpp
- $(CXX) -q -c -P -o$@ $(TEST_CXXFLAGS) .\vectors\vectors.cpp
-
-$(OBJS)\test_evtconnection.obj: .\weakref\evtconnection.cpp
- $(CXX) -q -c -P -o$@ $(TEST_CXXFLAGS) .\weakref\evtconnection.cpp
-
-$(OBJS)\test_weakref.obj: .\weakref\weakref.cpp
- $(CXX) -q -c -P -o$@ $(TEST_CXXFLAGS) .\weakref\weakref.cpp
-
-$(OBJS)\test_xlocale.obj: .\xlocale\xlocale.cpp
- $(CXX) -q -c -P -o$@ $(TEST_CXXFLAGS) .\xlocale\xlocale.cpp
-
-$(OBJS)\test_xmltest.obj: .\xml\xmltest.cpp
- $(CXX) -q -c -P -o$@ $(TEST_CXXFLAGS) .\xml\xmltest.cpp
-
-$(OBJS)\test_drawing_dummy.obj: .\dummy.cpp
- $(CXX) -q -c -P -o$@ $(TEST_DRAWING_CXXFLAGS) -H .\dummy.cpp
-
-$(OBJS)\test_drawing_test.obj: .\test.cpp
- $(CXX) -q -c -P -o$@ $(TEST_DRAWING_CXXFLAGS) .\test.cpp
-
-$(OBJS)\test_drawing_drawing.obj: .\drawing\drawing.cpp
- $(CXX) -q -c -P -o$@ $(TEST_DRAWING_CXXFLAGS) .\drawing\drawing.cpp
-
-$(OBJS)\test_drawing_plugindriver.obj: .\drawing\plugindriver.cpp
- $(CXX) -q -c -P -o$@ $(TEST_DRAWING_CXXFLAGS) .\drawing\plugindriver.cpp
-
-$(OBJS)\test_drawing_basictest.obj: .\drawing\basictest.cpp
- $(CXX) -q -c -P -o$@ $(TEST_DRAWING_CXXFLAGS) .\drawing\basictest.cpp
-
-$(OBJS)\test_drawing_fonttest.obj: .\drawing\fonttest.cpp
- $(CXX) -q -c -P -o$@ $(TEST_DRAWING_CXXFLAGS) .\drawing\fonttest.cpp
-
-$(OBJS)\test_drawingplugin_pluginsample.obj: .\drawing\pluginsample.cpp
- $(CXX) -q -c -P -o$@ $(TEST_DRAWINGPLUGIN_CXXFLAGS) .\drawing\pluginsample.cpp
-
-$(OBJS)\test_gui_sample.res: .\..\samples\sample.rc
- brcc32 -32 -r -fo$@ -i$(BCCDIR)\include -d__WXMSW__ $(__WXUNIV_DEFINE_p_7) $(__DEBUG_DEFINE_p_7) $(__NDEBUG_DEFINE_p_7) $(__EXCEPTIONS_DEFINE_p_7) $(__RTTI_DEFINE_p_7) $(__THREAD_DEFINE_p_7) $(__UNICODE_DEFINE_p_7) -i$(SETUPHDIR) -i.\..\include $(____CAIRO_INCLUDEDIR_FILENAMES_7_p) -i. $(__DLLFLAG_p_7) -i.\..\samples -i$(BCCDIR)\include\windows\sdk -dNOPCH .\..\samples\sample.rc
-
-$(OBJS)\test_gui_dummy.obj: .\dummy.cpp
- $(CXX) -q -c -P -o$@ $(TEST_GUI_CXXFLAGS) -H .\dummy.cpp
-
-$(OBJS)\test_gui_asserthelper.obj: .\asserthelper.cpp
- $(CXX) -q -c -P -o$@ $(TEST_GUI_CXXFLAGS) .\asserthelper.cpp
-
-$(OBJS)\test_gui_test.obj: .\test.cpp
- $(CXX) -q -c -P -o$@ $(TEST_GUI_CXXFLAGS) .\test.cpp
-
-$(OBJS)\test_gui_testableframe.obj: .\testableframe.cpp
- $(CXX) -q -c -P -o$@ $(TEST_GUI_CXXFLAGS) .\testableframe.cpp
-
-$(OBJS)\test_gui_rect.obj: .\geometry\rect.cpp
- $(CXX) -q -c -P -o$@ $(TEST_GUI_CXXFLAGS) .\geometry\rect.cpp
-
-$(OBJS)\test_gui_size.obj: .\geometry\size.cpp
- $(CXX) -q -c -P -o$@ $(TEST_GUI_CXXFLAGS) .\geometry\size.cpp
-
-$(OBJS)\test_gui_point.obj: .\geometry\point.cpp
- $(CXX) -q -c -P -o$@ $(TEST_GUI_CXXFLAGS) .\geometry\point.cpp
-
-$(OBJS)\test_gui_region.obj: .\geometry\region.cpp
- $(CXX) -q -c -P -o$@ $(TEST_GUI_CXXFLAGS) .\geometry\region.cpp
-
-$(OBJS)\test_gui_bitmap.obj: .\graphics\bitmap.cpp
- $(CXX) -q -c -P -o$@ $(TEST_GUI_CXXFLAGS) .\graphics\bitmap.cpp
-
-$(OBJS)\test_gui_colour.obj: .\graphics\colour.cpp
- $(CXX) -q -c -P -o$@ $(TEST_GUI_CXXFLAGS) .\graphics\colour.cpp
-
-$(OBJS)\test_gui_ellipsization.obj: .\graphics\ellipsization.cpp
- $(CXX) -q -c -P -o$@ $(TEST_GUI_CXXFLAGS) .\graphics\ellipsization.cpp
-
-$(OBJS)\test_gui_measuring.obj: .\graphics\measuring.cpp
- $(CXX) -q -c -P -o$@ $(TEST_GUI_CXXFLAGS) .\graphics\measuring.cpp
-
-$(OBJS)\test_gui_affinematrix.obj: .\graphics\affinematrix.cpp
- $(CXX) -q -c -P -o$@ $(TEST_GUI_CXXFLAGS) .\graphics\affinematrix.cpp
-
-$(OBJS)\test_gui_boundingbox.obj: .\graphics\boundingbox.cpp
- $(CXX) -q -c -P -o$@ $(TEST_GUI_CXXFLAGS) .\graphics\boundingbox.cpp
-
-$(OBJS)\test_gui_config.obj: .\config\config.cpp
- $(CXX) -q -c -P -o$@ $(TEST_GUI_CXXFLAGS) .\config\config.cpp
-
-$(OBJS)\test_gui_bitmapcomboboxtest.obj: .\controls\bitmapcomboboxtest.cpp
- $(CXX) -q -c -P -o$@ $(TEST_GUI_CXXFLAGS) .\controls\bitmapcomboboxtest.cpp
-
-$(OBJS)\test_gui_bitmaptogglebuttontest.obj: .\controls\bitmaptogglebuttontest.cpp
- $(CXX) -q -c -P -o$@ $(TEST_GUI_CXXFLAGS) .\controls\bitmaptogglebuttontest.cpp
-
-$(OBJS)\test_gui_bookctrlbasetest.obj: .\controls\bookctrlbasetest.cpp
- $(CXX) -q -c -P -o$@ $(TEST_GUI_CXXFLAGS) .\controls\bookctrlbasetest.cpp
-
-$(OBJS)\test_gui_buttontest.obj: .\controls\buttontest.cpp
- $(CXX) -q -c -P -o$@ $(TEST_GUI_CXXFLAGS) .\controls\buttontest.cpp
-
-$(OBJS)\test_gui_checkboxtest.obj: .\controls\checkboxtest.cpp
- $(CXX) -q -c -P -o$@ $(TEST_GUI_CXXFLAGS) .\controls\checkboxtest.cpp
-
-$(OBJS)\test_gui_checklistboxtest.obj: .\controls\checklistboxtest.cpp
- $(CXX) -q -c -P -o$@ $(TEST_GUI_CXXFLAGS) .\controls\checklistboxtest.cpp
-
-$(OBJS)\test_gui_choicebooktest.obj: .\controls\choicebooktest.cpp
- $(CXX) -q -c -P -o$@ $(TEST_GUI_CXXFLAGS) .\controls\choicebooktest.cpp
-
-$(OBJS)\test_gui_choicetest.obj: .\controls\choicetest.cpp
- $(CXX) -q -c -P -o$@ $(TEST_GUI_CXXFLAGS) .\controls\choicetest.cpp
-
-$(OBJS)\test_gui_comboboxtest.obj: .\controls\comboboxtest.cpp
- $(CXX) -q -c -P -o$@ $(TEST_GUI_CXXFLAGS) .\controls\comboboxtest.cpp
-
-$(OBJS)\test_gui_dataviewctrltest.obj: .\controls\dataviewctrltest.cpp
- $(CXX) -q -c -P -o$@ $(TEST_GUI_CXXFLAGS) .\controls\dataviewctrltest.cpp
-
-$(OBJS)\test_gui_datepickerctrltest.obj: .\controls\datepickerctrltest.cpp
- $(CXX) -q -c -P -o$@ $(TEST_GUI_CXXFLAGS) .\controls\datepickerctrltest.cpp
-
-$(OBJS)\test_gui_frametest.obj: .\controls\frametest.cpp
- $(CXX) -q -c -P -o$@ $(TEST_GUI_CXXFLAGS) .\controls\frametest.cpp
-
-$(OBJS)\test_gui_gaugetest.obj: .\controls\gaugetest.cpp
- $(CXX) -q -c -P -o$@ $(TEST_GUI_CXXFLAGS) .\controls\gaugetest.cpp
-
-$(OBJS)\test_gui_gridtest.obj: .\controls\gridtest.cpp
- $(CXX) -q -c -P -o$@ $(TEST_GUI_CXXFLAGS) .\controls\gridtest.cpp
-
-$(OBJS)\test_gui_headerctrltest.obj: .\controls\headerctrltest.cpp
- $(CXX) -q -c -P -o$@ $(TEST_GUI_CXXFLAGS) .\controls\headerctrltest.cpp
-
-$(OBJS)\test_gui_htmllboxtest.obj: .\controls\htmllboxtest.cpp
- $(CXX) -q -c -P -o$@ $(TEST_GUI_CXXFLAGS) .\controls\htmllboxtest.cpp
-
-$(OBJS)\test_gui_hyperlinkctrltest.obj: .\controls\hyperlinkctrltest.cpp
- $(CXX) -q -c -P -o$@ $(TEST_GUI_CXXFLAGS) .\controls\hyperlinkctrltest.cpp
-
-$(OBJS)\test_gui_itemcontainertest.obj: .\controls\itemcontainertest.cpp
- $(CXX) -q -c -P -o$@ $(TEST_GUI_CXXFLAGS) .\controls\itemcontainertest.cpp
-
-$(OBJS)\test_gui_label.obj: .\controls\label.cpp
- $(CXX) -q -c -P -o$@ $(TEST_GUI_CXXFLAGS) .\controls\label.cpp
-
-$(OBJS)\test_gui_listbasetest.obj: .\controls\listbasetest.cpp
- $(CXX) -q -c -P -o$@ $(TEST_GUI_CXXFLAGS) .\controls\listbasetest.cpp
-
-$(OBJS)\test_gui_listbooktest.obj: .\controls\listbooktest.cpp
- $(CXX) -q -c -P -o$@ $(TEST_GUI_CXXFLAGS) .\controls\listbooktest.cpp
-
-$(OBJS)\test_gui_listboxtest.obj: .\controls\listboxtest.cpp
- $(CXX) -q -c -P -o$@ $(TEST_GUI_CXXFLAGS) .\controls\listboxtest.cpp
-
-$(OBJS)\test_gui_listctrltest.obj: .\controls\listctrltest.cpp
- $(CXX) -q -c -P -o$@ $(TEST_GUI_CXXFLAGS) .\controls\listctrltest.cpp
-
-$(OBJS)\test_gui_listviewtest.obj: .\controls\listviewtest.cpp
- $(CXX) -q -c -P -o$@ $(TEST_GUI_CXXFLAGS) .\controls\listviewtest.cpp
-
-$(OBJS)\test_gui_markuptest.obj: .\controls\markuptest.cpp
- $(CXX) -q -c -P -o$@ $(TEST_GUI_CXXFLAGS) .\controls\markuptest.cpp
-
-$(OBJS)\test_gui_notebooktest.obj: .\controls\notebooktest.cpp
- $(CXX) -q -c -P -o$@ $(TEST_GUI_CXXFLAGS) .\controls\notebooktest.cpp
-
-$(OBJS)\test_gui_ownerdrawncomboboxtest.obj: .\controls\ownerdrawncomboboxtest.cpp
- $(CXX) -q -c -P -o$@ $(TEST_GUI_CXXFLAGS) .\controls\ownerdrawncomboboxtest.cpp
-
-$(OBJS)\test_gui_pickerbasetest.obj: .\controls\pickerbasetest.cpp
- $(CXX) -q -c -P -o$@ $(TEST_GUI_CXXFLAGS) .\controls\pickerbasetest.cpp
-
-$(OBJS)\test_gui_pickertest.obj: .\controls\pickertest.cpp
- $(CXX) -q -c -P -o$@ $(TEST_GUI_CXXFLAGS) .\controls\pickertest.cpp
-
-$(OBJS)\test_gui_radioboxtest.obj: .\controls\radioboxtest.cpp
- $(CXX) -q -c -P -o$@ $(TEST_GUI_CXXFLAGS) .\controls\radioboxtest.cpp
-
-$(OBJS)\test_gui_radiobuttontest.obj: .\controls\radiobuttontest.cpp
- $(CXX) -q -c -P -o$@ $(TEST_GUI_CXXFLAGS) .\controls\radiobuttontest.cpp
-
-$(OBJS)\test_gui_rearrangelisttest.obj: .\controls\rearrangelisttest.cpp
- $(CXX) -q -c -P -o$@ $(TEST_GUI_CXXFLAGS) .\controls\rearrangelisttest.cpp
-
-$(OBJS)\test_gui_richtextctrltest.obj: .\controls\richtextctrltest.cpp
- $(CXX) -q -c -P -o$@ $(TEST_GUI_CXXFLAGS) .\controls\richtextctrltest.cpp
-
-$(OBJS)\test_gui_searchctrltest.obj: .\controls\searchctrltest.cpp
- $(CXX) -q -c -P -o$@ $(TEST_GUI_CXXFLAGS) .\controls\searchctrltest.cpp
-
-$(OBJS)\test_gui_simplebooktest.obj: .\controls\simplebooktest.cpp
- $(CXX) -q -c -P -o$@ $(TEST_GUI_CXXFLAGS) .\controls\simplebooktest.cpp
-
-$(OBJS)\test_gui_slidertest.obj: .\controls\slidertest.cpp
- $(CXX) -q -c -P -o$@ $(TEST_GUI_CXXFLAGS) .\controls\slidertest.cpp
-
-$(OBJS)\test_gui_spinctrldbltest.obj: .\controls\spinctrldbltest.cpp
- $(CXX) -q -c -P -o$@ $(TEST_GUI_CXXFLAGS) .\controls\spinctrldbltest.cpp
-
-$(OBJS)\test_gui_spinctrltest.obj: .\controls\spinctrltest.cpp
- $(CXX) -q -c -P -o$@ $(TEST_GUI_CXXFLAGS) .\controls\spinctrltest.cpp
-
-$(OBJS)\test_gui_textctrltest.obj: .\controls\textctrltest.cpp
- $(CXX) -q -c -P -o$@ $(TEST_GUI_CXXFLAGS) .\controls\textctrltest.cpp
-
-$(OBJS)\test_gui_textentrytest.obj: .\controls\textentrytest.cpp
- $(CXX) -q -c -P -o$@ $(TEST_GUI_CXXFLAGS) .\controls\textentrytest.cpp
-
-$(OBJS)\test_gui_togglebuttontest.obj: .\controls\togglebuttontest.cpp
- $(CXX) -q -c -P -o$@ $(TEST_GUI_CXXFLAGS) .\controls\togglebuttontest.cpp
-
-$(OBJS)\test_gui_toolbooktest.obj: .\controls\toolbooktest.cpp
- $(CXX) -q -c -P -o$@ $(TEST_GUI_CXXFLAGS) .\controls\toolbooktest.cpp
-
-$(OBJS)\test_gui_treebooktest.obj: .\controls\treebooktest.cpp
- $(CXX) -q -c -P -o$@ $(TEST_GUI_CXXFLAGS) .\controls\treebooktest.cpp
-
-$(OBJS)\test_gui_treectrltest.obj: .\controls\treectrltest.cpp
- $(CXX) -q -c -P -o$@ $(TEST_GUI_CXXFLAGS) .\controls\treectrltest.cpp
-
-$(OBJS)\test_gui_treelistctrltest.obj: .\controls\treelistctrltest.cpp
- $(CXX) -q -c -P -o$@ $(TEST_GUI_CXXFLAGS) .\controls\treelistctrltest.cpp
-
-$(OBJS)\test_gui_virtlistctrltest.obj: .\controls\virtlistctrltest.cpp
- $(CXX) -q -c -P -o$@ $(TEST_GUI_CXXFLAGS) .\controls\virtlistctrltest.cpp
-
-$(OBJS)\test_gui_webtest.obj: .\controls\webtest.cpp
- $(CXX) -q -c -P -o$@ $(TEST_GUI_CXXFLAGS) .\controls\webtest.cpp
-
-$(OBJS)\test_gui_windowtest.obj: .\controls\windowtest.cpp
- $(CXX) -q -c -P -o$@ $(TEST_GUI_CXXFLAGS) .\controls\windowtest.cpp
-
-$(OBJS)\test_gui_dialogtest.obj: .\controls\dialogtest.cpp
- $(CXX) -q -c -P -o$@ $(TEST_GUI_CXXFLAGS) .\controls\dialogtest.cpp
-
-$(OBJS)\test_gui_clone.obj: .\events\clone.cpp
- $(CXX) -q -c -P -o$@ $(TEST_GUI_CXXFLAGS) .\events\clone.cpp
-
-$(OBJS)\test_gui_evtlooptest.obj: .\events\evtlooptest.cpp
- $(CXX) -q -c -P -o$@ $(TEST_GUI_CXXFLAGS) .\events\evtlooptest.cpp
-
-$(OBJS)\test_gui_propagation.obj: .\events\propagation.cpp
- $(CXX) -q -c -P -o$@ $(TEST_GUI_CXXFLAGS) .\events\propagation.cpp
-
-$(OBJS)\test_gui_keyboard.obj: .\events\keyboard.cpp
- $(CXX) -q -c -P -o$@ $(TEST_GUI_CXXFLAGS) .\events\keyboard.cpp
-
-$(OBJS)\test_gui_exec.obj: .\exec\exec.cpp
- $(CXX) -q -c -P -o$@ $(TEST_GUI_CXXFLAGS) .\exec\exec.cpp
-
-$(OBJS)\test_gui_fonttest.obj: .\font\fonttest.cpp
- $(CXX) -q -c -P -o$@ $(TEST_GUI_CXXFLAGS) .\font\fonttest.cpp
-
-$(OBJS)\test_gui_image.obj: .\image\image.cpp
- $(CXX) -q -c -P -o$@ $(TEST_GUI_CXXFLAGS) .\image\image.cpp
-
-$(OBJS)\test_gui_rawbmp.obj: .\image\rawbmp.cpp
- $(CXX) -q -c -P -o$@ $(TEST_GUI_CXXFLAGS) .\image\rawbmp.cpp
-
-$(OBJS)\test_gui_htmlparser.obj: .\html\htmlparser.cpp
- $(CXX) -q -c -P -o$@ $(TEST_GUI_CXXFLAGS) .\html\htmlparser.cpp
-
-$(OBJS)\test_gui_htmlwindow.obj: .\html\htmlwindow.cpp
- $(CXX) -q -c -P -o$@ $(TEST_GUI_CXXFLAGS) .\html\htmlwindow.cpp
-
-$(OBJS)\test_gui_accelentry.obj: .\menu\accelentry.cpp
- $(CXX) -q -c -P -o$@ $(TEST_GUI_CXXFLAGS) .\menu\accelentry.cpp
-
-$(OBJS)\test_gui_menu.obj: .\menu\menu.cpp
- $(CXX) -q -c -P -o$@ $(TEST_GUI_CXXFLAGS) .\menu\menu.cpp
-
-$(OBJS)\test_gui_guifuncs.obj: .\misc\guifuncs.cpp
- $(CXX) -q -c -P -o$@ $(TEST_GUI_CXXFLAGS) .\misc\guifuncs.cpp
-
-$(OBJS)\test_gui_selstoretest.obj: .\misc\selstoretest.cpp
- $(CXX) -q -c -P -o$@ $(TEST_GUI_CXXFLAGS) .\misc\selstoretest.cpp
-
-$(OBJS)\test_gui_garbage.obj: .\misc\garbage.cpp
- $(CXX) -q -c -P -o$@ $(TEST_GUI_CXXFLAGS) .\misc\garbage.cpp
-
-$(OBJS)\test_gui_safearrayconverttest.obj: .\misc\safearrayconverttest.cpp
- $(CXX) -q -c -P -o$@ $(TEST_GUI_CXXFLAGS) .\misc\safearrayconverttest.cpp
-
-$(OBJS)\test_gui_settings.obj: .\misc\settings.cpp
- $(CXX) -q -c -P -o$@ $(TEST_GUI_CXXFLAGS) .\misc\settings.cpp
-
-$(OBJS)\test_gui_socket.obj: .\net\socket.cpp
- $(CXX) -q -c -P -o$@ $(TEST_GUI_CXXFLAGS) .\net\socket.cpp
-
-$(OBJS)\test_gui_boxsizer.obj: .\sizers\boxsizer.cpp
- $(CXX) -q -c -P -o$@ $(TEST_GUI_CXXFLAGS) .\sizers\boxsizer.cpp
-
-$(OBJS)\test_gui_wrapsizer.obj: .\sizers\wrapsizer.cpp
- $(CXX) -q -c -P -o$@ $(TEST_GUI_CXXFLAGS) .\sizers\wrapsizer.cpp
-
-$(OBJS)\test_gui_toplevel.obj: .\toplevel\toplevel.cpp
- $(CXX) -q -c -P -o$@ $(TEST_GUI_CXXFLAGS) .\toplevel\toplevel.cpp
-
-$(OBJS)\test_gui_valnum.obj: .\validators\valnum.cpp
- $(CXX) -q -c -P -o$@ $(TEST_GUI_CXXFLAGS) .\validators\valnum.cpp
-
-$(OBJS)\test_gui_clientsize.obj: .\window\clientsize.cpp
- $(CXX) -q -c -P -o$@ $(TEST_GUI_CXXFLAGS) .\window\clientsize.cpp
-
-$(OBJS)\test_gui_setsize.obj: .\window\setsize.cpp
- $(CXX) -q -c -P -o$@ $(TEST_GUI_CXXFLAGS) .\window\setsize.cpp
-
-$(OBJS)\test_gui_xrctest.obj: .\xml\xrctest.cpp
- $(CXX) -q -c -P -o$@ $(TEST_GUI_CXXFLAGS) .\xml\xrctest.cpp
-
+# =========================================================================
+# This makefile was generated by
+# Bakefile 0.2.9 (http://www.bakefile.org)
+# 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: ###
+
+WX_RELEASE_NODOT = 31
+COMPILER_PREFIX = bcc
+OBJS = \
+ $(COMPILER_PREFIX)$(COMPILER_VERSION)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)
+LIBDIRNAME = \
+ .\..\lib\$(COMPILER_PREFIX)$(COMPILER_VERSION)_$(LIBTYPE_SUFFIX)$(CFG)
+SETUPHDIR = \
+ $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)
+TEST_CXXFLAGS = $(__RUNTIME_LIBS) -I$(BCCDIR)\include $(__DEBUGINFO) \
+ $(__OPTIMIZEFLAG) $(__THREADSFLAG_2) -D__WXMSW__ $(__WXUNIV_DEFINE_p) \
+ $(__DEBUG_DEFINE_p) $(__NDEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) \
+ $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) \
+ -I$(SETUPHDIR) -I.\..\include $(____CAIRO_INCLUDEDIR_FILENAMES) -I. \
+ $(__DLLFLAG_p) -DwxUSE_GUI=0 $(CPPUNIT_CFLAGS) -Hu \
+ -H=$(OBJS)\testprec_test.csm $(CPPFLAGS) $(CXXFLAGS)
+TEST_OBJECTS = \
+ $(OBJS)\test_dummy.obj \
+ $(OBJS)\test_test.obj \
+ $(OBJS)\test_anytest.obj \
+ $(OBJS)\test_archivetest.obj \
+ $(OBJS)\test_ziptest.obj \
+ $(OBJS)\test_tartest.obj \
+ $(OBJS)\test_arrays.obj \
+ $(OBJS)\test_base64.obj \
+ $(OBJS)\test_cmdlinetest.obj \
+ $(OBJS)\test_fileconf.obj \
+ $(OBJS)\test_regconf.obj \
+ $(OBJS)\test_datetimetest.obj \
+ $(OBJS)\test_evthandler.obj \
+ $(OBJS)\test_evtlooptest.obj \
+ $(OBJS)\test_evtsource.obj \
+ $(OBJS)\test_stopwatch.obj \
+ $(OBJS)\test_timertest.obj \
+ $(OBJS)\test_exec.obj \
+ $(OBJS)\test_dir.obj \
+ $(OBJS)\test_filefn.obj \
+ $(OBJS)\test_filetest.obj \
+ $(OBJS)\test_filekind.obj \
+ $(OBJS)\test_filenametest.obj \
+ $(OBJS)\test_filesystest.obj \
+ $(OBJS)\test_fontmaptest.obj \
+ $(OBJS)\test_formatconvertertest.obj \
+ $(OBJS)\test_fswatchertest.obj \
+ $(OBJS)\test_hashes.obj \
+ $(OBJS)\test_output.obj \
+ $(OBJS)\test_input.obj \
+ $(OBJS)\test_intltest.obj \
+ $(OBJS)\test_lists.obj \
+ $(OBJS)\test_logtest.obj \
+ $(OBJS)\test_longlongtest.obj \
+ $(OBJS)\test_convautotest.obj \
+ $(OBJS)\test_mbconvtest.obj \
+ $(OBJS)\test_dynamiclib.obj \
+ $(OBJS)\test_environ.obj \
+ $(OBJS)\test_metatest.obj \
+ $(OBJS)\test_misctests.obj \
+ $(OBJS)\test_module.obj \
+ $(OBJS)\test_pathlist.obj \
+ $(OBJS)\test_typeinfotest.obj \
+ $(OBJS)\test_ipc.obj \
+ $(OBJS)\test_socket.obj \
+ $(OBJS)\test_regextest.obj \
+ $(OBJS)\test_wxregextest.obj \
+ $(OBJS)\test_scopeguardtest.obj \
+ $(OBJS)\test_iostream.obj \
+ $(OBJS)\test_numformatter.obj \
+ $(OBJS)\test_strings.obj \
+ $(OBJS)\test_stdstrings.obj \
+ $(OBJS)\test_tokenizer.obj \
+ $(OBJS)\test_unichar.obj \
+ $(OBJS)\test_unicode.obj \
+ $(OBJS)\test_vararg.obj \
+ $(OBJS)\test_crt.obj \
+ $(OBJS)\test_vsnprintf.obj \
+ $(OBJS)\test_bstream.obj \
+ $(OBJS)\test_datastreamtest.obj \
+ $(OBJS)\test_ffilestream.obj \
+ $(OBJS)\test_fileback.obj \
+ $(OBJS)\test_filestream.obj \
+ $(OBJS)\test_iostreams.obj \
+ $(OBJS)\test_largefile.obj \
+ $(OBJS)\test_memstream.obj \
+ $(OBJS)\test_socketstream.obj \
+ $(OBJS)\test_sstream.obj \
+ $(OBJS)\test_stdstream.obj \
+ $(OBJS)\test_tempfile.obj \
+ $(OBJS)\test_textstreamtest.obj \
+ $(OBJS)\test_zlibstream.obj \
+ $(OBJS)\test_textfiletest.obj \
+ $(OBJS)\test_atomic.obj \
+ $(OBJS)\test_misc.obj \
+ $(OBJS)\test_queue.obj \
+ $(OBJS)\test_tls.obj \
+ $(OBJS)\test_ftp.obj \
+ $(OBJS)\test_uris.obj \
+ $(OBJS)\test_url.obj \
+ $(OBJS)\test_vectors.obj \
+ $(OBJS)\test_evtconnection.obj \
+ $(OBJS)\test_weakref.obj \
+ $(OBJS)\test_xlocale.obj \
+ $(OBJS)\test_xmltest.obj
+TEST_DRAWING_CXXFLAGS = $(__RUNTIME_LIBS) -I$(BCCDIR)\include $(__DEBUGINFO) \
+ $(__OPTIMIZEFLAG) $(__THREADSFLAG_2) -D__WXMSW__ $(__WXUNIV_DEFINE_p) \
+ $(__DEBUG_DEFINE_p) $(__NDEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) \
+ $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) \
+ -I$(SETUPHDIR) -I.\..\include $(____CAIRO_INCLUDEDIR_FILENAMES) -I. \
+ $(__DLLFLAG_p) -DwxUSE_GUI=0 $(CPPUNIT_CFLAGS) -Hu \
+ -H=$(OBJS)\testprec_test_drawing.csm $(CPPFLAGS) $(CXXFLAGS)
+TEST_DRAWING_OBJECTS = \
+ $(OBJS)\test_drawing_dummy.obj \
+ $(OBJS)\test_drawing_test.obj \
+ $(OBJS)\test_drawing_drawing.obj \
+ $(OBJS)\test_drawing_plugindriver.obj \
+ $(OBJS)\test_drawing_basictest.obj \
+ $(OBJS)\test_drawing_fonttest.obj
+TEST_DRAWINGPLUGIN_CXXFLAGS = $(__RUNTIME_LIBS) -I$(BCCDIR)\include \
+ $(__DEBUGINFO) $(__OPTIMIZEFLAG) $(__THREADSFLAG_2) -D__WXMSW__ \
+ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__NDEBUG_DEFINE_p) \
+ $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \
+ $(__UNICODE_DEFINE_p) -I$(SETUPHDIR) -I.\..\include \
+ $(____CAIRO_INCLUDEDIR_FILENAMES) $(__DLLFLAG_p) $(CPPFLAGS) $(CXXFLAGS)
+TEST_DRAWINGPLUGIN_OBJECTS = \
+ $(OBJS)\test_drawingplugin_pluginsample.obj
+TEST_GUI_CXXFLAGS = $(__RUNTIME_LIBS) -I$(BCCDIR)\include $(__DEBUGINFO) \
+ $(__OPTIMIZEFLAG) $(__THREADSFLAG_2) -D__WXMSW__ $(__WXUNIV_DEFINE_p) \
+ $(__DEBUG_DEFINE_p) $(__NDEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) \
+ $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) \
+ -I$(SETUPHDIR) -I.\..\include $(____CAIRO_INCLUDEDIR_FILENAMES) -I. \
+ $(__DLLFLAG_p) -I.\..\samples -DNOPCH $(CPPUNIT_CFLAGS) -Hu \
+ -H=$(OBJS)\testprec_test_gui.csm $(CPPFLAGS) $(CXXFLAGS)
+TEST_GUI_OBJECTS = \
+ $(OBJS)\test_gui_dummy.obj \
+ $(OBJS)\test_gui_asserthelper.obj \
+ $(OBJS)\test_gui_test.obj \
+ $(OBJS)\test_gui_testableframe.obj \
+ $(OBJS)\test_gui_rect.obj \
+ $(OBJS)\test_gui_size.obj \
+ $(OBJS)\test_gui_point.obj \
+ $(OBJS)\test_gui_region.obj \
+ $(OBJS)\test_gui_bitmap.obj \
+ $(OBJS)\test_gui_colour.obj \
+ $(OBJS)\test_gui_ellipsization.obj \
+ $(OBJS)\test_gui_measuring.obj \
+ $(OBJS)\test_gui_affinematrix.obj \
+ $(OBJS)\test_gui_boundingbox.obj \
+ $(OBJS)\test_gui_config.obj \
+ $(OBJS)\test_gui_bitmapcomboboxtest.obj \
+ $(OBJS)\test_gui_bitmaptogglebuttontest.obj \
+ $(OBJS)\test_gui_bookctrlbasetest.obj \
+ $(OBJS)\test_gui_buttontest.obj \
+ $(OBJS)\test_gui_checkboxtest.obj \
+ $(OBJS)\test_gui_checklistboxtest.obj \
+ $(OBJS)\test_gui_choicebooktest.obj \
+ $(OBJS)\test_gui_choicetest.obj \
+ $(OBJS)\test_gui_comboboxtest.obj \
+ $(OBJS)\test_gui_dataviewctrltest.obj \
+ $(OBJS)\test_gui_datepickerctrltest.obj \
+ $(OBJS)\test_gui_frametest.obj \
+ $(OBJS)\test_gui_gaugetest.obj \
+ $(OBJS)\test_gui_gridtest.obj \
+ $(OBJS)\test_gui_headerctrltest.obj \
+ $(OBJS)\test_gui_htmllboxtest.obj \
+ $(OBJS)\test_gui_hyperlinkctrltest.obj \
+ $(OBJS)\test_gui_itemcontainertest.obj \
+ $(OBJS)\test_gui_label.obj \
+ $(OBJS)\test_gui_listbasetest.obj \
+ $(OBJS)\test_gui_listbooktest.obj \
+ $(OBJS)\test_gui_listboxtest.obj \
+ $(OBJS)\test_gui_listctrltest.obj \
+ $(OBJS)\test_gui_listviewtest.obj \
+ $(OBJS)\test_gui_markuptest.obj \
+ $(OBJS)\test_gui_notebooktest.obj \
+ $(OBJS)\test_gui_ownerdrawncomboboxtest.obj \
+ $(OBJS)\test_gui_pickerbasetest.obj \
+ $(OBJS)\test_gui_pickertest.obj \
+ $(OBJS)\test_gui_radioboxtest.obj \
+ $(OBJS)\test_gui_radiobuttontest.obj \
+ $(OBJS)\test_gui_rearrangelisttest.obj \
+ $(OBJS)\test_gui_richtextctrltest.obj \
+ $(OBJS)\test_gui_searchctrltest.obj \
+ $(OBJS)\test_gui_simplebooktest.obj \
+ $(OBJS)\test_gui_slidertest.obj \
+ $(OBJS)\test_gui_spinctrldbltest.obj \
+ $(OBJS)\test_gui_spinctrltest.obj \
+ $(OBJS)\test_gui_textctrltest.obj \
+ $(OBJS)\test_gui_textentrytest.obj \
+ $(OBJS)\test_gui_togglebuttontest.obj \
+ $(OBJS)\test_gui_toolbooktest.obj \
+ $(OBJS)\test_gui_treebooktest.obj \
+ $(OBJS)\test_gui_treectrltest.obj \
+ $(OBJS)\test_gui_treelistctrltest.obj \
+ $(OBJS)\test_gui_virtlistctrltest.obj \
+ $(OBJS)\test_gui_webtest.obj \
+ $(OBJS)\test_gui_windowtest.obj \
+ $(OBJS)\test_gui_dialogtest.obj \
+ $(OBJS)\test_gui_clone.obj \
+ $(OBJS)\test_gui_evtlooptest.obj \
+ $(OBJS)\test_gui_propagation.obj \
+ $(OBJS)\test_gui_keyboard.obj \
+ $(OBJS)\test_gui_exec.obj \
+ $(OBJS)\test_gui_fonttest.obj \
+ $(OBJS)\test_gui_image.obj \
+ $(OBJS)\test_gui_rawbmp.obj \
+ $(OBJS)\test_gui_htmlparser.obj \
+ $(OBJS)\test_gui_htmlwindow.obj \
+ $(OBJS)\test_gui_accelentry.obj \
+ $(OBJS)\test_gui_menu.obj \
+ $(OBJS)\test_gui_guifuncs.obj \
+ $(OBJS)\test_gui_selstoretest.obj \
+ $(OBJS)\test_gui_garbage.obj \
+ $(OBJS)\test_gui_safearrayconverttest.obj \
+ $(OBJS)\test_gui_settings.obj \
+ $(OBJS)\test_gui_socket.obj \
+ $(OBJS)\test_gui_boxsizer.obj \
+ $(OBJS)\test_gui_wrapsizer.obj \
+ $(OBJS)\test_gui_toplevel.obj \
+ $(OBJS)\test_gui_valnum.obj \
+ $(OBJS)\test_gui_clientsize.obj \
+ $(OBJS)\test_gui_setsize.obj \
+ $(OBJS)\test_gui_xrctest.obj
+
+### Conditionally set variables: ###
+
+!if "$(USE_GUI)" == "0"
+PORTNAME = base
+!endif
+!if "$(USE_GUI)" == "1"
+PORTNAME = msw$(TOOLKIT_VERSION)
+!endif
+!if "$(OFFICIAL_BUILD)" == "1"
+COMPILER_VERSION = ERROR-COMPILER-VERSION-MUST-BE-SET-FOR-OFFICIAL-BUILD
+!endif
+!if "$(BUILD)" == "debug"
+WXDEBUGFLAG = d
+!endif
+!if "$(UNICODE)" == "1"
+WXUNICODEFLAG = u
+!endif
+!if "$(WXUNIV)" == "1"
+WXUNIVNAME = univ
+!endif
+!if "$(SHARED)" == "1"
+WXDLLFLAG = dll
+!endif
+!if "$(SHARED)" == "0"
+LIBTYPE_SUFFIX = lib
+!endif
+!if "$(SHARED)" == "1"
+LIBTYPE_SUFFIX = dll
+!endif
+!if "$(MONOLITHIC)" == "0"
+EXTRALIBS_FOR_BASE =
+!endif
+!if "$(MONOLITHIC)" == "1"
+EXTRALIBS_FOR_BASE =
+!endif
+!if "$(MONOLITHIC)" == "1"
+__LIB_PNG_IF_MONO_p = $(__LIB_PNG_p)
+!endif
+!if "$(USE_GUI)" == "1"
+__test_drawing___depname = $(OBJS)\test_drawing.exe
+!endif
+!if "$(SHARED)" == "1" && "$(USE_GUI)" == "1"
+__test_drawingplugin___depname = $(OBJS)\test_drawingplugin.dll
+!endif
+!if "$(USE_GUI)" == "1"
+__test_gui___depname = $(OBJS)\test_gui.exe
+!endif
+!if "$(WXUNIV)" == "1"
+__WXUNIV_DEFINE_p_7 = -d__WXUNIVERSAL__
+!endif
+!if "$(DEBUG_FLAG)" == "0"
+__DEBUG_DEFINE_p_7 = -dwxDEBUG_LEVEL=0
+!endif
+!if "$(BUILD)" == "release"
+__NDEBUG_DEFINE_p_7 = -dNDEBUG
+!endif
+!if "$(USE_EXCEPTIONS)" == "0"
+__EXCEPTIONS_DEFINE_p_7 = -dwxNO_EXCEPTIONS
+!endif
+!if "$(USE_RTTI)" == "0"
+__RTTI_DEFINE_p_7 = -dwxNO_RTTI
+!endif
+!if "$(USE_THREADS)" == "0"
+__THREAD_DEFINE_p_7 = -dwxNO_THREADS
+!endif
+!if "$(UNICODE)" == "0"
+__UNICODE_DEFINE_p_7 = -dwxUSE_UNICODE=0
+!endif
+!if "$(UNICODE)" == "1"
+__UNICODE_DEFINE_p_7 = -d_UNICODE
+!endif
+!if "$(USE_CAIRO)" == "1"
+____CAIRO_INCLUDEDIR_FILENAMES_7_p = -i$(CAIRO_ROOT)\include\cairo
+!endif
+!if "$(SHARED)" == "1"
+__DLLFLAG_p_7 = -dWXUSINGDLL
+!endif
+!if "$(MONOLITHIC)" == "0" && "$(USE_WEBVIEW)" == "1"
+__WXLIB_WEBVIEW_p = \
+ wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_webview.lib
+!endif
+!if "$(MONOLITHIC)" == "0"
+__WXLIB_RICHTEXT_p = \
+ wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_richtext.lib
+!endif
+!if "$(MONOLITHIC)" == "0" && "$(USE_MEDIA)" == "1"
+__WXLIB_MEDIA_p = \
+ wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_media.lib
+!endif
+!if "$(MONOLITHIC)" == "0"
+__WXLIB_XRC_p = \
+ wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xrc.lib
+!endif
+!if "$(MONOLITHIC)" == "0"
+__WXLIB_ADV_p = \
+ wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_adv.lib
+!endif
+!if "$(MONOLITHIC)" == "0"
+__WXLIB_HTML_p = \
+ wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_html.lib
+!endif
+!if "$(MONOLITHIC)" == "0"
+__WXLIB_XML_p = \
+ wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xml.lib
+!endif
+!if "$(MONOLITHIC)" == "0"
+__WXLIB_NET_p = \
+ wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_net.lib
+!endif
+!if "$(BUILD)" == "debug"
+__OPTIMIZEFLAG = -Od
+!endif
+!if "$(BUILD)" == "release"
+__OPTIMIZEFLAG = -O2
+!endif
+!if "$(USE_THREADS)" == "0"
+__THREADSFLAG =
+!endif
+!if "$(USE_THREADS)" == "1"
+__THREADSFLAG = mt
+!endif
+!if "$(USE_THREADS)" == "0"
+__THREADSFLAG_2 =
+!endif
+!if "$(USE_THREADS)" == "1"
+__THREADSFLAG_2 = -tWM
+!endif
+!if "$(RUNTIME_LIBS)" == "dynamic"
+__RUNTIME_LIBS = -tWR
+!endif
+!if "$(RUNTIME_LIBS)" == "static"
+__RUNTIME_LIBS =
+!endif
+!if "$(RUNTIME_LIBS)" == "dynamic"
+__RUNTIME_LIBS_2 = i
+!endif
+!if "$(RUNTIME_LIBS)" == "static"
+__RUNTIME_LIBS_2 =
+!endif
+!if "$(WXUNIV)" == "1"
+__WXUNIV_DEFINE_p = -D__WXUNIVERSAL__
+!endif
+!if "$(DEBUG_FLAG)" == "0"
+__DEBUG_DEFINE_p = -DwxDEBUG_LEVEL=0
+!endif
+!if "$(BUILD)" == "release"
+__NDEBUG_DEFINE_p = -DNDEBUG
+!endif
+!if "$(USE_EXCEPTIONS)" == "0"
+__EXCEPTIONS_DEFINE_p = -DwxNO_EXCEPTIONS
+!endif
+!if "$(USE_RTTI)" == "0"
+__RTTI_DEFINE_p = -DwxNO_RTTI
+!endif
+!if "$(USE_THREADS)" == "0"
+__THREAD_DEFINE_p = -DwxNO_THREADS
+!endif
+!if "$(UNICODE)" == "0"
+__UNICODE_DEFINE_p = -DwxUSE_UNICODE=0
+!endif
+!if "$(UNICODE)" == "1"
+__UNICODE_DEFINE_p = -D_UNICODE
+!endif
+!if "$(USE_CAIRO)" == "1"
+____CAIRO_INCLUDEDIR_FILENAMES = -I$(CAIRO_ROOT)\include\cairo
+!endif
+!if "$(SHARED)" == "1"
+__DLLFLAG_p = -DWXUSINGDLL
+!endif
+!if "$(MONOLITHIC)" == "0"
+__WXLIB_CORE_p = \
+ wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib
+!endif
+!if "$(MONOLITHIC)" == "0"
+__WXLIB_BASE_p = \
+ wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib
+!endif
+!if "$(MONOLITHIC)" == "1"
+__WXLIB_MONO_p = \
+ wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib
+!endif
+!if "$(MONOLITHIC)" == "1" && "$(USE_STC)" == "1"
+__LIB_SCINTILLA_IF_MONO_p = wxscintilla$(WXDEBUGFLAG).lib
+!endif
+!if "$(USE_GUI)" == "1"
+__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib
+!endif
+!if "$(USE_GUI)" == "1"
+__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib
+!endif
+!if "$(USE_GUI)" == "1"
+__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib
+!endif
+!if "$(USE_CAIRO)" == "1"
+__CAIRO_LIB_p = cairo.lib
+!endif
+!if "$(USE_CAIRO)" == "1"
+____CAIRO_LIBDIR_FILENAMES = -L$(CAIRO_ROOT)\lib
+!endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default"
+__DEBUGINFO = -v
+!endif
+!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default"
+__DEBUGINFO = -v-
+!endif
+!if "$(DEBUG_INFO)" == "0"
+__DEBUGINFO = -v-
+!endif
+!if "$(DEBUG_INFO)" == "1"
+__DEBUGINFO = -v
+!endif
+
+
+all: $(OBJS)
+$(OBJS):
+ -if not exist $(OBJS) mkdir $(OBJS)
+
+### Targets: ###
+
+all: $(OBJS)\test.exe $(__test_drawing___depname) $(__test_drawingplugin___depname) $(__test_gui___depname) data data-images fr
+
+clean:
+ -if exist $(OBJS)\*.obj del $(OBJS)\*.obj
+ -if exist $(OBJS)\*.res del $(OBJS)\*.res
+ -if exist $(OBJS)\*.csm del $(OBJS)\*.csm
+ -if exist $(OBJS)\test.exe del $(OBJS)\test.exe
+ -if exist $(OBJS)\test.tds del $(OBJS)\test.tds
+ -if exist $(OBJS)\test.ilc del $(OBJS)\test.ilc
+ -if exist $(OBJS)\test.ild del $(OBJS)\test.ild
+ -if exist $(OBJS)\test.ilf del $(OBJS)\test.ilf
+ -if exist $(OBJS)\test.ils del $(OBJS)\test.ils
+ -if exist $(OBJS)\test_drawing.exe del $(OBJS)\test_drawing.exe
+ -if exist $(OBJS)\test_drawing.tds del $(OBJS)\test_drawing.tds
+ -if exist $(OBJS)\test_drawing.ilc del $(OBJS)\test_drawing.ilc
+ -if exist $(OBJS)\test_drawing.ild del $(OBJS)\test_drawing.ild
+ -if exist $(OBJS)\test_drawing.ilf del $(OBJS)\test_drawing.ilf
+ -if exist $(OBJS)\test_drawing.ils del $(OBJS)\test_drawing.ils
+ -if exist $(OBJS)\test_drawingplugin.dll del $(OBJS)\test_drawingplugin.dll
+ -if exist $(OBJS)\test_drawingplugin.tds del $(OBJS)\test_drawingplugin.tds
+ -if exist $(OBJS)\test_drawingplugin.ilc del $(OBJS)\test_drawingplugin.ilc
+ -if exist $(OBJS)\test_drawingplugin.ild del $(OBJS)\test_drawingplugin.ild
+ -if exist $(OBJS)\test_drawingplugin.ilf del $(OBJS)\test_drawingplugin.ilf
+ -if exist $(OBJS)\test_drawingplugin.ils del $(OBJS)\test_drawingplugin.ils
+ -if exist $(OBJS)\test_gui.exe del $(OBJS)\test_gui.exe
+ -if exist $(OBJS)\test_gui.tds del $(OBJS)\test_gui.tds
+ -if exist $(OBJS)\test_gui.ilc del $(OBJS)\test_gui.ilc
+ -if exist $(OBJS)\test_gui.ild del $(OBJS)\test_gui.ild
+ -if exist $(OBJS)\test_gui.ilf del $(OBJS)\test_gui.ilf
+ -if exist $(OBJS)\test_gui.ils del $(OBJS)\test_gui.ils
+
+$(OBJS)\test.exe: $(OBJS)\test_dummy.obj $(TEST_OBJECTS)
+ ilink32 -Tpe -q -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUGINFO) -L$(LIBDIRNAME) -ap $(CPPUNIT_LIBS) $(____CAIRO_LIBDIR_FILENAMES) $(LDFLAGS) @&&|
+ c0x32.obj $(TEST_OBJECTS),$@,, $(__WXLIB_NET_p) $(__WXLIB_XML_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_PNG_IF_MONO_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__CAIRO_LIB_p) ole2w32.lib oleacc.lib import32.lib cw32$(__THREADSFLAG)$(__RUNTIME_LIBS_2).lib,,
+|
+
+!if "$(USE_GUI)" == "1"
+$(OBJS)\test_drawing.exe: $(OBJS)\test_drawing_dummy.obj $(TEST_DRAWING_OBJECTS)
+ ilink32 -Tpe -q -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUGINFO) -L$(LIBDIRNAME) -ap $(CPPUNIT_LIBS) $(____CAIRO_LIBDIR_FILENAMES) $(LDFLAGS) @&&|
+ c0x32.obj $(TEST_DRAWING_OBJECTS),$@,, $(__WXLIB_CORE_p) $(__WXLIB_NET_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_SCINTILLA_IF_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__CAIRO_LIB_p) ole2w32.lib oleacc.lib import32.lib cw32$(__THREADSFLAG)$(__RUNTIME_LIBS_2).lib,,
+|
+!endif
+
+!if "$(SHARED)" == "1" && "$(USE_GUI)" == "1"
+$(OBJS)\test_drawingplugin.dll: $(TEST_DRAWINGPLUGIN_OBJECTS)
+ ilink32 -Tpd -q -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUGINFO) -L$(LIBDIRNAME) $(____CAIRO_LIBDIR_FILENAMES) $(LDFLAGS) @&&|
+ c0d32.obj $(TEST_DRAWINGPLUGIN_OBJECTS),$@,, $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_SCINTILLA_IF_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__CAIRO_LIB_p) ole2w32.lib oleacc.lib import32.lib cw32$(__THREADSFLAG)$(__RUNTIME_LIBS_2).lib,,
+|
+!endif
+
+!if "$(USE_GUI)" == "1"
+$(OBJS)\test_gui.exe: $(OBJS)\test_gui_dummy.obj $(TEST_GUI_OBJECTS) $(OBJS)\test_gui_sample.res
+ ilink32 -Tpe -q -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUGINFO) -L$(LIBDIRNAME) $(CPPUNIT_LIBS) -ap $(____CAIRO_LIBDIR_FILENAMES) $(LDFLAGS) @&&|
+ c0x32.obj $(TEST_GUI_OBJECTS),$@,, $(__WXLIB_WEBVIEW_p) $(__WXLIB_RICHTEXT_p) $(__WXLIB_MEDIA_p) $(__WXLIB_XRC_p) $(__WXLIB_XML_p) $(__WXLIB_ADV_p) $(__WXLIB_HTML_p) $(__WXLIB_CORE_p) $(__WXLIB_NET_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_SCINTILLA_IF_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__CAIRO_LIB_p) ole2w32.lib oleacc.lib import32.lib cw32$(__THREADSFLAG)$(__RUNTIME_LIBS_2).lib,, $(OBJS)\test_gui_sample.res
+|
+!endif
+
+data:
+ if not exist $(OBJS) mkdir $(OBJS)
+ for %f in (horse.ani horse.bmp horse.cur horse.gif horse.ico horse.jpg horse.pcx horse.png horse.pnm horse.tga horse.tif horse.xpm) do if not exist $(OBJS)\%f copy .\%f $(OBJS)
+
+data-images:
+ if not exist image mkdir image
+ for %f in (horse_grey.bmp horse_grey_flipped.bmp horse_rle4.bmp horse_rle4_flipped.bmp horse_rle8.bmp horse_rle8_flipped.bmp horse_bicubic_50x50.png horse_bicubic_100x100.png horse_bicubic_150x150.png horse_bicubic_300x300.png horse_bilinear_50x50.png horse_bilinear_100x100.png horse_bilinear_150x150.png horse_bilinear_300x300.png horse_box_average_50x50.png horse_box_average_100x100.png horse_box_average_150x150.png horse_box_average_300x300.png) do if not exist image\%f copy .\image\%f image
+
+fr:
+ if not exist $(OBJS)\intl\fr mkdir $(OBJS)\intl\fr
+ for %f in (internat.po internat.mo) do if not exist $(OBJS)\intl\fr\%f copy .\intl\fr\%f $(OBJS)\intl\fr
+
+$(OBJS)\test_dummy.obj: .\dummy.cpp
+ $(CXX) -q -c -P -o$@ $(TEST_CXXFLAGS) -H .\dummy.cpp
+
+$(OBJS)\test_test.obj: .\test.cpp
+ $(CXX) -q -c -P -o$@ $(TEST_CXXFLAGS) .\test.cpp
+
+$(OBJS)\test_anytest.obj: .\any\anytest.cpp
+ $(CXX) -q -c -P -o$@ $(TEST_CXXFLAGS) .\any\anytest.cpp
+
+$(OBJS)\test_archivetest.obj: .\archive\archivetest.cpp
+ $(CXX) -q -c -P -o$@ $(TEST_CXXFLAGS) .\archive\archivetest.cpp
+
+$(OBJS)\test_ziptest.obj: .\archive\ziptest.cpp
+ $(CXX) -q -c -P -o$@ $(TEST_CXXFLAGS) .\archive\ziptest.cpp
+
+$(OBJS)\test_tartest.obj: .\archive\tartest.cpp
+ $(CXX) -q -c -P -o$@ $(TEST_CXXFLAGS) .\archive\tartest.cpp
+
+$(OBJS)\test_arrays.obj: .\arrays\arrays.cpp
+ $(CXX) -q -c -P -o$@ $(TEST_CXXFLAGS) .\arrays\arrays.cpp
+
+$(OBJS)\test_base64.obj: .\base64\base64.cpp
+ $(CXX) -q -c -P -o$@ $(TEST_CXXFLAGS) .\base64\base64.cpp
+
+$(OBJS)\test_cmdlinetest.obj: .\cmdline\cmdlinetest.cpp
+ $(CXX) -q -c -P -o$@ $(TEST_CXXFLAGS) .\cmdline\cmdlinetest.cpp
+
+$(OBJS)\test_fileconf.obj: .\config\fileconf.cpp
+ $(CXX) -q -c -P -o$@ $(TEST_CXXFLAGS) .\config\fileconf.cpp
+
+$(OBJS)\test_regconf.obj: .\config\regconf.cpp
+ $(CXX) -q -c -P -o$@ $(TEST_CXXFLAGS) .\config\regconf.cpp
+
+$(OBJS)\test_datetimetest.obj: .\datetime\datetimetest.cpp
+ $(CXX) -q -c -P -o$@ $(TEST_CXXFLAGS) .\datetime\datetimetest.cpp
+
+$(OBJS)\test_evthandler.obj: .\events\evthandler.cpp
+ $(CXX) -q -c -P -o$@ $(TEST_CXXFLAGS) .\events\evthandler.cpp
+
+$(OBJS)\test_evtlooptest.obj: .\events\evtlooptest.cpp
+ $(CXX) -q -c -P -o$@ $(TEST_CXXFLAGS) .\events\evtlooptest.cpp
+
+$(OBJS)\test_evtsource.obj: .\events\evtsource.cpp
+ $(CXX) -q -c -P -o$@ $(TEST_CXXFLAGS) .\events\evtsource.cpp
+
+$(OBJS)\test_stopwatch.obj: .\events\stopwatch.cpp
+ $(CXX) -q -c -P -o$@ $(TEST_CXXFLAGS) .\events\stopwatch.cpp
+
+$(OBJS)\test_timertest.obj: .\events\timertest.cpp
+ $(CXX) -q -c -P -o$@ $(TEST_CXXFLAGS) .\events\timertest.cpp
+
+$(OBJS)\test_exec.obj: .\exec\exec.cpp
+ $(CXX) -q -c -P -o$@ $(TEST_CXXFLAGS) .\exec\exec.cpp
+
+$(OBJS)\test_dir.obj: .\file\dir.cpp
+ $(CXX) -q -c -P -o$@ $(TEST_CXXFLAGS) .\file\dir.cpp
+
+$(OBJS)\test_filefn.obj: .\file\filefn.cpp
+ $(CXX) -q -c -P -o$@ $(TEST_CXXFLAGS) .\file\filefn.cpp
+
+$(OBJS)\test_filetest.obj: .\file\filetest.cpp
+ $(CXX) -q -c -P -o$@ $(TEST_CXXFLAGS) .\file\filetest.cpp
+
+$(OBJS)\test_filekind.obj: .\filekind\filekind.cpp
+ $(CXX) -q -c -P -o$@ $(TEST_CXXFLAGS) .\filekind\filekind.cpp
+
+$(OBJS)\test_filenametest.obj: .\filename\filenametest.cpp
+ $(CXX) -q -c -P -o$@ $(TEST_CXXFLAGS) .\filename\filenametest.cpp
+
+$(OBJS)\test_filesystest.obj: .\filesys\filesystest.cpp
+ $(CXX) -q -c -P -o$@ $(TEST_CXXFLAGS) .\filesys\filesystest.cpp
+
+$(OBJS)\test_fontmaptest.obj: .\fontmap\fontmaptest.cpp
+ $(CXX) -q -c -P -o$@ $(TEST_CXXFLAGS) .\fontmap\fontmaptest.cpp
+
+$(OBJS)\test_formatconvertertest.obj: .\formatconverter\formatconvertertest.cpp
+ $(CXX) -q -c -P -o$@ $(TEST_CXXFLAGS) .\formatconverter\formatconvertertest.cpp
+
+$(OBJS)\test_fswatchertest.obj: .\fswatcher\fswatchertest.cpp
+ $(CXX) -q -c -P -o$@ $(TEST_CXXFLAGS) .\fswatcher\fswatchertest.cpp
+
+$(OBJS)\test_hashes.obj: .\hashes\hashes.cpp
+ $(CXX) -q -c -P -o$@ $(TEST_CXXFLAGS) .\hashes\hashes.cpp
+
+$(OBJS)\test_output.obj: .\interactive\output.cpp
+ $(CXX) -q -c -P -o$@ $(TEST_CXXFLAGS) .\interactive\output.cpp
+
+$(OBJS)\test_input.obj: .\interactive\input.cpp
+ $(CXX) -q -c -P -o$@ $(TEST_CXXFLAGS) .\interactive\input.cpp
+
+$(OBJS)\test_intltest.obj: .\intl\intltest.cpp
+ $(CXX) -q -c -P -o$@ $(TEST_CXXFLAGS) .\intl\intltest.cpp
+
+$(OBJS)\test_lists.obj: .\lists\lists.cpp
+ $(CXX) -q -c -P -o$@ $(TEST_CXXFLAGS) .\lists\lists.cpp
+
+$(OBJS)\test_logtest.obj: .\log\logtest.cpp
+ $(CXX) -q -c -P -o$@ $(TEST_CXXFLAGS) .\log\logtest.cpp
+
+$(OBJS)\test_longlongtest.obj: .\longlong\longlongtest.cpp
+ $(CXX) -q -c -P -o$@ $(TEST_CXXFLAGS) .\longlong\longlongtest.cpp
+
+$(OBJS)\test_convautotest.obj: .\mbconv\convautotest.cpp
+ $(CXX) -q -c -P -o$@ $(TEST_CXXFLAGS) .\mbconv\convautotest.cpp
+
+$(OBJS)\test_mbconvtest.obj: .\mbconv\mbconvtest.cpp
+ $(CXX) -q -c -P -o$@ $(TEST_CXXFLAGS) .\mbconv\mbconvtest.cpp
+
+$(OBJS)\test_dynamiclib.obj: .\misc\dynamiclib.cpp
+ $(CXX) -q -c -P -o$@ $(TEST_CXXFLAGS) .\misc\dynamiclib.cpp
+
+$(OBJS)\test_environ.obj: .\misc\environ.cpp
+ $(CXX) -q -c -P -o$@ $(TEST_CXXFLAGS) .\misc\environ.cpp
+
+$(OBJS)\test_metatest.obj: .\misc\metatest.cpp
+ $(CXX) -q -c -P -o$@ $(TEST_CXXFLAGS) .\misc\metatest.cpp
+
+$(OBJS)\test_misctests.obj: .\misc\misctests.cpp
+ $(CXX) -q -c -P -o$@ $(TEST_CXXFLAGS) .\misc\misctests.cpp
+
+$(OBJS)\test_module.obj: .\misc\module.cpp
+ $(CXX) -q -c -P -o$@ $(TEST_CXXFLAGS) .\misc\module.cpp
+
+$(OBJS)\test_pathlist.obj: .\misc\pathlist.cpp
+ $(CXX) -q -c -P -o$@ $(TEST_CXXFLAGS) .\misc\pathlist.cpp
+
+$(OBJS)\test_typeinfotest.obj: .\misc\typeinfotest.cpp
+ $(CXX) -q -c -P -o$@ $(TEST_CXXFLAGS) .\misc\typeinfotest.cpp
+
+$(OBJS)\test_ipc.obj: .\net\ipc.cpp
+ $(CXX) -q -c -P -o$@ $(TEST_CXXFLAGS) .\net\ipc.cpp
+
+$(OBJS)\test_socket.obj: .\net\socket.cpp
+ $(CXX) -q -c -P -o$@ $(TEST_CXXFLAGS) .\net\socket.cpp
+
+$(OBJS)\test_regextest.obj: .\regex\regextest.cpp
+ $(CXX) -q -c -P -o$@ $(TEST_CXXFLAGS) .\regex\regextest.cpp
+
+$(OBJS)\test_wxregextest.obj: .\regex\wxregextest.cpp
+ $(CXX) -q -c -P -o$@ $(TEST_CXXFLAGS) .\regex\wxregextest.cpp
+
+$(OBJS)\test_scopeguardtest.obj: .\scopeguard\scopeguardtest.cpp
+ $(CXX) -q -c -P -o$@ $(TEST_CXXFLAGS) .\scopeguard\scopeguardtest.cpp
+
+$(OBJS)\test_iostream.obj: .\strings\iostream.cpp
+ $(CXX) -q -c -P -o$@ $(TEST_CXXFLAGS) .\strings\iostream.cpp
+
+$(OBJS)\test_numformatter.obj: .\strings\numformatter.cpp
+ $(CXX) -q -c -P -o$@ $(TEST_CXXFLAGS) .\strings\numformatter.cpp
+
+$(OBJS)\test_strings.obj: .\strings\strings.cpp
+ $(CXX) -q -c -P -o$@ $(TEST_CXXFLAGS) .\strings\strings.cpp
+
+$(OBJS)\test_stdstrings.obj: .\strings\stdstrings.cpp
+ $(CXX) -q -c -P -o$@ $(TEST_CXXFLAGS) .\strings\stdstrings.cpp
+
+$(OBJS)\test_tokenizer.obj: .\strings\tokenizer.cpp
+ $(CXX) -q -c -P -o$@ $(TEST_CXXFLAGS) .\strings\tokenizer.cpp
+
+$(OBJS)\test_unichar.obj: .\strings\unichar.cpp
+ $(CXX) -q -c -P -o$@ $(TEST_CXXFLAGS) .\strings\unichar.cpp
+
+$(OBJS)\test_unicode.obj: .\strings\unicode.cpp
+ $(CXX) -q -c -P -o$@ $(TEST_CXXFLAGS) .\strings\unicode.cpp
+
+$(OBJS)\test_vararg.obj: .\strings\vararg.cpp
+ $(CXX) -q -c -P -o$@ $(TEST_CXXFLAGS) .\strings\vararg.cpp
+
+$(OBJS)\test_crt.obj: .\strings\crt.cpp
+ $(CXX) -q -c -P -o$@ $(TEST_CXXFLAGS) .\strings\crt.cpp
+
+$(OBJS)\test_vsnprintf.obj: .\strings\vsnprintf.cpp
+ $(CXX) -q -c -P -o$@ $(TEST_CXXFLAGS) .\strings\vsnprintf.cpp
+
+$(OBJS)\test_bstream.obj: .\streams\bstream.cpp
+ $(CXX) -q -c -P -o$@ $(TEST_CXXFLAGS) .\streams\bstream.cpp
+
+$(OBJS)\test_datastreamtest.obj: .\streams\datastreamtest.cpp
+ $(CXX) -q -c -P -o$@ $(TEST_CXXFLAGS) .\streams\datastreamtest.cpp
+
+$(OBJS)\test_ffilestream.obj: .\streams\ffilestream.cpp
+ $(CXX) -q -c -P -o$@ $(TEST_CXXFLAGS) .\streams\ffilestream.cpp
+
+$(OBJS)\test_fileback.obj: .\streams\fileback.cpp
+ $(CXX) -q -c -P -o$@ $(TEST_CXXFLAGS) .\streams\fileback.cpp
+
+$(OBJS)\test_filestream.obj: .\streams\filestream.cpp
+ $(CXX) -q -c -P -o$@ $(TEST_CXXFLAGS) .\streams\filestream.cpp
+
+$(OBJS)\test_iostreams.obj: .\streams\iostreams.cpp
+ $(CXX) -q -c -P -o$@ $(TEST_CXXFLAGS) .\streams\iostreams.cpp
+
+$(OBJS)\test_largefile.obj: .\streams\largefile.cpp
+ $(CXX) -q -c -P -o$@ $(TEST_CXXFLAGS) .\streams\largefile.cpp
+
+$(OBJS)\test_memstream.obj: .\streams\memstream.cpp
+ $(CXX) -q -c -P -o$@ $(TEST_CXXFLAGS) .\streams\memstream.cpp
+
+$(OBJS)\test_socketstream.obj: .\streams\socketstream.cpp
+ $(CXX) -q -c -P -o$@ $(TEST_CXXFLAGS) .\streams\socketstream.cpp
+
+$(OBJS)\test_sstream.obj: .\streams\sstream.cpp
+ $(CXX) -q -c -P -o$@ $(TEST_CXXFLAGS) .\streams\sstream.cpp
+
+$(OBJS)\test_stdstream.obj: .\streams\stdstream.cpp
+ $(CXX) -q -c -P -o$@ $(TEST_CXXFLAGS) .\streams\stdstream.cpp
+
+$(OBJS)\test_tempfile.obj: .\streams\tempfile.cpp
+ $(CXX) -q -c -P -o$@ $(TEST_CXXFLAGS) .\streams\tempfile.cpp
+
+$(OBJS)\test_textstreamtest.obj: .\streams\textstreamtest.cpp
+ $(CXX) -q -c -P -o$@ $(TEST_CXXFLAGS) .\streams\textstreamtest.cpp
+
+$(OBJS)\test_zlibstream.obj: .\streams\zlibstream.cpp
+ $(CXX) -q -c -P -o$@ $(TEST_CXXFLAGS) .\streams\zlibstream.cpp
+
+$(OBJS)\test_textfiletest.obj: .\textfile\textfiletest.cpp
+ $(CXX) -q -c -P -o$@ $(TEST_CXXFLAGS) .\textfile\textfiletest.cpp
+
+$(OBJS)\test_atomic.obj: .\thread\atomic.cpp
+ $(CXX) -q -c -P -o$@ $(TEST_CXXFLAGS) .\thread\atomic.cpp
+
+$(OBJS)\test_misc.obj: .\thread\misc.cpp
+ $(CXX) -q -c -P -o$@ $(TEST_CXXFLAGS) .\thread\misc.cpp
+
+$(OBJS)\test_queue.obj: .\thread\queue.cpp
+ $(CXX) -q -c -P -o$@ $(TEST_CXXFLAGS) .\thread\queue.cpp
+
+$(OBJS)\test_tls.obj: .\thread\tls.cpp
+ $(CXX) -q -c -P -o$@ $(TEST_CXXFLAGS) .\thread\tls.cpp
+
+$(OBJS)\test_ftp.obj: .\uris\ftp.cpp
+ $(CXX) -q -c -P -o$@ $(TEST_CXXFLAGS) .\uris\ftp.cpp
+
+$(OBJS)\test_uris.obj: .\uris\uris.cpp
+ $(CXX) -q -c -P -o$@ $(TEST_CXXFLAGS) .\uris\uris.cpp
+
+$(OBJS)\test_url.obj: .\uris\url.cpp
+ $(CXX) -q -c -P -o$@ $(TEST_CXXFLAGS) .\uris\url.cpp
+
+$(OBJS)\test_vectors.obj: .\vectors\vectors.cpp
+ $(CXX) -q -c -P -o$@ $(TEST_CXXFLAGS) .\vectors\vectors.cpp
+
+$(OBJS)\test_evtconnection.obj: .\weakref\evtconnection.cpp
+ $(CXX) -q -c -P -o$@ $(TEST_CXXFLAGS) .\weakref\evtconnection.cpp
+
+$(OBJS)\test_weakref.obj: .\weakref\weakref.cpp
+ $(CXX) -q -c -P -o$@ $(TEST_CXXFLAGS) .\weakref\weakref.cpp
+
+$(OBJS)\test_xlocale.obj: .\xlocale\xlocale.cpp
+ $(CXX) -q -c -P -o$@ $(TEST_CXXFLAGS) .\xlocale\xlocale.cpp
+
+$(OBJS)\test_xmltest.obj: .\xml\xmltest.cpp
+ $(CXX) -q -c -P -o$@ $(TEST_CXXFLAGS) .\xml\xmltest.cpp
+
+$(OBJS)\test_drawing_dummy.obj: .\dummy.cpp
+ $(CXX) -q -c -P -o$@ $(TEST_DRAWING_CXXFLAGS) -H .\dummy.cpp
+
+$(OBJS)\test_drawing_test.obj: .\test.cpp
+ $(CXX) -q -c -P -o$@ $(TEST_DRAWING_CXXFLAGS) .\test.cpp
+
+$(OBJS)\test_drawing_drawing.obj: .\drawing\drawing.cpp
+ $(CXX) -q -c -P -o$@ $(TEST_DRAWING_CXXFLAGS) .\drawing\drawing.cpp
+
+$(OBJS)\test_drawing_plugindriver.obj: .\drawing\plugindriver.cpp
+ $(CXX) -q -c -P -o$@ $(TEST_DRAWING_CXXFLAGS) .\drawing\plugindriver.cpp
+
+$(OBJS)\test_drawing_basictest.obj: .\drawing\basictest.cpp
+ $(CXX) -q -c -P -o$@ $(TEST_DRAWING_CXXFLAGS) .\drawing\basictest.cpp
+
+$(OBJS)\test_drawing_fonttest.obj: .\drawing\fonttest.cpp
+ $(CXX) -q -c -P -o$@ $(TEST_DRAWING_CXXFLAGS) .\drawing\fonttest.cpp
+
+$(OBJS)\test_drawingplugin_pluginsample.obj: .\drawing\pluginsample.cpp
+ $(CXX) -q -c -P -o$@ $(TEST_DRAWINGPLUGIN_CXXFLAGS) .\drawing\pluginsample.cpp
+
+$(OBJS)\test_gui_sample.res: .\..\samples\sample.rc
+ brcc32 -32 -r -fo$@ -i$(BCCDIR)\include -d__WXMSW__ $(__WXUNIV_DEFINE_p_7) $(__DEBUG_DEFINE_p_7) $(__NDEBUG_DEFINE_p_7) $(__EXCEPTIONS_DEFINE_p_7) $(__RTTI_DEFINE_p_7) $(__THREAD_DEFINE_p_7) $(__UNICODE_DEFINE_p_7) -i$(SETUPHDIR) -i.\..\include $(____CAIRO_INCLUDEDIR_FILENAMES_7_p) -i. $(__DLLFLAG_p_7) -i.\..\samples -i$(BCCDIR)\include\windows\sdk -dNOPCH .\..\samples\sample.rc
+
+$(OBJS)\test_gui_dummy.obj: .\dummy.cpp
+ $(CXX) -q -c -P -o$@ $(TEST_GUI_CXXFLAGS) -H .\dummy.cpp
+
+$(OBJS)\test_gui_asserthelper.obj: .\asserthelper.cpp
+ $(CXX) -q -c -P -o$@ $(TEST_GUI_CXXFLAGS) .\asserthelper.cpp
+
+$(OBJS)\test_gui_test.obj: .\test.cpp
+ $(CXX) -q -c -P -o$@ $(TEST_GUI_CXXFLAGS) .\test.cpp
+
+$(OBJS)\test_gui_testableframe.obj: .\testableframe.cpp
+ $(CXX) -q -c -P -o$@ $(TEST_GUI_CXXFLAGS) .\testableframe.cpp
+
+$(OBJS)\test_gui_rect.obj: .\geometry\rect.cpp
+ $(CXX) -q -c -P -o$@ $(TEST_GUI_CXXFLAGS) .\geometry\rect.cpp
+
+$(OBJS)\test_gui_size.obj: .\geometry\size.cpp
+ $(CXX) -q -c -P -o$@ $(TEST_GUI_CXXFLAGS) .\geometry\size.cpp
+
+$(OBJS)\test_gui_point.obj: .\geometry\point.cpp
+ $(CXX) -q -c -P -o$@ $(TEST_GUI_CXXFLAGS) .\geometry\point.cpp
+
+$(OBJS)\test_gui_region.obj: .\geometry\region.cpp
+ $(CXX) -q -c -P -o$@ $(TEST_GUI_CXXFLAGS) .\geometry\region.cpp
+
+$(OBJS)\test_gui_bitmap.obj: .\graphics\bitmap.cpp
+ $(CXX) -q -c -P -o$@ $(TEST_GUI_CXXFLAGS) .\graphics\bitmap.cpp
+
+$(OBJS)\test_gui_colour.obj: .\graphics\colour.cpp
+ $(CXX) -q -c -P -o$@ $(TEST_GUI_CXXFLAGS) .\graphics\colour.cpp
+
+$(OBJS)\test_gui_ellipsization.obj: .\graphics\ellipsization.cpp
+ $(CXX) -q -c -P -o$@ $(TEST_GUI_CXXFLAGS) .\graphics\ellipsization.cpp
+
+$(OBJS)\test_gui_measuring.obj: .\graphics\measuring.cpp
+ $(CXX) -q -c -P -o$@ $(TEST_GUI_CXXFLAGS) .\graphics\measuring.cpp
+
+$(OBJS)\test_gui_affinematrix.obj: .\graphics\affinematrix.cpp
+ $(CXX) -q -c -P -o$@ $(TEST_GUI_CXXFLAGS) .\graphics\affinematrix.cpp
+
+$(OBJS)\test_gui_boundingbox.obj: .\graphics\boundingbox.cpp
+ $(CXX) -q -c -P -o$@ $(TEST_GUI_CXXFLAGS) .\graphics\boundingbox.cpp
+
+$(OBJS)\test_gui_config.obj: .\config\config.cpp
+ $(CXX) -q -c -P -o$@ $(TEST_GUI_CXXFLAGS) .\config\config.cpp
+
+$(OBJS)\test_gui_bitmapcomboboxtest.obj: .\controls\bitmapcomboboxtest.cpp
+ $(CXX) -q -c -P -o$@ $(TEST_GUI_CXXFLAGS) .\controls\bitmapcomboboxtest.cpp
+
+$(OBJS)\test_gui_bitmaptogglebuttontest.obj: .\controls\bitmaptogglebuttontest.cpp
+ $(CXX) -q -c -P -o$@ $(TEST_GUI_CXXFLAGS) .\controls\bitmaptogglebuttontest.cpp
+
+$(OBJS)\test_gui_bookctrlbasetest.obj: .\controls\bookctrlbasetest.cpp
+ $(CXX) -q -c -P -o$@ $(TEST_GUI_CXXFLAGS) .\controls\bookctrlbasetest.cpp
+
+$(OBJS)\test_gui_buttontest.obj: .\controls\buttontest.cpp
+ $(CXX) -q -c -P -o$@ $(TEST_GUI_CXXFLAGS) .\controls\buttontest.cpp
+
+$(OBJS)\test_gui_checkboxtest.obj: .\controls\checkboxtest.cpp
+ $(CXX) -q -c -P -o$@ $(TEST_GUI_CXXFLAGS) .\controls\checkboxtest.cpp
+
+$(OBJS)\test_gui_checklistboxtest.obj: .\controls\checklistboxtest.cpp
+ $(CXX) -q -c -P -o$@ $(TEST_GUI_CXXFLAGS) .\controls\checklistboxtest.cpp
+
+$(OBJS)\test_gui_choicebooktest.obj: .\controls\choicebooktest.cpp
+ $(CXX) -q -c -P -o$@ $(TEST_GUI_CXXFLAGS) .\controls\choicebooktest.cpp
+
+$(OBJS)\test_gui_choicetest.obj: .\controls\choicetest.cpp
+ $(CXX) -q -c -P -o$@ $(TEST_GUI_CXXFLAGS) .\controls\choicetest.cpp
+
+$(OBJS)\test_gui_comboboxtest.obj: .\controls\comboboxtest.cpp
+ $(CXX) -q -c -P -o$@ $(TEST_GUI_CXXFLAGS) .\controls\comboboxtest.cpp
+
+$(OBJS)\test_gui_dataviewctrltest.obj: .\controls\dataviewctrltest.cpp
+ $(CXX) -q -c -P -o$@ $(TEST_GUI_CXXFLAGS) .\controls\dataviewctrltest.cpp
+
+$(OBJS)\test_gui_datepickerctrltest.obj: .\controls\datepickerctrltest.cpp
+ $(CXX) -q -c -P -o$@ $(TEST_GUI_CXXFLAGS) .\controls\datepickerctrltest.cpp
+
+$(OBJS)\test_gui_frametest.obj: .\controls\frametest.cpp
+ $(CXX) -q -c -P -o$@ $(TEST_GUI_CXXFLAGS) .\controls\frametest.cpp
+
+$(OBJS)\test_gui_gaugetest.obj: .\controls\gaugetest.cpp
+ $(CXX) -q -c -P -o$@ $(TEST_GUI_CXXFLAGS) .\controls\gaugetest.cpp
+
+$(OBJS)\test_gui_gridtest.obj: .\controls\gridtest.cpp
+ $(CXX) -q -c -P -o$@ $(TEST_GUI_CXXFLAGS) .\controls\gridtest.cpp
+
+$(OBJS)\test_gui_headerctrltest.obj: .\controls\headerctrltest.cpp
+ $(CXX) -q -c -P -o$@ $(TEST_GUI_CXXFLAGS) .\controls\headerctrltest.cpp
+
+$(OBJS)\test_gui_htmllboxtest.obj: .\controls\htmllboxtest.cpp
+ $(CXX) -q -c -P -o$@ $(TEST_GUI_CXXFLAGS) .\controls\htmllboxtest.cpp
+
+$(OBJS)\test_gui_hyperlinkctrltest.obj: .\controls\hyperlinkctrltest.cpp
+ $(CXX) -q -c -P -o$@ $(TEST_GUI_CXXFLAGS) .\controls\hyperlinkctrltest.cpp
+
+$(OBJS)\test_gui_itemcontainertest.obj: .\controls\itemcontainertest.cpp
+ $(CXX) -q -c -P -o$@ $(TEST_GUI_CXXFLAGS) .\controls\itemcontainertest.cpp
+
+$(OBJS)\test_gui_label.obj: .\controls\label.cpp
+ $(CXX) -q -c -P -o$@ $(TEST_GUI_CXXFLAGS) .\controls\label.cpp
+
+$(OBJS)\test_gui_listbasetest.obj: .\controls\listbasetest.cpp
+ $(CXX) -q -c -P -o$@ $(TEST_GUI_CXXFLAGS) .\controls\listbasetest.cpp
+
+$(OBJS)\test_gui_listbooktest.obj: .\controls\listbooktest.cpp
+ $(CXX) -q -c -P -o$@ $(TEST_GUI_CXXFLAGS) .\controls\listbooktest.cpp
+
+$(OBJS)\test_gui_listboxtest.obj: .\controls\listboxtest.cpp
+ $(CXX) -q -c -P -o$@ $(TEST_GUI_CXXFLAGS) .\controls\listboxtest.cpp
+
+$(OBJS)\test_gui_listctrltest.obj: .\controls\listctrltest.cpp
+ $(CXX) -q -c -P -o$@ $(TEST_GUI_CXXFLAGS) .\controls\listctrltest.cpp
+
+$(OBJS)\test_gui_listviewtest.obj: .\controls\listviewtest.cpp
+ $(CXX) -q -c -P -o$@ $(TEST_GUI_CXXFLAGS) .\controls\listviewtest.cpp
+
+$(OBJS)\test_gui_markuptest.obj: .\controls\markuptest.cpp
+ $(CXX) -q -c -P -o$@ $(TEST_GUI_CXXFLAGS) .\controls\markuptest.cpp
+
+$(OBJS)\test_gui_notebooktest.obj: .\controls\notebooktest.cpp
+ $(CXX) -q -c -P -o$@ $(TEST_GUI_CXXFLAGS) .\controls\notebooktest.cpp
+
+$(OBJS)\test_gui_ownerdrawncomboboxtest.obj: .\controls\ownerdrawncomboboxtest.cpp
+ $(CXX) -q -c -P -o$@ $(TEST_GUI_CXXFLAGS) .\controls\ownerdrawncomboboxtest.cpp
+
+$(OBJS)\test_gui_pickerbasetest.obj: .\controls\pickerbasetest.cpp
+ $(CXX) -q -c -P -o$@ $(TEST_GUI_CXXFLAGS) .\controls\pickerbasetest.cpp
+
+$(OBJS)\test_gui_pickertest.obj: .\controls\pickertest.cpp
+ $(CXX) -q -c -P -o$@ $(TEST_GUI_CXXFLAGS) .\controls\pickertest.cpp
+
+$(OBJS)\test_gui_radioboxtest.obj: .\controls\radioboxtest.cpp
+ $(CXX) -q -c -P -o$@ $(TEST_GUI_CXXFLAGS) .\controls\radioboxtest.cpp
+
+$(OBJS)\test_gui_radiobuttontest.obj: .\controls\radiobuttontest.cpp
+ $(CXX) -q -c -P -o$@ $(TEST_GUI_CXXFLAGS) .\controls\radiobuttontest.cpp
+
+$(OBJS)\test_gui_rearrangelisttest.obj: .\controls\rearrangelisttest.cpp
+ $(CXX) -q -c -P -o$@ $(TEST_GUI_CXXFLAGS) .\controls\rearrangelisttest.cpp
+
+$(OBJS)\test_gui_richtextctrltest.obj: .\controls\richtextctrltest.cpp
+ $(CXX) -q -c -P -o$@ $(TEST_GUI_CXXFLAGS) .\controls\richtextctrltest.cpp
+
+$(OBJS)\test_gui_searchctrltest.obj: .\controls\searchctrltest.cpp
+ $(CXX) -q -c -P -o$@ $(TEST_GUI_CXXFLAGS) .\controls\searchctrltest.cpp
+
+$(OBJS)\test_gui_simplebooktest.obj: .\controls\simplebooktest.cpp
+ $(CXX) -q -c -P -o$@ $(TEST_GUI_CXXFLAGS) .\controls\simplebooktest.cpp
+
+$(OBJS)\test_gui_slidertest.obj: .\controls\slidertest.cpp
+ $(CXX) -q -c -P -o$@ $(TEST_GUI_CXXFLAGS) .\controls\slidertest.cpp
+
+$(OBJS)\test_gui_spinctrldbltest.obj: .\controls\spinctrldbltest.cpp
+ $(CXX) -q -c -P -o$@ $(TEST_GUI_CXXFLAGS) .\controls\spinctrldbltest.cpp
+
+$(OBJS)\test_gui_spinctrltest.obj: .\controls\spinctrltest.cpp
+ $(CXX) -q -c -P -o$@ $(TEST_GUI_CXXFLAGS) .\controls\spinctrltest.cpp
+
+$(OBJS)\test_gui_textctrltest.obj: .\controls\textctrltest.cpp
+ $(CXX) -q -c -P -o$@ $(TEST_GUI_CXXFLAGS) .\controls\textctrltest.cpp
+
+$(OBJS)\test_gui_textentrytest.obj: .\controls\textentrytest.cpp
+ $(CXX) -q -c -P -o$@ $(TEST_GUI_CXXFLAGS) .\controls\textentrytest.cpp
+
+$(OBJS)\test_gui_togglebuttontest.obj: .\controls\togglebuttontest.cpp
+ $(CXX) -q -c -P -o$@ $(TEST_GUI_CXXFLAGS) .\controls\togglebuttontest.cpp
+
+$(OBJS)\test_gui_toolbooktest.obj: .\controls\toolbooktest.cpp
+ $(CXX) -q -c -P -o$@ $(TEST_GUI_CXXFLAGS) .\controls\toolbooktest.cpp
+
+$(OBJS)\test_gui_treebooktest.obj: .\controls\treebooktest.cpp
+ $(CXX) -q -c -P -o$@ $(TEST_GUI_CXXFLAGS) .\controls\treebooktest.cpp
+
+$(OBJS)\test_gui_treectrltest.obj: .\controls\treectrltest.cpp
+ $(CXX) -q -c -P -o$@ $(TEST_GUI_CXXFLAGS) .\controls\treectrltest.cpp
+
+$(OBJS)\test_gui_treelistctrltest.obj: .\controls\treelistctrltest.cpp
+ $(CXX) -q -c -P -o$@ $(TEST_GUI_CXXFLAGS) .\controls\treelistctrltest.cpp
+
+$(OBJS)\test_gui_virtlistctrltest.obj: .\controls\virtlistctrltest.cpp
+ $(CXX) -q -c -P -o$@ $(TEST_GUI_CXXFLAGS) .\controls\virtlistctrltest.cpp
+
+$(OBJS)\test_gui_webtest.obj: .\controls\webtest.cpp
+ $(CXX) -q -c -P -o$@ $(TEST_GUI_CXXFLAGS) .\controls\webtest.cpp
+
+$(OBJS)\test_gui_windowtest.obj: .\controls\windowtest.cpp
+ $(CXX) -q -c -P -o$@ $(TEST_GUI_CXXFLAGS) .\controls\windowtest.cpp
+
+$(OBJS)\test_gui_dialogtest.obj: .\controls\dialogtest.cpp
+ $(CXX) -q -c -P -o$@ $(TEST_GUI_CXXFLAGS) .\controls\dialogtest.cpp
+
+$(OBJS)\test_gui_clone.obj: .\events\clone.cpp
+ $(CXX) -q -c -P -o$@ $(TEST_GUI_CXXFLAGS) .\events\clone.cpp
+
+$(OBJS)\test_gui_evtlooptest.obj: .\events\evtlooptest.cpp
+ $(CXX) -q -c -P -o$@ $(TEST_GUI_CXXFLAGS) .\events\evtlooptest.cpp
+
+$(OBJS)\test_gui_propagation.obj: .\events\propagation.cpp
+ $(CXX) -q -c -P -o$@ $(TEST_GUI_CXXFLAGS) .\events\propagation.cpp
+
+$(OBJS)\test_gui_keyboard.obj: .\events\keyboard.cpp
+ $(CXX) -q -c -P -o$@ $(TEST_GUI_CXXFLAGS) .\events\keyboard.cpp
+
+$(OBJS)\test_gui_exec.obj: .\exec\exec.cpp
+ $(CXX) -q -c -P -o$@ $(TEST_GUI_CXXFLAGS) .\exec\exec.cpp
+
+$(OBJS)\test_gui_fonttest.obj: .\font\fonttest.cpp
+ $(CXX) -q -c -P -o$@ $(TEST_GUI_CXXFLAGS) .\font\fonttest.cpp
+
+$(OBJS)\test_gui_image.obj: .\image\image.cpp
+ $(CXX) -q -c -P -o$@ $(TEST_GUI_CXXFLAGS) .\image\image.cpp
+
+$(OBJS)\test_gui_rawbmp.obj: .\image\rawbmp.cpp
+ $(CXX) -q -c -P -o$@ $(TEST_GUI_CXXFLAGS) .\image\rawbmp.cpp
+
+$(OBJS)\test_gui_htmlparser.obj: .\html\htmlparser.cpp
+ $(CXX) -q -c -P -o$@ $(TEST_GUI_CXXFLAGS) .\html\htmlparser.cpp
+
+$(OBJS)\test_gui_htmlwindow.obj: .\html\htmlwindow.cpp
+ $(CXX) -q -c -P -o$@ $(TEST_GUI_CXXFLAGS) .\html\htmlwindow.cpp
+
+$(OBJS)\test_gui_accelentry.obj: .\menu\accelentry.cpp
+ $(CXX) -q -c -P -o$@ $(TEST_GUI_CXXFLAGS) .\menu\accelentry.cpp
+
+$(OBJS)\test_gui_menu.obj: .\menu\menu.cpp
+ $(CXX) -q -c -P -o$@ $(TEST_GUI_CXXFLAGS) .\menu\menu.cpp
+
+$(OBJS)\test_gui_guifuncs.obj: .\misc\guifuncs.cpp
+ $(CXX) -q -c -P -o$@ $(TEST_GUI_CXXFLAGS) .\misc\guifuncs.cpp
+
+$(OBJS)\test_gui_selstoretest.obj: .\misc\selstoretest.cpp
+ $(CXX) -q -c -P -o$@ $(TEST_GUI_CXXFLAGS) .\misc\selstoretest.cpp
+
+$(OBJS)\test_gui_garbage.obj: .\misc\garbage.cpp
+ $(CXX) -q -c -P -o$@ $(TEST_GUI_CXXFLAGS) .\misc\garbage.cpp
+
+$(OBJS)\test_gui_safearrayconverttest.obj: .\misc\safearrayconverttest.cpp
+ $(CXX) -q -c -P -o$@ $(TEST_GUI_CXXFLAGS) .\misc\safearrayconverttest.cpp
+
+$(OBJS)\test_gui_settings.obj: .\misc\settings.cpp
+ $(CXX) -q -c -P -o$@ $(TEST_GUI_CXXFLAGS) .\misc\settings.cpp
+
+$(OBJS)\test_gui_socket.obj: .\net\socket.cpp
+ $(CXX) -q -c -P -o$@ $(TEST_GUI_CXXFLAGS) .\net\socket.cpp
+
+$(OBJS)\test_gui_boxsizer.obj: .\sizers\boxsizer.cpp
+ $(CXX) -q -c -P -o$@ $(TEST_GUI_CXXFLAGS) .\sizers\boxsizer.cpp
+
+$(OBJS)\test_gui_wrapsizer.obj: .\sizers\wrapsizer.cpp
+ $(CXX) -q -c -P -o$@ $(TEST_GUI_CXXFLAGS) .\sizers\wrapsizer.cpp
+
+$(OBJS)\test_gui_toplevel.obj: .\toplevel\toplevel.cpp
+ $(CXX) -q -c -P -o$@ $(TEST_GUI_CXXFLAGS) .\toplevel\toplevel.cpp
+
+$(OBJS)\test_gui_valnum.obj: .\validators\valnum.cpp
+ $(CXX) -q -c -P -o$@ $(TEST_GUI_CXXFLAGS) .\validators\valnum.cpp
+
+$(OBJS)\test_gui_clientsize.obj: .\window\clientsize.cpp
+ $(CXX) -q -c -P -o$@ $(TEST_GUI_CXXFLAGS) .\window\clientsize.cpp
+
+$(OBJS)\test_gui_setsize.obj: .\window\setsize.cpp
+ $(CXX) -q -c -P -o$@ $(TEST_GUI_CXXFLAGS) .\window\setsize.cpp
+
+$(OBJS)\test_gui_xrctest.obj: .\xml\xrctest.cpp
+ $(CXX) -q -c -P -o$@ $(TEST_GUI_CXXFLAGS) .\xml\xrctest.cpp
+
diff --git a/tests/makefile.gcc b/tests/makefile.gcc
index 5bdd6ccece..9167512348 100644
--- a/tests/makefile.gcc
+++ b/tests/makefile.gcc
@@ -1,1061 +1,1061 @@
-# =========================================================================
-# This makefile was generated by
-# Bakefile 0.2.9 (http://www.bakefile.org)
-# Do not modify, all changes will be overwritten!
-# =========================================================================
-
-include ../build/msw/config.gcc
-
-# -------------------------------------------------------------------------
-# Do not modify the rest of this file!
-# -------------------------------------------------------------------------
-
-### Variables: ###
-
-CPPDEPS = -MT$@ -MF$@.d -MD -MP
-WX_RELEASE_NODOT = 31
-COMPILER_PREFIX = gcc
-OBJS = \
- $(COMPILER_PREFIX)$(COMPILER_VERSION)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)
-LIBDIRNAME = \
- .\..\lib\$(COMPILER_PREFIX)$(COMPILER_VERSION)_$(LIBTYPE_SUFFIX)$(CFG)
-SETUPHDIR = \
- $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)
-TEST_CXXFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG) $(__THREADSFLAG) $(GCCFLAGS) \
- -DHAVE_W32API_H -D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \
- $(__NDEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \
- $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) -I$(SETUPHDIR) -I.\..\include \
- $(____CAIRO_INCLUDEDIR_FILENAMES) -W -Wall -I. $(__DLLFLAG_p) -DwxUSE_GUI=0 \
- $(CPPUNIT_CFLAGS) $(__RTTIFLAG) $(__EXCEPTIONSFLAG) -Wno-ctor-dtor-privacy \
- $(CPPFLAGS) $(CXXFLAGS)
-TEST_OBJECTS = \
- $(OBJS)\test_dummy.o \
- $(OBJS)\test_test.o \
- $(OBJS)\test_anytest.o \
- $(OBJS)\test_archivetest.o \
- $(OBJS)\test_ziptest.o \
- $(OBJS)\test_tartest.o \
- $(OBJS)\test_arrays.o \
- $(OBJS)\test_base64.o \
- $(OBJS)\test_cmdlinetest.o \
- $(OBJS)\test_fileconf.o \
- $(OBJS)\test_regconf.o \
- $(OBJS)\test_datetimetest.o \
- $(OBJS)\test_evthandler.o \
- $(OBJS)\test_evtlooptest.o \
- $(OBJS)\test_evtsource.o \
- $(OBJS)\test_stopwatch.o \
- $(OBJS)\test_timertest.o \
- $(OBJS)\test_exec.o \
- $(OBJS)\test_dir.o \
- $(OBJS)\test_filefn.o \
- $(OBJS)\test_filetest.o \
- $(OBJS)\test_filekind.o \
- $(OBJS)\test_filenametest.o \
- $(OBJS)\test_filesystest.o \
- $(OBJS)\test_fontmaptest.o \
- $(OBJS)\test_formatconvertertest.o \
- $(OBJS)\test_fswatchertest.o \
- $(OBJS)\test_hashes.o \
- $(OBJS)\test_output.o \
- $(OBJS)\test_input.o \
- $(OBJS)\test_intltest.o \
- $(OBJS)\test_lists.o \
- $(OBJS)\test_logtest.o \
- $(OBJS)\test_longlongtest.o \
- $(OBJS)\test_convautotest.o \
- $(OBJS)\test_mbconvtest.o \
- $(OBJS)\test_dynamiclib.o \
- $(OBJS)\test_environ.o \
- $(OBJS)\test_metatest.o \
- $(OBJS)\test_misctests.o \
- $(OBJS)\test_module.o \
- $(OBJS)\test_pathlist.o \
- $(OBJS)\test_typeinfotest.o \
- $(OBJS)\test_ipc.o \
- $(OBJS)\test_socket.o \
- $(OBJS)\test_regextest.o \
- $(OBJS)\test_wxregextest.o \
- $(OBJS)\test_scopeguardtest.o \
- $(OBJS)\test_iostream.o \
- $(OBJS)\test_numformatter.o \
- $(OBJS)\test_strings.o \
- $(OBJS)\test_stdstrings.o \
- $(OBJS)\test_tokenizer.o \
- $(OBJS)\test_unichar.o \
- $(OBJS)\test_unicode.o \
- $(OBJS)\test_vararg.o \
- $(OBJS)\test_crt.o \
- $(OBJS)\test_vsnprintf.o \
- $(OBJS)\test_bstream.o \
- $(OBJS)\test_datastreamtest.o \
- $(OBJS)\test_ffilestream.o \
- $(OBJS)\test_fileback.o \
- $(OBJS)\test_filestream.o \
- $(OBJS)\test_iostreams.o \
- $(OBJS)\test_largefile.o \
- $(OBJS)\test_memstream.o \
- $(OBJS)\test_socketstream.o \
- $(OBJS)\test_sstream.o \
- $(OBJS)\test_stdstream.o \
- $(OBJS)\test_tempfile.o \
- $(OBJS)\test_textstreamtest.o \
- $(OBJS)\test_zlibstream.o \
- $(OBJS)\test_textfiletest.o \
- $(OBJS)\test_atomic.o \
- $(OBJS)\test_misc.o \
- $(OBJS)\test_queue.o \
- $(OBJS)\test_tls.o \
- $(OBJS)\test_ftp.o \
- $(OBJS)\test_uris.o \
- $(OBJS)\test_url.o \
- $(OBJS)\test_vectors.o \
- $(OBJS)\test_evtconnection.o \
- $(OBJS)\test_weakref.o \
- $(OBJS)\test_xlocale.o \
- $(OBJS)\test_xmltest.o
-TEST_DRAWING_CXXFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG) $(__THREADSFLAG) \
- $(GCCFLAGS) -DHAVE_W32API_H -D__WXMSW__ $(__WXUNIV_DEFINE_p) \
- $(__DEBUG_DEFINE_p) $(__NDEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) \
- $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) \
- -I$(SETUPHDIR) -I.\..\include $(____CAIRO_INCLUDEDIR_FILENAMES) -W -Wall -I. \
- $(__DLLFLAG_p) -DwxUSE_GUI=0 $(CPPUNIT_CFLAGS) $(__RTTIFLAG) \
- $(__EXCEPTIONSFLAG) -Wno-ctor-dtor-privacy $(CPPFLAGS) $(CXXFLAGS)
-TEST_DRAWING_OBJECTS = \
- $(OBJS)\test_drawing_dummy.o \
- $(OBJS)\test_drawing_test.o \
- $(OBJS)\test_drawing_drawing.o \
- $(OBJS)\test_drawing_plugindriver.o \
- $(OBJS)\test_drawing_basictest.o \
- $(OBJS)\test_drawing_fonttest.o
-TEST_DRAWINGPLUGIN_CXXFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG) \
- $(__THREADSFLAG) $(GCCFLAGS) -DHAVE_W32API_H -D__WXMSW__ \
- $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__NDEBUG_DEFINE_p) \
- $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \
- $(__UNICODE_DEFINE_p) -I$(SETUPHDIR) -I.\..\include \
- $(____CAIRO_INCLUDEDIR_FILENAMES) -W -Wall $(__DLLFLAG_p) $(__RTTIFLAG) \
- $(__EXCEPTIONSFLAG) -Wno-ctor-dtor-privacy $(CPPFLAGS) $(CXXFLAGS)
-TEST_DRAWINGPLUGIN_OBJECTS = \
- $(OBJS)\test_drawingplugin_pluginsample.o
-TEST_GUI_CXXFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG) $(__THREADSFLAG) \
- $(GCCFLAGS) -DHAVE_W32API_H -D__WXMSW__ $(__WXUNIV_DEFINE_p) \
- $(__DEBUG_DEFINE_p) $(__NDEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) \
- $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) \
- -I$(SETUPHDIR) -I.\..\include $(____CAIRO_INCLUDEDIR_FILENAMES) -W -Wall -I. \
- $(__DLLFLAG_p) -I.\..\samples -DNOPCH $(CPPUNIT_CFLAGS) $(__RTTIFLAG) \
- $(__EXCEPTIONSFLAG) -Wno-ctor-dtor-privacy $(CPPFLAGS) $(CXXFLAGS)
-TEST_GUI_OBJECTS = \
- $(OBJS)\test_gui_sample_rc.o \
- $(OBJS)\test_gui_dummy.o \
- $(OBJS)\test_gui_asserthelper.o \
- $(OBJS)\test_gui_test.o \
- $(OBJS)\test_gui_testableframe.o \
- $(OBJS)\test_gui_rect.o \
- $(OBJS)\test_gui_size.o \
- $(OBJS)\test_gui_point.o \
- $(OBJS)\test_gui_region.o \
- $(OBJS)\test_gui_bitmap.o \
- $(OBJS)\test_gui_colour.o \
- $(OBJS)\test_gui_ellipsization.o \
- $(OBJS)\test_gui_measuring.o \
- $(OBJS)\test_gui_affinematrix.o \
- $(OBJS)\test_gui_boundingbox.o \
- $(OBJS)\test_gui_config.o \
- $(OBJS)\test_gui_bitmapcomboboxtest.o \
- $(OBJS)\test_gui_bitmaptogglebuttontest.o \
- $(OBJS)\test_gui_bookctrlbasetest.o \
- $(OBJS)\test_gui_buttontest.o \
- $(OBJS)\test_gui_checkboxtest.o \
- $(OBJS)\test_gui_checklistboxtest.o \
- $(OBJS)\test_gui_choicebooktest.o \
- $(OBJS)\test_gui_choicetest.o \
- $(OBJS)\test_gui_comboboxtest.o \
- $(OBJS)\test_gui_dataviewctrltest.o \
- $(OBJS)\test_gui_datepickerctrltest.o \
- $(OBJS)\test_gui_frametest.o \
- $(OBJS)\test_gui_gaugetest.o \
- $(OBJS)\test_gui_gridtest.o \
- $(OBJS)\test_gui_headerctrltest.o \
- $(OBJS)\test_gui_htmllboxtest.o \
- $(OBJS)\test_gui_hyperlinkctrltest.o \
- $(OBJS)\test_gui_itemcontainertest.o \
- $(OBJS)\test_gui_label.o \
- $(OBJS)\test_gui_listbasetest.o \
- $(OBJS)\test_gui_listbooktest.o \
- $(OBJS)\test_gui_listboxtest.o \
- $(OBJS)\test_gui_listctrltest.o \
- $(OBJS)\test_gui_listviewtest.o \
- $(OBJS)\test_gui_markuptest.o \
- $(OBJS)\test_gui_notebooktest.o \
- $(OBJS)\test_gui_ownerdrawncomboboxtest.o \
- $(OBJS)\test_gui_pickerbasetest.o \
- $(OBJS)\test_gui_pickertest.o \
- $(OBJS)\test_gui_radioboxtest.o \
- $(OBJS)\test_gui_radiobuttontest.o \
- $(OBJS)\test_gui_rearrangelisttest.o \
- $(OBJS)\test_gui_richtextctrltest.o \
- $(OBJS)\test_gui_searchctrltest.o \
- $(OBJS)\test_gui_simplebooktest.o \
- $(OBJS)\test_gui_slidertest.o \
- $(OBJS)\test_gui_spinctrldbltest.o \
- $(OBJS)\test_gui_spinctrltest.o \
- $(OBJS)\test_gui_textctrltest.o \
- $(OBJS)\test_gui_textentrytest.o \
- $(OBJS)\test_gui_togglebuttontest.o \
- $(OBJS)\test_gui_toolbooktest.o \
- $(OBJS)\test_gui_treebooktest.o \
- $(OBJS)\test_gui_treectrltest.o \
- $(OBJS)\test_gui_treelistctrltest.o \
- $(OBJS)\test_gui_virtlistctrltest.o \
- $(OBJS)\test_gui_webtest.o \
- $(OBJS)\test_gui_windowtest.o \
- $(OBJS)\test_gui_dialogtest.o \
- $(OBJS)\test_gui_clone.o \
- $(OBJS)\test_gui_evtlooptest.o \
- $(OBJS)\test_gui_propagation.o \
- $(OBJS)\test_gui_keyboard.o \
- $(OBJS)\test_gui_exec.o \
- $(OBJS)\test_gui_fonttest.o \
- $(OBJS)\test_gui_image.o \
- $(OBJS)\test_gui_rawbmp.o \
- $(OBJS)\test_gui_htmlparser.o \
- $(OBJS)\test_gui_htmlwindow.o \
- $(OBJS)\test_gui_accelentry.o \
- $(OBJS)\test_gui_menu.o \
- $(OBJS)\test_gui_guifuncs.o \
- $(OBJS)\test_gui_selstoretest.o \
- $(OBJS)\test_gui_garbage.o \
- $(OBJS)\test_gui_safearrayconverttest.o \
- $(OBJS)\test_gui_settings.o \
- $(OBJS)\test_gui_socket.o \
- $(OBJS)\test_gui_boxsizer.o \
- $(OBJS)\test_gui_wrapsizer.o \
- $(OBJS)\test_gui_toplevel.o \
- $(OBJS)\test_gui_valnum.o \
- $(OBJS)\test_gui_clientsize.o \
- $(OBJS)\test_gui_setsize.o \
- $(OBJS)\test_gui_xrctest.o
-
-### Conditionally set variables: ###
-
-ifeq ($(GCC_VERSION),2.95)
-GCCFLAGS = -fvtable-thunks
-endif
-ifeq ($(USE_GUI),0)
-PORTNAME = base
-endif
-ifeq ($(USE_GUI),1)
-PORTNAME = msw$(TOOLKIT_VERSION)
-endif
-ifeq ($(OFFICIAL_BUILD),1)
-COMPILER_VERSION = ERROR-COMPILER-VERSION-MUST-BE-SET-FOR-OFFICIAL-BUILD
-endif
-ifeq ($(BUILD),debug)
-WXDEBUGFLAG = d
-endif
-ifeq ($(UNICODE),1)
-WXUNICODEFLAG = u
-endif
-ifeq ($(WXUNIV),1)
-WXUNIVNAME = univ
-endif
-ifeq ($(SHARED),1)
-WXDLLFLAG = dll
-endif
-ifeq ($(SHARED),0)
-LIBTYPE_SUFFIX = lib
-endif
-ifeq ($(SHARED),1)
-LIBTYPE_SUFFIX = dll
-endif
-ifeq ($(MONOLITHIC),0)
-EXTRALIBS_FOR_BASE =
-endif
-ifeq ($(MONOLITHIC),1)
-EXTRALIBS_FOR_BASE =
-endif
-ifeq ($(MONOLITHIC),1)
-__LIB_PNG_IF_MONO_p = $(__LIB_PNG_p)
-endif
-ifeq ($(USE_GUI),1)
-__test_drawing___depname = $(OBJS)\test_drawing.exe
-endif
-ifeq ($(SHARED),1)
-ifeq ($(USE_GUI),1)
-__test_drawingplugin___depname = $(OBJS)\test_drawingplugin.dll
-endif
-endif
-ifeq ($(USE_GUI),1)
-__test_gui___depname = $(OBJS)\test_gui.exe
-endif
-ifeq ($(WXUNIV),1)
-__WXUNIV_DEFINE_p_6 = --define __WXUNIVERSAL__
-endif
-ifeq ($(DEBUG_FLAG),0)
-__DEBUG_DEFINE_p_6 = --define wxDEBUG_LEVEL=0
-endif
-ifeq ($(BUILD),release)
-__NDEBUG_DEFINE_p_6 = --define NDEBUG
-endif
-ifeq ($(USE_EXCEPTIONS),0)
-__EXCEPTIONS_DEFINE_p_6 = --define wxNO_EXCEPTIONS
-endif
-ifeq ($(USE_RTTI),0)
-__RTTI_DEFINE_p_6 = --define wxNO_RTTI
-endif
-ifeq ($(USE_THREADS),0)
-__THREAD_DEFINE_p_6 = --define wxNO_THREADS
-endif
-ifeq ($(UNICODE),0)
-__UNICODE_DEFINE_p_6 = --define wxUSE_UNICODE=0
-endif
-ifeq ($(UNICODE),1)
-__UNICODE_DEFINE_p_6 = --define _UNICODE
-endif
-ifeq ($(USE_CAIRO),1)
-__CAIRO_INCLUDEDIR_p_2 = --include-dir $(CAIRO_ROOT)/include/cairo
-endif
-ifeq ($(SHARED),1)
-__DLLFLAG_p_6 = --define WXUSINGDLL
-endif
-ifeq ($(MONOLITHIC),0)
-ifeq ($(USE_WEBVIEW),1)
-__WXLIB_WEBVIEW_p = \
- -lwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_webview
-endif
-endif
-ifeq ($(MONOLITHIC),0)
-__WXLIB_RICHTEXT_p = \
- -lwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_richtext
-endif
-ifeq ($(MONOLITHIC),0)
-ifeq ($(USE_MEDIA),1)
-__WXLIB_MEDIA_p = \
- -lwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_media
-endif
-endif
-ifeq ($(MONOLITHIC),0)
-__WXLIB_XRC_p = \
- -lwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xrc
-endif
-ifeq ($(MONOLITHIC),0)
-__WXLIB_ADV_p = \
- -lwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_adv
-endif
-ifeq ($(MONOLITHIC),0)
-__WXLIB_HTML_p = \
- -lwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_html
-endif
-ifeq ($(MONOLITHIC),0)
-__WXLIB_XML_p = \
- -lwxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xml
-endif
-ifeq ($(MONOLITHIC),0)
-__WXLIB_NET_p = \
- -lwxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_net
-endif
-ifeq ($(BUILD),debug)
-__OPTIMIZEFLAG = -O0
-endif
-ifeq ($(BUILD),release)
-__OPTIMIZEFLAG = -O2
-endif
-ifeq ($(USE_RTTI),0)
-__RTTIFLAG = -fno-rtti
-endif
-ifeq ($(USE_RTTI),1)
-__RTTIFLAG =
-endif
-ifeq ($(USE_EXCEPTIONS),0)
-__EXCEPTIONSFLAG = -fno-exceptions
-endif
-ifeq ($(USE_EXCEPTIONS),1)
-__EXCEPTIONSFLAG =
-endif
-ifeq ($(WXUNIV),1)
-__WXUNIV_DEFINE_p = -D__WXUNIVERSAL__
-endif
-ifeq ($(DEBUG_FLAG),0)
-__DEBUG_DEFINE_p = -DwxDEBUG_LEVEL=0
-endif
-ifeq ($(BUILD),release)
-__NDEBUG_DEFINE_p = -DNDEBUG
-endif
-ifeq ($(USE_EXCEPTIONS),0)
-__EXCEPTIONS_DEFINE_p = -DwxNO_EXCEPTIONS
-endif
-ifeq ($(USE_RTTI),0)
-__RTTI_DEFINE_p = -DwxNO_RTTI
-endif
-ifeq ($(USE_THREADS),0)
-__THREAD_DEFINE_p = -DwxNO_THREADS
-endif
-ifeq ($(UNICODE),0)
-__UNICODE_DEFINE_p = -DwxUSE_UNICODE=0
-endif
-ifeq ($(UNICODE),1)
-__UNICODE_DEFINE_p = -D_UNICODE
-endif
-ifeq ($(USE_CAIRO),1)
-____CAIRO_INCLUDEDIR_FILENAMES = -I$(CAIRO_ROOT)\include\cairo
-endif
-ifeq ($(SHARED),1)
-__DLLFLAG_p = -DWXUSINGDLL
-endif
-ifeq ($(MONOLITHIC),0)
-__WXLIB_CORE_p = \
- -lwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core
-endif
-ifeq ($(MONOLITHIC),0)
-__WXLIB_BASE_p = \
- -lwxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)
-endif
-ifeq ($(MONOLITHIC),1)
-__WXLIB_MONO_p = \
- -lwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)
-endif
-ifeq ($(MONOLITHIC),1)
-ifeq ($(USE_STC),1)
-__LIB_SCINTILLA_IF_MONO_p = -lwxscintilla$(WXDEBUGFLAG)
-endif
-endif
-ifeq ($(USE_GUI),1)
-__LIB_TIFF_p = -lwxtiff$(WXDEBUGFLAG)
-endif
-ifeq ($(USE_GUI),1)
-__LIB_JPEG_p = -lwxjpeg$(WXDEBUGFLAG)
-endif
-ifeq ($(USE_GUI),1)
-__LIB_PNG_p = -lwxpng$(WXDEBUGFLAG)
-endif
-ifeq ($(USE_CAIRO),1)
-__CAIRO_LIB_p = -lcairo
-endif
-ifeq ($(USE_CAIRO),1)
-____CAIRO_LIBDIR_FILENAMES = -L$(CAIRO_ROOT)\lib
-endif
-ifeq ($(BUILD),debug)
-ifeq ($(DEBUG_INFO),default)
-__DEBUGINFO = -g
-endif
-endif
-ifeq ($(BUILD),release)
-ifeq ($(DEBUG_INFO),default)
-__DEBUGINFO =
-endif
-endif
-ifeq ($(DEBUG_INFO),0)
-__DEBUGINFO =
-endif
-ifeq ($(DEBUG_INFO),1)
-__DEBUGINFO = -g
-endif
-ifeq ($(USE_THREADS),0)
-__THREADSFLAG =
-endif
-ifeq ($(USE_THREADS),1)
-__THREADSFLAG = -mthreads
-endif
-
-
-all: $(OBJS)
-$(OBJS):
- -if not exist $(OBJS) mkdir $(OBJS)
-
-### Targets: ###
-
-all: $(OBJS)\test.exe $(__test_drawing___depname) $(__test_drawingplugin___depname) $(__test_gui___depname) data data-images fr
-
-clean:
- -if exist $(OBJS)\*.o del $(OBJS)\*.o
- -if exist $(OBJS)\*.d del $(OBJS)\*.d
- -if exist $(OBJS)\test.exe del $(OBJS)\test.exe
- -if exist $(OBJS)\test_drawing.exe del $(OBJS)\test_drawing.exe
- -if exist $(OBJS)\test_drawingplugin.dll del $(OBJS)\test_drawingplugin.dll
- -if exist $(OBJS)\test_gui.exe del $(OBJS)\test_gui.exe
-
-$(OBJS)\test.exe: $(TEST_OBJECTS)
- $(CXX) -o $@ $(TEST_OBJECTS) $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) $(CPPUNIT_LIBS) $(____CAIRO_LIBDIR_FILENAMES) $(LDFLAGS) $(__WXLIB_NET_p) $(__WXLIB_XML_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_PNG_IF_MONO_p) -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(EXTRALIBS_FOR_BASE) $(__CAIRO_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32 -lwininet
-
-ifeq ($(USE_GUI),1)
-$(OBJS)\test_drawing.exe: $(TEST_DRAWING_OBJECTS)
- $(CXX) -o $@ $(TEST_DRAWING_OBJECTS) $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) $(CPPUNIT_LIBS) $(____CAIRO_LIBDIR_FILENAMES) $(LDFLAGS) $(__WXLIB_CORE_p) $(__WXLIB_NET_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_SCINTILLA_IF_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(EXTRALIBS_FOR_BASE) $(__CAIRO_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32 -lwininet
-endif
-
-ifeq ($(SHARED),1)
-ifeq ($(USE_GUI),1)
-$(OBJS)\test_drawingplugin.dll: $(TEST_DRAWINGPLUGIN_OBJECTS)
- $(CXX) $(LINK_MODULE_FLAGS) -fPIC -o $@ $(TEST_DRAWINGPLUGIN_OBJECTS) $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) $(____CAIRO_LIBDIR_FILENAMES) $(LDFLAGS) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_SCINTILLA_IF_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(EXTRALIBS_FOR_BASE) $(__CAIRO_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32 -lwininet
-endif
-endif
-
-ifeq ($(USE_GUI),1)
-$(OBJS)\test_gui.exe: $(TEST_GUI_OBJECTS) $(OBJS)\test_gui_sample_rc.o
- $(CXX) -o $@ $(TEST_GUI_OBJECTS) $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) $(CPPUNIT_LIBS) $(____CAIRO_LIBDIR_FILENAMES) $(LDFLAGS) $(__WXLIB_WEBVIEW_p) $(__WXLIB_RICHTEXT_p) $(__WXLIB_MEDIA_p) $(__WXLIB_XRC_p) $(__WXLIB_XML_p) $(__WXLIB_ADV_p) $(__WXLIB_HTML_p) $(__WXLIB_CORE_p) $(__WXLIB_NET_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_SCINTILLA_IF_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(EXTRALIBS_FOR_BASE) $(__CAIRO_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32 -lwininet
-endif
-
-data:
- if not exist $(OBJS) mkdir $(OBJS)
- for %%f in (horse.ani horse.bmp horse.cur horse.gif horse.ico horse.jpg horse.pcx horse.png horse.pnm horse.tga horse.tif horse.xpm) do if not exist $(OBJS)\%%f copy .\%%f $(OBJS)
-
-data-images:
- if not exist image mkdir image
- for %%f in (horse_grey.bmp horse_grey_flipped.bmp horse_rle4.bmp horse_rle4_flipped.bmp horse_rle8.bmp horse_rle8_flipped.bmp horse_bicubic_50x50.png horse_bicubic_100x100.png horse_bicubic_150x150.png horse_bicubic_300x300.png horse_bilinear_50x50.png horse_bilinear_100x100.png horse_bilinear_150x150.png horse_bilinear_300x300.png horse_box_average_50x50.png horse_box_average_100x100.png horse_box_average_150x150.png horse_box_average_300x300.png) do if not exist image\%%f copy .\image\%%f image
-
-fr:
- if not exist $(OBJS)\intl\fr mkdir $(OBJS)\intl\fr
- for %%f in (internat.po internat.mo) do if not exist $(OBJS)\intl\fr\%%f copy .\intl\fr\%%f $(OBJS)\intl\fr
-
-$(OBJS)\test_dummy.o: ./dummy.cpp
- $(CXX) -c -o $@ $(TEST_CXXFLAGS) $(CPPDEPS) $<
-
-$(OBJS)\test_test.o: ./test.cpp
- $(CXX) -c -o $@ $(TEST_CXXFLAGS) $(CPPDEPS) $<
-
-$(OBJS)\test_anytest.o: ./any/anytest.cpp
- $(CXX) -c -o $@ $(TEST_CXXFLAGS) $(CPPDEPS) $<
-
-$(OBJS)\test_archivetest.o: ./archive/archivetest.cpp
- $(CXX) -c -o $@ $(TEST_CXXFLAGS) $(CPPDEPS) $<
-
-$(OBJS)\test_ziptest.o: ./archive/ziptest.cpp
- $(CXX) -c -o $@ $(TEST_CXXFLAGS) $(CPPDEPS) $<
-
-$(OBJS)\test_tartest.o: ./archive/tartest.cpp
- $(CXX) -c -o $@ $(TEST_CXXFLAGS) $(CPPDEPS) $<
-
-$(OBJS)\test_arrays.o: ./arrays/arrays.cpp
- $(CXX) -c -o $@ $(TEST_CXXFLAGS) $(CPPDEPS) $<
-
-$(OBJS)\test_base64.o: ./base64/base64.cpp
- $(CXX) -c -o $@ $(TEST_CXXFLAGS) $(CPPDEPS) $<
-
-$(OBJS)\test_cmdlinetest.o: ./cmdline/cmdlinetest.cpp
- $(CXX) -c -o $@ $(TEST_CXXFLAGS) $(CPPDEPS) $<
-
-$(OBJS)\test_fileconf.o: ./config/fileconf.cpp
- $(CXX) -c -o $@ $(TEST_CXXFLAGS) $(CPPDEPS) $<
-
-$(OBJS)\test_regconf.o: ./config/regconf.cpp
- $(CXX) -c -o $@ $(TEST_CXXFLAGS) $(CPPDEPS) $<
-
-$(OBJS)\test_datetimetest.o: ./datetime/datetimetest.cpp
- $(CXX) -c -o $@ $(TEST_CXXFLAGS) $(CPPDEPS) $<
-
-$(OBJS)\test_evthandler.o: ./events/evthandler.cpp
- $(CXX) -c -o $@ $(TEST_CXXFLAGS) $(CPPDEPS) $<
-
-$(OBJS)\test_evtlooptest.o: ./events/evtlooptest.cpp
- $(CXX) -c -o $@ $(TEST_CXXFLAGS) $(CPPDEPS) $<
-
-$(OBJS)\test_evtsource.o: ./events/evtsource.cpp
- $(CXX) -c -o $@ $(TEST_CXXFLAGS) $(CPPDEPS) $<
-
-$(OBJS)\test_stopwatch.o: ./events/stopwatch.cpp
- $(CXX) -c -o $@ $(TEST_CXXFLAGS) $(CPPDEPS) $<
-
-$(OBJS)\test_timertest.o: ./events/timertest.cpp
- $(CXX) -c -o $@ $(TEST_CXXFLAGS) $(CPPDEPS) $<
-
-$(OBJS)\test_exec.o: ./exec/exec.cpp
- $(CXX) -c -o $@ $(TEST_CXXFLAGS) $(CPPDEPS) $<
-
-$(OBJS)\test_dir.o: ./file/dir.cpp
- $(CXX) -c -o $@ $(TEST_CXXFLAGS) $(CPPDEPS) $<
-
-$(OBJS)\test_filefn.o: ./file/filefn.cpp
- $(CXX) -c -o $@ $(TEST_CXXFLAGS) $(CPPDEPS) $<
-
-$(OBJS)\test_filetest.o: ./file/filetest.cpp
- $(CXX) -c -o $@ $(TEST_CXXFLAGS) $(CPPDEPS) $<
-
-$(OBJS)\test_filekind.o: ./filekind/filekind.cpp
- $(CXX) -c -o $@ $(TEST_CXXFLAGS) $(CPPDEPS) $<
-
-$(OBJS)\test_filenametest.o: ./filename/filenametest.cpp
- $(CXX) -c -o $@ $(TEST_CXXFLAGS) $(CPPDEPS) $<
-
-$(OBJS)\test_filesystest.o: ./filesys/filesystest.cpp
- $(CXX) -c -o $@ $(TEST_CXXFLAGS) $(CPPDEPS) $<
-
-$(OBJS)\test_fontmaptest.o: ./fontmap/fontmaptest.cpp
- $(CXX) -c -o $@ $(TEST_CXXFLAGS) $(CPPDEPS) $<
-
-$(OBJS)\test_formatconvertertest.o: ./formatconverter/formatconvertertest.cpp
- $(CXX) -c -o $@ $(TEST_CXXFLAGS) $(CPPDEPS) $<
-
-$(OBJS)\test_fswatchertest.o: ./fswatcher/fswatchertest.cpp
- $(CXX) -c -o $@ $(TEST_CXXFLAGS) $(CPPDEPS) $<
-
-$(OBJS)\test_hashes.o: ./hashes/hashes.cpp
- $(CXX) -c -o $@ $(TEST_CXXFLAGS) $(CPPDEPS) $<
-
-$(OBJS)\test_output.o: ./interactive/output.cpp
- $(CXX) -c -o $@ $(TEST_CXXFLAGS) $(CPPDEPS) $<
-
-$(OBJS)\test_input.o: ./interactive/input.cpp
- $(CXX) -c -o $@ $(TEST_CXXFLAGS) $(CPPDEPS) $<
-
-$(OBJS)\test_intltest.o: ./intl/intltest.cpp
- $(CXX) -c -o $@ $(TEST_CXXFLAGS) $(CPPDEPS) $<
-
-$(OBJS)\test_lists.o: ./lists/lists.cpp
- $(CXX) -c -o $@ $(TEST_CXXFLAGS) $(CPPDEPS) $<
-
-$(OBJS)\test_logtest.o: ./log/logtest.cpp
- $(CXX) -c -o $@ $(TEST_CXXFLAGS) $(CPPDEPS) $<
-
-$(OBJS)\test_longlongtest.o: ./longlong/longlongtest.cpp
- $(CXX) -c -o $@ $(TEST_CXXFLAGS) $(CPPDEPS) $<
-
-$(OBJS)\test_convautotest.o: ./mbconv/convautotest.cpp
- $(CXX) -c -o $@ $(TEST_CXXFLAGS) $(CPPDEPS) $<
-
-$(OBJS)\test_mbconvtest.o: ./mbconv/mbconvtest.cpp
- $(CXX) -c -o $@ $(TEST_CXXFLAGS) $(CPPDEPS) $<
-
-$(OBJS)\test_dynamiclib.o: ./misc/dynamiclib.cpp
- $(CXX) -c -o $@ $(TEST_CXXFLAGS) $(CPPDEPS) $<
-
-$(OBJS)\test_environ.o: ./misc/environ.cpp
- $(CXX) -c -o $@ $(TEST_CXXFLAGS) $(CPPDEPS) $<
-
-$(OBJS)\test_metatest.o: ./misc/metatest.cpp
- $(CXX) -c -o $@ $(TEST_CXXFLAGS) $(CPPDEPS) $<
-
-$(OBJS)\test_misctests.o: ./misc/misctests.cpp
- $(CXX) -c -o $@ $(TEST_CXXFLAGS) $(CPPDEPS) $<
-
-$(OBJS)\test_module.o: ./misc/module.cpp
- $(CXX) -c -o $@ $(TEST_CXXFLAGS) $(CPPDEPS) $<
-
-$(OBJS)\test_pathlist.o: ./misc/pathlist.cpp
- $(CXX) -c -o $@ $(TEST_CXXFLAGS) $(CPPDEPS) $<
-
-$(OBJS)\test_typeinfotest.o: ./misc/typeinfotest.cpp
- $(CXX) -c -o $@ $(TEST_CXXFLAGS) $(CPPDEPS) $<
-
-$(OBJS)\test_ipc.o: ./net/ipc.cpp
- $(CXX) -c -o $@ $(TEST_CXXFLAGS) $(CPPDEPS) $<
-
-$(OBJS)\test_socket.o: ./net/socket.cpp
- $(CXX) -c -o $@ $(TEST_CXXFLAGS) $(CPPDEPS) $<
-
-$(OBJS)\test_regextest.o: ./regex/regextest.cpp
- $(CXX) -c -o $@ $(TEST_CXXFLAGS) $(CPPDEPS) $<
-
-$(OBJS)\test_wxregextest.o: ./regex/wxregextest.cpp
- $(CXX) -c -o $@ $(TEST_CXXFLAGS) $(CPPDEPS) $<
-
-$(OBJS)\test_scopeguardtest.o: ./scopeguard/scopeguardtest.cpp
- $(CXX) -c -o $@ $(TEST_CXXFLAGS) $(CPPDEPS) $<
-
-$(OBJS)\test_iostream.o: ./strings/iostream.cpp
- $(CXX) -c -o $@ $(TEST_CXXFLAGS) $(CPPDEPS) $<
-
-$(OBJS)\test_numformatter.o: ./strings/numformatter.cpp
- $(CXX) -c -o $@ $(TEST_CXXFLAGS) $(CPPDEPS) $<
-
-$(OBJS)\test_strings.o: ./strings/strings.cpp
- $(CXX) -c -o $@ $(TEST_CXXFLAGS) $(CPPDEPS) $<
-
-$(OBJS)\test_stdstrings.o: ./strings/stdstrings.cpp
- $(CXX) -c -o $@ $(TEST_CXXFLAGS) $(CPPDEPS) $<
-
-$(OBJS)\test_tokenizer.o: ./strings/tokenizer.cpp
- $(CXX) -c -o $@ $(TEST_CXXFLAGS) $(CPPDEPS) $<
-
-$(OBJS)\test_unichar.o: ./strings/unichar.cpp
- $(CXX) -c -o $@ $(TEST_CXXFLAGS) $(CPPDEPS) $<
-
-$(OBJS)\test_unicode.o: ./strings/unicode.cpp
- $(CXX) -c -o $@ $(TEST_CXXFLAGS) $(CPPDEPS) $<
-
-$(OBJS)\test_vararg.o: ./strings/vararg.cpp
- $(CXX) -c -o $@ $(TEST_CXXFLAGS) $(CPPDEPS) $<
-
-$(OBJS)\test_crt.o: ./strings/crt.cpp
- $(CXX) -c -o $@ $(TEST_CXXFLAGS) $(CPPDEPS) $<
-
-$(OBJS)\test_vsnprintf.o: ./strings/vsnprintf.cpp
- $(CXX) -c -o $@ $(TEST_CXXFLAGS) $(CPPDEPS) $<
-
-$(OBJS)\test_bstream.o: ./streams/bstream.cpp
- $(CXX) -c -o $@ $(TEST_CXXFLAGS) $(CPPDEPS) $<
-
-$(OBJS)\test_datastreamtest.o: ./streams/datastreamtest.cpp
- $(CXX) -c -o $@ $(TEST_CXXFLAGS) $(CPPDEPS) $<
-
-$(OBJS)\test_ffilestream.o: ./streams/ffilestream.cpp
- $(CXX) -c -o $@ $(TEST_CXXFLAGS) $(CPPDEPS) $<
-
-$(OBJS)\test_fileback.o: ./streams/fileback.cpp
- $(CXX) -c -o $@ $(TEST_CXXFLAGS) $(CPPDEPS) $<
-
-$(OBJS)\test_filestream.o: ./streams/filestream.cpp
- $(CXX) -c -o $@ $(TEST_CXXFLAGS) $(CPPDEPS) $<
-
-$(OBJS)\test_iostreams.o: ./streams/iostreams.cpp
- $(CXX) -c -o $@ $(TEST_CXXFLAGS) $(CPPDEPS) $<
-
-$(OBJS)\test_largefile.o: ./streams/largefile.cpp
- $(CXX) -c -o $@ $(TEST_CXXFLAGS) $(CPPDEPS) $<
-
-$(OBJS)\test_memstream.o: ./streams/memstream.cpp
- $(CXX) -c -o $@ $(TEST_CXXFLAGS) $(CPPDEPS) $<
-
-$(OBJS)\test_socketstream.o: ./streams/socketstream.cpp
- $(CXX) -c -o $@ $(TEST_CXXFLAGS) $(CPPDEPS) $<
-
-$(OBJS)\test_sstream.o: ./streams/sstream.cpp
- $(CXX) -c -o $@ $(TEST_CXXFLAGS) $(CPPDEPS) $<
-
-$(OBJS)\test_stdstream.o: ./streams/stdstream.cpp
- $(CXX) -c -o $@ $(TEST_CXXFLAGS) $(CPPDEPS) $<
-
-$(OBJS)\test_tempfile.o: ./streams/tempfile.cpp
- $(CXX) -c -o $@ $(TEST_CXXFLAGS) $(CPPDEPS) $<
-
-$(OBJS)\test_textstreamtest.o: ./streams/textstreamtest.cpp
- $(CXX) -c -o $@ $(TEST_CXXFLAGS) $(CPPDEPS) $<
-
-$(OBJS)\test_zlibstream.o: ./streams/zlibstream.cpp
- $(CXX) -c -o $@ $(TEST_CXXFLAGS) $(CPPDEPS) $<
-
-$(OBJS)\test_textfiletest.o: ./textfile/textfiletest.cpp
- $(CXX) -c -o $@ $(TEST_CXXFLAGS) $(CPPDEPS) $<
-
-$(OBJS)\test_atomic.o: ./thread/atomic.cpp
- $(CXX) -c -o $@ $(TEST_CXXFLAGS) $(CPPDEPS) $<
-
-$(OBJS)\test_misc.o: ./thread/misc.cpp
- $(CXX) -c -o $@ $(TEST_CXXFLAGS) $(CPPDEPS) $<
-
-$(OBJS)\test_queue.o: ./thread/queue.cpp
- $(CXX) -c -o $@ $(TEST_CXXFLAGS) $(CPPDEPS) $<
-
-$(OBJS)\test_tls.o: ./thread/tls.cpp
- $(CXX) -c -o $@ $(TEST_CXXFLAGS) $(CPPDEPS) $<
-
-$(OBJS)\test_ftp.o: ./uris/ftp.cpp
- $(CXX) -c -o $@ $(TEST_CXXFLAGS) $(CPPDEPS) $<
-
-$(OBJS)\test_uris.o: ./uris/uris.cpp
- $(CXX) -c -o $@ $(TEST_CXXFLAGS) $(CPPDEPS) $<
-
-$(OBJS)\test_url.o: ./uris/url.cpp
- $(CXX) -c -o $@ $(TEST_CXXFLAGS) $(CPPDEPS) $<
-
-$(OBJS)\test_vectors.o: ./vectors/vectors.cpp
- $(CXX) -c -o $@ $(TEST_CXXFLAGS) $(CPPDEPS) $<
-
-$(OBJS)\test_evtconnection.o: ./weakref/evtconnection.cpp
- $(CXX) -c -o $@ $(TEST_CXXFLAGS) $(CPPDEPS) $<
-
-$(OBJS)\test_weakref.o: ./weakref/weakref.cpp
- $(CXX) -c -o $@ $(TEST_CXXFLAGS) $(CPPDEPS) $<
-
-$(OBJS)\test_xlocale.o: ./xlocale/xlocale.cpp
- $(CXX) -c -o $@ $(TEST_CXXFLAGS) $(CPPDEPS) $<
-
-$(OBJS)\test_xmltest.o: ./xml/xmltest.cpp
- $(CXX) -c -o $@ $(TEST_CXXFLAGS) $(CPPDEPS) $<
-
-$(OBJS)\test_drawing_dummy.o: ./dummy.cpp
- $(CXX) -c -o $@ $(TEST_DRAWING_CXXFLAGS) $(CPPDEPS) $<
-
-$(OBJS)\test_drawing_test.o: ./test.cpp
- $(CXX) -c -o $@ $(TEST_DRAWING_CXXFLAGS) $(CPPDEPS) $<
-
-$(OBJS)\test_drawing_drawing.o: ./drawing/drawing.cpp
- $(CXX) -c -o $@ $(TEST_DRAWING_CXXFLAGS) $(CPPDEPS) $<
-
-$(OBJS)\test_drawing_plugindriver.o: ./drawing/plugindriver.cpp
- $(CXX) -c -o $@ $(TEST_DRAWING_CXXFLAGS) $(CPPDEPS) $<
-
-$(OBJS)\test_drawing_basictest.o: ./drawing/basictest.cpp
- $(CXX) -c -o $@ $(TEST_DRAWING_CXXFLAGS) $(CPPDEPS) $<
-
-$(OBJS)\test_drawing_fonttest.o: ./drawing/fonttest.cpp
- $(CXX) -c -o $@ $(TEST_DRAWING_CXXFLAGS) $(CPPDEPS) $<
-
-$(OBJS)\test_drawingplugin_pluginsample.o: ./drawing/pluginsample.cpp
- $(CXX) -c -o $@ $(TEST_DRAWINGPLUGIN_CXXFLAGS) $(CPPDEPS) $<
-
-$(OBJS)\test_gui_sample_rc.o: ./../samples/sample.rc
- $(WINDRES) -i$< -o$@ --define __WXMSW__ $(__WXUNIV_DEFINE_p_6) $(__DEBUG_DEFINE_p_6) $(__NDEBUG_DEFINE_p_6) $(__EXCEPTIONS_DEFINE_p_6) $(__RTTI_DEFINE_p_6) $(__THREAD_DEFINE_p_6) $(__UNICODE_DEFINE_p_6) --include-dir $(SETUPHDIR) --include-dir ./../include $(__CAIRO_INCLUDEDIR_p_2) --include-dir . $(__DLLFLAG_p_6) --include-dir ./../samples --define NOPCH
-
-$(OBJS)\test_gui_dummy.o: ./dummy.cpp
- $(CXX) -c -o $@ $(TEST_GUI_CXXFLAGS) $(CPPDEPS) $<
-
-$(OBJS)\test_gui_asserthelper.o: ./asserthelper.cpp
- $(CXX) -c -o $@ $(TEST_GUI_CXXFLAGS) $(CPPDEPS) $<
-
-$(OBJS)\test_gui_test.o: ./test.cpp
- $(CXX) -c -o $@ $(TEST_GUI_CXXFLAGS) $(CPPDEPS) $<
-
-$(OBJS)\test_gui_testableframe.o: ./testableframe.cpp
- $(CXX) -c -o $@ $(TEST_GUI_CXXFLAGS) $(CPPDEPS) $<
-
-$(OBJS)\test_gui_rect.o: ./geometry/rect.cpp
- $(CXX) -c -o $@ $(TEST_GUI_CXXFLAGS) $(CPPDEPS) $<
-
-$(OBJS)\test_gui_size.o: ./geometry/size.cpp
- $(CXX) -c -o $@ $(TEST_GUI_CXXFLAGS) $(CPPDEPS) $<
-
-$(OBJS)\test_gui_point.o: ./geometry/point.cpp
- $(CXX) -c -o $@ $(TEST_GUI_CXXFLAGS) $(CPPDEPS) $<
-
-$(OBJS)\test_gui_region.o: ./geometry/region.cpp
- $(CXX) -c -o $@ $(TEST_GUI_CXXFLAGS) $(CPPDEPS) $<
-
-$(OBJS)\test_gui_bitmap.o: ./graphics/bitmap.cpp
- $(CXX) -c -o $@ $(TEST_GUI_CXXFLAGS) $(CPPDEPS) $<
-
-$(OBJS)\test_gui_colour.o: ./graphics/colour.cpp
- $(CXX) -c -o $@ $(TEST_GUI_CXXFLAGS) $(CPPDEPS) $<
-
-$(OBJS)\test_gui_ellipsization.o: ./graphics/ellipsization.cpp
- $(CXX) -c -o $@ $(TEST_GUI_CXXFLAGS) $(CPPDEPS) $<
-
-$(OBJS)\test_gui_measuring.o: ./graphics/measuring.cpp
- $(CXX) -c -o $@ $(TEST_GUI_CXXFLAGS) $(CPPDEPS) $<
-
-$(OBJS)\test_gui_affinematrix.o: ./graphics/affinematrix.cpp
- $(CXX) -c -o $@ $(TEST_GUI_CXXFLAGS) $(CPPDEPS) $<
-
-$(OBJS)\test_gui_boundingbox.o: ./graphics/boundingbox.cpp
- $(CXX) -c -o $@ $(TEST_GUI_CXXFLAGS) $(CPPDEPS) $<
-
-$(OBJS)\test_gui_config.o: ./config/config.cpp
- $(CXX) -c -o $@ $(TEST_GUI_CXXFLAGS) $(CPPDEPS) $<
-
-$(OBJS)\test_gui_bitmapcomboboxtest.o: ./controls/bitmapcomboboxtest.cpp
- $(CXX) -c -o $@ $(TEST_GUI_CXXFLAGS) $(CPPDEPS) $<
-
-$(OBJS)\test_gui_bitmaptogglebuttontest.o: ./controls/bitmaptogglebuttontest.cpp
- $(CXX) -c -o $@ $(TEST_GUI_CXXFLAGS) $(CPPDEPS) $<
-
-$(OBJS)\test_gui_bookctrlbasetest.o: ./controls/bookctrlbasetest.cpp
- $(CXX) -c -o $@ $(TEST_GUI_CXXFLAGS) $(CPPDEPS) $<
-
-$(OBJS)\test_gui_buttontest.o: ./controls/buttontest.cpp
- $(CXX) -c -o $@ $(TEST_GUI_CXXFLAGS) $(CPPDEPS) $<
-
-$(OBJS)\test_gui_checkboxtest.o: ./controls/checkboxtest.cpp
- $(CXX) -c -o $@ $(TEST_GUI_CXXFLAGS) $(CPPDEPS) $<
-
-$(OBJS)\test_gui_checklistboxtest.o: ./controls/checklistboxtest.cpp
- $(CXX) -c -o $@ $(TEST_GUI_CXXFLAGS) $(CPPDEPS) $<
-
-$(OBJS)\test_gui_choicebooktest.o: ./controls/choicebooktest.cpp
- $(CXX) -c -o $@ $(TEST_GUI_CXXFLAGS) $(CPPDEPS) $<
-
-$(OBJS)\test_gui_choicetest.o: ./controls/choicetest.cpp
- $(CXX) -c -o $@ $(TEST_GUI_CXXFLAGS) $(CPPDEPS) $<
-
-$(OBJS)\test_gui_comboboxtest.o: ./controls/comboboxtest.cpp
- $(CXX) -c -o $@ $(TEST_GUI_CXXFLAGS) $(CPPDEPS) $<
-
-$(OBJS)\test_gui_dataviewctrltest.o: ./controls/dataviewctrltest.cpp
- $(CXX) -c -o $@ $(TEST_GUI_CXXFLAGS) $(CPPDEPS) $<
-
-$(OBJS)\test_gui_datepickerctrltest.o: ./controls/datepickerctrltest.cpp
- $(CXX) -c -o $@ $(TEST_GUI_CXXFLAGS) $(CPPDEPS) $<
-
-$(OBJS)\test_gui_frametest.o: ./controls/frametest.cpp
- $(CXX) -c -o $@ $(TEST_GUI_CXXFLAGS) $(CPPDEPS) $<
-
-$(OBJS)\test_gui_gaugetest.o: ./controls/gaugetest.cpp
- $(CXX) -c -o $@ $(TEST_GUI_CXXFLAGS) $(CPPDEPS) $<
-
-$(OBJS)\test_gui_gridtest.o: ./controls/gridtest.cpp
- $(CXX) -c -o $@ $(TEST_GUI_CXXFLAGS) $(CPPDEPS) $<
-
-$(OBJS)\test_gui_headerctrltest.o: ./controls/headerctrltest.cpp
- $(CXX) -c -o $@ $(TEST_GUI_CXXFLAGS) $(CPPDEPS) $<
-
-$(OBJS)\test_gui_htmllboxtest.o: ./controls/htmllboxtest.cpp
- $(CXX) -c -o $@ $(TEST_GUI_CXXFLAGS) $(CPPDEPS) $<
-
-$(OBJS)\test_gui_hyperlinkctrltest.o: ./controls/hyperlinkctrltest.cpp
- $(CXX) -c -o $@ $(TEST_GUI_CXXFLAGS) $(CPPDEPS) $<
-
-$(OBJS)\test_gui_itemcontainertest.o: ./controls/itemcontainertest.cpp
- $(CXX) -c -o $@ $(TEST_GUI_CXXFLAGS) $(CPPDEPS) $<
-
-$(OBJS)\test_gui_label.o: ./controls/label.cpp
- $(CXX) -c -o $@ $(TEST_GUI_CXXFLAGS) $(CPPDEPS) $<
-
-$(OBJS)\test_gui_listbasetest.o: ./controls/listbasetest.cpp
- $(CXX) -c -o $@ $(TEST_GUI_CXXFLAGS) $(CPPDEPS) $<
-
-$(OBJS)\test_gui_listbooktest.o: ./controls/listbooktest.cpp
- $(CXX) -c -o $@ $(TEST_GUI_CXXFLAGS) $(CPPDEPS) $<
-
-$(OBJS)\test_gui_listboxtest.o: ./controls/listboxtest.cpp
- $(CXX) -c -o $@ $(TEST_GUI_CXXFLAGS) $(CPPDEPS) $<
-
-$(OBJS)\test_gui_listctrltest.o: ./controls/listctrltest.cpp
- $(CXX) -c -o $@ $(TEST_GUI_CXXFLAGS) $(CPPDEPS) $<
-
-$(OBJS)\test_gui_listviewtest.o: ./controls/listviewtest.cpp
- $(CXX) -c -o $@ $(TEST_GUI_CXXFLAGS) $(CPPDEPS) $<
-
-$(OBJS)\test_gui_markuptest.o: ./controls/markuptest.cpp
- $(CXX) -c -o $@ $(TEST_GUI_CXXFLAGS) $(CPPDEPS) $<
-
-$(OBJS)\test_gui_notebooktest.o: ./controls/notebooktest.cpp
- $(CXX) -c -o $@ $(TEST_GUI_CXXFLAGS) $(CPPDEPS) $<
-
-$(OBJS)\test_gui_ownerdrawncomboboxtest.o: ./controls/ownerdrawncomboboxtest.cpp
- $(CXX) -c -o $@ $(TEST_GUI_CXXFLAGS) $(CPPDEPS) $<
-
-$(OBJS)\test_gui_pickerbasetest.o: ./controls/pickerbasetest.cpp
- $(CXX) -c -o $@ $(TEST_GUI_CXXFLAGS) $(CPPDEPS) $<
-
-$(OBJS)\test_gui_pickertest.o: ./controls/pickertest.cpp
- $(CXX) -c -o $@ $(TEST_GUI_CXXFLAGS) $(CPPDEPS) $<
-
-$(OBJS)\test_gui_radioboxtest.o: ./controls/radioboxtest.cpp
- $(CXX) -c -o $@ $(TEST_GUI_CXXFLAGS) $(CPPDEPS) $<
-
-$(OBJS)\test_gui_radiobuttontest.o: ./controls/radiobuttontest.cpp
- $(CXX) -c -o $@ $(TEST_GUI_CXXFLAGS) $(CPPDEPS) $<
-
-$(OBJS)\test_gui_rearrangelisttest.o: ./controls/rearrangelisttest.cpp
- $(CXX) -c -o $@ $(TEST_GUI_CXXFLAGS) $(CPPDEPS) $<
-
-$(OBJS)\test_gui_richtextctrltest.o: ./controls/richtextctrltest.cpp
- $(CXX) -c -o $@ $(TEST_GUI_CXXFLAGS) $(CPPDEPS) $<
-
-$(OBJS)\test_gui_searchctrltest.o: ./controls/searchctrltest.cpp
- $(CXX) -c -o $@ $(TEST_GUI_CXXFLAGS) $(CPPDEPS) $<
-
-$(OBJS)\test_gui_simplebooktest.o: ./controls/simplebooktest.cpp
- $(CXX) -c -o $@ $(TEST_GUI_CXXFLAGS) $(CPPDEPS) $<
-
-$(OBJS)\test_gui_slidertest.o: ./controls/slidertest.cpp
- $(CXX) -c -o $@ $(TEST_GUI_CXXFLAGS) $(CPPDEPS) $<
-
-$(OBJS)\test_gui_spinctrldbltest.o: ./controls/spinctrldbltest.cpp
- $(CXX) -c -o $@ $(TEST_GUI_CXXFLAGS) $(CPPDEPS) $<
-
-$(OBJS)\test_gui_spinctrltest.o: ./controls/spinctrltest.cpp
- $(CXX) -c -o $@ $(TEST_GUI_CXXFLAGS) $(CPPDEPS) $<
-
-$(OBJS)\test_gui_textctrltest.o: ./controls/textctrltest.cpp
- $(CXX) -c -o $@ $(TEST_GUI_CXXFLAGS) $(CPPDEPS) $<
-
-$(OBJS)\test_gui_textentrytest.o: ./controls/textentrytest.cpp
- $(CXX) -c -o $@ $(TEST_GUI_CXXFLAGS) $(CPPDEPS) $<
-
-$(OBJS)\test_gui_togglebuttontest.o: ./controls/togglebuttontest.cpp
- $(CXX) -c -o $@ $(TEST_GUI_CXXFLAGS) $(CPPDEPS) $<
-
-$(OBJS)\test_gui_toolbooktest.o: ./controls/toolbooktest.cpp
- $(CXX) -c -o $@ $(TEST_GUI_CXXFLAGS) $(CPPDEPS) $<
-
-$(OBJS)\test_gui_treebooktest.o: ./controls/treebooktest.cpp
- $(CXX) -c -o $@ $(TEST_GUI_CXXFLAGS) $(CPPDEPS) $<
-
-$(OBJS)\test_gui_treectrltest.o: ./controls/treectrltest.cpp
- $(CXX) -c -o $@ $(TEST_GUI_CXXFLAGS) $(CPPDEPS) $<
-
-$(OBJS)\test_gui_treelistctrltest.o: ./controls/treelistctrltest.cpp
- $(CXX) -c -o $@ $(TEST_GUI_CXXFLAGS) $(CPPDEPS) $<
-
-$(OBJS)\test_gui_virtlistctrltest.o: ./controls/virtlistctrltest.cpp
- $(CXX) -c -o $@ $(TEST_GUI_CXXFLAGS) $(CPPDEPS) $<
-
-$(OBJS)\test_gui_webtest.o: ./controls/webtest.cpp
- $(CXX) -c -o $@ $(TEST_GUI_CXXFLAGS) $(CPPDEPS) $<
-
-$(OBJS)\test_gui_windowtest.o: ./controls/windowtest.cpp
- $(CXX) -c -o $@ $(TEST_GUI_CXXFLAGS) $(CPPDEPS) $<
-
-$(OBJS)\test_gui_dialogtest.o: ./controls/dialogtest.cpp
- $(CXX) -c -o $@ $(TEST_GUI_CXXFLAGS) $(CPPDEPS) $<
-
-$(OBJS)\test_gui_clone.o: ./events/clone.cpp
- $(CXX) -c -o $@ $(TEST_GUI_CXXFLAGS) $(CPPDEPS) $<
-
-$(OBJS)\test_gui_evtlooptest.o: ./events/evtlooptest.cpp
- $(CXX) -c -o $@ $(TEST_GUI_CXXFLAGS) $(CPPDEPS) $<
-
-$(OBJS)\test_gui_propagation.o: ./events/propagation.cpp
- $(CXX) -c -o $@ $(TEST_GUI_CXXFLAGS) $(CPPDEPS) $<
-
-$(OBJS)\test_gui_keyboard.o: ./events/keyboard.cpp
- $(CXX) -c -o $@ $(TEST_GUI_CXXFLAGS) $(CPPDEPS) $<
-
-$(OBJS)\test_gui_exec.o: ./exec/exec.cpp
- $(CXX) -c -o $@ $(TEST_GUI_CXXFLAGS) $(CPPDEPS) $<
-
-$(OBJS)\test_gui_fonttest.o: ./font/fonttest.cpp
- $(CXX) -c -o $@ $(TEST_GUI_CXXFLAGS) $(CPPDEPS) $<
-
-$(OBJS)\test_gui_image.o: ./image/image.cpp
- $(CXX) -c -o $@ $(TEST_GUI_CXXFLAGS) $(CPPDEPS) $<
-
-$(OBJS)\test_gui_rawbmp.o: ./image/rawbmp.cpp
- $(CXX) -c -o $@ $(TEST_GUI_CXXFLAGS) $(CPPDEPS) $<
-
-$(OBJS)\test_gui_htmlparser.o: ./html/htmlparser.cpp
- $(CXX) -c -o $@ $(TEST_GUI_CXXFLAGS) $(CPPDEPS) $<
-
-$(OBJS)\test_gui_htmlwindow.o: ./html/htmlwindow.cpp
- $(CXX) -c -o $@ $(TEST_GUI_CXXFLAGS) $(CPPDEPS) $<
-
-$(OBJS)\test_gui_accelentry.o: ./menu/accelentry.cpp
- $(CXX) -c -o $@ $(TEST_GUI_CXXFLAGS) $(CPPDEPS) $<
-
-$(OBJS)\test_gui_menu.o: ./menu/menu.cpp
- $(CXX) -c -o $@ $(TEST_GUI_CXXFLAGS) $(CPPDEPS) $<
-
-$(OBJS)\test_gui_guifuncs.o: ./misc/guifuncs.cpp
- $(CXX) -c -o $@ $(TEST_GUI_CXXFLAGS) $(CPPDEPS) $<
-
-$(OBJS)\test_gui_selstoretest.o: ./misc/selstoretest.cpp
- $(CXX) -c -o $@ $(TEST_GUI_CXXFLAGS) $(CPPDEPS) $<
-
-$(OBJS)\test_gui_garbage.o: ./misc/garbage.cpp
- $(CXX) -c -o $@ $(TEST_GUI_CXXFLAGS) $(CPPDEPS) $<
-
-$(OBJS)\test_gui_safearrayconverttest.o: ./misc/safearrayconverttest.cpp
- $(CXX) -c -o $@ $(TEST_GUI_CXXFLAGS) $(CPPDEPS) $<
-
-$(OBJS)\test_gui_settings.o: ./misc/settings.cpp
- $(CXX) -c -o $@ $(TEST_GUI_CXXFLAGS) $(CPPDEPS) $<
-
-$(OBJS)\test_gui_socket.o: ./net/socket.cpp
- $(CXX) -c -o $@ $(TEST_GUI_CXXFLAGS) $(CPPDEPS) $<
-
-$(OBJS)\test_gui_boxsizer.o: ./sizers/boxsizer.cpp
- $(CXX) -c -o $@ $(TEST_GUI_CXXFLAGS) $(CPPDEPS) $<
-
-$(OBJS)\test_gui_wrapsizer.o: ./sizers/wrapsizer.cpp
- $(CXX) -c -o $@ $(TEST_GUI_CXXFLAGS) $(CPPDEPS) $<
-
-$(OBJS)\test_gui_toplevel.o: ./toplevel/toplevel.cpp
- $(CXX) -c -o $@ $(TEST_GUI_CXXFLAGS) $(CPPDEPS) $<
-
-$(OBJS)\test_gui_valnum.o: ./validators/valnum.cpp
- $(CXX) -c -o $@ $(TEST_GUI_CXXFLAGS) $(CPPDEPS) $<
-
-$(OBJS)\test_gui_clientsize.o: ./window/clientsize.cpp
- $(CXX) -c -o $@ $(TEST_GUI_CXXFLAGS) $(CPPDEPS) $<
-
-$(OBJS)\test_gui_setsize.o: ./window/setsize.cpp
- $(CXX) -c -o $@ $(TEST_GUI_CXXFLAGS) $(CPPDEPS) $<
-
-$(OBJS)\test_gui_xrctest.o: ./xml/xrctest.cpp
- $(CXX) -c -o $@ $(TEST_GUI_CXXFLAGS) $(CPPDEPS) $<
-
-.PHONY: all clean data data-images fr
-
-
-SHELL := $(COMSPEC)
-
-# Dependencies tracking:
--include $(OBJS)/*.d
+# =========================================================================
+# This makefile was generated by
+# Bakefile 0.2.9 (http://www.bakefile.org)
+# Do not modify, all changes will be overwritten!
+# =========================================================================
+
+include ../build/msw/config.gcc
+
+# -------------------------------------------------------------------------
+# Do not modify the rest of this file!
+# -------------------------------------------------------------------------
+
+### Variables: ###
+
+CPPDEPS = -MT$@ -MF$@.d -MD -MP
+WX_RELEASE_NODOT = 31
+COMPILER_PREFIX = gcc
+OBJS = \
+ $(COMPILER_PREFIX)$(COMPILER_VERSION)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)
+LIBDIRNAME = \
+ .\..\lib\$(COMPILER_PREFIX)$(COMPILER_VERSION)_$(LIBTYPE_SUFFIX)$(CFG)
+SETUPHDIR = \
+ $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)
+TEST_CXXFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG) $(__THREADSFLAG) $(GCCFLAGS) \
+ -DHAVE_W32API_H -D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \
+ $(__NDEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \
+ $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) -I$(SETUPHDIR) -I.\..\include \
+ $(____CAIRO_INCLUDEDIR_FILENAMES) -W -Wall -I. $(__DLLFLAG_p) -DwxUSE_GUI=0 \
+ $(CPPUNIT_CFLAGS) $(__RTTIFLAG) $(__EXCEPTIONSFLAG) -Wno-ctor-dtor-privacy \
+ $(CPPFLAGS) $(CXXFLAGS)
+TEST_OBJECTS = \
+ $(OBJS)\test_dummy.o \
+ $(OBJS)\test_test.o \
+ $(OBJS)\test_anytest.o \
+ $(OBJS)\test_archivetest.o \
+ $(OBJS)\test_ziptest.o \
+ $(OBJS)\test_tartest.o \
+ $(OBJS)\test_arrays.o \
+ $(OBJS)\test_base64.o \
+ $(OBJS)\test_cmdlinetest.o \
+ $(OBJS)\test_fileconf.o \
+ $(OBJS)\test_regconf.o \
+ $(OBJS)\test_datetimetest.o \
+ $(OBJS)\test_evthandler.o \
+ $(OBJS)\test_evtlooptest.o \
+ $(OBJS)\test_evtsource.o \
+ $(OBJS)\test_stopwatch.o \
+ $(OBJS)\test_timertest.o \
+ $(OBJS)\test_exec.o \
+ $(OBJS)\test_dir.o \
+ $(OBJS)\test_filefn.o \
+ $(OBJS)\test_filetest.o \
+ $(OBJS)\test_filekind.o \
+ $(OBJS)\test_filenametest.o \
+ $(OBJS)\test_filesystest.o \
+ $(OBJS)\test_fontmaptest.o \
+ $(OBJS)\test_formatconvertertest.o \
+ $(OBJS)\test_fswatchertest.o \
+ $(OBJS)\test_hashes.o \
+ $(OBJS)\test_output.o \
+ $(OBJS)\test_input.o \
+ $(OBJS)\test_intltest.o \
+ $(OBJS)\test_lists.o \
+ $(OBJS)\test_logtest.o \
+ $(OBJS)\test_longlongtest.o \
+ $(OBJS)\test_convautotest.o \
+ $(OBJS)\test_mbconvtest.o \
+ $(OBJS)\test_dynamiclib.o \
+ $(OBJS)\test_environ.o \
+ $(OBJS)\test_metatest.o \
+ $(OBJS)\test_misctests.o \
+ $(OBJS)\test_module.o \
+ $(OBJS)\test_pathlist.o \
+ $(OBJS)\test_typeinfotest.o \
+ $(OBJS)\test_ipc.o \
+ $(OBJS)\test_socket.o \
+ $(OBJS)\test_regextest.o \
+ $(OBJS)\test_wxregextest.o \
+ $(OBJS)\test_scopeguardtest.o \
+ $(OBJS)\test_iostream.o \
+ $(OBJS)\test_numformatter.o \
+ $(OBJS)\test_strings.o \
+ $(OBJS)\test_stdstrings.o \
+ $(OBJS)\test_tokenizer.o \
+ $(OBJS)\test_unichar.o \
+ $(OBJS)\test_unicode.o \
+ $(OBJS)\test_vararg.o \
+ $(OBJS)\test_crt.o \
+ $(OBJS)\test_vsnprintf.o \
+ $(OBJS)\test_bstream.o \
+ $(OBJS)\test_datastreamtest.o \
+ $(OBJS)\test_ffilestream.o \
+ $(OBJS)\test_fileback.o \
+ $(OBJS)\test_filestream.o \
+ $(OBJS)\test_iostreams.o \
+ $(OBJS)\test_largefile.o \
+ $(OBJS)\test_memstream.o \
+ $(OBJS)\test_socketstream.o \
+ $(OBJS)\test_sstream.o \
+ $(OBJS)\test_stdstream.o \
+ $(OBJS)\test_tempfile.o \
+ $(OBJS)\test_textstreamtest.o \
+ $(OBJS)\test_zlibstream.o \
+ $(OBJS)\test_textfiletest.o \
+ $(OBJS)\test_atomic.o \
+ $(OBJS)\test_misc.o \
+ $(OBJS)\test_queue.o \
+ $(OBJS)\test_tls.o \
+ $(OBJS)\test_ftp.o \
+ $(OBJS)\test_uris.o \
+ $(OBJS)\test_url.o \
+ $(OBJS)\test_vectors.o \
+ $(OBJS)\test_evtconnection.o \
+ $(OBJS)\test_weakref.o \
+ $(OBJS)\test_xlocale.o \
+ $(OBJS)\test_xmltest.o
+TEST_DRAWING_CXXFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG) $(__THREADSFLAG) \
+ $(GCCFLAGS) -DHAVE_W32API_H -D__WXMSW__ $(__WXUNIV_DEFINE_p) \
+ $(__DEBUG_DEFINE_p) $(__NDEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) \
+ $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) \
+ -I$(SETUPHDIR) -I.\..\include $(____CAIRO_INCLUDEDIR_FILENAMES) -W -Wall -I. \
+ $(__DLLFLAG_p) -DwxUSE_GUI=0 $(CPPUNIT_CFLAGS) $(__RTTIFLAG) \
+ $(__EXCEPTIONSFLAG) -Wno-ctor-dtor-privacy $(CPPFLAGS) $(CXXFLAGS)
+TEST_DRAWING_OBJECTS = \
+ $(OBJS)\test_drawing_dummy.o \
+ $(OBJS)\test_drawing_test.o \
+ $(OBJS)\test_drawing_drawing.o \
+ $(OBJS)\test_drawing_plugindriver.o \
+ $(OBJS)\test_drawing_basictest.o \
+ $(OBJS)\test_drawing_fonttest.o
+TEST_DRAWINGPLUGIN_CXXFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG) \
+ $(__THREADSFLAG) $(GCCFLAGS) -DHAVE_W32API_H -D__WXMSW__ \
+ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__NDEBUG_DEFINE_p) \
+ $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \
+ $(__UNICODE_DEFINE_p) -I$(SETUPHDIR) -I.\..\include \
+ $(____CAIRO_INCLUDEDIR_FILENAMES) -W -Wall $(__DLLFLAG_p) $(__RTTIFLAG) \
+ $(__EXCEPTIONSFLAG) -Wno-ctor-dtor-privacy $(CPPFLAGS) $(CXXFLAGS)
+TEST_DRAWINGPLUGIN_OBJECTS = \
+ $(OBJS)\test_drawingplugin_pluginsample.o
+TEST_GUI_CXXFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG) $(__THREADSFLAG) \
+ $(GCCFLAGS) -DHAVE_W32API_H -D__WXMSW__ $(__WXUNIV_DEFINE_p) \
+ $(__DEBUG_DEFINE_p) $(__NDEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) \
+ $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) \
+ -I$(SETUPHDIR) -I.\..\include $(____CAIRO_INCLUDEDIR_FILENAMES) -W -Wall -I. \
+ $(__DLLFLAG_p) -I.\..\samples -DNOPCH $(CPPUNIT_CFLAGS) $(__RTTIFLAG) \
+ $(__EXCEPTIONSFLAG) -Wno-ctor-dtor-privacy $(CPPFLAGS) $(CXXFLAGS)
+TEST_GUI_OBJECTS = \
+ $(OBJS)\test_gui_sample_rc.o \
+ $(OBJS)\test_gui_dummy.o \
+ $(OBJS)\test_gui_asserthelper.o \
+ $(OBJS)\test_gui_test.o \
+ $(OBJS)\test_gui_testableframe.o \
+ $(OBJS)\test_gui_rect.o \
+ $(OBJS)\test_gui_size.o \
+ $(OBJS)\test_gui_point.o \
+ $(OBJS)\test_gui_region.o \
+ $(OBJS)\test_gui_bitmap.o \
+ $(OBJS)\test_gui_colour.o \
+ $(OBJS)\test_gui_ellipsization.o \
+ $(OBJS)\test_gui_measuring.o \
+ $(OBJS)\test_gui_affinematrix.o \
+ $(OBJS)\test_gui_boundingbox.o \
+ $(OBJS)\test_gui_config.o \
+ $(OBJS)\test_gui_bitmapcomboboxtest.o \
+ $(OBJS)\test_gui_bitmaptogglebuttontest.o \
+ $(OBJS)\test_gui_bookctrlbasetest.o \
+ $(OBJS)\test_gui_buttontest.o \
+ $(OBJS)\test_gui_checkboxtest.o \
+ $(OBJS)\test_gui_checklistboxtest.o \
+ $(OBJS)\test_gui_choicebooktest.o \
+ $(OBJS)\test_gui_choicetest.o \
+ $(OBJS)\test_gui_comboboxtest.o \
+ $(OBJS)\test_gui_dataviewctrltest.o \
+ $(OBJS)\test_gui_datepickerctrltest.o \
+ $(OBJS)\test_gui_frametest.o \
+ $(OBJS)\test_gui_gaugetest.o \
+ $(OBJS)\test_gui_gridtest.o \
+ $(OBJS)\test_gui_headerctrltest.o \
+ $(OBJS)\test_gui_htmllboxtest.o \
+ $(OBJS)\test_gui_hyperlinkctrltest.o \
+ $(OBJS)\test_gui_itemcontainertest.o \
+ $(OBJS)\test_gui_label.o \
+ $(OBJS)\test_gui_listbasetest.o \
+ $(OBJS)\test_gui_listbooktest.o \
+ $(OBJS)\test_gui_listboxtest.o \
+ $(OBJS)\test_gui_listctrltest.o \
+ $(OBJS)\test_gui_listviewtest.o \
+ $(OBJS)\test_gui_markuptest.o \
+ $(OBJS)\test_gui_notebooktest.o \
+ $(OBJS)\test_gui_ownerdrawncomboboxtest.o \
+ $(OBJS)\test_gui_pickerbasetest.o \
+ $(OBJS)\test_gui_pickertest.o \
+ $(OBJS)\test_gui_radioboxtest.o \
+ $(OBJS)\test_gui_radiobuttontest.o \
+ $(OBJS)\test_gui_rearrangelisttest.o \
+ $(OBJS)\test_gui_richtextctrltest.o \
+ $(OBJS)\test_gui_searchctrltest.o \
+ $(OBJS)\test_gui_simplebooktest.o \
+ $(OBJS)\test_gui_slidertest.o \
+ $(OBJS)\test_gui_spinctrldbltest.o \
+ $(OBJS)\test_gui_spinctrltest.o \
+ $(OBJS)\test_gui_textctrltest.o \
+ $(OBJS)\test_gui_textentrytest.o \
+ $(OBJS)\test_gui_togglebuttontest.o \
+ $(OBJS)\test_gui_toolbooktest.o \
+ $(OBJS)\test_gui_treebooktest.o \
+ $(OBJS)\test_gui_treectrltest.o \
+ $(OBJS)\test_gui_treelistctrltest.o \
+ $(OBJS)\test_gui_virtlistctrltest.o \
+ $(OBJS)\test_gui_webtest.o \
+ $(OBJS)\test_gui_windowtest.o \
+ $(OBJS)\test_gui_dialogtest.o \
+ $(OBJS)\test_gui_clone.o \
+ $(OBJS)\test_gui_evtlooptest.o \
+ $(OBJS)\test_gui_propagation.o \
+ $(OBJS)\test_gui_keyboard.o \
+ $(OBJS)\test_gui_exec.o \
+ $(OBJS)\test_gui_fonttest.o \
+ $(OBJS)\test_gui_image.o \
+ $(OBJS)\test_gui_rawbmp.o \
+ $(OBJS)\test_gui_htmlparser.o \
+ $(OBJS)\test_gui_htmlwindow.o \
+ $(OBJS)\test_gui_accelentry.o \
+ $(OBJS)\test_gui_menu.o \
+ $(OBJS)\test_gui_guifuncs.o \
+ $(OBJS)\test_gui_selstoretest.o \
+ $(OBJS)\test_gui_garbage.o \
+ $(OBJS)\test_gui_safearrayconverttest.o \
+ $(OBJS)\test_gui_settings.o \
+ $(OBJS)\test_gui_socket.o \
+ $(OBJS)\test_gui_boxsizer.o \
+ $(OBJS)\test_gui_wrapsizer.o \
+ $(OBJS)\test_gui_toplevel.o \
+ $(OBJS)\test_gui_valnum.o \
+ $(OBJS)\test_gui_clientsize.o \
+ $(OBJS)\test_gui_setsize.o \
+ $(OBJS)\test_gui_xrctest.o
+
+### Conditionally set variables: ###
+
+ifeq ($(GCC_VERSION),2.95)
+GCCFLAGS = -fvtable-thunks
+endif
+ifeq ($(USE_GUI),0)
+PORTNAME = base
+endif
+ifeq ($(USE_GUI),1)
+PORTNAME = msw$(TOOLKIT_VERSION)
+endif
+ifeq ($(OFFICIAL_BUILD),1)
+COMPILER_VERSION = ERROR-COMPILER-VERSION-MUST-BE-SET-FOR-OFFICIAL-BUILD
+endif
+ifeq ($(BUILD),debug)
+WXDEBUGFLAG = d
+endif
+ifeq ($(UNICODE),1)
+WXUNICODEFLAG = u
+endif
+ifeq ($(WXUNIV),1)
+WXUNIVNAME = univ
+endif
+ifeq ($(SHARED),1)
+WXDLLFLAG = dll
+endif
+ifeq ($(SHARED),0)
+LIBTYPE_SUFFIX = lib
+endif
+ifeq ($(SHARED),1)
+LIBTYPE_SUFFIX = dll
+endif
+ifeq ($(MONOLITHIC),0)
+EXTRALIBS_FOR_BASE =
+endif
+ifeq ($(MONOLITHIC),1)
+EXTRALIBS_FOR_BASE =
+endif
+ifeq ($(MONOLITHIC),1)
+__LIB_PNG_IF_MONO_p = $(__LIB_PNG_p)
+endif
+ifeq ($(USE_GUI),1)
+__test_drawing___depname = $(OBJS)\test_drawing.exe
+endif
+ifeq ($(SHARED),1)
+ifeq ($(USE_GUI),1)
+__test_drawingplugin___depname = $(OBJS)\test_drawingplugin.dll
+endif
+endif
+ifeq ($(USE_GUI),1)
+__test_gui___depname = $(OBJS)\test_gui.exe
+endif
+ifeq ($(WXUNIV),1)
+__WXUNIV_DEFINE_p_6 = --define __WXUNIVERSAL__
+endif
+ifeq ($(DEBUG_FLAG),0)
+__DEBUG_DEFINE_p_6 = --define wxDEBUG_LEVEL=0
+endif
+ifeq ($(BUILD),release)
+__NDEBUG_DEFINE_p_6 = --define NDEBUG
+endif
+ifeq ($(USE_EXCEPTIONS),0)
+__EXCEPTIONS_DEFINE_p_6 = --define wxNO_EXCEPTIONS
+endif
+ifeq ($(USE_RTTI),0)
+__RTTI_DEFINE_p_6 = --define wxNO_RTTI
+endif
+ifeq ($(USE_THREADS),0)
+__THREAD_DEFINE_p_6 = --define wxNO_THREADS
+endif
+ifeq ($(UNICODE),0)
+__UNICODE_DEFINE_p_6 = --define wxUSE_UNICODE=0
+endif
+ifeq ($(UNICODE),1)
+__UNICODE_DEFINE_p_6 = --define _UNICODE
+endif
+ifeq ($(USE_CAIRO),1)
+__CAIRO_INCLUDEDIR_p_2 = --include-dir $(CAIRO_ROOT)/include/cairo
+endif
+ifeq ($(SHARED),1)
+__DLLFLAG_p_6 = --define WXUSINGDLL
+endif
+ifeq ($(MONOLITHIC),0)
+ifeq ($(USE_WEBVIEW),1)
+__WXLIB_WEBVIEW_p = \
+ -lwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_webview
+endif
+endif
+ifeq ($(MONOLITHIC),0)
+__WXLIB_RICHTEXT_p = \
+ -lwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_richtext
+endif
+ifeq ($(MONOLITHIC),0)
+ifeq ($(USE_MEDIA),1)
+__WXLIB_MEDIA_p = \
+ -lwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_media
+endif
+endif
+ifeq ($(MONOLITHIC),0)
+__WXLIB_XRC_p = \
+ -lwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xrc
+endif
+ifeq ($(MONOLITHIC),0)
+__WXLIB_ADV_p = \
+ -lwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_adv
+endif
+ifeq ($(MONOLITHIC),0)
+__WXLIB_HTML_p = \
+ -lwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_html
+endif
+ifeq ($(MONOLITHIC),0)
+__WXLIB_XML_p = \
+ -lwxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xml
+endif
+ifeq ($(MONOLITHIC),0)
+__WXLIB_NET_p = \
+ -lwxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_net
+endif
+ifeq ($(BUILD),debug)
+__OPTIMIZEFLAG = -O0
+endif
+ifeq ($(BUILD),release)
+__OPTIMIZEFLAG = -O2
+endif
+ifeq ($(USE_RTTI),0)
+__RTTIFLAG = -fno-rtti
+endif
+ifeq ($(USE_RTTI),1)
+__RTTIFLAG =
+endif
+ifeq ($(USE_EXCEPTIONS),0)
+__EXCEPTIONSFLAG = -fno-exceptions
+endif
+ifeq ($(USE_EXCEPTIONS),1)
+__EXCEPTIONSFLAG =
+endif
+ifeq ($(WXUNIV),1)
+__WXUNIV_DEFINE_p = -D__WXUNIVERSAL__
+endif
+ifeq ($(DEBUG_FLAG),0)
+__DEBUG_DEFINE_p = -DwxDEBUG_LEVEL=0
+endif
+ifeq ($(BUILD),release)
+__NDEBUG_DEFINE_p = -DNDEBUG
+endif
+ifeq ($(USE_EXCEPTIONS),0)
+__EXCEPTIONS_DEFINE_p = -DwxNO_EXCEPTIONS
+endif
+ifeq ($(USE_RTTI),0)
+__RTTI_DEFINE_p = -DwxNO_RTTI
+endif
+ifeq ($(USE_THREADS),0)
+__THREAD_DEFINE_p = -DwxNO_THREADS
+endif
+ifeq ($(UNICODE),0)
+__UNICODE_DEFINE_p = -DwxUSE_UNICODE=0
+endif
+ifeq ($(UNICODE),1)
+__UNICODE_DEFINE_p = -D_UNICODE
+endif
+ifeq ($(USE_CAIRO),1)
+____CAIRO_INCLUDEDIR_FILENAMES = -I$(CAIRO_ROOT)\include\cairo
+endif
+ifeq ($(SHARED),1)
+__DLLFLAG_p = -DWXUSINGDLL
+endif
+ifeq ($(MONOLITHIC),0)
+__WXLIB_CORE_p = \
+ -lwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core
+endif
+ifeq ($(MONOLITHIC),0)
+__WXLIB_BASE_p = \
+ -lwxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)
+endif
+ifeq ($(MONOLITHIC),1)
+__WXLIB_MONO_p = \
+ -lwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)
+endif
+ifeq ($(MONOLITHIC),1)
+ifeq ($(USE_STC),1)
+__LIB_SCINTILLA_IF_MONO_p = -lwxscintilla$(WXDEBUGFLAG)
+endif
+endif
+ifeq ($(USE_GUI),1)
+__LIB_TIFF_p = -lwxtiff$(WXDEBUGFLAG)
+endif
+ifeq ($(USE_GUI),1)
+__LIB_JPEG_p = -lwxjpeg$(WXDEBUGFLAG)
+endif
+ifeq ($(USE_GUI),1)
+__LIB_PNG_p = -lwxpng$(WXDEBUGFLAG)
+endif
+ifeq ($(USE_CAIRO),1)
+__CAIRO_LIB_p = -lcairo
+endif
+ifeq ($(USE_CAIRO),1)
+____CAIRO_LIBDIR_FILENAMES = -L$(CAIRO_ROOT)\lib
+endif
+ifeq ($(BUILD),debug)
+ifeq ($(DEBUG_INFO),default)
+__DEBUGINFO = -g
+endif
+endif
+ifeq ($(BUILD),release)
+ifeq ($(DEBUG_INFO),default)
+__DEBUGINFO =
+endif
+endif
+ifeq ($(DEBUG_INFO),0)
+__DEBUGINFO =
+endif
+ifeq ($(DEBUG_INFO),1)
+__DEBUGINFO = -g
+endif
+ifeq ($(USE_THREADS),0)
+__THREADSFLAG =
+endif
+ifeq ($(USE_THREADS),1)
+__THREADSFLAG = -mthreads
+endif
+
+
+all: $(OBJS)
+$(OBJS):
+ -if not exist $(OBJS) mkdir $(OBJS)
+
+### Targets: ###
+
+all: $(OBJS)\test.exe $(__test_drawing___depname) $(__test_drawingplugin___depname) $(__test_gui___depname) data data-images fr
+
+clean:
+ -if exist $(OBJS)\*.o del $(OBJS)\*.o
+ -if exist $(OBJS)\*.d del $(OBJS)\*.d
+ -if exist $(OBJS)\test.exe del $(OBJS)\test.exe
+ -if exist $(OBJS)\test_drawing.exe del $(OBJS)\test_drawing.exe
+ -if exist $(OBJS)\test_drawingplugin.dll del $(OBJS)\test_drawingplugin.dll
+ -if exist $(OBJS)\test_gui.exe del $(OBJS)\test_gui.exe
+
+$(OBJS)\test.exe: $(TEST_OBJECTS)
+ $(CXX) -o $@ $(TEST_OBJECTS) $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) $(CPPUNIT_LIBS) $(____CAIRO_LIBDIR_FILENAMES) $(LDFLAGS) $(__WXLIB_NET_p) $(__WXLIB_XML_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_PNG_IF_MONO_p) -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(EXTRALIBS_FOR_BASE) $(__CAIRO_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32 -lwininet
+
+ifeq ($(USE_GUI),1)
+$(OBJS)\test_drawing.exe: $(TEST_DRAWING_OBJECTS)
+ $(CXX) -o $@ $(TEST_DRAWING_OBJECTS) $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) $(CPPUNIT_LIBS) $(____CAIRO_LIBDIR_FILENAMES) $(LDFLAGS) $(__WXLIB_CORE_p) $(__WXLIB_NET_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_SCINTILLA_IF_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(EXTRALIBS_FOR_BASE) $(__CAIRO_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32 -lwininet
+endif
+
+ifeq ($(SHARED),1)
+ifeq ($(USE_GUI),1)
+$(OBJS)\test_drawingplugin.dll: $(TEST_DRAWINGPLUGIN_OBJECTS)
+ $(CXX) $(LINK_MODULE_FLAGS) -fPIC -o $@ $(TEST_DRAWINGPLUGIN_OBJECTS) $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) $(____CAIRO_LIBDIR_FILENAMES) $(LDFLAGS) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_SCINTILLA_IF_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(EXTRALIBS_FOR_BASE) $(__CAIRO_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32 -lwininet
+endif
+endif
+
+ifeq ($(USE_GUI),1)
+$(OBJS)\test_gui.exe: $(TEST_GUI_OBJECTS) $(OBJS)\test_gui_sample_rc.o
+ $(CXX) -o $@ $(TEST_GUI_OBJECTS) $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) $(CPPUNIT_LIBS) $(____CAIRO_LIBDIR_FILENAMES) $(LDFLAGS) $(__WXLIB_WEBVIEW_p) $(__WXLIB_RICHTEXT_p) $(__WXLIB_MEDIA_p) $(__WXLIB_XRC_p) $(__WXLIB_XML_p) $(__WXLIB_ADV_p) $(__WXLIB_HTML_p) $(__WXLIB_CORE_p) $(__WXLIB_NET_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_SCINTILLA_IF_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(EXTRALIBS_FOR_BASE) $(__CAIRO_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32 -lwininet
+endif
+
+data:
+ if not exist $(OBJS) mkdir $(OBJS)
+ for %%f in (horse.ani horse.bmp horse.cur horse.gif horse.ico horse.jpg horse.pcx horse.png horse.pnm horse.tga horse.tif horse.xpm) do if not exist $(OBJS)\%%f copy .\%%f $(OBJS)
+
+data-images:
+ if not exist image mkdir image
+ for %%f in (horse_grey.bmp horse_grey_flipped.bmp horse_rle4.bmp horse_rle4_flipped.bmp horse_rle8.bmp horse_rle8_flipped.bmp horse_bicubic_50x50.png horse_bicubic_100x100.png horse_bicubic_150x150.png horse_bicubic_300x300.png horse_bilinear_50x50.png horse_bilinear_100x100.png horse_bilinear_150x150.png horse_bilinear_300x300.png horse_box_average_50x50.png horse_box_average_100x100.png horse_box_average_150x150.png horse_box_average_300x300.png) do if not exist image\%%f copy .\image\%%f image
+
+fr:
+ if not exist $(OBJS)\intl\fr mkdir $(OBJS)\intl\fr
+ for %%f in (internat.po internat.mo) do if not exist $(OBJS)\intl\fr\%%f copy .\intl\fr\%%f $(OBJS)\intl\fr
+
+$(OBJS)\test_dummy.o: ./dummy.cpp
+ $(CXX) -c -o $@ $(TEST_CXXFLAGS) $(CPPDEPS) $<
+
+$(OBJS)\test_test.o: ./test.cpp
+ $(CXX) -c -o $@ $(TEST_CXXFLAGS) $(CPPDEPS) $<
+
+$(OBJS)\test_anytest.o: ./any/anytest.cpp
+ $(CXX) -c -o $@ $(TEST_CXXFLAGS) $(CPPDEPS) $<
+
+$(OBJS)\test_archivetest.o: ./archive/archivetest.cpp
+ $(CXX) -c -o $@ $(TEST_CXXFLAGS) $(CPPDEPS) $<
+
+$(OBJS)\test_ziptest.o: ./archive/ziptest.cpp
+ $(CXX) -c -o $@ $(TEST_CXXFLAGS) $(CPPDEPS) $<
+
+$(OBJS)\test_tartest.o: ./archive/tartest.cpp
+ $(CXX) -c -o $@ $(TEST_CXXFLAGS) $(CPPDEPS) $<
+
+$(OBJS)\test_arrays.o: ./arrays/arrays.cpp
+ $(CXX) -c -o $@ $(TEST_CXXFLAGS) $(CPPDEPS) $<
+
+$(OBJS)\test_base64.o: ./base64/base64.cpp
+ $(CXX) -c -o $@ $(TEST_CXXFLAGS) $(CPPDEPS) $<
+
+$(OBJS)\test_cmdlinetest.o: ./cmdline/cmdlinetest.cpp
+ $(CXX) -c -o $@ $(TEST_CXXFLAGS) $(CPPDEPS) $<
+
+$(OBJS)\test_fileconf.o: ./config/fileconf.cpp
+ $(CXX) -c -o $@ $(TEST_CXXFLAGS) $(CPPDEPS) $<
+
+$(OBJS)\test_regconf.o: ./config/regconf.cpp
+ $(CXX) -c -o $@ $(TEST_CXXFLAGS) $(CPPDEPS) $<
+
+$(OBJS)\test_datetimetest.o: ./datetime/datetimetest.cpp
+ $(CXX) -c -o $@ $(TEST_CXXFLAGS) $(CPPDEPS) $<
+
+$(OBJS)\test_evthandler.o: ./events/evthandler.cpp
+ $(CXX) -c -o $@ $(TEST_CXXFLAGS) $(CPPDEPS) $<
+
+$(OBJS)\test_evtlooptest.o: ./events/evtlooptest.cpp
+ $(CXX) -c -o $@ $(TEST_CXXFLAGS) $(CPPDEPS) $<
+
+$(OBJS)\test_evtsource.o: ./events/evtsource.cpp
+ $(CXX) -c -o $@ $(TEST_CXXFLAGS) $(CPPDEPS) $<
+
+$(OBJS)\test_stopwatch.o: ./events/stopwatch.cpp
+ $(CXX) -c -o $@ $(TEST_CXXFLAGS) $(CPPDEPS) $<
+
+$(OBJS)\test_timertest.o: ./events/timertest.cpp
+ $(CXX) -c -o $@ $(TEST_CXXFLAGS) $(CPPDEPS) $<
+
+$(OBJS)\test_exec.o: ./exec/exec.cpp
+ $(CXX) -c -o $@ $(TEST_CXXFLAGS) $(CPPDEPS) $<
+
+$(OBJS)\test_dir.o: ./file/dir.cpp
+ $(CXX) -c -o $@ $(TEST_CXXFLAGS) $(CPPDEPS) $<
+
+$(OBJS)\test_filefn.o: ./file/filefn.cpp
+ $(CXX) -c -o $@ $(TEST_CXXFLAGS) $(CPPDEPS) $<
+
+$(OBJS)\test_filetest.o: ./file/filetest.cpp
+ $(CXX) -c -o $@ $(TEST_CXXFLAGS) $(CPPDEPS) $<
+
+$(OBJS)\test_filekind.o: ./filekind/filekind.cpp
+ $(CXX) -c -o $@ $(TEST_CXXFLAGS) $(CPPDEPS) $<
+
+$(OBJS)\test_filenametest.o: ./filename/filenametest.cpp
+ $(CXX) -c -o $@ $(TEST_CXXFLAGS) $(CPPDEPS) $<
+
+$(OBJS)\test_filesystest.o: ./filesys/filesystest.cpp
+ $(CXX) -c -o $@ $(TEST_CXXFLAGS) $(CPPDEPS) $<
+
+$(OBJS)\test_fontmaptest.o: ./fontmap/fontmaptest.cpp
+ $(CXX) -c -o $@ $(TEST_CXXFLAGS) $(CPPDEPS) $<
+
+$(OBJS)\test_formatconvertertest.o: ./formatconverter/formatconvertertest.cpp
+ $(CXX) -c -o $@ $(TEST_CXXFLAGS) $(CPPDEPS) $<
+
+$(OBJS)\test_fswatchertest.o: ./fswatcher/fswatchertest.cpp
+ $(CXX) -c -o $@ $(TEST_CXXFLAGS) $(CPPDEPS) $<
+
+$(OBJS)\test_hashes.o: ./hashes/hashes.cpp
+ $(CXX) -c -o $@ $(TEST_CXXFLAGS) $(CPPDEPS) $<
+
+$(OBJS)\test_output.o: ./interactive/output.cpp
+ $(CXX) -c -o $@ $(TEST_CXXFLAGS) $(CPPDEPS) $<
+
+$(OBJS)\test_input.o: ./interactive/input.cpp
+ $(CXX) -c -o $@ $(TEST_CXXFLAGS) $(CPPDEPS) $<
+
+$(OBJS)\test_intltest.o: ./intl/intltest.cpp
+ $(CXX) -c -o $@ $(TEST_CXXFLAGS) $(CPPDEPS) $<
+
+$(OBJS)\test_lists.o: ./lists/lists.cpp
+ $(CXX) -c -o $@ $(TEST_CXXFLAGS) $(CPPDEPS) $<
+
+$(OBJS)\test_logtest.o: ./log/logtest.cpp
+ $(CXX) -c -o $@ $(TEST_CXXFLAGS) $(CPPDEPS) $<
+
+$(OBJS)\test_longlongtest.o: ./longlong/longlongtest.cpp
+ $(CXX) -c -o $@ $(TEST_CXXFLAGS) $(CPPDEPS) $<
+
+$(OBJS)\test_convautotest.o: ./mbconv/convautotest.cpp
+ $(CXX) -c -o $@ $(TEST_CXXFLAGS) $(CPPDEPS) $<
+
+$(OBJS)\test_mbconvtest.o: ./mbconv/mbconvtest.cpp
+ $(CXX) -c -o $@ $(TEST_CXXFLAGS) $(CPPDEPS) $<
+
+$(OBJS)\test_dynamiclib.o: ./misc/dynamiclib.cpp
+ $(CXX) -c -o $@ $(TEST_CXXFLAGS) $(CPPDEPS) $<
+
+$(OBJS)\test_environ.o: ./misc/environ.cpp
+ $(CXX) -c -o $@ $(TEST_CXXFLAGS) $(CPPDEPS) $<
+
+$(OBJS)\test_metatest.o: ./misc/metatest.cpp
+ $(CXX) -c -o $@ $(TEST_CXXFLAGS) $(CPPDEPS) $<
+
+$(OBJS)\test_misctests.o: ./misc/misctests.cpp
+ $(CXX) -c -o $@ $(TEST_CXXFLAGS) $(CPPDEPS) $<
+
+$(OBJS)\test_module.o: ./misc/module.cpp
+ $(CXX) -c -o $@ $(TEST_CXXFLAGS) $(CPPDEPS) $<
+
+$(OBJS)\test_pathlist.o: ./misc/pathlist.cpp
+ $(CXX) -c -o $@ $(TEST_CXXFLAGS) $(CPPDEPS) $<
+
+$(OBJS)\test_typeinfotest.o: ./misc/typeinfotest.cpp
+ $(CXX) -c -o $@ $(TEST_CXXFLAGS) $(CPPDEPS) $<
+
+$(OBJS)\test_ipc.o: ./net/ipc.cpp
+ $(CXX) -c -o $@ $(TEST_CXXFLAGS) $(CPPDEPS) $<
+
+$(OBJS)\test_socket.o: ./net/socket.cpp
+ $(CXX) -c -o $@ $(TEST_CXXFLAGS) $(CPPDEPS) $<
+
+$(OBJS)\test_regextest.o: ./regex/regextest.cpp
+ $(CXX) -c -o $@ $(TEST_CXXFLAGS) $(CPPDEPS) $<
+
+$(OBJS)\test_wxregextest.o: ./regex/wxregextest.cpp
+ $(CXX) -c -o $@ $(TEST_CXXFLAGS) $(CPPDEPS) $<
+
+$(OBJS)\test_scopeguardtest.o: ./scopeguard/scopeguardtest.cpp
+ $(CXX) -c -o $@ $(TEST_CXXFLAGS) $(CPPDEPS) $<
+
+$(OBJS)\test_iostream.o: ./strings/iostream.cpp
+ $(CXX) -c -o $@ $(TEST_CXXFLAGS) $(CPPDEPS) $<
+
+$(OBJS)\test_numformatter.o: ./strings/numformatter.cpp
+ $(CXX) -c -o $@ $(TEST_CXXFLAGS) $(CPPDEPS) $<
+
+$(OBJS)\test_strings.o: ./strings/strings.cpp
+ $(CXX) -c -o $@ $(TEST_CXXFLAGS) $(CPPDEPS) $<
+
+$(OBJS)\test_stdstrings.o: ./strings/stdstrings.cpp
+ $(CXX) -c -o $@ $(TEST_CXXFLAGS) $(CPPDEPS) $<
+
+$(OBJS)\test_tokenizer.o: ./strings/tokenizer.cpp
+ $(CXX) -c -o $@ $(TEST_CXXFLAGS) $(CPPDEPS) $<
+
+$(OBJS)\test_unichar.o: ./strings/unichar.cpp
+ $(CXX) -c -o $@ $(TEST_CXXFLAGS) $(CPPDEPS) $<
+
+$(OBJS)\test_unicode.o: ./strings/unicode.cpp
+ $(CXX) -c -o $@ $(TEST_CXXFLAGS) $(CPPDEPS) $<
+
+$(OBJS)\test_vararg.o: ./strings/vararg.cpp
+ $(CXX) -c -o $@ $(TEST_CXXFLAGS) $(CPPDEPS) $<
+
+$(OBJS)\test_crt.o: ./strings/crt.cpp
+ $(CXX) -c -o $@ $(TEST_CXXFLAGS) $(CPPDEPS) $<
+
+$(OBJS)\test_vsnprintf.o: ./strings/vsnprintf.cpp
+ $(CXX) -c -o $@ $(TEST_CXXFLAGS) $(CPPDEPS) $<
+
+$(OBJS)\test_bstream.o: ./streams/bstream.cpp
+ $(CXX) -c -o $@ $(TEST_CXXFLAGS) $(CPPDEPS) $<
+
+$(OBJS)\test_datastreamtest.o: ./streams/datastreamtest.cpp
+ $(CXX) -c -o $@ $(TEST_CXXFLAGS) $(CPPDEPS) $<
+
+$(OBJS)\test_ffilestream.o: ./streams/ffilestream.cpp
+ $(CXX) -c -o $@ $(TEST_CXXFLAGS) $(CPPDEPS) $<
+
+$(OBJS)\test_fileback.o: ./streams/fileback.cpp
+ $(CXX) -c -o $@ $(TEST_CXXFLAGS) $(CPPDEPS) $<
+
+$(OBJS)\test_filestream.o: ./streams/filestream.cpp
+ $(CXX) -c -o $@ $(TEST_CXXFLAGS) $(CPPDEPS) $<
+
+$(OBJS)\test_iostreams.o: ./streams/iostreams.cpp
+ $(CXX) -c -o $@ $(TEST_CXXFLAGS) $(CPPDEPS) $<
+
+$(OBJS)\test_largefile.o: ./streams/largefile.cpp
+ $(CXX) -c -o $@ $(TEST_CXXFLAGS) $(CPPDEPS) $<
+
+$(OBJS)\test_memstream.o: ./streams/memstream.cpp
+ $(CXX) -c -o $@ $(TEST_CXXFLAGS) $(CPPDEPS) $<
+
+$(OBJS)\test_socketstream.o: ./streams/socketstream.cpp
+ $(CXX) -c -o $@ $(TEST_CXXFLAGS) $(CPPDEPS) $<
+
+$(OBJS)\test_sstream.o: ./streams/sstream.cpp
+ $(CXX) -c -o $@ $(TEST_CXXFLAGS) $(CPPDEPS) $<
+
+$(OBJS)\test_stdstream.o: ./streams/stdstream.cpp
+ $(CXX) -c -o $@ $(TEST_CXXFLAGS) $(CPPDEPS) $<
+
+$(OBJS)\test_tempfile.o: ./streams/tempfile.cpp
+ $(CXX) -c -o $@ $(TEST_CXXFLAGS) $(CPPDEPS) $<
+
+$(OBJS)\test_textstreamtest.o: ./streams/textstreamtest.cpp
+ $(CXX) -c -o $@ $(TEST_CXXFLAGS) $(CPPDEPS) $<
+
+$(OBJS)\test_zlibstream.o: ./streams/zlibstream.cpp
+ $(CXX) -c -o $@ $(TEST_CXXFLAGS) $(CPPDEPS) $<
+
+$(OBJS)\test_textfiletest.o: ./textfile/textfiletest.cpp
+ $(CXX) -c -o $@ $(TEST_CXXFLAGS) $(CPPDEPS) $<
+
+$(OBJS)\test_atomic.o: ./thread/atomic.cpp
+ $(CXX) -c -o $@ $(TEST_CXXFLAGS) $(CPPDEPS) $<
+
+$(OBJS)\test_misc.o: ./thread/misc.cpp
+ $(CXX) -c -o $@ $(TEST_CXXFLAGS) $(CPPDEPS) $<
+
+$(OBJS)\test_queue.o: ./thread/queue.cpp
+ $(CXX) -c -o $@ $(TEST_CXXFLAGS) $(CPPDEPS) $<
+
+$(OBJS)\test_tls.o: ./thread/tls.cpp
+ $(CXX) -c -o $@ $(TEST_CXXFLAGS) $(CPPDEPS) $<
+
+$(OBJS)\test_ftp.o: ./uris/ftp.cpp
+ $(CXX) -c -o $@ $(TEST_CXXFLAGS) $(CPPDEPS) $<
+
+$(OBJS)\test_uris.o: ./uris/uris.cpp
+ $(CXX) -c -o $@ $(TEST_CXXFLAGS) $(CPPDEPS) $<
+
+$(OBJS)\test_url.o: ./uris/url.cpp
+ $(CXX) -c -o $@ $(TEST_CXXFLAGS) $(CPPDEPS) $<
+
+$(OBJS)\test_vectors.o: ./vectors/vectors.cpp
+ $(CXX) -c -o $@ $(TEST_CXXFLAGS) $(CPPDEPS) $<
+
+$(OBJS)\test_evtconnection.o: ./weakref/evtconnection.cpp
+ $(CXX) -c -o $@ $(TEST_CXXFLAGS) $(CPPDEPS) $<
+
+$(OBJS)\test_weakref.o: ./weakref/weakref.cpp
+ $(CXX) -c -o $@ $(TEST_CXXFLAGS) $(CPPDEPS) $<
+
+$(OBJS)\test_xlocale.o: ./xlocale/xlocale.cpp
+ $(CXX) -c -o $@ $(TEST_CXXFLAGS) $(CPPDEPS) $<
+
+$(OBJS)\test_xmltest.o: ./xml/xmltest.cpp
+ $(CXX) -c -o $@ $(TEST_CXXFLAGS) $(CPPDEPS) $<
+
+$(OBJS)\test_drawing_dummy.o: ./dummy.cpp
+ $(CXX) -c -o $@ $(TEST_DRAWING_CXXFLAGS) $(CPPDEPS) $<
+
+$(OBJS)\test_drawing_test.o: ./test.cpp
+ $(CXX) -c -o $@ $(TEST_DRAWING_CXXFLAGS) $(CPPDEPS) $<
+
+$(OBJS)\test_drawing_drawing.o: ./drawing/drawing.cpp
+ $(CXX) -c -o $@ $(TEST_DRAWING_CXXFLAGS) $(CPPDEPS) $<
+
+$(OBJS)\test_drawing_plugindriver.o: ./drawing/plugindriver.cpp
+ $(CXX) -c -o $@ $(TEST_DRAWING_CXXFLAGS) $(CPPDEPS) $<
+
+$(OBJS)\test_drawing_basictest.o: ./drawing/basictest.cpp
+ $(CXX) -c -o $@ $(TEST_DRAWING_CXXFLAGS) $(CPPDEPS) $<
+
+$(OBJS)\test_drawing_fonttest.o: ./drawing/fonttest.cpp
+ $(CXX) -c -o $@ $(TEST_DRAWING_CXXFLAGS) $(CPPDEPS) $<
+
+$(OBJS)\test_drawingplugin_pluginsample.o: ./drawing/pluginsample.cpp
+ $(CXX) -c -o $@ $(TEST_DRAWINGPLUGIN_CXXFLAGS) $(CPPDEPS) $<
+
+$(OBJS)\test_gui_sample_rc.o: ./../samples/sample.rc
+ $(WINDRES) -i$< -o$@ --define __WXMSW__ $(__WXUNIV_DEFINE_p_6) $(__DEBUG_DEFINE_p_6) $(__NDEBUG_DEFINE_p_6) $(__EXCEPTIONS_DEFINE_p_6) $(__RTTI_DEFINE_p_6) $(__THREAD_DEFINE_p_6) $(__UNICODE_DEFINE_p_6) --include-dir $(SETUPHDIR) --include-dir ./../include $(__CAIRO_INCLUDEDIR_p_2) --include-dir . $(__DLLFLAG_p_6) --include-dir ./../samples --define NOPCH
+
+$(OBJS)\test_gui_dummy.o: ./dummy.cpp
+ $(CXX) -c -o $@ $(TEST_GUI_CXXFLAGS) $(CPPDEPS) $<
+
+$(OBJS)\test_gui_asserthelper.o: ./asserthelper.cpp
+ $(CXX) -c -o $@ $(TEST_GUI_CXXFLAGS) $(CPPDEPS) $<
+
+$(OBJS)\test_gui_test.o: ./test.cpp
+ $(CXX) -c -o $@ $(TEST_GUI_CXXFLAGS) $(CPPDEPS) $<
+
+$(OBJS)\test_gui_testableframe.o: ./testableframe.cpp
+ $(CXX) -c -o $@ $(TEST_GUI_CXXFLAGS) $(CPPDEPS) $<
+
+$(OBJS)\test_gui_rect.o: ./geometry/rect.cpp
+ $(CXX) -c -o $@ $(TEST_GUI_CXXFLAGS) $(CPPDEPS) $<
+
+$(OBJS)\test_gui_size.o: ./geometry/size.cpp
+ $(CXX) -c -o $@ $(TEST_GUI_CXXFLAGS) $(CPPDEPS) $<
+
+$(OBJS)\test_gui_point.o: ./geometry/point.cpp
+ $(CXX) -c -o $@ $(TEST_GUI_CXXFLAGS) $(CPPDEPS) $<
+
+$(OBJS)\test_gui_region.o: ./geometry/region.cpp
+ $(CXX) -c -o $@ $(TEST_GUI_CXXFLAGS) $(CPPDEPS) $<
+
+$(OBJS)\test_gui_bitmap.o: ./graphics/bitmap.cpp
+ $(CXX) -c -o $@ $(TEST_GUI_CXXFLAGS) $(CPPDEPS) $<
+
+$(OBJS)\test_gui_colour.o: ./graphics/colour.cpp
+ $(CXX) -c -o $@ $(TEST_GUI_CXXFLAGS) $(CPPDEPS) $<
+
+$(OBJS)\test_gui_ellipsization.o: ./graphics/ellipsization.cpp
+ $(CXX) -c -o $@ $(TEST_GUI_CXXFLAGS) $(CPPDEPS) $<
+
+$(OBJS)\test_gui_measuring.o: ./graphics/measuring.cpp
+ $(CXX) -c -o $@ $(TEST_GUI_CXXFLAGS) $(CPPDEPS) $<
+
+$(OBJS)\test_gui_affinematrix.o: ./graphics/affinematrix.cpp
+ $(CXX) -c -o $@ $(TEST_GUI_CXXFLAGS) $(CPPDEPS) $<
+
+$(OBJS)\test_gui_boundingbox.o: ./graphics/boundingbox.cpp
+ $(CXX) -c -o $@ $(TEST_GUI_CXXFLAGS) $(CPPDEPS) $<
+
+$(OBJS)\test_gui_config.o: ./config/config.cpp
+ $(CXX) -c -o $@ $(TEST_GUI_CXXFLAGS) $(CPPDEPS) $<
+
+$(OBJS)\test_gui_bitmapcomboboxtest.o: ./controls/bitmapcomboboxtest.cpp
+ $(CXX) -c -o $@ $(TEST_GUI_CXXFLAGS) $(CPPDEPS) $<
+
+$(OBJS)\test_gui_bitmaptogglebuttontest.o: ./controls/bitmaptogglebuttontest.cpp
+ $(CXX) -c -o $@ $(TEST_GUI_CXXFLAGS) $(CPPDEPS) $<
+
+$(OBJS)\test_gui_bookctrlbasetest.o: ./controls/bookctrlbasetest.cpp
+ $(CXX) -c -o $@ $(TEST_GUI_CXXFLAGS) $(CPPDEPS) $<
+
+$(OBJS)\test_gui_buttontest.o: ./controls/buttontest.cpp
+ $(CXX) -c -o $@ $(TEST_GUI_CXXFLAGS) $(CPPDEPS) $<
+
+$(OBJS)\test_gui_checkboxtest.o: ./controls/checkboxtest.cpp
+ $(CXX) -c -o $@ $(TEST_GUI_CXXFLAGS) $(CPPDEPS) $<
+
+$(OBJS)\test_gui_checklistboxtest.o: ./controls/checklistboxtest.cpp
+ $(CXX) -c -o $@ $(TEST_GUI_CXXFLAGS) $(CPPDEPS) $<
+
+$(OBJS)\test_gui_choicebooktest.o: ./controls/choicebooktest.cpp
+ $(CXX) -c -o $@ $(TEST_GUI_CXXFLAGS) $(CPPDEPS) $<
+
+$(OBJS)\test_gui_choicetest.o: ./controls/choicetest.cpp
+ $(CXX) -c -o $@ $(TEST_GUI_CXXFLAGS) $(CPPDEPS) $<
+
+$(OBJS)\test_gui_comboboxtest.o: ./controls/comboboxtest.cpp
+ $(CXX) -c -o $@ $(TEST_GUI_CXXFLAGS) $(CPPDEPS) $<
+
+$(OBJS)\test_gui_dataviewctrltest.o: ./controls/dataviewctrltest.cpp
+ $(CXX) -c -o $@ $(TEST_GUI_CXXFLAGS) $(CPPDEPS) $<
+
+$(OBJS)\test_gui_datepickerctrltest.o: ./controls/datepickerctrltest.cpp
+ $(CXX) -c -o $@ $(TEST_GUI_CXXFLAGS) $(CPPDEPS) $<
+
+$(OBJS)\test_gui_frametest.o: ./controls/frametest.cpp
+ $(CXX) -c -o $@ $(TEST_GUI_CXXFLAGS) $(CPPDEPS) $<
+
+$(OBJS)\test_gui_gaugetest.o: ./controls/gaugetest.cpp
+ $(CXX) -c -o $@ $(TEST_GUI_CXXFLAGS) $(CPPDEPS) $<
+
+$(OBJS)\test_gui_gridtest.o: ./controls/gridtest.cpp
+ $(CXX) -c -o $@ $(TEST_GUI_CXXFLAGS) $(CPPDEPS) $<
+
+$(OBJS)\test_gui_headerctrltest.o: ./controls/headerctrltest.cpp
+ $(CXX) -c -o $@ $(TEST_GUI_CXXFLAGS) $(CPPDEPS) $<
+
+$(OBJS)\test_gui_htmllboxtest.o: ./controls/htmllboxtest.cpp
+ $(CXX) -c -o $@ $(TEST_GUI_CXXFLAGS) $(CPPDEPS) $<
+
+$(OBJS)\test_gui_hyperlinkctrltest.o: ./controls/hyperlinkctrltest.cpp
+ $(CXX) -c -o $@ $(TEST_GUI_CXXFLAGS) $(CPPDEPS) $<
+
+$(OBJS)\test_gui_itemcontainertest.o: ./controls/itemcontainertest.cpp
+ $(CXX) -c -o $@ $(TEST_GUI_CXXFLAGS) $(CPPDEPS) $<
+
+$(OBJS)\test_gui_label.o: ./controls/label.cpp
+ $(CXX) -c -o $@ $(TEST_GUI_CXXFLAGS) $(CPPDEPS) $<
+
+$(OBJS)\test_gui_listbasetest.o: ./controls/listbasetest.cpp
+ $(CXX) -c -o $@ $(TEST_GUI_CXXFLAGS) $(CPPDEPS) $<
+
+$(OBJS)\test_gui_listbooktest.o: ./controls/listbooktest.cpp
+ $(CXX) -c -o $@ $(TEST_GUI_CXXFLAGS) $(CPPDEPS) $<
+
+$(OBJS)\test_gui_listboxtest.o: ./controls/listboxtest.cpp
+ $(CXX) -c -o $@ $(TEST_GUI_CXXFLAGS) $(CPPDEPS) $<
+
+$(OBJS)\test_gui_listctrltest.o: ./controls/listctrltest.cpp
+ $(CXX) -c -o $@ $(TEST_GUI_CXXFLAGS) $(CPPDEPS) $<
+
+$(OBJS)\test_gui_listviewtest.o: ./controls/listviewtest.cpp
+ $(CXX) -c -o $@ $(TEST_GUI_CXXFLAGS) $(CPPDEPS) $<
+
+$(OBJS)\test_gui_markuptest.o: ./controls/markuptest.cpp
+ $(CXX) -c -o $@ $(TEST_GUI_CXXFLAGS) $(CPPDEPS) $<
+
+$(OBJS)\test_gui_notebooktest.o: ./controls/notebooktest.cpp
+ $(CXX) -c -o $@ $(TEST_GUI_CXXFLAGS) $(CPPDEPS) $<
+
+$(OBJS)\test_gui_ownerdrawncomboboxtest.o: ./controls/ownerdrawncomboboxtest.cpp
+ $(CXX) -c -o $@ $(TEST_GUI_CXXFLAGS) $(CPPDEPS) $<
+
+$(OBJS)\test_gui_pickerbasetest.o: ./controls/pickerbasetest.cpp
+ $(CXX) -c -o $@ $(TEST_GUI_CXXFLAGS) $(CPPDEPS) $<
+
+$(OBJS)\test_gui_pickertest.o: ./controls/pickertest.cpp
+ $(CXX) -c -o $@ $(TEST_GUI_CXXFLAGS) $(CPPDEPS) $<
+
+$(OBJS)\test_gui_radioboxtest.o: ./controls/radioboxtest.cpp
+ $(CXX) -c -o $@ $(TEST_GUI_CXXFLAGS) $(CPPDEPS) $<
+
+$(OBJS)\test_gui_radiobuttontest.o: ./controls/radiobuttontest.cpp
+ $(CXX) -c -o $@ $(TEST_GUI_CXXFLAGS) $(CPPDEPS) $<
+
+$(OBJS)\test_gui_rearrangelisttest.o: ./controls/rearrangelisttest.cpp
+ $(CXX) -c -o $@ $(TEST_GUI_CXXFLAGS) $(CPPDEPS) $<
+
+$(OBJS)\test_gui_richtextctrltest.o: ./controls/richtextctrltest.cpp
+ $(CXX) -c -o $@ $(TEST_GUI_CXXFLAGS) $(CPPDEPS) $<
+
+$(OBJS)\test_gui_searchctrltest.o: ./controls/searchctrltest.cpp
+ $(CXX) -c -o $@ $(TEST_GUI_CXXFLAGS) $(CPPDEPS) $<
+
+$(OBJS)\test_gui_simplebooktest.o: ./controls/simplebooktest.cpp
+ $(CXX) -c -o $@ $(TEST_GUI_CXXFLAGS) $(CPPDEPS) $<
+
+$(OBJS)\test_gui_slidertest.o: ./controls/slidertest.cpp
+ $(CXX) -c -o $@ $(TEST_GUI_CXXFLAGS) $(CPPDEPS) $<
+
+$(OBJS)\test_gui_spinctrldbltest.o: ./controls/spinctrldbltest.cpp
+ $(CXX) -c -o $@ $(TEST_GUI_CXXFLAGS) $(CPPDEPS) $<
+
+$(OBJS)\test_gui_spinctrltest.o: ./controls/spinctrltest.cpp
+ $(CXX) -c -o $@ $(TEST_GUI_CXXFLAGS) $(CPPDEPS) $<
+
+$(OBJS)\test_gui_textctrltest.o: ./controls/textctrltest.cpp
+ $(CXX) -c -o $@ $(TEST_GUI_CXXFLAGS) $(CPPDEPS) $<
+
+$(OBJS)\test_gui_textentrytest.o: ./controls/textentrytest.cpp
+ $(CXX) -c -o $@ $(TEST_GUI_CXXFLAGS) $(CPPDEPS) $<
+
+$(OBJS)\test_gui_togglebuttontest.o: ./controls/togglebuttontest.cpp
+ $(CXX) -c -o $@ $(TEST_GUI_CXXFLAGS) $(CPPDEPS) $<
+
+$(OBJS)\test_gui_toolbooktest.o: ./controls/toolbooktest.cpp
+ $(CXX) -c -o $@ $(TEST_GUI_CXXFLAGS) $(CPPDEPS) $<
+
+$(OBJS)\test_gui_treebooktest.o: ./controls/treebooktest.cpp
+ $(CXX) -c -o $@ $(TEST_GUI_CXXFLAGS) $(CPPDEPS) $<
+
+$(OBJS)\test_gui_treectrltest.o: ./controls/treectrltest.cpp
+ $(CXX) -c -o $@ $(TEST_GUI_CXXFLAGS) $(CPPDEPS) $<
+
+$(OBJS)\test_gui_treelistctrltest.o: ./controls/treelistctrltest.cpp
+ $(CXX) -c -o $@ $(TEST_GUI_CXXFLAGS) $(CPPDEPS) $<
+
+$(OBJS)\test_gui_virtlistctrltest.o: ./controls/virtlistctrltest.cpp
+ $(CXX) -c -o $@ $(TEST_GUI_CXXFLAGS) $(CPPDEPS) $<
+
+$(OBJS)\test_gui_webtest.o: ./controls/webtest.cpp
+ $(CXX) -c -o $@ $(TEST_GUI_CXXFLAGS) $(CPPDEPS) $<
+
+$(OBJS)\test_gui_windowtest.o: ./controls/windowtest.cpp
+ $(CXX) -c -o $@ $(TEST_GUI_CXXFLAGS) $(CPPDEPS) $<
+
+$(OBJS)\test_gui_dialogtest.o: ./controls/dialogtest.cpp
+ $(CXX) -c -o $@ $(TEST_GUI_CXXFLAGS) $(CPPDEPS) $<
+
+$(OBJS)\test_gui_clone.o: ./events/clone.cpp
+ $(CXX) -c -o $@ $(TEST_GUI_CXXFLAGS) $(CPPDEPS) $<
+
+$(OBJS)\test_gui_evtlooptest.o: ./events/evtlooptest.cpp
+ $(CXX) -c -o $@ $(TEST_GUI_CXXFLAGS) $(CPPDEPS) $<
+
+$(OBJS)\test_gui_propagation.o: ./events/propagation.cpp
+ $(CXX) -c -o $@ $(TEST_GUI_CXXFLAGS) $(CPPDEPS) $<
+
+$(OBJS)\test_gui_keyboard.o: ./events/keyboard.cpp
+ $(CXX) -c -o $@ $(TEST_GUI_CXXFLAGS) $(CPPDEPS) $<
+
+$(OBJS)\test_gui_exec.o: ./exec/exec.cpp
+ $(CXX) -c -o $@ $(TEST_GUI_CXXFLAGS) $(CPPDEPS) $<
+
+$(OBJS)\test_gui_fonttest.o: ./font/fonttest.cpp
+ $(CXX) -c -o $@ $(TEST_GUI_CXXFLAGS) $(CPPDEPS) $<
+
+$(OBJS)\test_gui_image.o: ./image/image.cpp
+ $(CXX) -c -o $@ $(TEST_GUI_CXXFLAGS) $(CPPDEPS) $<
+
+$(OBJS)\test_gui_rawbmp.o: ./image/rawbmp.cpp
+ $(CXX) -c -o $@ $(TEST_GUI_CXXFLAGS) $(CPPDEPS) $<
+
+$(OBJS)\test_gui_htmlparser.o: ./html/htmlparser.cpp
+ $(CXX) -c -o $@ $(TEST_GUI_CXXFLAGS) $(CPPDEPS) $<
+
+$(OBJS)\test_gui_htmlwindow.o: ./html/htmlwindow.cpp
+ $(CXX) -c -o $@ $(TEST_GUI_CXXFLAGS) $(CPPDEPS) $<
+
+$(OBJS)\test_gui_accelentry.o: ./menu/accelentry.cpp
+ $(CXX) -c -o $@ $(TEST_GUI_CXXFLAGS) $(CPPDEPS) $<
+
+$(OBJS)\test_gui_menu.o: ./menu/menu.cpp
+ $(CXX) -c -o $@ $(TEST_GUI_CXXFLAGS) $(CPPDEPS) $<
+
+$(OBJS)\test_gui_guifuncs.o: ./misc/guifuncs.cpp
+ $(CXX) -c -o $@ $(TEST_GUI_CXXFLAGS) $(CPPDEPS) $<
+
+$(OBJS)\test_gui_selstoretest.o: ./misc/selstoretest.cpp
+ $(CXX) -c -o $@ $(TEST_GUI_CXXFLAGS) $(CPPDEPS) $<
+
+$(OBJS)\test_gui_garbage.o: ./misc/garbage.cpp
+ $(CXX) -c -o $@ $(TEST_GUI_CXXFLAGS) $(CPPDEPS) $<
+
+$(OBJS)\test_gui_safearrayconverttest.o: ./misc/safearrayconverttest.cpp
+ $(CXX) -c -o $@ $(TEST_GUI_CXXFLAGS) $(CPPDEPS) $<
+
+$(OBJS)\test_gui_settings.o: ./misc/settings.cpp
+ $(CXX) -c -o $@ $(TEST_GUI_CXXFLAGS) $(CPPDEPS) $<
+
+$(OBJS)\test_gui_socket.o: ./net/socket.cpp
+ $(CXX) -c -o $@ $(TEST_GUI_CXXFLAGS) $(CPPDEPS) $<
+
+$(OBJS)\test_gui_boxsizer.o: ./sizers/boxsizer.cpp
+ $(CXX) -c -o $@ $(TEST_GUI_CXXFLAGS) $(CPPDEPS) $<
+
+$(OBJS)\test_gui_wrapsizer.o: ./sizers/wrapsizer.cpp
+ $(CXX) -c -o $@ $(TEST_GUI_CXXFLAGS) $(CPPDEPS) $<
+
+$(OBJS)\test_gui_toplevel.o: ./toplevel/toplevel.cpp
+ $(CXX) -c -o $@ $(TEST_GUI_CXXFLAGS) $(CPPDEPS) $<
+
+$(OBJS)\test_gui_valnum.o: ./validators/valnum.cpp
+ $(CXX) -c -o $@ $(TEST_GUI_CXXFLAGS) $(CPPDEPS) $<
+
+$(OBJS)\test_gui_clientsize.o: ./window/clientsize.cpp
+ $(CXX) -c -o $@ $(TEST_GUI_CXXFLAGS) $(CPPDEPS) $<
+
+$(OBJS)\test_gui_setsize.o: ./window/setsize.cpp
+ $(CXX) -c -o $@ $(TEST_GUI_CXXFLAGS) $(CPPDEPS) $<
+
+$(OBJS)\test_gui_xrctest.o: ./xml/xrctest.cpp
+ $(CXX) -c -o $@ $(TEST_GUI_CXXFLAGS) $(CPPDEPS) $<
+
+.PHONY: all clean data data-images fr
+
+
+SHELL := $(COMSPEC)
+
+# Dependencies tracking:
+-include $(OBJS)/*.d
diff --git a/tests/makefile.vc b/tests/makefile.vc
index b7b1304134..9aef18cb8b 100644
--- a/tests/makefile.vc
+++ b/tests/makefile.vc
@@ -1,1255 +1,1255 @@
-# =========================================================================
-# This makefile was generated by
-# Bakefile 0.2.9 (http://www.bakefile.org)
-# Do not modify, all changes will be overwritten!
-# =========================================================================
-
-!include <../build/msw/config.vc>
-
-# -------------------------------------------------------------------------
-# Do not modify the rest of this file!
-# -------------------------------------------------------------------------
-
-### Variables: ###
-
-WX_RELEASE_NODOT = 31
-COMPILER_PREFIX = vc
-OBJS = \
- $(COMPILER_PREFIX)$(COMPILER_VERSION)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)$(ARCH_SUFFIX)
-LIBDIRNAME = \
- .\..\lib\$(COMPILER_PREFIX)$(COMPILER_VERSION)$(ARCH_SUFFIX)_$(LIBTYPE_SUFFIX)$(CFG)
-SETUPHDIR = \
- $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)
-TEST_CXXFLAGS = /M$(__RUNTIME_LIBS_10)$(__DEBUGRUNTIME) /DWIN32 $(__DEBUGINFO) \
- /Fd$(OBJS)\test.pdb $(____DEBUGRUNTIME) $(__OPTIMIZEFLAG) \
- /D_CRT_SECURE_NO_DEPRECATE=1 /D_CRT_NON_CONFORMING_SWPRINTFS=1 \
- /D_SCL_SECURE_NO_WARNINGS=1 $(__NO_VC_CRTDBG_p) /D__WXMSW__ \
- $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__NDEBUG_DEFINE_p) \
- $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \
- $(__UNICODE_DEFINE_p) /I$(SETUPHDIR) /I.\..\include \
- $(____CAIRO_INCLUDEDIR_FILENAMES) /W4 /I. $(__DLLFLAG_p) /D_CONSOLE \
- /DwxUSE_GUI=0 $(CPPUNIT_CFLAGS) $(__RTTIFLAG) $(__EXCEPTIONSFLAG) \
- /Yu"testprec.h" /Fp"$(OBJS)\testprec_test.pch" $(CPPFLAGS) $(CXXFLAGS)
-TEST_OBJECTS = \
- $(OBJS)\test_dummy.obj \
- $(OBJS)\test_test.obj \
- $(OBJS)\test_anytest.obj \
- $(OBJS)\test_archivetest.obj \
- $(OBJS)\test_ziptest.obj \
- $(OBJS)\test_tartest.obj \
- $(OBJS)\test_arrays.obj \
- $(OBJS)\test_base64.obj \
- $(OBJS)\test_cmdlinetest.obj \
- $(OBJS)\test_fileconf.obj \
- $(OBJS)\test_regconf.obj \
- $(OBJS)\test_datetimetest.obj \
- $(OBJS)\test_evthandler.obj \
- $(OBJS)\test_evtlooptest.obj \
- $(OBJS)\test_evtsource.obj \
- $(OBJS)\test_stopwatch.obj \
- $(OBJS)\test_timertest.obj \
- $(OBJS)\test_exec.obj \
- $(OBJS)\test_dir.obj \
- $(OBJS)\test_filefn.obj \
- $(OBJS)\test_filetest.obj \
- $(OBJS)\test_filekind.obj \
- $(OBJS)\test_filenametest.obj \
- $(OBJS)\test_filesystest.obj \
- $(OBJS)\test_fontmaptest.obj \
- $(OBJS)\test_formatconvertertest.obj \
- $(OBJS)\test_fswatchertest.obj \
- $(OBJS)\test_hashes.obj \
- $(OBJS)\test_output.obj \
- $(OBJS)\test_input.obj \
- $(OBJS)\test_intltest.obj \
- $(OBJS)\test_lists.obj \
- $(OBJS)\test_logtest.obj \
- $(OBJS)\test_longlongtest.obj \
- $(OBJS)\test_convautotest.obj \
- $(OBJS)\test_mbconvtest.obj \
- $(OBJS)\test_dynamiclib.obj \
- $(OBJS)\test_environ.obj \
- $(OBJS)\test_metatest.obj \
- $(OBJS)\test_misctests.obj \
- $(OBJS)\test_module.obj \
- $(OBJS)\test_pathlist.obj \
- $(OBJS)\test_typeinfotest.obj \
- $(OBJS)\test_ipc.obj \
- $(OBJS)\test_socket.obj \
- $(OBJS)\test_regextest.obj \
- $(OBJS)\test_wxregextest.obj \
- $(OBJS)\test_scopeguardtest.obj \
- $(OBJS)\test_iostream.obj \
- $(OBJS)\test_numformatter.obj \
- $(OBJS)\test_strings.obj \
- $(OBJS)\test_stdstrings.obj \
- $(OBJS)\test_tokenizer.obj \
- $(OBJS)\test_unichar.obj \
- $(OBJS)\test_unicode.obj \
- $(OBJS)\test_vararg.obj \
- $(OBJS)\test_crt.obj \
- $(OBJS)\test_vsnprintf.obj \
- $(OBJS)\test_bstream.obj \
- $(OBJS)\test_datastreamtest.obj \
- $(OBJS)\test_ffilestream.obj \
- $(OBJS)\test_fileback.obj \
- $(OBJS)\test_filestream.obj \
- $(OBJS)\test_iostreams.obj \
- $(OBJS)\test_largefile.obj \
- $(OBJS)\test_memstream.obj \
- $(OBJS)\test_socketstream.obj \
- $(OBJS)\test_sstream.obj \
- $(OBJS)\test_stdstream.obj \
- $(OBJS)\test_tempfile.obj \
- $(OBJS)\test_textstreamtest.obj \
- $(OBJS)\test_zlibstream.obj \
- $(OBJS)\test_textfiletest.obj \
- $(OBJS)\test_atomic.obj \
- $(OBJS)\test_misc.obj \
- $(OBJS)\test_queue.obj \
- $(OBJS)\test_tls.obj \
- $(OBJS)\test_ftp.obj \
- $(OBJS)\test_uris.obj \
- $(OBJS)\test_url.obj \
- $(OBJS)\test_vectors.obj \
- $(OBJS)\test_evtconnection.obj \
- $(OBJS)\test_weakref.obj \
- $(OBJS)\test_xlocale.obj \
- $(OBJS)\test_xmltest.obj
-TEST_DRAWING_CXXFLAGS = /M$(__RUNTIME_LIBS_27)$(__DEBUGRUNTIME) /DWIN32 \
- $(__DEBUGINFO) /Fd$(OBJS)\test_drawing.pdb $(____DEBUGRUNTIME) \
- $(__OPTIMIZEFLAG) /D_CRT_SECURE_NO_DEPRECATE=1 \
- /D_CRT_NON_CONFORMING_SWPRINTFS=1 /D_SCL_SECURE_NO_WARNINGS=1 \
- $(__NO_VC_CRTDBG_p) /D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \
- $(__NDEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \
- $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) /I$(SETUPHDIR) /I.\..\include \
- $(____CAIRO_INCLUDEDIR_FILENAMES) /W4 /I. $(__DLLFLAG_p) /D_CONSOLE \
- /DwxUSE_GUI=0 $(CPPUNIT_CFLAGS) $(__RTTIFLAG) $(__EXCEPTIONSFLAG) \
- /Yu"testprec.h" /Fp"$(OBJS)\testprec_test_drawing.pch" $(CPPFLAGS) \
- $(CXXFLAGS)
-TEST_DRAWING_OBJECTS = \
- $(OBJS)\test_drawing_dummy.obj \
- $(OBJS)\test_drawing_test.obj \
- $(OBJS)\test_drawing_drawing.obj \
- $(OBJS)\test_drawing_plugindriver.obj \
- $(OBJS)\test_drawing_basictest.obj \
- $(OBJS)\test_drawing_fonttest.obj
-TEST_DRAWINGPLUGIN_CXXFLAGS = /M$(__RUNTIME_LIBS_45)$(__DEBUGRUNTIME) /DWIN32 \
- $(__DEBUGINFO) /Fd$(OBJS)\test_drawingplugin.pdb $(____DEBUGRUNTIME) \
- $(__OPTIMIZEFLAG) /D_CRT_SECURE_NO_DEPRECATE=1 \
- /D_CRT_NON_CONFORMING_SWPRINTFS=1 /D_SCL_SECURE_NO_WARNINGS=1 \
- $(__NO_VC_CRTDBG_p) /D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \
- $(__NDEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \
- $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) /I$(SETUPHDIR) /I.\..\include \
- $(____CAIRO_INCLUDEDIR_FILENAMES) /W4 $(__DLLFLAG_p) $(__RTTIFLAG) \
- $(__EXCEPTIONSFLAG) $(CPPFLAGS) $(CXXFLAGS)
-TEST_DRAWINGPLUGIN_OBJECTS = \
- $(OBJS)\test_drawingplugin_pluginsample.obj
-TEST_GUI_CXXFLAGS = /M$(__RUNTIME_LIBS_59)$(__DEBUGRUNTIME) /DWIN32 \
- $(__DEBUGINFO) /Fd$(OBJS)\test_gui.pdb $(____DEBUGRUNTIME) \
- $(__OPTIMIZEFLAG) /D_CRT_SECURE_NO_DEPRECATE=1 \
- /D_CRT_NON_CONFORMING_SWPRINTFS=1 /D_SCL_SECURE_NO_WARNINGS=1 \
- $(__NO_VC_CRTDBG_p) /D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \
- $(__NDEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \
- $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) /I$(SETUPHDIR) /I.\..\include \
- $(____CAIRO_INCLUDEDIR_FILENAMES) /W4 /I. $(__DLLFLAG_p) /I.\..\samples \
- /DNOPCH $(CPPUNIT_CFLAGS) /D_CONSOLE $(__RTTIFLAG) $(__EXCEPTIONSFLAG) \
- /Yu"testprec.h" /Fp"$(OBJS)\testprec_test_gui.pch" $(CPPFLAGS) $(CXXFLAGS)
-TEST_GUI_OBJECTS = \
- $(OBJS)\test_gui_dummy.obj \
- $(OBJS)\test_gui_asserthelper.obj \
- $(OBJS)\test_gui_test.obj \
- $(OBJS)\test_gui_testableframe.obj \
- $(OBJS)\test_gui_rect.obj \
- $(OBJS)\test_gui_size.obj \
- $(OBJS)\test_gui_point.obj \
- $(OBJS)\test_gui_region.obj \
- $(OBJS)\test_gui_bitmap.obj \
- $(OBJS)\test_gui_colour.obj \
- $(OBJS)\test_gui_ellipsization.obj \
- $(OBJS)\test_gui_measuring.obj \
- $(OBJS)\test_gui_affinematrix.obj \
- $(OBJS)\test_gui_boundingbox.obj \
- $(OBJS)\test_gui_config.obj \
- $(OBJS)\test_gui_bitmapcomboboxtest.obj \
- $(OBJS)\test_gui_bitmaptogglebuttontest.obj \
- $(OBJS)\test_gui_bookctrlbasetest.obj \
- $(OBJS)\test_gui_buttontest.obj \
- $(OBJS)\test_gui_checkboxtest.obj \
- $(OBJS)\test_gui_checklistboxtest.obj \
- $(OBJS)\test_gui_choicebooktest.obj \
- $(OBJS)\test_gui_choicetest.obj \
- $(OBJS)\test_gui_comboboxtest.obj \
- $(OBJS)\test_gui_dataviewctrltest.obj \
- $(OBJS)\test_gui_datepickerctrltest.obj \
- $(OBJS)\test_gui_frametest.obj \
- $(OBJS)\test_gui_gaugetest.obj \
- $(OBJS)\test_gui_gridtest.obj \
- $(OBJS)\test_gui_headerctrltest.obj \
- $(OBJS)\test_gui_htmllboxtest.obj \
- $(OBJS)\test_gui_hyperlinkctrltest.obj \
- $(OBJS)\test_gui_itemcontainertest.obj \
- $(OBJS)\test_gui_label.obj \
- $(OBJS)\test_gui_listbasetest.obj \
- $(OBJS)\test_gui_listbooktest.obj \
- $(OBJS)\test_gui_listboxtest.obj \
- $(OBJS)\test_gui_listctrltest.obj \
- $(OBJS)\test_gui_listviewtest.obj \
- $(OBJS)\test_gui_markuptest.obj \
- $(OBJS)\test_gui_notebooktest.obj \
- $(OBJS)\test_gui_ownerdrawncomboboxtest.obj \
- $(OBJS)\test_gui_pickerbasetest.obj \
- $(OBJS)\test_gui_pickertest.obj \
- $(OBJS)\test_gui_radioboxtest.obj \
- $(OBJS)\test_gui_radiobuttontest.obj \
- $(OBJS)\test_gui_rearrangelisttest.obj \
- $(OBJS)\test_gui_richtextctrltest.obj \
- $(OBJS)\test_gui_searchctrltest.obj \
- $(OBJS)\test_gui_simplebooktest.obj \
- $(OBJS)\test_gui_slidertest.obj \
- $(OBJS)\test_gui_spinctrldbltest.obj \
- $(OBJS)\test_gui_spinctrltest.obj \
- $(OBJS)\test_gui_textctrltest.obj \
- $(OBJS)\test_gui_textentrytest.obj \
- $(OBJS)\test_gui_togglebuttontest.obj \
- $(OBJS)\test_gui_toolbooktest.obj \
- $(OBJS)\test_gui_treebooktest.obj \
- $(OBJS)\test_gui_treectrltest.obj \
- $(OBJS)\test_gui_treelistctrltest.obj \
- $(OBJS)\test_gui_virtlistctrltest.obj \
- $(OBJS)\test_gui_webtest.obj \
- $(OBJS)\test_gui_windowtest.obj \
- $(OBJS)\test_gui_dialogtest.obj \
- $(OBJS)\test_gui_clone.obj \
- $(OBJS)\test_gui_evtlooptest.obj \
- $(OBJS)\test_gui_propagation.obj \
- $(OBJS)\test_gui_keyboard.obj \
- $(OBJS)\test_gui_exec.obj \
- $(OBJS)\test_gui_fonttest.obj \
- $(OBJS)\test_gui_image.obj \
- $(OBJS)\test_gui_rawbmp.obj \
- $(OBJS)\test_gui_htmlparser.obj \
- $(OBJS)\test_gui_htmlwindow.obj \
- $(OBJS)\test_gui_accelentry.obj \
- $(OBJS)\test_gui_menu.obj \
- $(OBJS)\test_gui_guifuncs.obj \
- $(OBJS)\test_gui_selstoretest.obj \
- $(OBJS)\test_gui_garbage.obj \
- $(OBJS)\test_gui_safearrayconverttest.obj \
- $(OBJS)\test_gui_settings.obj \
- $(OBJS)\test_gui_socket.obj \
- $(OBJS)\test_gui_boxsizer.obj \
- $(OBJS)\test_gui_wrapsizer.obj \
- $(OBJS)\test_gui_toplevel.obj \
- $(OBJS)\test_gui_valnum.obj \
- $(OBJS)\test_gui_clientsize.obj \
- $(OBJS)\test_gui_setsize.obj \
- $(OBJS)\test_gui_xrctest.obj
-TEST_GUI_RESOURCES = \
- $(OBJS)\test_gui_sample.res
-
-### Conditionally set variables: ###
-
-!if "$(TARGET_CPU)" == "AMD64"
-ARCH_SUFFIX = _x64
-!endif
-!if "$(TARGET_CPU)" == "IA64"
-ARCH_SUFFIX = _ia64
-!endif
-!if "$(TARGET_CPU)" == "X64"
-ARCH_SUFFIX = _x64
-!endif
-!if "$(TARGET_CPU)" == "amd64"
-ARCH_SUFFIX = _x64
-!endif
-!if "$(TARGET_CPU)" == "ia64"
-ARCH_SUFFIX = _ia64
-!endif
-!if "$(TARGET_CPU)" == "x64"
-ARCH_SUFFIX = _x64
-!endif
-!if "$(USE_GUI)" == "0"
-PORTNAME = base
-!endif
-!if "$(USE_GUI)" == "1"
-PORTNAME = msw$(TOOLKIT_VERSION)
-!endif
-!if "$(OFFICIAL_BUILD)" == "1"
-COMPILER_VERSION = ERROR-COMPILER-VERSION-MUST-BE-SET-FOR-OFFICIAL-BUILD
-!endif
-!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default"
-WXDEBUGFLAG = d
-!endif
-!if "$(DEBUG_RUNTIME_LIBS)" == "1"
-WXDEBUGFLAG = d
-!endif
-!if "$(UNICODE)" == "1"
-WXUNICODEFLAG = u
-!endif
-!if "$(WXUNIV)" == "1"
-WXUNIVNAME = univ
-!endif
-!if "$(SHARED)" == "1"
-WXDLLFLAG = dll
-!endif
-!if "$(SHARED)" == "0"
-LIBTYPE_SUFFIX = lib
-!endif
-!if "$(SHARED)" == "1"
-LIBTYPE_SUFFIX = dll
-!endif
-!if "$(TARGET_CPU)" == "AMD64"
-LINK_TARGET_CPU = /MACHINE:X64
-!endif
-!if "$(TARGET_CPU)" == "IA64"
-LINK_TARGET_CPU = /MACHINE:IA64
-!endif
-!if "$(TARGET_CPU)" == "X64"
-LINK_TARGET_CPU = /MACHINE:X64
-!endif
-!if "$(TARGET_CPU)" == "amd64"
-LINK_TARGET_CPU = /MACHINE:X64
-!endif
-!if "$(TARGET_CPU)" == "ia64"
-LINK_TARGET_CPU = /MACHINE:IA64
-!endif
-!if "$(TARGET_CPU)" == "x64"
-LINK_TARGET_CPU = /MACHINE:X64
-!endif
-!if "$(MONOLITHIC)" == "0"
-EXTRALIBS_FOR_BASE =
-!endif
-!if "$(MONOLITHIC)" == "1"
-EXTRALIBS_FOR_BASE =
-!endif
-!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default"
-__DEBUGINFO_2 = $(__DEBUGRUNTIME_2)
-!endif
-!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default"
-__DEBUGINFO_2 =
-!endif
-!if "$(DEBUG_INFO)" == "0"
-__DEBUGINFO_2 =
-!endif
-!if "$(DEBUG_INFO)" == "1"
-__DEBUGINFO_2 = $(__DEBUGRUNTIME_2)
-!endif
-!if "$(RUNTIME_LIBS)" == "dynamic"
-__RUNTIME_LIBS_10 = D
-!endif
-!if "$(RUNTIME_LIBS)" == "static"
-__RUNTIME_LIBS_10 = $(__THREADSFLAG)
-!endif
-!if "$(MONOLITHIC)" == "1"
-__LIB_PNG_IF_MONO_p = $(__LIB_PNG_p)
-!endif
-!if "$(USE_GUI)" == "1"
-__test_drawing___depname = $(OBJS)\test_drawing.exe
-!endif
-!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default"
-__DEBUGINFO_19 = $(__DEBUGRUNTIME_2)
-!endif
-!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default"
-__DEBUGINFO_19 =
-!endif
-!if "$(DEBUG_INFO)" == "0"
-__DEBUGINFO_19 =
-!endif
-!if "$(DEBUG_INFO)" == "1"
-__DEBUGINFO_19 = $(__DEBUGRUNTIME_2)
-!endif
-!if "$(RUNTIME_LIBS)" == "dynamic"
-__RUNTIME_LIBS_27 = D
-!endif
-!if "$(RUNTIME_LIBS)" == "static"
-__RUNTIME_LIBS_27 = $(__THREADSFLAG)
-!endif
-!if "$(SHARED)" == "1" && "$(USE_GUI)" == "1"
-__test_drawingplugin___depname = $(OBJS)\test_drawingplugin.dll
-!endif
-!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default"
-__DEBUGINFO_37 = $(__DEBUGRUNTIME_2)
-!endif
-!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default"
-__DEBUGINFO_37 =
-!endif
-!if "$(DEBUG_INFO)" == "0"
-__DEBUGINFO_37 =
-!endif
-!if "$(DEBUG_INFO)" == "1"
-__DEBUGINFO_37 = $(__DEBUGRUNTIME_2)
-!endif
-!if "$(RUNTIME_LIBS)" == "dynamic"
-__RUNTIME_LIBS_45 = D
-!endif
-!if "$(RUNTIME_LIBS)" == "static"
-__RUNTIME_LIBS_45 = $(__THREADSFLAG)
-!endif
-!if "$(USE_GUI)" == "1"
-__test_gui___depname = $(OBJS)\test_gui.exe
-!endif
-!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default"
-__DEBUGINFO_51 = $(__DEBUGRUNTIME_2)
-!endif
-!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default"
-__DEBUGINFO_51 =
-!endif
-!if "$(DEBUG_INFO)" == "0"
-__DEBUGINFO_51 =
-!endif
-!if "$(DEBUG_INFO)" == "1"
-__DEBUGINFO_51 = $(__DEBUGRUNTIME_2)
-!endif
-!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default"
-____DEBUGRUNTIME_52_p_1 = /d _DEBUG
-!endif
-!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default"
-____DEBUGRUNTIME_52_p_1 =
-!endif
-!if "$(DEBUG_RUNTIME_LIBS)" == "0"
-____DEBUGRUNTIME_52_p_1 =
-!endif
-!if "$(DEBUG_RUNTIME_LIBS)" == "1"
-____DEBUGRUNTIME_52_p_1 = /d _DEBUG
-!endif
-!if "$(RUNTIME_LIBS)" == "dynamic"
-__RUNTIME_LIBS_59 = D
-!endif
-!if "$(RUNTIME_LIBS)" == "static"
-__RUNTIME_LIBS_59 = $(__THREADSFLAG)
-!endif
-!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "0"
-__NO_VC_CRTDBG_p_7 = /d __NO_VC_CRTDBG__
-!endif
-!if "$(BUILD)" == "release" && "$(DEBUG_FLAG)" == "1"
-__NO_VC_CRTDBG_p_7 = /d __NO_VC_CRTDBG__
-!endif
-!if "$(WXUNIV)" == "1"
-__WXUNIV_DEFINE_p_7 = /d __WXUNIVERSAL__
-!endif
-!if "$(DEBUG_FLAG)" == "0"
-__DEBUG_DEFINE_p_7 = /d wxDEBUG_LEVEL=0
-!endif
-!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default"
-__NDEBUG_DEFINE_p_7 = /d NDEBUG
-!endif
-!if "$(DEBUG_RUNTIME_LIBS)" == "0"
-__NDEBUG_DEFINE_p_7 = /d NDEBUG
-!endif
-!if "$(USE_EXCEPTIONS)" == "0"
-__EXCEPTIONS_DEFINE_p_7 = /d wxNO_EXCEPTIONS
-!endif
-!if "$(USE_RTTI)" == "0"
-__RTTI_DEFINE_p_7 = /d wxNO_RTTI
-!endif
-!if "$(USE_THREADS)" == "0"
-__THREAD_DEFINE_p_7 = /d wxNO_THREADS
-!endif
-!if "$(UNICODE)" == "0"
-__UNICODE_DEFINE_p_7 = /d wxUSE_UNICODE=0
-!endif
-!if "$(UNICODE)" == "1"
-__UNICODE_DEFINE_p_7 = /d _UNICODE
-!endif
-!if "$(USE_CAIRO)" == "1"
-____CAIRO_INCLUDEDIR_FILENAMES_7_p = /i $(CAIRO_ROOT)\include\cairo
-!endif
-!if "$(SHARED)" == "1"
-__DLLFLAG_p_7 = /d WXUSINGDLL
-!endif
-!if "$(MONOLITHIC)" == "0" && "$(USE_WEBVIEW)" == "1"
-__WXLIB_WEBVIEW_p = \
- wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_webview.lib
-!endif
-!if "$(MONOLITHIC)" == "0"
-__WXLIB_RICHTEXT_p = \
- wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_richtext.lib
-!endif
-!if "$(MONOLITHIC)" == "0" && "$(USE_MEDIA)" == "1"
-__WXLIB_MEDIA_p = \
- wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_media.lib
-!endif
-!if "$(MONOLITHIC)" == "0"
-__WXLIB_XRC_p = \
- wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xrc.lib
-!endif
-!if "$(MONOLITHIC)" == "0"
-__WXLIB_ADV_p = \
- wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_adv.lib
-!endif
-!if "$(MONOLITHIC)" == "0"
-__WXLIB_HTML_p = \
- wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_html.lib
-!endif
-!if "$(MONOLITHIC)" == "0"
-__WXLIB_XML_p = \
- wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xml.lib
-!endif
-!if "$(MONOLITHIC)" == "0"
-__WXLIB_NET_p = \
- wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_net.lib
-!endif
-!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default"
-__DEBUGINFO = /Zi
-!endif
-!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default"
-__DEBUGINFO =
-!endif
-!if "$(DEBUG_INFO)" == "0"
-__DEBUGINFO =
-!endif
-!if "$(DEBUG_INFO)" == "1"
-__DEBUGINFO = /Zi
-!endif
-!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default"
-__DEBUGINFO_4 = /DEBUG
-!endif
-!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default"
-__DEBUGINFO_4 =
-!endif
-!if "$(DEBUG_INFO)" == "0"
-__DEBUGINFO_4 =
-!endif
-!if "$(DEBUG_INFO)" == "1"
-__DEBUGINFO_4 = /DEBUG
-!endif
-!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default"
-____DEBUGRUNTIME = /D_DEBUG
-!endif
-!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default"
-____DEBUGRUNTIME =
-!endif
-!if "$(DEBUG_RUNTIME_LIBS)" == "0"
-____DEBUGRUNTIME =
-!endif
-!if "$(DEBUG_RUNTIME_LIBS)" == "1"
-____DEBUGRUNTIME = /D_DEBUG
-!endif
-!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default"
-__DEBUGRUNTIME = d
-!endif
-!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default"
-__DEBUGRUNTIME =
-!endif
-!if "$(DEBUG_RUNTIME_LIBS)" == "0"
-__DEBUGRUNTIME =
-!endif
-!if "$(DEBUG_RUNTIME_LIBS)" == "1"
-__DEBUGRUNTIME = d
-!endif
-!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default"
-__DEBUGRUNTIME_2 =
-!endif
-!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default"
-__DEBUGRUNTIME_2 = /opt:ref /opt:icf
-!endif
-!if "$(DEBUG_RUNTIME_LIBS)" == "0"
-__DEBUGRUNTIME_2 = /opt:ref /opt:icf
-!endif
-!if "$(DEBUG_RUNTIME_LIBS)" == "1"
-__DEBUGRUNTIME_2 =
-!endif
-!if "$(BUILD)" == "debug"
-__OPTIMIZEFLAG = /Od
-!endif
-!if "$(BUILD)" == "release"
-__OPTIMIZEFLAG = /O2
-!endif
-!if "$(USE_THREADS)" == "0"
-__THREADSFLAG = L
-!endif
-!if "$(USE_THREADS)" == "1"
-__THREADSFLAG = T
-!endif
-!if "$(USE_RTTI)" == "0"
-__RTTIFLAG =
-!endif
-!if "$(USE_RTTI)" == "1"
-__RTTIFLAG = /GR
-!endif
-!if "$(USE_EXCEPTIONS)" == "0"
-__EXCEPTIONSFLAG =
-!endif
-!if "$(USE_EXCEPTIONS)" == "1"
-__EXCEPTIONSFLAG = /EHsc
-!endif
-!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "0"
-__NO_VC_CRTDBG_p = /D__NO_VC_CRTDBG__
-!endif
-!if "$(BUILD)" == "release" && "$(DEBUG_FLAG)" == "1"
-__NO_VC_CRTDBG_p = /D__NO_VC_CRTDBG__
-!endif
-!if "$(WXUNIV)" == "1"
-__WXUNIV_DEFINE_p = /D__WXUNIVERSAL__
-!endif
-!if "$(DEBUG_FLAG)" == "0"
-__DEBUG_DEFINE_p = /DwxDEBUG_LEVEL=0
-!endif
-!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default"
-__NDEBUG_DEFINE_p = /DNDEBUG
-!endif
-!if "$(DEBUG_RUNTIME_LIBS)" == "0"
-__NDEBUG_DEFINE_p = /DNDEBUG
-!endif
-!if "$(USE_EXCEPTIONS)" == "0"
-__EXCEPTIONS_DEFINE_p = /DwxNO_EXCEPTIONS
-!endif
-!if "$(USE_RTTI)" == "0"
-__RTTI_DEFINE_p = /DwxNO_RTTI
-!endif
-!if "$(USE_THREADS)" == "0"
-__THREAD_DEFINE_p = /DwxNO_THREADS
-!endif
-!if "$(UNICODE)" == "0"
-__UNICODE_DEFINE_p = /DwxUSE_UNICODE=0
-!endif
-!if "$(UNICODE)" == "1"
-__UNICODE_DEFINE_p = /D_UNICODE
-!endif
-!if "$(USE_CAIRO)" == "1"
-____CAIRO_INCLUDEDIR_FILENAMES = /I$(CAIRO_ROOT)\include\cairo
-!endif
-!if "$(SHARED)" == "1"
-__DLLFLAG_p = /DWXUSINGDLL
-!endif
-!if "$(MONOLITHIC)" == "0"
-__WXLIB_CORE_p = \
- wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib
-!endif
-!if "$(MONOLITHIC)" == "0"
-__WXLIB_BASE_p = \
- wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib
-!endif
-!if "$(MONOLITHIC)" == "1"
-__WXLIB_MONO_p = \
- wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib
-!endif
-!if "$(MONOLITHIC)" == "1" && "$(USE_STC)" == "1"
-__LIB_SCINTILLA_IF_MONO_p = wxscintilla$(WXDEBUGFLAG).lib
-!endif
-!if "$(USE_GUI)" == "1"
-__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib
-!endif
-!if "$(USE_GUI)" == "1"
-__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib
-!endif
-!if "$(USE_GUI)" == "1"
-__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib
-!endif
-!if "$(USE_CAIRO)" == "1"
-__CAIRO_LIB_p = cairo.lib
-!endif
-!if "$(USE_CAIRO)" == "1"
-____CAIRO_LIBDIR_FILENAMES = /LIBPATH:$(CAIRO_ROOT)\lib
-!endif
-
-
-all: $(OBJS)
-$(OBJS):
- -if not exist $(OBJS) mkdir $(OBJS)
-
-### Targets: ###
-
-all: $(OBJS)\test.exe $(__test_drawing___depname) $(__test_drawingplugin___depname) $(__test_gui___depname) data data-images fr
-
-clean:
- -if exist $(OBJS)\*.obj del $(OBJS)\*.obj
- -if exist $(OBJS)\*.res del $(OBJS)\*.res
- -if exist $(OBJS)\*.pch del $(OBJS)\*.pch
- -if exist $(OBJS)\test.exe del $(OBJS)\test.exe
- -if exist $(OBJS)\test.ilk del $(OBJS)\test.ilk
- -if exist $(OBJS)\test.pdb del $(OBJS)\test.pdb
- -if exist $(OBJS)\test_drawing.exe del $(OBJS)\test_drawing.exe
- -if exist $(OBJS)\test_drawing.ilk del $(OBJS)\test_drawing.ilk
- -if exist $(OBJS)\test_drawing.pdb del $(OBJS)\test_drawing.pdb
- -if exist $(OBJS)\test_drawingplugin.dll del $(OBJS)\test_drawingplugin.dll
- -if exist $(OBJS)\test_drawingplugin.ilk del $(OBJS)\test_drawingplugin.ilk
- -if exist $(OBJS)\test_drawingplugin.pdb del $(OBJS)\test_drawingplugin.pdb
- -if exist $(OBJS)\test_gui.exe del $(OBJS)\test_gui.exe
- -if exist $(OBJS)\test_gui.ilk del $(OBJS)\test_gui.ilk
- -if exist $(OBJS)\test_gui.pdb del $(OBJS)\test_gui.pdb
-
-$(OBJS)\test.exe: $(OBJS)\test_dummy.obj $(TEST_OBJECTS)
- link /NOLOGO /OUT:$@ $(__DEBUGINFO_4) /pdb:"$(OBJS)\test.pdb" $(__DEBUGINFO_2) $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:CONSOLE $(CPPUNIT_LIBS) $(____CAIRO_LIBDIR_FILENAMES) $(LDFLAGS) @<<
- $(TEST_OBJECTS) $(__WXLIB_NET_p) $(__WXLIB_XML_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_PNG_IF_MONO_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__CAIRO_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib
-<<
-
-!if "$(USE_GUI)" == "1"
-$(OBJS)\test_drawing.exe: $(OBJS)\test_drawing_dummy.obj $(TEST_DRAWING_OBJECTS)
- link /NOLOGO /OUT:$@ $(__DEBUGINFO_4) /pdb:"$(OBJS)\test_drawing.pdb" $(__DEBUGINFO_19) $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:CONSOLE $(CPPUNIT_LIBS) $(____CAIRO_LIBDIR_FILENAMES) $(LDFLAGS) @<<
- $(TEST_DRAWING_OBJECTS) $(__WXLIB_CORE_p) $(__WXLIB_NET_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_SCINTILLA_IF_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__CAIRO_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib
-<<
-!endif
-
-!if "$(SHARED)" == "1" && "$(USE_GUI)" == "1"
-$(OBJS)\test_drawingplugin.dll: $(TEST_DRAWINGPLUGIN_OBJECTS)
- link /DLL /NOLOGO /OUT:$@ $(__DEBUGINFO_4) /pdb:"$(OBJS)\test_drawingplugin.pdb" $(__DEBUGINFO_37) $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) $(____CAIRO_LIBDIR_FILENAMES) $(LDFLAGS) @<<
- $(TEST_DRAWINGPLUGIN_OBJECTS) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_SCINTILLA_IF_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__CAIRO_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib
-<<
-!endif
-
-!if "$(USE_GUI)" == "1"
-$(OBJS)\test_gui.exe: $(OBJS)\test_gui_dummy.obj $(TEST_GUI_OBJECTS) $(OBJS)\test_gui_sample.res
- link /NOLOGO /OUT:$@ $(__DEBUGINFO_4) /pdb:"$(OBJS)\test_gui.pdb" $(__DEBUGINFO_51) $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) $(CPPUNIT_LIBS) /SUBSYSTEM:CONSOLE $(____CAIRO_LIBDIR_FILENAMES) $(LDFLAGS) @<<
- $(TEST_GUI_OBJECTS) $(TEST_GUI_RESOURCES) $(__WXLIB_WEBVIEW_p) $(__WXLIB_RICHTEXT_p) $(__WXLIB_MEDIA_p) $(__WXLIB_XRC_p) $(__WXLIB_XML_p) $(__WXLIB_ADV_p) $(__WXLIB_HTML_p) $(__WXLIB_CORE_p) $(__WXLIB_NET_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_SCINTILLA_IF_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__CAIRO_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib
-<<
-!endif
-
-data:
- if not exist $(OBJS) mkdir $(OBJS)
- for %f in (horse.ani horse.bmp horse.cur horse.gif horse.ico horse.jpg horse.pcx horse.png horse.pnm horse.tga horse.tif horse.xpm) do if not exist $(OBJS)\%f copy .\%f $(OBJS)
-
-data-images:
- if not exist image mkdir image
- for %f in (horse_grey.bmp horse_grey_flipped.bmp horse_rle4.bmp horse_rle4_flipped.bmp horse_rle8.bmp horse_rle8_flipped.bmp horse_bicubic_50x50.png horse_bicubic_100x100.png horse_bicubic_150x150.png horse_bicubic_300x300.png horse_bilinear_50x50.png horse_bilinear_100x100.png horse_bilinear_150x150.png horse_bilinear_300x300.png horse_box_average_50x50.png horse_box_average_100x100.png horse_box_average_150x150.png horse_box_average_300x300.png) do if not exist image\%f copy .\image\%f image
-
-fr:
- if not exist $(OBJS)\intl\fr mkdir $(OBJS)\intl\fr
- for %f in (internat.po internat.mo) do if not exist $(OBJS)\intl\fr\%f copy .\intl\fr\%f $(OBJS)\intl\fr
-
-$(OBJS)\test_dummy.obj: .\dummy.cpp
- $(CXX) /c /nologo /TP /Fo$@ $(TEST_CXXFLAGS) /Yctestprec.h .\dummy.cpp
-
-$(OBJS)\test_test.obj: .\test.cpp
- $(CXX) /c /nologo /TP /Fo$@ $(TEST_CXXFLAGS) .\test.cpp
-
-$(OBJS)\test_anytest.obj: .\any\anytest.cpp
- $(CXX) /c /nologo /TP /Fo$@ $(TEST_CXXFLAGS) .\any\anytest.cpp
-
-$(OBJS)\test_archivetest.obj: .\archive\archivetest.cpp
- $(CXX) /c /nologo /TP /Fo$@ $(TEST_CXXFLAGS) .\archive\archivetest.cpp
-
-$(OBJS)\test_ziptest.obj: .\archive\ziptest.cpp
- $(CXX) /c /nologo /TP /Fo$@ $(TEST_CXXFLAGS) .\archive\ziptest.cpp
-
-$(OBJS)\test_tartest.obj: .\archive\tartest.cpp
- $(CXX) /c /nologo /TP /Fo$@ $(TEST_CXXFLAGS) .\archive\tartest.cpp
-
-$(OBJS)\test_arrays.obj: .\arrays\arrays.cpp
- $(CXX) /c /nologo /TP /Fo$@ $(TEST_CXXFLAGS) .\arrays\arrays.cpp
-
-$(OBJS)\test_base64.obj: .\base64\base64.cpp
- $(CXX) /c /nologo /TP /Fo$@ $(TEST_CXXFLAGS) .\base64\base64.cpp
-
-$(OBJS)\test_cmdlinetest.obj: .\cmdline\cmdlinetest.cpp
- $(CXX) /c /nologo /TP /Fo$@ $(TEST_CXXFLAGS) .\cmdline\cmdlinetest.cpp
-
-$(OBJS)\test_fileconf.obj: .\config\fileconf.cpp
- $(CXX) /c /nologo /TP /Fo$@ $(TEST_CXXFLAGS) .\config\fileconf.cpp
-
-$(OBJS)\test_regconf.obj: .\config\regconf.cpp
- $(CXX) /c /nologo /TP /Fo$@ $(TEST_CXXFLAGS) .\config\regconf.cpp
-
-$(OBJS)\test_datetimetest.obj: .\datetime\datetimetest.cpp
- $(CXX) /c /nologo /TP /Fo$@ $(TEST_CXXFLAGS) .\datetime\datetimetest.cpp
-
-$(OBJS)\test_evthandler.obj: .\events\evthandler.cpp
- $(CXX) /c /nologo /TP /Fo$@ $(TEST_CXXFLAGS) .\events\evthandler.cpp
-
-$(OBJS)\test_evtlooptest.obj: .\events\evtlooptest.cpp
- $(CXX) /c /nologo /TP /Fo$@ $(TEST_CXXFLAGS) .\events\evtlooptest.cpp
-
-$(OBJS)\test_evtsource.obj: .\events\evtsource.cpp
- $(CXX) /c /nologo /TP /Fo$@ $(TEST_CXXFLAGS) .\events\evtsource.cpp
-
-$(OBJS)\test_stopwatch.obj: .\events\stopwatch.cpp
- $(CXX) /c /nologo /TP /Fo$@ $(TEST_CXXFLAGS) .\events\stopwatch.cpp
-
-$(OBJS)\test_timertest.obj: .\events\timertest.cpp
- $(CXX) /c /nologo /TP /Fo$@ $(TEST_CXXFLAGS) .\events\timertest.cpp
-
-$(OBJS)\test_exec.obj: .\exec\exec.cpp
- $(CXX) /c /nologo /TP /Fo$@ $(TEST_CXXFLAGS) .\exec\exec.cpp
-
-$(OBJS)\test_dir.obj: .\file\dir.cpp
- $(CXX) /c /nologo /TP /Fo$@ $(TEST_CXXFLAGS) .\file\dir.cpp
-
-$(OBJS)\test_filefn.obj: .\file\filefn.cpp
- $(CXX) /c /nologo /TP /Fo$@ $(TEST_CXXFLAGS) .\file\filefn.cpp
-
-$(OBJS)\test_filetest.obj: .\file\filetest.cpp
- $(CXX) /c /nologo /TP /Fo$@ $(TEST_CXXFLAGS) .\file\filetest.cpp
-
-$(OBJS)\test_filekind.obj: .\filekind\filekind.cpp
- $(CXX) /c /nologo /TP /Fo$@ $(TEST_CXXFLAGS) .\filekind\filekind.cpp
-
-$(OBJS)\test_filenametest.obj: .\filename\filenametest.cpp
- $(CXX) /c /nologo /TP /Fo$@ $(TEST_CXXFLAGS) .\filename\filenametest.cpp
-
-$(OBJS)\test_filesystest.obj: .\filesys\filesystest.cpp
- $(CXX) /c /nologo /TP /Fo$@ $(TEST_CXXFLAGS) .\filesys\filesystest.cpp
-
-$(OBJS)\test_fontmaptest.obj: .\fontmap\fontmaptest.cpp
- $(CXX) /c /nologo /TP /Fo$@ $(TEST_CXXFLAGS) .\fontmap\fontmaptest.cpp
-
-$(OBJS)\test_formatconvertertest.obj: .\formatconverter\formatconvertertest.cpp
- $(CXX) /c /nologo /TP /Fo$@ $(TEST_CXXFLAGS) .\formatconverter\formatconvertertest.cpp
-
-$(OBJS)\test_fswatchertest.obj: .\fswatcher\fswatchertest.cpp
- $(CXX) /c /nologo /TP /Fo$@ $(TEST_CXXFLAGS) .\fswatcher\fswatchertest.cpp
-
-$(OBJS)\test_hashes.obj: .\hashes\hashes.cpp
- $(CXX) /c /nologo /TP /Fo$@ $(TEST_CXXFLAGS) .\hashes\hashes.cpp
-
-$(OBJS)\test_output.obj: .\interactive\output.cpp
- $(CXX) /c /nologo /TP /Fo$@ $(TEST_CXXFLAGS) .\interactive\output.cpp
-
-$(OBJS)\test_input.obj: .\interactive\input.cpp
- $(CXX) /c /nologo /TP /Fo$@ $(TEST_CXXFLAGS) .\interactive\input.cpp
-
-$(OBJS)\test_intltest.obj: .\intl\intltest.cpp
- $(CXX) /c /nologo /TP /Fo$@ $(TEST_CXXFLAGS) .\intl\intltest.cpp
-
-$(OBJS)\test_lists.obj: .\lists\lists.cpp
- $(CXX) /c /nologo /TP /Fo$@ $(TEST_CXXFLAGS) .\lists\lists.cpp
-
-$(OBJS)\test_logtest.obj: .\log\logtest.cpp
- $(CXX) /c /nologo /TP /Fo$@ $(TEST_CXXFLAGS) .\log\logtest.cpp
-
-$(OBJS)\test_longlongtest.obj: .\longlong\longlongtest.cpp
- $(CXX) /c /nologo /TP /Fo$@ $(TEST_CXXFLAGS) .\longlong\longlongtest.cpp
-
-$(OBJS)\test_convautotest.obj: .\mbconv\convautotest.cpp
- $(CXX) /c /nologo /TP /Fo$@ $(TEST_CXXFLAGS) .\mbconv\convautotest.cpp
-
-$(OBJS)\test_mbconvtest.obj: .\mbconv\mbconvtest.cpp
- $(CXX) /c /nologo /TP /Fo$@ $(TEST_CXXFLAGS) .\mbconv\mbconvtest.cpp
-
-$(OBJS)\test_dynamiclib.obj: .\misc\dynamiclib.cpp
- $(CXX) /c /nologo /TP /Fo$@ $(TEST_CXXFLAGS) .\misc\dynamiclib.cpp
-
-$(OBJS)\test_environ.obj: .\misc\environ.cpp
- $(CXX) /c /nologo /TP /Fo$@ $(TEST_CXXFLAGS) .\misc\environ.cpp
-
-$(OBJS)\test_metatest.obj: .\misc\metatest.cpp
- $(CXX) /c /nologo /TP /Fo$@ $(TEST_CXXFLAGS) .\misc\metatest.cpp
-
-$(OBJS)\test_misctests.obj: .\misc\misctests.cpp
- $(CXX) /c /nologo /TP /Fo$@ $(TEST_CXXFLAGS) .\misc\misctests.cpp
-
-$(OBJS)\test_module.obj: .\misc\module.cpp
- $(CXX) /c /nologo /TP /Fo$@ $(TEST_CXXFLAGS) .\misc\module.cpp
-
-$(OBJS)\test_pathlist.obj: .\misc\pathlist.cpp
- $(CXX) /c /nologo /TP /Fo$@ $(TEST_CXXFLAGS) .\misc\pathlist.cpp
-
-$(OBJS)\test_typeinfotest.obj: .\misc\typeinfotest.cpp
- $(CXX) /c /nologo /TP /Fo$@ $(TEST_CXXFLAGS) .\misc\typeinfotest.cpp
-
-$(OBJS)\test_ipc.obj: .\net\ipc.cpp
- $(CXX) /c /nologo /TP /Fo$@ $(TEST_CXXFLAGS) .\net\ipc.cpp
-
-$(OBJS)\test_socket.obj: .\net\socket.cpp
- $(CXX) /c /nologo /TP /Fo$@ $(TEST_CXXFLAGS) .\net\socket.cpp
-
-$(OBJS)\test_regextest.obj: .\regex\regextest.cpp
- $(CXX) /c /nologo /TP /Fo$@ $(TEST_CXXFLAGS) .\regex\regextest.cpp
-
-$(OBJS)\test_wxregextest.obj: .\regex\wxregextest.cpp
- $(CXX) /c /nologo /TP /Fo$@ $(TEST_CXXFLAGS) .\regex\wxregextest.cpp
-
-$(OBJS)\test_scopeguardtest.obj: .\scopeguard\scopeguardtest.cpp
- $(CXX) /c /nologo /TP /Fo$@ $(TEST_CXXFLAGS) .\scopeguard\scopeguardtest.cpp
-
-$(OBJS)\test_iostream.obj: .\strings\iostream.cpp
- $(CXX) /c /nologo /TP /Fo$@ $(TEST_CXXFLAGS) .\strings\iostream.cpp
-
-$(OBJS)\test_numformatter.obj: .\strings\numformatter.cpp
- $(CXX) /c /nologo /TP /Fo$@ $(TEST_CXXFLAGS) .\strings\numformatter.cpp
-
-$(OBJS)\test_strings.obj: .\strings\strings.cpp
- $(CXX) /c /nologo /TP /Fo$@ $(TEST_CXXFLAGS) .\strings\strings.cpp
-
-$(OBJS)\test_stdstrings.obj: .\strings\stdstrings.cpp
- $(CXX) /c /nologo /TP /Fo$@ $(TEST_CXXFLAGS) .\strings\stdstrings.cpp
-
-$(OBJS)\test_tokenizer.obj: .\strings\tokenizer.cpp
- $(CXX) /c /nologo /TP /Fo$@ $(TEST_CXXFLAGS) .\strings\tokenizer.cpp
-
-$(OBJS)\test_unichar.obj: .\strings\unichar.cpp
- $(CXX) /c /nologo /TP /Fo$@ $(TEST_CXXFLAGS) .\strings\unichar.cpp
-
-$(OBJS)\test_unicode.obj: .\strings\unicode.cpp
- $(CXX) /c /nologo /TP /Fo$@ $(TEST_CXXFLAGS) .\strings\unicode.cpp
-
-$(OBJS)\test_vararg.obj: .\strings\vararg.cpp
- $(CXX) /c /nologo /TP /Fo$@ $(TEST_CXXFLAGS) .\strings\vararg.cpp
-
-$(OBJS)\test_crt.obj: .\strings\crt.cpp
- $(CXX) /c /nologo /TP /Fo$@ $(TEST_CXXFLAGS) .\strings\crt.cpp
-
-$(OBJS)\test_vsnprintf.obj: .\strings\vsnprintf.cpp
- $(CXX) /c /nologo /TP /Fo$@ $(TEST_CXXFLAGS) .\strings\vsnprintf.cpp
-
-$(OBJS)\test_bstream.obj: .\streams\bstream.cpp
- $(CXX) /c /nologo /TP /Fo$@ $(TEST_CXXFLAGS) .\streams\bstream.cpp
-
-$(OBJS)\test_datastreamtest.obj: .\streams\datastreamtest.cpp
- $(CXX) /c /nologo /TP /Fo$@ $(TEST_CXXFLAGS) .\streams\datastreamtest.cpp
-
-$(OBJS)\test_ffilestream.obj: .\streams\ffilestream.cpp
- $(CXX) /c /nologo /TP /Fo$@ $(TEST_CXXFLAGS) .\streams\ffilestream.cpp
-
-$(OBJS)\test_fileback.obj: .\streams\fileback.cpp
- $(CXX) /c /nologo /TP /Fo$@ $(TEST_CXXFLAGS) .\streams\fileback.cpp
-
-$(OBJS)\test_filestream.obj: .\streams\filestream.cpp
- $(CXX) /c /nologo /TP /Fo$@ $(TEST_CXXFLAGS) .\streams\filestream.cpp
-
-$(OBJS)\test_iostreams.obj: .\streams\iostreams.cpp
- $(CXX) /c /nologo /TP /Fo$@ $(TEST_CXXFLAGS) .\streams\iostreams.cpp
-
-$(OBJS)\test_largefile.obj: .\streams\largefile.cpp
- $(CXX) /c /nologo /TP /Fo$@ $(TEST_CXXFLAGS) .\streams\largefile.cpp
-
-$(OBJS)\test_memstream.obj: .\streams\memstream.cpp
- $(CXX) /c /nologo /TP /Fo$@ $(TEST_CXXFLAGS) .\streams\memstream.cpp
-
-$(OBJS)\test_socketstream.obj: .\streams\socketstream.cpp
- $(CXX) /c /nologo /TP /Fo$@ $(TEST_CXXFLAGS) .\streams\socketstream.cpp
-
-$(OBJS)\test_sstream.obj: .\streams\sstream.cpp
- $(CXX) /c /nologo /TP /Fo$@ $(TEST_CXXFLAGS) .\streams\sstream.cpp
-
-$(OBJS)\test_stdstream.obj: .\streams\stdstream.cpp
- $(CXX) /c /nologo /TP /Fo$@ $(TEST_CXXFLAGS) .\streams\stdstream.cpp
-
-$(OBJS)\test_tempfile.obj: .\streams\tempfile.cpp
- $(CXX) /c /nologo /TP /Fo$@ $(TEST_CXXFLAGS) .\streams\tempfile.cpp
-
-$(OBJS)\test_textstreamtest.obj: .\streams\textstreamtest.cpp
- $(CXX) /c /nologo /TP /Fo$@ $(TEST_CXXFLAGS) .\streams\textstreamtest.cpp
-
-$(OBJS)\test_zlibstream.obj: .\streams\zlibstream.cpp
- $(CXX) /c /nologo /TP /Fo$@ $(TEST_CXXFLAGS) .\streams\zlibstream.cpp
-
-$(OBJS)\test_textfiletest.obj: .\textfile\textfiletest.cpp
- $(CXX) /c /nologo /TP /Fo$@ $(TEST_CXXFLAGS) .\textfile\textfiletest.cpp
-
-$(OBJS)\test_atomic.obj: .\thread\atomic.cpp
- $(CXX) /c /nologo /TP /Fo$@ $(TEST_CXXFLAGS) .\thread\atomic.cpp
-
-$(OBJS)\test_misc.obj: .\thread\misc.cpp
- $(CXX) /c /nologo /TP /Fo$@ $(TEST_CXXFLAGS) .\thread\misc.cpp
-
-$(OBJS)\test_queue.obj: .\thread\queue.cpp
- $(CXX) /c /nologo /TP /Fo$@ $(TEST_CXXFLAGS) .\thread\queue.cpp
-
-$(OBJS)\test_tls.obj: .\thread\tls.cpp
- $(CXX) /c /nologo /TP /Fo$@ $(TEST_CXXFLAGS) .\thread\tls.cpp
-
-$(OBJS)\test_ftp.obj: .\uris\ftp.cpp
- $(CXX) /c /nologo /TP /Fo$@ $(TEST_CXXFLAGS) .\uris\ftp.cpp
-
-$(OBJS)\test_uris.obj: .\uris\uris.cpp
- $(CXX) /c /nologo /TP /Fo$@ $(TEST_CXXFLAGS) .\uris\uris.cpp
-
-$(OBJS)\test_url.obj: .\uris\url.cpp
- $(CXX) /c /nologo /TP /Fo$@ $(TEST_CXXFLAGS) .\uris\url.cpp
-
-$(OBJS)\test_vectors.obj: .\vectors\vectors.cpp
- $(CXX) /c /nologo /TP /Fo$@ $(TEST_CXXFLAGS) .\vectors\vectors.cpp
-
-$(OBJS)\test_evtconnection.obj: .\weakref\evtconnection.cpp
- $(CXX) /c /nologo /TP /Fo$@ $(TEST_CXXFLAGS) .\weakref\evtconnection.cpp
-
-$(OBJS)\test_weakref.obj: .\weakref\weakref.cpp
- $(CXX) /c /nologo /TP /Fo$@ $(TEST_CXXFLAGS) .\weakref\weakref.cpp
-
-$(OBJS)\test_xlocale.obj: .\xlocale\xlocale.cpp
- $(CXX) /c /nologo /TP /Fo$@ $(TEST_CXXFLAGS) .\xlocale\xlocale.cpp
-
-$(OBJS)\test_xmltest.obj: .\xml\xmltest.cpp
- $(CXX) /c /nologo /TP /Fo$@ $(TEST_CXXFLAGS) .\xml\xmltest.cpp
-
-$(OBJS)\test_drawing_dummy.obj: .\dummy.cpp
- $(CXX) /c /nologo /TP /Fo$@ $(TEST_DRAWING_CXXFLAGS) /Yctestprec.h .\dummy.cpp
-
-$(OBJS)\test_drawing_test.obj: .\test.cpp
- $(CXX) /c /nologo /TP /Fo$@ $(TEST_DRAWING_CXXFLAGS) .\test.cpp
-
-$(OBJS)\test_drawing_drawing.obj: .\drawing\drawing.cpp
- $(CXX) /c /nologo /TP /Fo$@ $(TEST_DRAWING_CXXFLAGS) .\drawing\drawing.cpp
-
-$(OBJS)\test_drawing_plugindriver.obj: .\drawing\plugindriver.cpp
- $(CXX) /c /nologo /TP /Fo$@ $(TEST_DRAWING_CXXFLAGS) .\drawing\plugindriver.cpp
-
-$(OBJS)\test_drawing_basictest.obj: .\drawing\basictest.cpp
- $(CXX) /c /nologo /TP /Fo$@ $(TEST_DRAWING_CXXFLAGS) .\drawing\basictest.cpp
-
-$(OBJS)\test_drawing_fonttest.obj: .\drawing\fonttest.cpp
- $(CXX) /c /nologo /TP /Fo$@ $(TEST_DRAWING_CXXFLAGS) .\drawing\fonttest.cpp
-
-$(OBJS)\test_drawingplugin_pluginsample.obj: .\drawing\pluginsample.cpp
- $(CXX) /c /nologo /TP /Fo$@ $(TEST_DRAWINGPLUGIN_CXXFLAGS) .\drawing\pluginsample.cpp
-
-$(OBJS)\test_gui_dummy.obj: .\dummy.cpp
- $(CXX) /c /nologo /TP /Fo$@ $(TEST_GUI_CXXFLAGS) /Yctestprec.h .\dummy.cpp
-
-$(OBJS)\test_gui_sample.res: .\..\samples\sample.rc
- rc /fo$@ /d WIN32 $(____DEBUGRUNTIME_52_p_1) /d _CRT_SECURE_NO_DEPRECATE=1 /d _CRT_NON_CONFORMING_SWPRINTFS=1 /d _SCL_SECURE_NO_WARNINGS=1 $(__NO_VC_CRTDBG_p_7) /d __WXMSW__ $(__WXUNIV_DEFINE_p_7) $(__DEBUG_DEFINE_p_7) $(__NDEBUG_DEFINE_p_7) $(__EXCEPTIONS_DEFINE_p_7) $(__RTTI_DEFINE_p_7) $(__THREAD_DEFINE_p_7) $(__UNICODE_DEFINE_p_7) /i $(SETUPHDIR) /i .\..\include $(____CAIRO_INCLUDEDIR_FILENAMES_7_p) /i . $(__DLLFLAG_p_7) /i .\..\samples /d NOPCH /d _CONSOLE .\..\samples\sample.rc
-
-$(OBJS)\test_gui_asserthelper.obj: .\asserthelper.cpp
- $(CXX) /c /nologo /TP /Fo$@ $(TEST_GUI_CXXFLAGS) .\asserthelper.cpp
-
-$(OBJS)\test_gui_test.obj: .\test.cpp
- $(CXX) /c /nologo /TP /Fo$@ $(TEST_GUI_CXXFLAGS) .\test.cpp
-
-$(OBJS)\test_gui_testableframe.obj: .\testableframe.cpp
- $(CXX) /c /nologo /TP /Fo$@ $(TEST_GUI_CXXFLAGS) .\testableframe.cpp
-
-$(OBJS)\test_gui_rect.obj: .\geometry\rect.cpp
- $(CXX) /c /nologo /TP /Fo$@ $(TEST_GUI_CXXFLAGS) .\geometry\rect.cpp
-
-$(OBJS)\test_gui_size.obj: .\geometry\size.cpp
- $(CXX) /c /nologo /TP /Fo$@ $(TEST_GUI_CXXFLAGS) .\geometry\size.cpp
-
-$(OBJS)\test_gui_point.obj: .\geometry\point.cpp
- $(CXX) /c /nologo /TP /Fo$@ $(TEST_GUI_CXXFLAGS) .\geometry\point.cpp
-
-$(OBJS)\test_gui_region.obj: .\geometry\region.cpp
- $(CXX) /c /nologo /TP /Fo$@ $(TEST_GUI_CXXFLAGS) .\geometry\region.cpp
-
-$(OBJS)\test_gui_bitmap.obj: .\graphics\bitmap.cpp
- $(CXX) /c /nologo /TP /Fo$@ $(TEST_GUI_CXXFLAGS) .\graphics\bitmap.cpp
-
-$(OBJS)\test_gui_colour.obj: .\graphics\colour.cpp
- $(CXX) /c /nologo /TP /Fo$@ $(TEST_GUI_CXXFLAGS) .\graphics\colour.cpp
-
-$(OBJS)\test_gui_ellipsization.obj: .\graphics\ellipsization.cpp
- $(CXX) /c /nologo /TP /Fo$@ $(TEST_GUI_CXXFLAGS) .\graphics\ellipsization.cpp
-
-$(OBJS)\test_gui_measuring.obj: .\graphics\measuring.cpp
- $(CXX) /c /nologo /TP /Fo$@ $(TEST_GUI_CXXFLAGS) .\graphics\measuring.cpp
-
-$(OBJS)\test_gui_affinematrix.obj: .\graphics\affinematrix.cpp
- $(CXX) /c /nologo /TP /Fo$@ $(TEST_GUI_CXXFLAGS) .\graphics\affinematrix.cpp
-
-$(OBJS)\test_gui_boundingbox.obj: .\graphics\boundingbox.cpp
- $(CXX) /c /nologo /TP /Fo$@ $(TEST_GUI_CXXFLAGS) .\graphics\boundingbox.cpp
-
-$(OBJS)\test_gui_config.obj: .\config\config.cpp
- $(CXX) /c /nologo /TP /Fo$@ $(TEST_GUI_CXXFLAGS) .\config\config.cpp
-
-$(OBJS)\test_gui_bitmapcomboboxtest.obj: .\controls\bitmapcomboboxtest.cpp
- $(CXX) /c /nologo /TP /Fo$@ $(TEST_GUI_CXXFLAGS) .\controls\bitmapcomboboxtest.cpp
-
-$(OBJS)\test_gui_bitmaptogglebuttontest.obj: .\controls\bitmaptogglebuttontest.cpp
- $(CXX) /c /nologo /TP /Fo$@ $(TEST_GUI_CXXFLAGS) .\controls\bitmaptogglebuttontest.cpp
-
-$(OBJS)\test_gui_bookctrlbasetest.obj: .\controls\bookctrlbasetest.cpp
- $(CXX) /c /nologo /TP /Fo$@ $(TEST_GUI_CXXFLAGS) .\controls\bookctrlbasetest.cpp
-
-$(OBJS)\test_gui_buttontest.obj: .\controls\buttontest.cpp
- $(CXX) /c /nologo /TP /Fo$@ $(TEST_GUI_CXXFLAGS) .\controls\buttontest.cpp
-
-$(OBJS)\test_gui_checkboxtest.obj: .\controls\checkboxtest.cpp
- $(CXX) /c /nologo /TP /Fo$@ $(TEST_GUI_CXXFLAGS) .\controls\checkboxtest.cpp
-
-$(OBJS)\test_gui_checklistboxtest.obj: .\controls\checklistboxtest.cpp
- $(CXX) /c /nologo /TP /Fo$@ $(TEST_GUI_CXXFLAGS) .\controls\checklistboxtest.cpp
-
-$(OBJS)\test_gui_choicebooktest.obj: .\controls\choicebooktest.cpp
- $(CXX) /c /nologo /TP /Fo$@ $(TEST_GUI_CXXFLAGS) .\controls\choicebooktest.cpp
-
-$(OBJS)\test_gui_choicetest.obj: .\controls\choicetest.cpp
- $(CXX) /c /nologo /TP /Fo$@ $(TEST_GUI_CXXFLAGS) .\controls\choicetest.cpp
-
-$(OBJS)\test_gui_comboboxtest.obj: .\controls\comboboxtest.cpp
- $(CXX) /c /nologo /TP /Fo$@ $(TEST_GUI_CXXFLAGS) .\controls\comboboxtest.cpp
-
-$(OBJS)\test_gui_dataviewctrltest.obj: .\controls\dataviewctrltest.cpp
- $(CXX) /c /nologo /TP /Fo$@ $(TEST_GUI_CXXFLAGS) .\controls\dataviewctrltest.cpp
-
-$(OBJS)\test_gui_datepickerctrltest.obj: .\controls\datepickerctrltest.cpp
- $(CXX) /c /nologo /TP /Fo$@ $(TEST_GUI_CXXFLAGS) .\controls\datepickerctrltest.cpp
-
-$(OBJS)\test_gui_frametest.obj: .\controls\frametest.cpp
- $(CXX) /c /nologo /TP /Fo$@ $(TEST_GUI_CXXFLAGS) .\controls\frametest.cpp
-
-$(OBJS)\test_gui_gaugetest.obj: .\controls\gaugetest.cpp
- $(CXX) /c /nologo /TP /Fo$@ $(TEST_GUI_CXXFLAGS) .\controls\gaugetest.cpp
-
-$(OBJS)\test_gui_gridtest.obj: .\controls\gridtest.cpp
- $(CXX) /c /nologo /TP /Fo$@ $(TEST_GUI_CXXFLAGS) .\controls\gridtest.cpp
-
-$(OBJS)\test_gui_headerctrltest.obj: .\controls\headerctrltest.cpp
- $(CXX) /c /nologo /TP /Fo$@ $(TEST_GUI_CXXFLAGS) .\controls\headerctrltest.cpp
-
-$(OBJS)\test_gui_htmllboxtest.obj: .\controls\htmllboxtest.cpp
- $(CXX) /c /nologo /TP /Fo$@ $(TEST_GUI_CXXFLAGS) .\controls\htmllboxtest.cpp
-
-$(OBJS)\test_gui_hyperlinkctrltest.obj: .\controls\hyperlinkctrltest.cpp
- $(CXX) /c /nologo /TP /Fo$@ $(TEST_GUI_CXXFLAGS) .\controls\hyperlinkctrltest.cpp
-
-$(OBJS)\test_gui_itemcontainertest.obj: .\controls\itemcontainertest.cpp
- $(CXX) /c /nologo /TP /Fo$@ $(TEST_GUI_CXXFLAGS) .\controls\itemcontainertest.cpp
-
-$(OBJS)\test_gui_label.obj: .\controls\label.cpp
- $(CXX) /c /nologo /TP /Fo$@ $(TEST_GUI_CXXFLAGS) .\controls\label.cpp
-
-$(OBJS)\test_gui_listbasetest.obj: .\controls\listbasetest.cpp
- $(CXX) /c /nologo /TP /Fo$@ $(TEST_GUI_CXXFLAGS) .\controls\listbasetest.cpp
-
-$(OBJS)\test_gui_listbooktest.obj: .\controls\listbooktest.cpp
- $(CXX) /c /nologo /TP /Fo$@ $(TEST_GUI_CXXFLAGS) .\controls\listbooktest.cpp
-
-$(OBJS)\test_gui_listboxtest.obj: .\controls\listboxtest.cpp
- $(CXX) /c /nologo /TP /Fo$@ $(TEST_GUI_CXXFLAGS) .\controls\listboxtest.cpp
-
-$(OBJS)\test_gui_listctrltest.obj: .\controls\listctrltest.cpp
- $(CXX) /c /nologo /TP /Fo$@ $(TEST_GUI_CXXFLAGS) .\controls\listctrltest.cpp
-
-$(OBJS)\test_gui_listviewtest.obj: .\controls\listviewtest.cpp
- $(CXX) /c /nologo /TP /Fo$@ $(TEST_GUI_CXXFLAGS) .\controls\listviewtest.cpp
-
-$(OBJS)\test_gui_markuptest.obj: .\controls\markuptest.cpp
- $(CXX) /c /nologo /TP /Fo$@ $(TEST_GUI_CXXFLAGS) .\controls\markuptest.cpp
-
-$(OBJS)\test_gui_notebooktest.obj: .\controls\notebooktest.cpp
- $(CXX) /c /nologo /TP /Fo$@ $(TEST_GUI_CXXFLAGS) .\controls\notebooktest.cpp
-
-$(OBJS)\test_gui_ownerdrawncomboboxtest.obj: .\controls\ownerdrawncomboboxtest.cpp
- $(CXX) /c /nologo /TP /Fo$@ $(TEST_GUI_CXXFLAGS) .\controls\ownerdrawncomboboxtest.cpp
-
-$(OBJS)\test_gui_pickerbasetest.obj: .\controls\pickerbasetest.cpp
- $(CXX) /c /nologo /TP /Fo$@ $(TEST_GUI_CXXFLAGS) .\controls\pickerbasetest.cpp
-
-$(OBJS)\test_gui_pickertest.obj: .\controls\pickertest.cpp
- $(CXX) /c /nologo /TP /Fo$@ $(TEST_GUI_CXXFLAGS) .\controls\pickertest.cpp
-
-$(OBJS)\test_gui_radioboxtest.obj: .\controls\radioboxtest.cpp
- $(CXX) /c /nologo /TP /Fo$@ $(TEST_GUI_CXXFLAGS) .\controls\radioboxtest.cpp
-
-$(OBJS)\test_gui_radiobuttontest.obj: .\controls\radiobuttontest.cpp
- $(CXX) /c /nologo /TP /Fo$@ $(TEST_GUI_CXXFLAGS) .\controls\radiobuttontest.cpp
-
-$(OBJS)\test_gui_rearrangelisttest.obj: .\controls\rearrangelisttest.cpp
- $(CXX) /c /nologo /TP /Fo$@ $(TEST_GUI_CXXFLAGS) .\controls\rearrangelisttest.cpp
-
-$(OBJS)\test_gui_richtextctrltest.obj: .\controls\richtextctrltest.cpp
- $(CXX) /c /nologo /TP /Fo$@ $(TEST_GUI_CXXFLAGS) .\controls\richtextctrltest.cpp
-
-$(OBJS)\test_gui_searchctrltest.obj: .\controls\searchctrltest.cpp
- $(CXX) /c /nologo /TP /Fo$@ $(TEST_GUI_CXXFLAGS) .\controls\searchctrltest.cpp
-
-$(OBJS)\test_gui_simplebooktest.obj: .\controls\simplebooktest.cpp
- $(CXX) /c /nologo /TP /Fo$@ $(TEST_GUI_CXXFLAGS) .\controls\simplebooktest.cpp
-
-$(OBJS)\test_gui_slidertest.obj: .\controls\slidertest.cpp
- $(CXX) /c /nologo /TP /Fo$@ $(TEST_GUI_CXXFLAGS) .\controls\slidertest.cpp
-
-$(OBJS)\test_gui_spinctrldbltest.obj: .\controls\spinctrldbltest.cpp
- $(CXX) /c /nologo /TP /Fo$@ $(TEST_GUI_CXXFLAGS) .\controls\spinctrldbltest.cpp
-
-$(OBJS)\test_gui_spinctrltest.obj: .\controls\spinctrltest.cpp
- $(CXX) /c /nologo /TP /Fo$@ $(TEST_GUI_CXXFLAGS) .\controls\spinctrltest.cpp
-
-$(OBJS)\test_gui_textctrltest.obj: .\controls\textctrltest.cpp
- $(CXX) /c /nologo /TP /Fo$@ $(TEST_GUI_CXXFLAGS) .\controls\textctrltest.cpp
-
-$(OBJS)\test_gui_textentrytest.obj: .\controls\textentrytest.cpp
- $(CXX) /c /nologo /TP /Fo$@ $(TEST_GUI_CXXFLAGS) .\controls\textentrytest.cpp
-
-$(OBJS)\test_gui_togglebuttontest.obj: .\controls\togglebuttontest.cpp
- $(CXX) /c /nologo /TP /Fo$@ $(TEST_GUI_CXXFLAGS) .\controls\togglebuttontest.cpp
-
-$(OBJS)\test_gui_toolbooktest.obj: .\controls\toolbooktest.cpp
- $(CXX) /c /nologo /TP /Fo$@ $(TEST_GUI_CXXFLAGS) .\controls\toolbooktest.cpp
-
-$(OBJS)\test_gui_treebooktest.obj: .\controls\treebooktest.cpp
- $(CXX) /c /nologo /TP /Fo$@ $(TEST_GUI_CXXFLAGS) .\controls\treebooktest.cpp
-
-$(OBJS)\test_gui_treectrltest.obj: .\controls\treectrltest.cpp
- $(CXX) /c /nologo /TP /Fo$@ $(TEST_GUI_CXXFLAGS) .\controls\treectrltest.cpp
-
-$(OBJS)\test_gui_treelistctrltest.obj: .\controls\treelistctrltest.cpp
- $(CXX) /c /nologo /TP /Fo$@ $(TEST_GUI_CXXFLAGS) .\controls\treelistctrltest.cpp
-
-$(OBJS)\test_gui_virtlistctrltest.obj: .\controls\virtlistctrltest.cpp
- $(CXX) /c /nologo /TP /Fo$@ $(TEST_GUI_CXXFLAGS) .\controls\virtlistctrltest.cpp
-
-$(OBJS)\test_gui_webtest.obj: .\controls\webtest.cpp
- $(CXX) /c /nologo /TP /Fo$@ $(TEST_GUI_CXXFLAGS) .\controls\webtest.cpp
-
-$(OBJS)\test_gui_windowtest.obj: .\controls\windowtest.cpp
- $(CXX) /c /nologo /TP /Fo$@ $(TEST_GUI_CXXFLAGS) .\controls\windowtest.cpp
-
-$(OBJS)\test_gui_dialogtest.obj: .\controls\dialogtest.cpp
- $(CXX) /c /nologo /TP /Fo$@ $(TEST_GUI_CXXFLAGS) .\controls\dialogtest.cpp
-
-$(OBJS)\test_gui_clone.obj: .\events\clone.cpp
- $(CXX) /c /nologo /TP /Fo$@ $(TEST_GUI_CXXFLAGS) .\events\clone.cpp
-
-$(OBJS)\test_gui_evtlooptest.obj: .\events\evtlooptest.cpp
- $(CXX) /c /nologo /TP /Fo$@ $(TEST_GUI_CXXFLAGS) .\events\evtlooptest.cpp
-
-$(OBJS)\test_gui_propagation.obj: .\events\propagation.cpp
- $(CXX) /c /nologo /TP /Fo$@ $(TEST_GUI_CXXFLAGS) .\events\propagation.cpp
-
-$(OBJS)\test_gui_keyboard.obj: .\events\keyboard.cpp
- $(CXX) /c /nologo /TP /Fo$@ $(TEST_GUI_CXXFLAGS) .\events\keyboard.cpp
-
-$(OBJS)\test_gui_exec.obj: .\exec\exec.cpp
- $(CXX) /c /nologo /TP /Fo$@ $(TEST_GUI_CXXFLAGS) .\exec\exec.cpp
-
-$(OBJS)\test_gui_fonttest.obj: .\font\fonttest.cpp
- $(CXX) /c /nologo /TP /Fo$@ $(TEST_GUI_CXXFLAGS) .\font\fonttest.cpp
-
-$(OBJS)\test_gui_image.obj: .\image\image.cpp
- $(CXX) /c /nologo /TP /Fo$@ $(TEST_GUI_CXXFLAGS) .\image\image.cpp
-
-$(OBJS)\test_gui_rawbmp.obj: .\image\rawbmp.cpp
- $(CXX) /c /nologo /TP /Fo$@ $(TEST_GUI_CXXFLAGS) .\image\rawbmp.cpp
-
-$(OBJS)\test_gui_htmlparser.obj: .\html\htmlparser.cpp
- $(CXX) /c /nologo /TP /Fo$@ $(TEST_GUI_CXXFLAGS) .\html\htmlparser.cpp
-
-$(OBJS)\test_gui_htmlwindow.obj: .\html\htmlwindow.cpp
- $(CXX) /c /nologo /TP /Fo$@ $(TEST_GUI_CXXFLAGS) .\html\htmlwindow.cpp
-
-$(OBJS)\test_gui_accelentry.obj: .\menu\accelentry.cpp
- $(CXX) /c /nologo /TP /Fo$@ $(TEST_GUI_CXXFLAGS) .\menu\accelentry.cpp
-
-$(OBJS)\test_gui_menu.obj: .\menu\menu.cpp
- $(CXX) /c /nologo /TP /Fo$@ $(TEST_GUI_CXXFLAGS) .\menu\menu.cpp
-
-$(OBJS)\test_gui_guifuncs.obj: .\misc\guifuncs.cpp
- $(CXX) /c /nologo /TP /Fo$@ $(TEST_GUI_CXXFLAGS) .\misc\guifuncs.cpp
-
-$(OBJS)\test_gui_selstoretest.obj: .\misc\selstoretest.cpp
- $(CXX) /c /nologo /TP /Fo$@ $(TEST_GUI_CXXFLAGS) .\misc\selstoretest.cpp
-
-$(OBJS)\test_gui_garbage.obj: .\misc\garbage.cpp
- $(CXX) /c /nologo /TP /Fo$@ $(TEST_GUI_CXXFLAGS) .\misc\garbage.cpp
-
-$(OBJS)\test_gui_safearrayconverttest.obj: .\misc\safearrayconverttest.cpp
- $(CXX) /c /nologo /TP /Fo$@ $(TEST_GUI_CXXFLAGS) .\misc\safearrayconverttest.cpp
-
-$(OBJS)\test_gui_settings.obj: .\misc\settings.cpp
- $(CXX) /c /nologo /TP /Fo$@ $(TEST_GUI_CXXFLAGS) .\misc\settings.cpp
-
-$(OBJS)\test_gui_socket.obj: .\net\socket.cpp
- $(CXX) /c /nologo /TP /Fo$@ $(TEST_GUI_CXXFLAGS) .\net\socket.cpp
-
-$(OBJS)\test_gui_boxsizer.obj: .\sizers\boxsizer.cpp
- $(CXX) /c /nologo /TP /Fo$@ $(TEST_GUI_CXXFLAGS) .\sizers\boxsizer.cpp
-
-$(OBJS)\test_gui_wrapsizer.obj: .\sizers\wrapsizer.cpp
- $(CXX) /c /nologo /TP /Fo$@ $(TEST_GUI_CXXFLAGS) .\sizers\wrapsizer.cpp
-
-$(OBJS)\test_gui_toplevel.obj: .\toplevel\toplevel.cpp
- $(CXX) /c /nologo /TP /Fo$@ $(TEST_GUI_CXXFLAGS) .\toplevel\toplevel.cpp
-
-$(OBJS)\test_gui_valnum.obj: .\validators\valnum.cpp
- $(CXX) /c /nologo /TP /Fo$@ $(TEST_GUI_CXXFLAGS) .\validators\valnum.cpp
-
-$(OBJS)\test_gui_clientsize.obj: .\window\clientsize.cpp
- $(CXX) /c /nologo /TP /Fo$@ $(TEST_GUI_CXXFLAGS) .\window\clientsize.cpp
-
-$(OBJS)\test_gui_setsize.obj: .\window\setsize.cpp
- $(CXX) /c /nologo /TP /Fo$@ $(TEST_GUI_CXXFLAGS) .\window\setsize.cpp
-
-$(OBJS)\test_gui_xrctest.obj: .\xml\xrctest.cpp
- $(CXX) /c /nologo /TP /Fo$@ $(TEST_GUI_CXXFLAGS) .\xml\xrctest.cpp
-
+# =========================================================================
+# This makefile was generated by
+# Bakefile 0.2.9 (http://www.bakefile.org)
+# Do not modify, all changes will be overwritten!
+# =========================================================================
+
+!include <../build/msw/config.vc>
+
+# -------------------------------------------------------------------------
+# Do not modify the rest of this file!
+# -------------------------------------------------------------------------
+
+### Variables: ###
+
+WX_RELEASE_NODOT = 31
+COMPILER_PREFIX = vc
+OBJS = \
+ $(COMPILER_PREFIX)$(COMPILER_VERSION)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)$(ARCH_SUFFIX)
+LIBDIRNAME = \
+ .\..\lib\$(COMPILER_PREFIX)$(COMPILER_VERSION)$(ARCH_SUFFIX)_$(LIBTYPE_SUFFIX)$(CFG)
+SETUPHDIR = \
+ $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)
+TEST_CXXFLAGS = /M$(__RUNTIME_LIBS_10)$(__DEBUGRUNTIME) /DWIN32 $(__DEBUGINFO) \
+ /Fd$(OBJS)\test.pdb $(____DEBUGRUNTIME) $(__OPTIMIZEFLAG) \
+ /D_CRT_SECURE_NO_DEPRECATE=1 /D_CRT_NON_CONFORMING_SWPRINTFS=1 \
+ /D_SCL_SECURE_NO_WARNINGS=1 $(__NO_VC_CRTDBG_p) /D__WXMSW__ \
+ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__NDEBUG_DEFINE_p) \
+ $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \
+ $(__UNICODE_DEFINE_p) /I$(SETUPHDIR) /I.\..\include \
+ $(____CAIRO_INCLUDEDIR_FILENAMES) /W4 /I. $(__DLLFLAG_p) /D_CONSOLE \
+ /DwxUSE_GUI=0 $(CPPUNIT_CFLAGS) $(__RTTIFLAG) $(__EXCEPTIONSFLAG) \
+ /Yu"testprec.h" /Fp"$(OBJS)\testprec_test.pch" $(CPPFLAGS) $(CXXFLAGS)
+TEST_OBJECTS = \
+ $(OBJS)\test_dummy.obj \
+ $(OBJS)\test_test.obj \
+ $(OBJS)\test_anytest.obj \
+ $(OBJS)\test_archivetest.obj \
+ $(OBJS)\test_ziptest.obj \
+ $(OBJS)\test_tartest.obj \
+ $(OBJS)\test_arrays.obj \
+ $(OBJS)\test_base64.obj \
+ $(OBJS)\test_cmdlinetest.obj \
+ $(OBJS)\test_fileconf.obj \
+ $(OBJS)\test_regconf.obj \
+ $(OBJS)\test_datetimetest.obj \
+ $(OBJS)\test_evthandler.obj \
+ $(OBJS)\test_evtlooptest.obj \
+ $(OBJS)\test_evtsource.obj \
+ $(OBJS)\test_stopwatch.obj \
+ $(OBJS)\test_timertest.obj \
+ $(OBJS)\test_exec.obj \
+ $(OBJS)\test_dir.obj \
+ $(OBJS)\test_filefn.obj \
+ $(OBJS)\test_filetest.obj \
+ $(OBJS)\test_filekind.obj \
+ $(OBJS)\test_filenametest.obj \
+ $(OBJS)\test_filesystest.obj \
+ $(OBJS)\test_fontmaptest.obj \
+ $(OBJS)\test_formatconvertertest.obj \
+ $(OBJS)\test_fswatchertest.obj \
+ $(OBJS)\test_hashes.obj \
+ $(OBJS)\test_output.obj \
+ $(OBJS)\test_input.obj \
+ $(OBJS)\test_intltest.obj \
+ $(OBJS)\test_lists.obj \
+ $(OBJS)\test_logtest.obj \
+ $(OBJS)\test_longlongtest.obj \
+ $(OBJS)\test_convautotest.obj \
+ $(OBJS)\test_mbconvtest.obj \
+ $(OBJS)\test_dynamiclib.obj \
+ $(OBJS)\test_environ.obj \
+ $(OBJS)\test_metatest.obj \
+ $(OBJS)\test_misctests.obj \
+ $(OBJS)\test_module.obj \
+ $(OBJS)\test_pathlist.obj \
+ $(OBJS)\test_typeinfotest.obj \
+ $(OBJS)\test_ipc.obj \
+ $(OBJS)\test_socket.obj \
+ $(OBJS)\test_regextest.obj \
+ $(OBJS)\test_wxregextest.obj \
+ $(OBJS)\test_scopeguardtest.obj \
+ $(OBJS)\test_iostream.obj \
+ $(OBJS)\test_numformatter.obj \
+ $(OBJS)\test_strings.obj \
+ $(OBJS)\test_stdstrings.obj \
+ $(OBJS)\test_tokenizer.obj \
+ $(OBJS)\test_unichar.obj \
+ $(OBJS)\test_unicode.obj \
+ $(OBJS)\test_vararg.obj \
+ $(OBJS)\test_crt.obj \
+ $(OBJS)\test_vsnprintf.obj \
+ $(OBJS)\test_bstream.obj \
+ $(OBJS)\test_datastreamtest.obj \
+ $(OBJS)\test_ffilestream.obj \
+ $(OBJS)\test_fileback.obj \
+ $(OBJS)\test_filestream.obj \
+ $(OBJS)\test_iostreams.obj \
+ $(OBJS)\test_largefile.obj \
+ $(OBJS)\test_memstream.obj \
+ $(OBJS)\test_socketstream.obj \
+ $(OBJS)\test_sstream.obj \
+ $(OBJS)\test_stdstream.obj \
+ $(OBJS)\test_tempfile.obj \
+ $(OBJS)\test_textstreamtest.obj \
+ $(OBJS)\test_zlibstream.obj \
+ $(OBJS)\test_textfiletest.obj \
+ $(OBJS)\test_atomic.obj \
+ $(OBJS)\test_misc.obj \
+ $(OBJS)\test_queue.obj \
+ $(OBJS)\test_tls.obj \
+ $(OBJS)\test_ftp.obj \
+ $(OBJS)\test_uris.obj \
+ $(OBJS)\test_url.obj \
+ $(OBJS)\test_vectors.obj \
+ $(OBJS)\test_evtconnection.obj \
+ $(OBJS)\test_weakref.obj \
+ $(OBJS)\test_xlocale.obj \
+ $(OBJS)\test_xmltest.obj
+TEST_DRAWING_CXXFLAGS = /M$(__RUNTIME_LIBS_27)$(__DEBUGRUNTIME) /DWIN32 \
+ $(__DEBUGINFO) /Fd$(OBJS)\test_drawing.pdb $(____DEBUGRUNTIME) \
+ $(__OPTIMIZEFLAG) /D_CRT_SECURE_NO_DEPRECATE=1 \
+ /D_CRT_NON_CONFORMING_SWPRINTFS=1 /D_SCL_SECURE_NO_WARNINGS=1 \
+ $(__NO_VC_CRTDBG_p) /D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \
+ $(__NDEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \
+ $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) /I$(SETUPHDIR) /I.\..\include \
+ $(____CAIRO_INCLUDEDIR_FILENAMES) /W4 /I. $(__DLLFLAG_p) /D_CONSOLE \
+ /DwxUSE_GUI=0 $(CPPUNIT_CFLAGS) $(__RTTIFLAG) $(__EXCEPTIONSFLAG) \
+ /Yu"testprec.h" /Fp"$(OBJS)\testprec_test_drawing.pch" $(CPPFLAGS) \
+ $(CXXFLAGS)
+TEST_DRAWING_OBJECTS = \
+ $(OBJS)\test_drawing_dummy.obj \
+ $(OBJS)\test_drawing_test.obj \
+ $(OBJS)\test_drawing_drawing.obj \
+ $(OBJS)\test_drawing_plugindriver.obj \
+ $(OBJS)\test_drawing_basictest.obj \
+ $(OBJS)\test_drawing_fonttest.obj
+TEST_DRAWINGPLUGIN_CXXFLAGS = /M$(__RUNTIME_LIBS_45)$(__DEBUGRUNTIME) /DWIN32 \
+ $(__DEBUGINFO) /Fd$(OBJS)\test_drawingplugin.pdb $(____DEBUGRUNTIME) \
+ $(__OPTIMIZEFLAG) /D_CRT_SECURE_NO_DEPRECATE=1 \
+ /D_CRT_NON_CONFORMING_SWPRINTFS=1 /D_SCL_SECURE_NO_WARNINGS=1 \
+ $(__NO_VC_CRTDBG_p) /D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \
+ $(__NDEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \
+ $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) /I$(SETUPHDIR) /I.\..\include \
+ $(____CAIRO_INCLUDEDIR_FILENAMES) /W4 $(__DLLFLAG_p) $(__RTTIFLAG) \
+ $(__EXCEPTIONSFLAG) $(CPPFLAGS) $(CXXFLAGS)
+TEST_DRAWINGPLUGIN_OBJECTS = \
+ $(OBJS)\test_drawingplugin_pluginsample.obj
+TEST_GUI_CXXFLAGS = /M$(__RUNTIME_LIBS_59)$(__DEBUGRUNTIME) /DWIN32 \
+ $(__DEBUGINFO) /Fd$(OBJS)\test_gui.pdb $(____DEBUGRUNTIME) \
+ $(__OPTIMIZEFLAG) /D_CRT_SECURE_NO_DEPRECATE=1 \
+ /D_CRT_NON_CONFORMING_SWPRINTFS=1 /D_SCL_SECURE_NO_WARNINGS=1 \
+ $(__NO_VC_CRTDBG_p) /D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \
+ $(__NDEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \
+ $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) /I$(SETUPHDIR) /I.\..\include \
+ $(____CAIRO_INCLUDEDIR_FILENAMES) /W4 /I. $(__DLLFLAG_p) /I.\..\samples \
+ /DNOPCH $(CPPUNIT_CFLAGS) /D_CONSOLE $(__RTTIFLAG) $(__EXCEPTIONSFLAG) \
+ /Yu"testprec.h" /Fp"$(OBJS)\testprec_test_gui.pch" $(CPPFLAGS) $(CXXFLAGS)
+TEST_GUI_OBJECTS = \
+ $(OBJS)\test_gui_dummy.obj \
+ $(OBJS)\test_gui_asserthelper.obj \
+ $(OBJS)\test_gui_test.obj \
+ $(OBJS)\test_gui_testableframe.obj \
+ $(OBJS)\test_gui_rect.obj \
+ $(OBJS)\test_gui_size.obj \
+ $(OBJS)\test_gui_point.obj \
+ $(OBJS)\test_gui_region.obj \
+ $(OBJS)\test_gui_bitmap.obj \
+ $(OBJS)\test_gui_colour.obj \
+ $(OBJS)\test_gui_ellipsization.obj \
+ $(OBJS)\test_gui_measuring.obj \
+ $(OBJS)\test_gui_affinematrix.obj \
+ $(OBJS)\test_gui_boundingbox.obj \
+ $(OBJS)\test_gui_config.obj \
+ $(OBJS)\test_gui_bitmapcomboboxtest.obj \
+ $(OBJS)\test_gui_bitmaptogglebuttontest.obj \
+ $(OBJS)\test_gui_bookctrlbasetest.obj \
+ $(OBJS)\test_gui_buttontest.obj \
+ $(OBJS)\test_gui_checkboxtest.obj \
+ $(OBJS)\test_gui_checklistboxtest.obj \
+ $(OBJS)\test_gui_choicebooktest.obj \
+ $(OBJS)\test_gui_choicetest.obj \
+ $(OBJS)\test_gui_comboboxtest.obj \
+ $(OBJS)\test_gui_dataviewctrltest.obj \
+ $(OBJS)\test_gui_datepickerctrltest.obj \
+ $(OBJS)\test_gui_frametest.obj \
+ $(OBJS)\test_gui_gaugetest.obj \
+ $(OBJS)\test_gui_gridtest.obj \
+ $(OBJS)\test_gui_headerctrltest.obj \
+ $(OBJS)\test_gui_htmllboxtest.obj \
+ $(OBJS)\test_gui_hyperlinkctrltest.obj \
+ $(OBJS)\test_gui_itemcontainertest.obj \
+ $(OBJS)\test_gui_label.obj \
+ $(OBJS)\test_gui_listbasetest.obj \
+ $(OBJS)\test_gui_listbooktest.obj \
+ $(OBJS)\test_gui_listboxtest.obj \
+ $(OBJS)\test_gui_listctrltest.obj \
+ $(OBJS)\test_gui_listviewtest.obj \
+ $(OBJS)\test_gui_markuptest.obj \
+ $(OBJS)\test_gui_notebooktest.obj \
+ $(OBJS)\test_gui_ownerdrawncomboboxtest.obj \
+ $(OBJS)\test_gui_pickerbasetest.obj \
+ $(OBJS)\test_gui_pickertest.obj \
+ $(OBJS)\test_gui_radioboxtest.obj \
+ $(OBJS)\test_gui_radiobuttontest.obj \
+ $(OBJS)\test_gui_rearrangelisttest.obj \
+ $(OBJS)\test_gui_richtextctrltest.obj \
+ $(OBJS)\test_gui_searchctrltest.obj \
+ $(OBJS)\test_gui_simplebooktest.obj \
+ $(OBJS)\test_gui_slidertest.obj \
+ $(OBJS)\test_gui_spinctrldbltest.obj \
+ $(OBJS)\test_gui_spinctrltest.obj \
+ $(OBJS)\test_gui_textctrltest.obj \
+ $(OBJS)\test_gui_textentrytest.obj \
+ $(OBJS)\test_gui_togglebuttontest.obj \
+ $(OBJS)\test_gui_toolbooktest.obj \
+ $(OBJS)\test_gui_treebooktest.obj \
+ $(OBJS)\test_gui_treectrltest.obj \
+ $(OBJS)\test_gui_treelistctrltest.obj \
+ $(OBJS)\test_gui_virtlistctrltest.obj \
+ $(OBJS)\test_gui_webtest.obj \
+ $(OBJS)\test_gui_windowtest.obj \
+ $(OBJS)\test_gui_dialogtest.obj \
+ $(OBJS)\test_gui_clone.obj \
+ $(OBJS)\test_gui_evtlooptest.obj \
+ $(OBJS)\test_gui_propagation.obj \
+ $(OBJS)\test_gui_keyboard.obj \
+ $(OBJS)\test_gui_exec.obj \
+ $(OBJS)\test_gui_fonttest.obj \
+ $(OBJS)\test_gui_image.obj \
+ $(OBJS)\test_gui_rawbmp.obj \
+ $(OBJS)\test_gui_htmlparser.obj \
+ $(OBJS)\test_gui_htmlwindow.obj \
+ $(OBJS)\test_gui_accelentry.obj \
+ $(OBJS)\test_gui_menu.obj \
+ $(OBJS)\test_gui_guifuncs.obj \
+ $(OBJS)\test_gui_selstoretest.obj \
+ $(OBJS)\test_gui_garbage.obj \
+ $(OBJS)\test_gui_safearrayconverttest.obj \
+ $(OBJS)\test_gui_settings.obj \
+ $(OBJS)\test_gui_socket.obj \
+ $(OBJS)\test_gui_boxsizer.obj \
+ $(OBJS)\test_gui_wrapsizer.obj \
+ $(OBJS)\test_gui_toplevel.obj \
+ $(OBJS)\test_gui_valnum.obj \
+ $(OBJS)\test_gui_clientsize.obj \
+ $(OBJS)\test_gui_setsize.obj \
+ $(OBJS)\test_gui_xrctest.obj
+TEST_GUI_RESOURCES = \
+ $(OBJS)\test_gui_sample.res
+
+### Conditionally set variables: ###
+
+!if "$(TARGET_CPU)" == "AMD64"
+ARCH_SUFFIX = _x64
+!endif
+!if "$(TARGET_CPU)" == "IA64"
+ARCH_SUFFIX = _ia64
+!endif
+!if "$(TARGET_CPU)" == "X64"
+ARCH_SUFFIX = _x64
+!endif
+!if "$(TARGET_CPU)" == "amd64"
+ARCH_SUFFIX = _x64
+!endif
+!if "$(TARGET_CPU)" == "ia64"
+ARCH_SUFFIX = _ia64
+!endif
+!if "$(TARGET_CPU)" == "x64"
+ARCH_SUFFIX = _x64
+!endif
+!if "$(USE_GUI)" == "0"
+PORTNAME = base
+!endif
+!if "$(USE_GUI)" == "1"
+PORTNAME = msw$(TOOLKIT_VERSION)
+!endif
+!if "$(OFFICIAL_BUILD)" == "1"
+COMPILER_VERSION = ERROR-COMPILER-VERSION-MUST-BE-SET-FOR-OFFICIAL-BUILD
+!endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default"
+WXDEBUGFLAG = d
+!endif
+!if "$(DEBUG_RUNTIME_LIBS)" == "1"
+WXDEBUGFLAG = d
+!endif
+!if "$(UNICODE)" == "1"
+WXUNICODEFLAG = u
+!endif
+!if "$(WXUNIV)" == "1"
+WXUNIVNAME = univ
+!endif
+!if "$(SHARED)" == "1"
+WXDLLFLAG = dll
+!endif
+!if "$(SHARED)" == "0"
+LIBTYPE_SUFFIX = lib
+!endif
+!if "$(SHARED)" == "1"
+LIBTYPE_SUFFIX = dll
+!endif
+!if "$(TARGET_CPU)" == "AMD64"
+LINK_TARGET_CPU = /MACHINE:X64
+!endif
+!if "$(TARGET_CPU)" == "IA64"
+LINK_TARGET_CPU = /MACHINE:IA64
+!endif
+!if "$(TARGET_CPU)" == "X64"
+LINK_TARGET_CPU = /MACHINE:X64
+!endif
+!if "$(TARGET_CPU)" == "amd64"
+LINK_TARGET_CPU = /MACHINE:X64
+!endif
+!if "$(TARGET_CPU)" == "ia64"
+LINK_TARGET_CPU = /MACHINE:IA64
+!endif
+!if "$(TARGET_CPU)" == "x64"
+LINK_TARGET_CPU = /MACHINE:X64
+!endif
+!if "$(MONOLITHIC)" == "0"
+EXTRALIBS_FOR_BASE =
+!endif
+!if "$(MONOLITHIC)" == "1"
+EXTRALIBS_FOR_BASE =
+!endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default"
+__DEBUGINFO_2 = $(__DEBUGRUNTIME_2)
+!endif
+!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default"
+__DEBUGINFO_2 =
+!endif
+!if "$(DEBUG_INFO)" == "0"
+__DEBUGINFO_2 =
+!endif
+!if "$(DEBUG_INFO)" == "1"
+__DEBUGINFO_2 = $(__DEBUGRUNTIME_2)
+!endif
+!if "$(RUNTIME_LIBS)" == "dynamic"
+__RUNTIME_LIBS_10 = D
+!endif
+!if "$(RUNTIME_LIBS)" == "static"
+__RUNTIME_LIBS_10 = $(__THREADSFLAG)
+!endif
+!if "$(MONOLITHIC)" == "1"
+__LIB_PNG_IF_MONO_p = $(__LIB_PNG_p)
+!endif
+!if "$(USE_GUI)" == "1"
+__test_drawing___depname = $(OBJS)\test_drawing.exe
+!endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default"
+__DEBUGINFO_19 = $(__DEBUGRUNTIME_2)
+!endif
+!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default"
+__DEBUGINFO_19 =
+!endif
+!if "$(DEBUG_INFO)" == "0"
+__DEBUGINFO_19 =
+!endif
+!if "$(DEBUG_INFO)" == "1"
+__DEBUGINFO_19 = $(__DEBUGRUNTIME_2)
+!endif
+!if "$(RUNTIME_LIBS)" == "dynamic"
+__RUNTIME_LIBS_27 = D
+!endif
+!if "$(RUNTIME_LIBS)" == "static"
+__RUNTIME_LIBS_27 = $(__THREADSFLAG)
+!endif
+!if "$(SHARED)" == "1" && "$(USE_GUI)" == "1"
+__test_drawingplugin___depname = $(OBJS)\test_drawingplugin.dll
+!endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default"
+__DEBUGINFO_37 = $(__DEBUGRUNTIME_2)
+!endif
+!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default"
+__DEBUGINFO_37 =
+!endif
+!if "$(DEBUG_INFO)" == "0"
+__DEBUGINFO_37 =
+!endif
+!if "$(DEBUG_INFO)" == "1"
+__DEBUGINFO_37 = $(__DEBUGRUNTIME_2)
+!endif
+!if "$(RUNTIME_LIBS)" == "dynamic"
+__RUNTIME_LIBS_45 = D
+!endif
+!if "$(RUNTIME_LIBS)" == "static"
+__RUNTIME_LIBS_45 = $(__THREADSFLAG)
+!endif
+!if "$(USE_GUI)" == "1"
+__test_gui___depname = $(OBJS)\test_gui.exe
+!endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default"
+__DEBUGINFO_51 = $(__DEBUGRUNTIME_2)
+!endif
+!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default"
+__DEBUGINFO_51 =
+!endif
+!if "$(DEBUG_INFO)" == "0"
+__DEBUGINFO_51 =
+!endif
+!if "$(DEBUG_INFO)" == "1"
+__DEBUGINFO_51 = $(__DEBUGRUNTIME_2)
+!endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default"
+____DEBUGRUNTIME_52_p_1 = /d _DEBUG
+!endif
+!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default"
+____DEBUGRUNTIME_52_p_1 =
+!endif
+!if "$(DEBUG_RUNTIME_LIBS)" == "0"
+____DEBUGRUNTIME_52_p_1 =
+!endif
+!if "$(DEBUG_RUNTIME_LIBS)" == "1"
+____DEBUGRUNTIME_52_p_1 = /d _DEBUG
+!endif
+!if "$(RUNTIME_LIBS)" == "dynamic"
+__RUNTIME_LIBS_59 = D
+!endif
+!if "$(RUNTIME_LIBS)" == "static"
+__RUNTIME_LIBS_59 = $(__THREADSFLAG)
+!endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "0"
+__NO_VC_CRTDBG_p_7 = /d __NO_VC_CRTDBG__
+!endif
+!if "$(BUILD)" == "release" && "$(DEBUG_FLAG)" == "1"
+__NO_VC_CRTDBG_p_7 = /d __NO_VC_CRTDBG__
+!endif
+!if "$(WXUNIV)" == "1"
+__WXUNIV_DEFINE_p_7 = /d __WXUNIVERSAL__
+!endif
+!if "$(DEBUG_FLAG)" == "0"
+__DEBUG_DEFINE_p_7 = /d wxDEBUG_LEVEL=0
+!endif
+!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default"
+__NDEBUG_DEFINE_p_7 = /d NDEBUG
+!endif
+!if "$(DEBUG_RUNTIME_LIBS)" == "0"
+__NDEBUG_DEFINE_p_7 = /d NDEBUG
+!endif
+!if "$(USE_EXCEPTIONS)" == "0"
+__EXCEPTIONS_DEFINE_p_7 = /d wxNO_EXCEPTIONS
+!endif
+!if "$(USE_RTTI)" == "0"
+__RTTI_DEFINE_p_7 = /d wxNO_RTTI
+!endif
+!if "$(USE_THREADS)" == "0"
+__THREAD_DEFINE_p_7 = /d wxNO_THREADS
+!endif
+!if "$(UNICODE)" == "0"
+__UNICODE_DEFINE_p_7 = /d wxUSE_UNICODE=0
+!endif
+!if "$(UNICODE)" == "1"
+__UNICODE_DEFINE_p_7 = /d _UNICODE
+!endif
+!if "$(USE_CAIRO)" == "1"
+____CAIRO_INCLUDEDIR_FILENAMES_7_p = /i $(CAIRO_ROOT)\include\cairo
+!endif
+!if "$(SHARED)" == "1"
+__DLLFLAG_p_7 = /d WXUSINGDLL
+!endif
+!if "$(MONOLITHIC)" == "0" && "$(USE_WEBVIEW)" == "1"
+__WXLIB_WEBVIEW_p = \
+ wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_webview.lib
+!endif
+!if "$(MONOLITHIC)" == "0"
+__WXLIB_RICHTEXT_p = \
+ wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_richtext.lib
+!endif
+!if "$(MONOLITHIC)" == "0" && "$(USE_MEDIA)" == "1"
+__WXLIB_MEDIA_p = \
+ wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_media.lib
+!endif
+!if "$(MONOLITHIC)" == "0"
+__WXLIB_XRC_p = \
+ wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xrc.lib
+!endif
+!if "$(MONOLITHIC)" == "0"
+__WXLIB_ADV_p = \
+ wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_adv.lib
+!endif
+!if "$(MONOLITHIC)" == "0"
+__WXLIB_HTML_p = \
+ wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_html.lib
+!endif
+!if "$(MONOLITHIC)" == "0"
+__WXLIB_XML_p = \
+ wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xml.lib
+!endif
+!if "$(MONOLITHIC)" == "0"
+__WXLIB_NET_p = \
+ wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_net.lib
+!endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default"
+__DEBUGINFO = /Zi
+!endif
+!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default"
+__DEBUGINFO =
+!endif
+!if "$(DEBUG_INFO)" == "0"
+__DEBUGINFO =
+!endif
+!if "$(DEBUG_INFO)" == "1"
+__DEBUGINFO = /Zi
+!endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default"
+__DEBUGINFO_4 = /DEBUG
+!endif
+!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default"
+__DEBUGINFO_4 =
+!endif
+!if "$(DEBUG_INFO)" == "0"
+__DEBUGINFO_4 =
+!endif
+!if "$(DEBUG_INFO)" == "1"
+__DEBUGINFO_4 = /DEBUG
+!endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default"
+____DEBUGRUNTIME = /D_DEBUG
+!endif
+!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default"
+____DEBUGRUNTIME =
+!endif
+!if "$(DEBUG_RUNTIME_LIBS)" == "0"
+____DEBUGRUNTIME =
+!endif
+!if "$(DEBUG_RUNTIME_LIBS)" == "1"
+____DEBUGRUNTIME = /D_DEBUG
+!endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default"
+__DEBUGRUNTIME = d
+!endif
+!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default"
+__DEBUGRUNTIME =
+!endif
+!if "$(DEBUG_RUNTIME_LIBS)" == "0"
+__DEBUGRUNTIME =
+!endif
+!if "$(DEBUG_RUNTIME_LIBS)" == "1"
+__DEBUGRUNTIME = d
+!endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default"
+__DEBUGRUNTIME_2 =
+!endif
+!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default"
+__DEBUGRUNTIME_2 = /opt:ref /opt:icf
+!endif
+!if "$(DEBUG_RUNTIME_LIBS)" == "0"
+__DEBUGRUNTIME_2 = /opt:ref /opt:icf
+!endif
+!if "$(DEBUG_RUNTIME_LIBS)" == "1"
+__DEBUGRUNTIME_2 =
+!endif
+!if "$(BUILD)" == "debug"
+__OPTIMIZEFLAG = /Od
+!endif
+!if "$(BUILD)" == "release"
+__OPTIMIZEFLAG = /O2
+!endif
+!if "$(USE_THREADS)" == "0"
+__THREADSFLAG = L
+!endif
+!if "$(USE_THREADS)" == "1"
+__THREADSFLAG = T
+!endif
+!if "$(USE_RTTI)" == "0"
+__RTTIFLAG =
+!endif
+!if "$(USE_RTTI)" == "1"
+__RTTIFLAG = /GR
+!endif
+!if "$(USE_EXCEPTIONS)" == "0"
+__EXCEPTIONSFLAG =
+!endif
+!if "$(USE_EXCEPTIONS)" == "1"
+__EXCEPTIONSFLAG = /EHsc
+!endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "0"
+__NO_VC_CRTDBG_p = /D__NO_VC_CRTDBG__
+!endif
+!if "$(BUILD)" == "release" && "$(DEBUG_FLAG)" == "1"
+__NO_VC_CRTDBG_p = /D__NO_VC_CRTDBG__
+!endif
+!if "$(WXUNIV)" == "1"
+__WXUNIV_DEFINE_p = /D__WXUNIVERSAL__
+!endif
+!if "$(DEBUG_FLAG)" == "0"
+__DEBUG_DEFINE_p = /DwxDEBUG_LEVEL=0
+!endif
+!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default"
+__NDEBUG_DEFINE_p = /DNDEBUG
+!endif
+!if "$(DEBUG_RUNTIME_LIBS)" == "0"
+__NDEBUG_DEFINE_p = /DNDEBUG
+!endif
+!if "$(USE_EXCEPTIONS)" == "0"
+__EXCEPTIONS_DEFINE_p = /DwxNO_EXCEPTIONS
+!endif
+!if "$(USE_RTTI)" == "0"
+__RTTI_DEFINE_p = /DwxNO_RTTI
+!endif
+!if "$(USE_THREADS)" == "0"
+__THREAD_DEFINE_p = /DwxNO_THREADS
+!endif
+!if "$(UNICODE)" == "0"
+__UNICODE_DEFINE_p = /DwxUSE_UNICODE=0
+!endif
+!if "$(UNICODE)" == "1"
+__UNICODE_DEFINE_p = /D_UNICODE
+!endif
+!if "$(USE_CAIRO)" == "1"
+____CAIRO_INCLUDEDIR_FILENAMES = /I$(CAIRO_ROOT)\include\cairo
+!endif
+!if "$(SHARED)" == "1"
+__DLLFLAG_p = /DWXUSINGDLL
+!endif
+!if "$(MONOLITHIC)" == "0"
+__WXLIB_CORE_p = \
+ wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib
+!endif
+!if "$(MONOLITHIC)" == "0"
+__WXLIB_BASE_p = \
+ wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib
+!endif
+!if "$(MONOLITHIC)" == "1"
+__WXLIB_MONO_p = \
+ wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib
+!endif
+!if "$(MONOLITHIC)" == "1" && "$(USE_STC)" == "1"
+__LIB_SCINTILLA_IF_MONO_p = wxscintilla$(WXDEBUGFLAG).lib
+!endif
+!if "$(USE_GUI)" == "1"
+__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib
+!endif
+!if "$(USE_GUI)" == "1"
+__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib
+!endif
+!if "$(USE_GUI)" == "1"
+__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib
+!endif
+!if "$(USE_CAIRO)" == "1"
+__CAIRO_LIB_p = cairo.lib
+!endif
+!if "$(USE_CAIRO)" == "1"
+____CAIRO_LIBDIR_FILENAMES = /LIBPATH:$(CAIRO_ROOT)\lib
+!endif
+
+
+all: $(OBJS)
+$(OBJS):
+ -if not exist $(OBJS) mkdir $(OBJS)
+
+### Targets: ###
+
+all: $(OBJS)\test.exe $(__test_drawing___depname) $(__test_drawingplugin___depname) $(__test_gui___depname) data data-images fr
+
+clean:
+ -if exist $(OBJS)\*.obj del $(OBJS)\*.obj
+ -if exist $(OBJS)\*.res del $(OBJS)\*.res
+ -if exist $(OBJS)\*.pch del $(OBJS)\*.pch
+ -if exist $(OBJS)\test.exe del $(OBJS)\test.exe
+ -if exist $(OBJS)\test.ilk del $(OBJS)\test.ilk
+ -if exist $(OBJS)\test.pdb del $(OBJS)\test.pdb
+ -if exist $(OBJS)\test_drawing.exe del $(OBJS)\test_drawing.exe
+ -if exist $(OBJS)\test_drawing.ilk del $(OBJS)\test_drawing.ilk
+ -if exist $(OBJS)\test_drawing.pdb del $(OBJS)\test_drawing.pdb
+ -if exist $(OBJS)\test_drawingplugin.dll del $(OBJS)\test_drawingplugin.dll
+ -if exist $(OBJS)\test_drawingplugin.ilk del $(OBJS)\test_drawingplugin.ilk
+ -if exist $(OBJS)\test_drawingplugin.pdb del $(OBJS)\test_drawingplugin.pdb
+ -if exist $(OBJS)\test_gui.exe del $(OBJS)\test_gui.exe
+ -if exist $(OBJS)\test_gui.ilk del $(OBJS)\test_gui.ilk
+ -if exist $(OBJS)\test_gui.pdb del $(OBJS)\test_gui.pdb
+
+$(OBJS)\test.exe: $(OBJS)\test_dummy.obj $(TEST_OBJECTS)
+ link /NOLOGO /OUT:$@ $(__DEBUGINFO_4) /pdb:"$(OBJS)\test.pdb" $(__DEBUGINFO_2) $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:CONSOLE $(CPPUNIT_LIBS) $(____CAIRO_LIBDIR_FILENAMES) $(LDFLAGS) @<<
+ $(TEST_OBJECTS) $(__WXLIB_NET_p) $(__WXLIB_XML_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_PNG_IF_MONO_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__CAIRO_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib
+<<
+
+!if "$(USE_GUI)" == "1"
+$(OBJS)\test_drawing.exe: $(OBJS)\test_drawing_dummy.obj $(TEST_DRAWING_OBJECTS)
+ link /NOLOGO /OUT:$@ $(__DEBUGINFO_4) /pdb:"$(OBJS)\test_drawing.pdb" $(__DEBUGINFO_19) $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:CONSOLE $(CPPUNIT_LIBS) $(____CAIRO_LIBDIR_FILENAMES) $(LDFLAGS) @<<
+ $(TEST_DRAWING_OBJECTS) $(__WXLIB_CORE_p) $(__WXLIB_NET_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_SCINTILLA_IF_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__CAIRO_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib
+<<
+!endif
+
+!if "$(SHARED)" == "1" && "$(USE_GUI)" == "1"
+$(OBJS)\test_drawingplugin.dll: $(TEST_DRAWINGPLUGIN_OBJECTS)
+ link /DLL /NOLOGO /OUT:$@ $(__DEBUGINFO_4) /pdb:"$(OBJS)\test_drawingplugin.pdb" $(__DEBUGINFO_37) $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) $(____CAIRO_LIBDIR_FILENAMES) $(LDFLAGS) @<<
+ $(TEST_DRAWINGPLUGIN_OBJECTS) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_SCINTILLA_IF_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__CAIRO_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib
+<<
+!endif
+
+!if "$(USE_GUI)" == "1"
+$(OBJS)\test_gui.exe: $(OBJS)\test_gui_dummy.obj $(TEST_GUI_OBJECTS) $(OBJS)\test_gui_sample.res
+ link /NOLOGO /OUT:$@ $(__DEBUGINFO_4) /pdb:"$(OBJS)\test_gui.pdb" $(__DEBUGINFO_51) $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) $(CPPUNIT_LIBS) /SUBSYSTEM:CONSOLE $(____CAIRO_LIBDIR_FILENAMES) $(LDFLAGS) @<<
+ $(TEST_GUI_OBJECTS) $(TEST_GUI_RESOURCES) $(__WXLIB_WEBVIEW_p) $(__WXLIB_RICHTEXT_p) $(__WXLIB_MEDIA_p) $(__WXLIB_XRC_p) $(__WXLIB_XML_p) $(__WXLIB_ADV_p) $(__WXLIB_HTML_p) $(__WXLIB_CORE_p) $(__WXLIB_NET_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_SCINTILLA_IF_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__CAIRO_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib
+<<
+!endif
+
+data:
+ if not exist $(OBJS) mkdir $(OBJS)
+ for %f in (horse.ani horse.bmp horse.cur horse.gif horse.ico horse.jpg horse.pcx horse.png horse.pnm horse.tga horse.tif horse.xpm) do if not exist $(OBJS)\%f copy .\%f $(OBJS)
+
+data-images:
+ if not exist image mkdir image
+ for %f in (horse_grey.bmp horse_grey_flipped.bmp horse_rle4.bmp horse_rle4_flipped.bmp horse_rle8.bmp horse_rle8_flipped.bmp horse_bicubic_50x50.png horse_bicubic_100x100.png horse_bicubic_150x150.png horse_bicubic_300x300.png horse_bilinear_50x50.png horse_bilinear_100x100.png horse_bilinear_150x150.png horse_bilinear_300x300.png horse_box_average_50x50.png horse_box_average_100x100.png horse_box_average_150x150.png horse_box_average_300x300.png) do if not exist image\%f copy .\image\%f image
+
+fr:
+ if not exist $(OBJS)\intl\fr mkdir $(OBJS)\intl\fr
+ for %f in (internat.po internat.mo) do if not exist $(OBJS)\intl\fr\%f copy .\intl\fr\%f $(OBJS)\intl\fr
+
+$(OBJS)\test_dummy.obj: .\dummy.cpp
+ $(CXX) /c /nologo /TP /Fo$@ $(TEST_CXXFLAGS) /Yctestprec.h .\dummy.cpp
+
+$(OBJS)\test_test.obj: .\test.cpp
+ $(CXX) /c /nologo /TP /Fo$@ $(TEST_CXXFLAGS) .\test.cpp
+
+$(OBJS)\test_anytest.obj: .\any\anytest.cpp
+ $(CXX) /c /nologo /TP /Fo$@ $(TEST_CXXFLAGS) .\any\anytest.cpp
+
+$(OBJS)\test_archivetest.obj: .\archive\archivetest.cpp
+ $(CXX) /c /nologo /TP /Fo$@ $(TEST_CXXFLAGS) .\archive\archivetest.cpp
+
+$(OBJS)\test_ziptest.obj: .\archive\ziptest.cpp
+ $(CXX) /c /nologo /TP /Fo$@ $(TEST_CXXFLAGS) .\archive\ziptest.cpp
+
+$(OBJS)\test_tartest.obj: .\archive\tartest.cpp
+ $(CXX) /c /nologo /TP /Fo$@ $(TEST_CXXFLAGS) .\archive\tartest.cpp
+
+$(OBJS)\test_arrays.obj: .\arrays\arrays.cpp
+ $(CXX) /c /nologo /TP /Fo$@ $(TEST_CXXFLAGS) .\arrays\arrays.cpp
+
+$(OBJS)\test_base64.obj: .\base64\base64.cpp
+ $(CXX) /c /nologo /TP /Fo$@ $(TEST_CXXFLAGS) .\base64\base64.cpp
+
+$(OBJS)\test_cmdlinetest.obj: .\cmdline\cmdlinetest.cpp
+ $(CXX) /c /nologo /TP /Fo$@ $(TEST_CXXFLAGS) .\cmdline\cmdlinetest.cpp
+
+$(OBJS)\test_fileconf.obj: .\config\fileconf.cpp
+ $(CXX) /c /nologo /TP /Fo$@ $(TEST_CXXFLAGS) .\config\fileconf.cpp
+
+$(OBJS)\test_regconf.obj: .\config\regconf.cpp
+ $(CXX) /c /nologo /TP /Fo$@ $(TEST_CXXFLAGS) .\config\regconf.cpp
+
+$(OBJS)\test_datetimetest.obj: .\datetime\datetimetest.cpp
+ $(CXX) /c /nologo /TP /Fo$@ $(TEST_CXXFLAGS) .\datetime\datetimetest.cpp
+
+$(OBJS)\test_evthandler.obj: .\events\evthandler.cpp
+ $(CXX) /c /nologo /TP /Fo$@ $(TEST_CXXFLAGS) .\events\evthandler.cpp
+
+$(OBJS)\test_evtlooptest.obj: .\events\evtlooptest.cpp
+ $(CXX) /c /nologo /TP /Fo$@ $(TEST_CXXFLAGS) .\events\evtlooptest.cpp
+
+$(OBJS)\test_evtsource.obj: .\events\evtsource.cpp
+ $(CXX) /c /nologo /TP /Fo$@ $(TEST_CXXFLAGS) .\events\evtsource.cpp
+
+$(OBJS)\test_stopwatch.obj: .\events\stopwatch.cpp
+ $(CXX) /c /nologo /TP /Fo$@ $(TEST_CXXFLAGS) .\events\stopwatch.cpp
+
+$(OBJS)\test_timertest.obj: .\events\timertest.cpp
+ $(CXX) /c /nologo /TP /Fo$@ $(TEST_CXXFLAGS) .\events\timertest.cpp
+
+$(OBJS)\test_exec.obj: .\exec\exec.cpp
+ $(CXX) /c /nologo /TP /Fo$@ $(TEST_CXXFLAGS) .\exec\exec.cpp
+
+$(OBJS)\test_dir.obj: .\file\dir.cpp
+ $(CXX) /c /nologo /TP /Fo$@ $(TEST_CXXFLAGS) .\file\dir.cpp
+
+$(OBJS)\test_filefn.obj: .\file\filefn.cpp
+ $(CXX) /c /nologo /TP /Fo$@ $(TEST_CXXFLAGS) .\file\filefn.cpp
+
+$(OBJS)\test_filetest.obj: .\file\filetest.cpp
+ $(CXX) /c /nologo /TP /Fo$@ $(TEST_CXXFLAGS) .\file\filetest.cpp
+
+$(OBJS)\test_filekind.obj: .\filekind\filekind.cpp
+ $(CXX) /c /nologo /TP /Fo$@ $(TEST_CXXFLAGS) .\filekind\filekind.cpp
+
+$(OBJS)\test_filenametest.obj: .\filename\filenametest.cpp
+ $(CXX) /c /nologo /TP /Fo$@ $(TEST_CXXFLAGS) .\filename\filenametest.cpp
+
+$(OBJS)\test_filesystest.obj: .\filesys\filesystest.cpp
+ $(CXX) /c /nologo /TP /Fo$@ $(TEST_CXXFLAGS) .\filesys\filesystest.cpp
+
+$(OBJS)\test_fontmaptest.obj: .\fontmap\fontmaptest.cpp
+ $(CXX) /c /nologo /TP /Fo$@ $(TEST_CXXFLAGS) .\fontmap\fontmaptest.cpp
+
+$(OBJS)\test_formatconvertertest.obj: .\formatconverter\formatconvertertest.cpp
+ $(CXX) /c /nologo /TP /Fo$@ $(TEST_CXXFLAGS) .\formatconverter\formatconvertertest.cpp
+
+$(OBJS)\test_fswatchertest.obj: .\fswatcher\fswatchertest.cpp
+ $(CXX) /c /nologo /TP /Fo$@ $(TEST_CXXFLAGS) .\fswatcher\fswatchertest.cpp
+
+$(OBJS)\test_hashes.obj: .\hashes\hashes.cpp
+ $(CXX) /c /nologo /TP /Fo$@ $(TEST_CXXFLAGS) .\hashes\hashes.cpp
+
+$(OBJS)\test_output.obj: .\interactive\output.cpp
+ $(CXX) /c /nologo /TP /Fo$@ $(TEST_CXXFLAGS) .\interactive\output.cpp
+
+$(OBJS)\test_input.obj: .\interactive\input.cpp
+ $(CXX) /c /nologo /TP /Fo$@ $(TEST_CXXFLAGS) .\interactive\input.cpp
+
+$(OBJS)\test_intltest.obj: .\intl\intltest.cpp
+ $(CXX) /c /nologo /TP /Fo$@ $(TEST_CXXFLAGS) .\intl\intltest.cpp
+
+$(OBJS)\test_lists.obj: .\lists\lists.cpp
+ $(CXX) /c /nologo /TP /Fo$@ $(TEST_CXXFLAGS) .\lists\lists.cpp
+
+$(OBJS)\test_logtest.obj: .\log\logtest.cpp
+ $(CXX) /c /nologo /TP /Fo$@ $(TEST_CXXFLAGS) .\log\logtest.cpp
+
+$(OBJS)\test_longlongtest.obj: .\longlong\longlongtest.cpp
+ $(CXX) /c /nologo /TP /Fo$@ $(TEST_CXXFLAGS) .\longlong\longlongtest.cpp
+
+$(OBJS)\test_convautotest.obj: .\mbconv\convautotest.cpp
+ $(CXX) /c /nologo /TP /Fo$@ $(TEST_CXXFLAGS) .\mbconv\convautotest.cpp
+
+$(OBJS)\test_mbconvtest.obj: .\mbconv\mbconvtest.cpp
+ $(CXX) /c /nologo /TP /Fo$@ $(TEST_CXXFLAGS) .\mbconv\mbconvtest.cpp
+
+$(OBJS)\test_dynamiclib.obj: .\misc\dynamiclib.cpp
+ $(CXX) /c /nologo /TP /Fo$@ $(TEST_CXXFLAGS) .\misc\dynamiclib.cpp
+
+$(OBJS)\test_environ.obj: .\misc\environ.cpp
+ $(CXX) /c /nologo /TP /Fo$@ $(TEST_CXXFLAGS) .\misc\environ.cpp
+
+$(OBJS)\test_metatest.obj: .\misc\metatest.cpp
+ $(CXX) /c /nologo /TP /Fo$@ $(TEST_CXXFLAGS) .\misc\metatest.cpp
+
+$(OBJS)\test_misctests.obj: .\misc\misctests.cpp
+ $(CXX) /c /nologo /TP /Fo$@ $(TEST_CXXFLAGS) .\misc\misctests.cpp
+
+$(OBJS)\test_module.obj: .\misc\module.cpp
+ $(CXX) /c /nologo /TP /Fo$@ $(TEST_CXXFLAGS) .\misc\module.cpp
+
+$(OBJS)\test_pathlist.obj: .\misc\pathlist.cpp
+ $(CXX) /c /nologo /TP /Fo$@ $(TEST_CXXFLAGS) .\misc\pathlist.cpp
+
+$(OBJS)\test_typeinfotest.obj: .\misc\typeinfotest.cpp
+ $(CXX) /c /nologo /TP /Fo$@ $(TEST_CXXFLAGS) .\misc\typeinfotest.cpp
+
+$(OBJS)\test_ipc.obj: .\net\ipc.cpp
+ $(CXX) /c /nologo /TP /Fo$@ $(TEST_CXXFLAGS) .\net\ipc.cpp
+
+$(OBJS)\test_socket.obj: .\net\socket.cpp
+ $(CXX) /c /nologo /TP /Fo$@ $(TEST_CXXFLAGS) .\net\socket.cpp
+
+$(OBJS)\test_regextest.obj: .\regex\regextest.cpp
+ $(CXX) /c /nologo /TP /Fo$@ $(TEST_CXXFLAGS) .\regex\regextest.cpp
+
+$(OBJS)\test_wxregextest.obj: .\regex\wxregextest.cpp
+ $(CXX) /c /nologo /TP /Fo$@ $(TEST_CXXFLAGS) .\regex\wxregextest.cpp
+
+$(OBJS)\test_scopeguardtest.obj: .\scopeguard\scopeguardtest.cpp
+ $(CXX) /c /nologo /TP /Fo$@ $(TEST_CXXFLAGS) .\scopeguard\scopeguardtest.cpp
+
+$(OBJS)\test_iostream.obj: .\strings\iostream.cpp
+ $(CXX) /c /nologo /TP /Fo$@ $(TEST_CXXFLAGS) .\strings\iostream.cpp
+
+$(OBJS)\test_numformatter.obj: .\strings\numformatter.cpp
+ $(CXX) /c /nologo /TP /Fo$@ $(TEST_CXXFLAGS) .\strings\numformatter.cpp
+
+$(OBJS)\test_strings.obj: .\strings\strings.cpp
+ $(CXX) /c /nologo /TP /Fo$@ $(TEST_CXXFLAGS) .\strings\strings.cpp
+
+$(OBJS)\test_stdstrings.obj: .\strings\stdstrings.cpp
+ $(CXX) /c /nologo /TP /Fo$@ $(TEST_CXXFLAGS) .\strings\stdstrings.cpp
+
+$(OBJS)\test_tokenizer.obj: .\strings\tokenizer.cpp
+ $(CXX) /c /nologo /TP /Fo$@ $(TEST_CXXFLAGS) .\strings\tokenizer.cpp
+
+$(OBJS)\test_unichar.obj: .\strings\unichar.cpp
+ $(CXX) /c /nologo /TP /Fo$@ $(TEST_CXXFLAGS) .\strings\unichar.cpp
+
+$(OBJS)\test_unicode.obj: .\strings\unicode.cpp
+ $(CXX) /c /nologo /TP /Fo$@ $(TEST_CXXFLAGS) .\strings\unicode.cpp
+
+$(OBJS)\test_vararg.obj: .\strings\vararg.cpp
+ $(CXX) /c /nologo /TP /Fo$@ $(TEST_CXXFLAGS) .\strings\vararg.cpp
+
+$(OBJS)\test_crt.obj: .\strings\crt.cpp
+ $(CXX) /c /nologo /TP /Fo$@ $(TEST_CXXFLAGS) .\strings\crt.cpp
+
+$(OBJS)\test_vsnprintf.obj: .\strings\vsnprintf.cpp
+ $(CXX) /c /nologo /TP /Fo$@ $(TEST_CXXFLAGS) .\strings\vsnprintf.cpp
+
+$(OBJS)\test_bstream.obj: .\streams\bstream.cpp
+ $(CXX) /c /nologo /TP /Fo$@ $(TEST_CXXFLAGS) .\streams\bstream.cpp
+
+$(OBJS)\test_datastreamtest.obj: .\streams\datastreamtest.cpp
+ $(CXX) /c /nologo /TP /Fo$@ $(TEST_CXXFLAGS) .\streams\datastreamtest.cpp
+
+$(OBJS)\test_ffilestream.obj: .\streams\ffilestream.cpp
+ $(CXX) /c /nologo /TP /Fo$@ $(TEST_CXXFLAGS) .\streams\ffilestream.cpp
+
+$(OBJS)\test_fileback.obj: .\streams\fileback.cpp
+ $(CXX) /c /nologo /TP /Fo$@ $(TEST_CXXFLAGS) .\streams\fileback.cpp
+
+$(OBJS)\test_filestream.obj: .\streams\filestream.cpp
+ $(CXX) /c /nologo /TP /Fo$@ $(TEST_CXXFLAGS) .\streams\filestream.cpp
+
+$(OBJS)\test_iostreams.obj: .\streams\iostreams.cpp
+ $(CXX) /c /nologo /TP /Fo$@ $(TEST_CXXFLAGS) .\streams\iostreams.cpp
+
+$(OBJS)\test_largefile.obj: .\streams\largefile.cpp
+ $(CXX) /c /nologo /TP /Fo$@ $(TEST_CXXFLAGS) .\streams\largefile.cpp
+
+$(OBJS)\test_memstream.obj: .\streams\memstream.cpp
+ $(CXX) /c /nologo /TP /Fo$@ $(TEST_CXXFLAGS) .\streams\memstream.cpp
+
+$(OBJS)\test_socketstream.obj: .\streams\socketstream.cpp
+ $(CXX) /c /nologo /TP /Fo$@ $(TEST_CXXFLAGS) .\streams\socketstream.cpp
+
+$(OBJS)\test_sstream.obj: .\streams\sstream.cpp
+ $(CXX) /c /nologo /TP /Fo$@ $(TEST_CXXFLAGS) .\streams\sstream.cpp
+
+$(OBJS)\test_stdstream.obj: .\streams\stdstream.cpp
+ $(CXX) /c /nologo /TP /Fo$@ $(TEST_CXXFLAGS) .\streams\stdstream.cpp
+
+$(OBJS)\test_tempfile.obj: .\streams\tempfile.cpp
+ $(CXX) /c /nologo /TP /Fo$@ $(TEST_CXXFLAGS) .\streams\tempfile.cpp
+
+$(OBJS)\test_textstreamtest.obj: .\streams\textstreamtest.cpp
+ $(CXX) /c /nologo /TP /Fo$@ $(TEST_CXXFLAGS) .\streams\textstreamtest.cpp
+
+$(OBJS)\test_zlibstream.obj: .\streams\zlibstream.cpp
+ $(CXX) /c /nologo /TP /Fo$@ $(TEST_CXXFLAGS) .\streams\zlibstream.cpp
+
+$(OBJS)\test_textfiletest.obj: .\textfile\textfiletest.cpp
+ $(CXX) /c /nologo /TP /Fo$@ $(TEST_CXXFLAGS) .\textfile\textfiletest.cpp
+
+$(OBJS)\test_atomic.obj: .\thread\atomic.cpp
+ $(CXX) /c /nologo /TP /Fo$@ $(TEST_CXXFLAGS) .\thread\atomic.cpp
+
+$(OBJS)\test_misc.obj: .\thread\misc.cpp
+ $(CXX) /c /nologo /TP /Fo$@ $(TEST_CXXFLAGS) .\thread\misc.cpp
+
+$(OBJS)\test_queue.obj: .\thread\queue.cpp
+ $(CXX) /c /nologo /TP /Fo$@ $(TEST_CXXFLAGS) .\thread\queue.cpp
+
+$(OBJS)\test_tls.obj: .\thread\tls.cpp
+ $(CXX) /c /nologo /TP /Fo$@ $(TEST_CXXFLAGS) .\thread\tls.cpp
+
+$(OBJS)\test_ftp.obj: .\uris\ftp.cpp
+ $(CXX) /c /nologo /TP /Fo$@ $(TEST_CXXFLAGS) .\uris\ftp.cpp
+
+$(OBJS)\test_uris.obj: .\uris\uris.cpp
+ $(CXX) /c /nologo /TP /Fo$@ $(TEST_CXXFLAGS) .\uris\uris.cpp
+
+$(OBJS)\test_url.obj: .\uris\url.cpp
+ $(CXX) /c /nologo /TP /Fo$@ $(TEST_CXXFLAGS) .\uris\url.cpp
+
+$(OBJS)\test_vectors.obj: .\vectors\vectors.cpp
+ $(CXX) /c /nologo /TP /Fo$@ $(TEST_CXXFLAGS) .\vectors\vectors.cpp
+
+$(OBJS)\test_evtconnection.obj: .\weakref\evtconnection.cpp
+ $(CXX) /c /nologo /TP /Fo$@ $(TEST_CXXFLAGS) .\weakref\evtconnection.cpp
+
+$(OBJS)\test_weakref.obj: .\weakref\weakref.cpp
+ $(CXX) /c /nologo /TP /Fo$@ $(TEST_CXXFLAGS) .\weakref\weakref.cpp
+
+$(OBJS)\test_xlocale.obj: .\xlocale\xlocale.cpp
+ $(CXX) /c /nologo /TP /Fo$@ $(TEST_CXXFLAGS) .\xlocale\xlocale.cpp
+
+$(OBJS)\test_xmltest.obj: .\xml\xmltest.cpp
+ $(CXX) /c /nologo /TP /Fo$@ $(TEST_CXXFLAGS) .\xml\xmltest.cpp
+
+$(OBJS)\test_drawing_dummy.obj: .\dummy.cpp
+ $(CXX) /c /nologo /TP /Fo$@ $(TEST_DRAWING_CXXFLAGS) /Yctestprec.h .\dummy.cpp
+
+$(OBJS)\test_drawing_test.obj: .\test.cpp
+ $(CXX) /c /nologo /TP /Fo$@ $(TEST_DRAWING_CXXFLAGS) .\test.cpp
+
+$(OBJS)\test_drawing_drawing.obj: .\drawing\drawing.cpp
+ $(CXX) /c /nologo /TP /Fo$@ $(TEST_DRAWING_CXXFLAGS) .\drawing\drawing.cpp
+
+$(OBJS)\test_drawing_plugindriver.obj: .\drawing\plugindriver.cpp
+ $(CXX) /c /nologo /TP /Fo$@ $(TEST_DRAWING_CXXFLAGS) .\drawing\plugindriver.cpp
+
+$(OBJS)\test_drawing_basictest.obj: .\drawing\basictest.cpp
+ $(CXX) /c /nologo /TP /Fo$@ $(TEST_DRAWING_CXXFLAGS) .\drawing\basictest.cpp
+
+$(OBJS)\test_drawing_fonttest.obj: .\drawing\fonttest.cpp
+ $(CXX) /c /nologo /TP /Fo$@ $(TEST_DRAWING_CXXFLAGS) .\drawing\fonttest.cpp
+
+$(OBJS)\test_drawingplugin_pluginsample.obj: .\drawing\pluginsample.cpp
+ $(CXX) /c /nologo /TP /Fo$@ $(TEST_DRAWINGPLUGIN_CXXFLAGS) .\drawing\pluginsample.cpp
+
+$(OBJS)\test_gui_dummy.obj: .\dummy.cpp
+ $(CXX) /c /nologo /TP /Fo$@ $(TEST_GUI_CXXFLAGS) /Yctestprec.h .\dummy.cpp
+
+$(OBJS)\test_gui_sample.res: .\..\samples\sample.rc
+ rc /fo$@ /d WIN32 $(____DEBUGRUNTIME_52_p_1) /d _CRT_SECURE_NO_DEPRECATE=1 /d _CRT_NON_CONFORMING_SWPRINTFS=1 /d _SCL_SECURE_NO_WARNINGS=1 $(__NO_VC_CRTDBG_p_7) /d __WXMSW__ $(__WXUNIV_DEFINE_p_7) $(__DEBUG_DEFINE_p_7) $(__NDEBUG_DEFINE_p_7) $(__EXCEPTIONS_DEFINE_p_7) $(__RTTI_DEFINE_p_7) $(__THREAD_DEFINE_p_7) $(__UNICODE_DEFINE_p_7) /i $(SETUPHDIR) /i .\..\include $(____CAIRO_INCLUDEDIR_FILENAMES_7_p) /i . $(__DLLFLAG_p_7) /i .\..\samples /d NOPCH /d _CONSOLE .\..\samples\sample.rc
+
+$(OBJS)\test_gui_asserthelper.obj: .\asserthelper.cpp
+ $(CXX) /c /nologo /TP /Fo$@ $(TEST_GUI_CXXFLAGS) .\asserthelper.cpp
+
+$(OBJS)\test_gui_test.obj: .\test.cpp
+ $(CXX) /c /nologo /TP /Fo$@ $(TEST_GUI_CXXFLAGS) .\test.cpp
+
+$(OBJS)\test_gui_testableframe.obj: .\testableframe.cpp
+ $(CXX) /c /nologo /TP /Fo$@ $(TEST_GUI_CXXFLAGS) .\testableframe.cpp
+
+$(OBJS)\test_gui_rect.obj: .\geometry\rect.cpp
+ $(CXX) /c /nologo /TP /Fo$@ $(TEST_GUI_CXXFLAGS) .\geometry\rect.cpp
+
+$(OBJS)\test_gui_size.obj: .\geometry\size.cpp
+ $(CXX) /c /nologo /TP /Fo$@ $(TEST_GUI_CXXFLAGS) .\geometry\size.cpp
+
+$(OBJS)\test_gui_point.obj: .\geometry\point.cpp
+ $(CXX) /c /nologo /TP /Fo$@ $(TEST_GUI_CXXFLAGS) .\geometry\point.cpp
+
+$(OBJS)\test_gui_region.obj: .\geometry\region.cpp
+ $(CXX) /c /nologo /TP /Fo$@ $(TEST_GUI_CXXFLAGS) .\geometry\region.cpp
+
+$(OBJS)\test_gui_bitmap.obj: .\graphics\bitmap.cpp
+ $(CXX) /c /nologo /TP /Fo$@ $(TEST_GUI_CXXFLAGS) .\graphics\bitmap.cpp
+
+$(OBJS)\test_gui_colour.obj: .\graphics\colour.cpp
+ $(CXX) /c /nologo /TP /Fo$@ $(TEST_GUI_CXXFLAGS) .\graphics\colour.cpp
+
+$(OBJS)\test_gui_ellipsization.obj: .\graphics\ellipsization.cpp
+ $(CXX) /c /nologo /TP /Fo$@ $(TEST_GUI_CXXFLAGS) .\graphics\ellipsization.cpp
+
+$(OBJS)\test_gui_measuring.obj: .\graphics\measuring.cpp
+ $(CXX) /c /nologo /TP /Fo$@ $(TEST_GUI_CXXFLAGS) .\graphics\measuring.cpp
+
+$(OBJS)\test_gui_affinematrix.obj: .\graphics\affinematrix.cpp
+ $(CXX) /c /nologo /TP /Fo$@ $(TEST_GUI_CXXFLAGS) .\graphics\affinematrix.cpp
+
+$(OBJS)\test_gui_boundingbox.obj: .\graphics\boundingbox.cpp
+ $(CXX) /c /nologo /TP /Fo$@ $(TEST_GUI_CXXFLAGS) .\graphics\boundingbox.cpp
+
+$(OBJS)\test_gui_config.obj: .\config\config.cpp
+ $(CXX) /c /nologo /TP /Fo$@ $(TEST_GUI_CXXFLAGS) .\config\config.cpp
+
+$(OBJS)\test_gui_bitmapcomboboxtest.obj: .\controls\bitmapcomboboxtest.cpp
+ $(CXX) /c /nologo /TP /Fo$@ $(TEST_GUI_CXXFLAGS) .\controls\bitmapcomboboxtest.cpp
+
+$(OBJS)\test_gui_bitmaptogglebuttontest.obj: .\controls\bitmaptogglebuttontest.cpp
+ $(CXX) /c /nologo /TP /Fo$@ $(TEST_GUI_CXXFLAGS) .\controls\bitmaptogglebuttontest.cpp
+
+$(OBJS)\test_gui_bookctrlbasetest.obj: .\controls\bookctrlbasetest.cpp
+ $(CXX) /c /nologo /TP /Fo$@ $(TEST_GUI_CXXFLAGS) .\controls\bookctrlbasetest.cpp
+
+$(OBJS)\test_gui_buttontest.obj: .\controls\buttontest.cpp
+ $(CXX) /c /nologo /TP /Fo$@ $(TEST_GUI_CXXFLAGS) .\controls\buttontest.cpp
+
+$(OBJS)\test_gui_checkboxtest.obj: .\controls\checkboxtest.cpp
+ $(CXX) /c /nologo /TP /Fo$@ $(TEST_GUI_CXXFLAGS) .\controls\checkboxtest.cpp
+
+$(OBJS)\test_gui_checklistboxtest.obj: .\controls\checklistboxtest.cpp
+ $(CXX) /c /nologo /TP /Fo$@ $(TEST_GUI_CXXFLAGS) .\controls\checklistboxtest.cpp
+
+$(OBJS)\test_gui_choicebooktest.obj: .\controls\choicebooktest.cpp
+ $(CXX) /c /nologo /TP /Fo$@ $(TEST_GUI_CXXFLAGS) .\controls\choicebooktest.cpp
+
+$(OBJS)\test_gui_choicetest.obj: .\controls\choicetest.cpp
+ $(CXX) /c /nologo /TP /Fo$@ $(TEST_GUI_CXXFLAGS) .\controls\choicetest.cpp
+
+$(OBJS)\test_gui_comboboxtest.obj: .\controls\comboboxtest.cpp
+ $(CXX) /c /nologo /TP /Fo$@ $(TEST_GUI_CXXFLAGS) .\controls\comboboxtest.cpp
+
+$(OBJS)\test_gui_dataviewctrltest.obj: .\controls\dataviewctrltest.cpp
+ $(CXX) /c /nologo /TP /Fo$@ $(TEST_GUI_CXXFLAGS) .\controls\dataviewctrltest.cpp
+
+$(OBJS)\test_gui_datepickerctrltest.obj: .\controls\datepickerctrltest.cpp
+ $(CXX) /c /nologo /TP /Fo$@ $(TEST_GUI_CXXFLAGS) .\controls\datepickerctrltest.cpp
+
+$(OBJS)\test_gui_frametest.obj: .\controls\frametest.cpp
+ $(CXX) /c /nologo /TP /Fo$@ $(TEST_GUI_CXXFLAGS) .\controls\frametest.cpp
+
+$(OBJS)\test_gui_gaugetest.obj: .\controls\gaugetest.cpp
+ $(CXX) /c /nologo /TP /Fo$@ $(TEST_GUI_CXXFLAGS) .\controls\gaugetest.cpp
+
+$(OBJS)\test_gui_gridtest.obj: .\controls\gridtest.cpp
+ $(CXX) /c /nologo /TP /Fo$@ $(TEST_GUI_CXXFLAGS) .\controls\gridtest.cpp
+
+$(OBJS)\test_gui_headerctrltest.obj: .\controls\headerctrltest.cpp
+ $(CXX) /c /nologo /TP /Fo$@ $(TEST_GUI_CXXFLAGS) .\controls\headerctrltest.cpp
+
+$(OBJS)\test_gui_htmllboxtest.obj: .\controls\htmllboxtest.cpp
+ $(CXX) /c /nologo /TP /Fo$@ $(TEST_GUI_CXXFLAGS) .\controls\htmllboxtest.cpp
+
+$(OBJS)\test_gui_hyperlinkctrltest.obj: .\controls\hyperlinkctrltest.cpp
+ $(CXX) /c /nologo /TP /Fo$@ $(TEST_GUI_CXXFLAGS) .\controls\hyperlinkctrltest.cpp
+
+$(OBJS)\test_gui_itemcontainertest.obj: .\controls\itemcontainertest.cpp
+ $(CXX) /c /nologo /TP /Fo$@ $(TEST_GUI_CXXFLAGS) .\controls\itemcontainertest.cpp
+
+$(OBJS)\test_gui_label.obj: .\controls\label.cpp
+ $(CXX) /c /nologo /TP /Fo$@ $(TEST_GUI_CXXFLAGS) .\controls\label.cpp
+
+$(OBJS)\test_gui_listbasetest.obj: .\controls\listbasetest.cpp
+ $(CXX) /c /nologo /TP /Fo$@ $(TEST_GUI_CXXFLAGS) .\controls\listbasetest.cpp
+
+$(OBJS)\test_gui_listbooktest.obj: .\controls\listbooktest.cpp
+ $(CXX) /c /nologo /TP /Fo$@ $(TEST_GUI_CXXFLAGS) .\controls\listbooktest.cpp
+
+$(OBJS)\test_gui_listboxtest.obj: .\controls\listboxtest.cpp
+ $(CXX) /c /nologo /TP /Fo$@ $(TEST_GUI_CXXFLAGS) .\controls\listboxtest.cpp
+
+$(OBJS)\test_gui_listctrltest.obj: .\controls\listctrltest.cpp
+ $(CXX) /c /nologo /TP /Fo$@ $(TEST_GUI_CXXFLAGS) .\controls\listctrltest.cpp
+
+$(OBJS)\test_gui_listviewtest.obj: .\controls\listviewtest.cpp
+ $(CXX) /c /nologo /TP /Fo$@ $(TEST_GUI_CXXFLAGS) .\controls\listviewtest.cpp
+
+$(OBJS)\test_gui_markuptest.obj: .\controls\markuptest.cpp
+ $(CXX) /c /nologo /TP /Fo$@ $(TEST_GUI_CXXFLAGS) .\controls\markuptest.cpp
+
+$(OBJS)\test_gui_notebooktest.obj: .\controls\notebooktest.cpp
+ $(CXX) /c /nologo /TP /Fo$@ $(TEST_GUI_CXXFLAGS) .\controls\notebooktest.cpp
+
+$(OBJS)\test_gui_ownerdrawncomboboxtest.obj: .\controls\ownerdrawncomboboxtest.cpp
+ $(CXX) /c /nologo /TP /Fo$@ $(TEST_GUI_CXXFLAGS) .\controls\ownerdrawncomboboxtest.cpp
+
+$(OBJS)\test_gui_pickerbasetest.obj: .\controls\pickerbasetest.cpp
+ $(CXX) /c /nologo /TP /Fo$@ $(TEST_GUI_CXXFLAGS) .\controls\pickerbasetest.cpp
+
+$(OBJS)\test_gui_pickertest.obj: .\controls\pickertest.cpp
+ $(CXX) /c /nologo /TP /Fo$@ $(TEST_GUI_CXXFLAGS) .\controls\pickertest.cpp
+
+$(OBJS)\test_gui_radioboxtest.obj: .\controls\radioboxtest.cpp
+ $(CXX) /c /nologo /TP /Fo$@ $(TEST_GUI_CXXFLAGS) .\controls\radioboxtest.cpp
+
+$(OBJS)\test_gui_radiobuttontest.obj: .\controls\radiobuttontest.cpp
+ $(CXX) /c /nologo /TP /Fo$@ $(TEST_GUI_CXXFLAGS) .\controls\radiobuttontest.cpp
+
+$(OBJS)\test_gui_rearrangelisttest.obj: .\controls\rearrangelisttest.cpp
+ $(CXX) /c /nologo /TP /Fo$@ $(TEST_GUI_CXXFLAGS) .\controls\rearrangelisttest.cpp
+
+$(OBJS)\test_gui_richtextctrltest.obj: .\controls\richtextctrltest.cpp
+ $(CXX) /c /nologo /TP /Fo$@ $(TEST_GUI_CXXFLAGS) .\controls\richtextctrltest.cpp
+
+$(OBJS)\test_gui_searchctrltest.obj: .\controls\searchctrltest.cpp
+ $(CXX) /c /nologo /TP /Fo$@ $(TEST_GUI_CXXFLAGS) .\controls\searchctrltest.cpp
+
+$(OBJS)\test_gui_simplebooktest.obj: .\controls\simplebooktest.cpp
+ $(CXX) /c /nologo /TP /Fo$@ $(TEST_GUI_CXXFLAGS) .\controls\simplebooktest.cpp
+
+$(OBJS)\test_gui_slidertest.obj: .\controls\slidertest.cpp
+ $(CXX) /c /nologo /TP /Fo$@ $(TEST_GUI_CXXFLAGS) .\controls\slidertest.cpp
+
+$(OBJS)\test_gui_spinctrldbltest.obj: .\controls\spinctrldbltest.cpp
+ $(CXX) /c /nologo /TP /Fo$@ $(TEST_GUI_CXXFLAGS) .\controls\spinctrldbltest.cpp
+
+$(OBJS)\test_gui_spinctrltest.obj: .\controls\spinctrltest.cpp
+ $(CXX) /c /nologo /TP /Fo$@ $(TEST_GUI_CXXFLAGS) .\controls\spinctrltest.cpp
+
+$(OBJS)\test_gui_textctrltest.obj: .\controls\textctrltest.cpp
+ $(CXX) /c /nologo /TP /Fo$@ $(TEST_GUI_CXXFLAGS) .\controls\textctrltest.cpp
+
+$(OBJS)\test_gui_textentrytest.obj: .\controls\textentrytest.cpp
+ $(CXX) /c /nologo /TP /Fo$@ $(TEST_GUI_CXXFLAGS) .\controls\textentrytest.cpp
+
+$(OBJS)\test_gui_togglebuttontest.obj: .\controls\togglebuttontest.cpp
+ $(CXX) /c /nologo /TP /Fo$@ $(TEST_GUI_CXXFLAGS) .\controls\togglebuttontest.cpp
+
+$(OBJS)\test_gui_toolbooktest.obj: .\controls\toolbooktest.cpp
+ $(CXX) /c /nologo /TP /Fo$@ $(TEST_GUI_CXXFLAGS) .\controls\toolbooktest.cpp
+
+$(OBJS)\test_gui_treebooktest.obj: .\controls\treebooktest.cpp
+ $(CXX) /c /nologo /TP /Fo$@ $(TEST_GUI_CXXFLAGS) .\controls\treebooktest.cpp
+
+$(OBJS)\test_gui_treectrltest.obj: .\controls\treectrltest.cpp
+ $(CXX) /c /nologo /TP /Fo$@ $(TEST_GUI_CXXFLAGS) .\controls\treectrltest.cpp
+
+$(OBJS)\test_gui_treelistctrltest.obj: .\controls\treelistctrltest.cpp
+ $(CXX) /c /nologo /TP /Fo$@ $(TEST_GUI_CXXFLAGS) .\controls\treelistctrltest.cpp
+
+$(OBJS)\test_gui_virtlistctrltest.obj: .\controls\virtlistctrltest.cpp
+ $(CXX) /c /nologo /TP /Fo$@ $(TEST_GUI_CXXFLAGS) .\controls\virtlistctrltest.cpp
+
+$(OBJS)\test_gui_webtest.obj: .\controls\webtest.cpp
+ $(CXX) /c /nologo /TP /Fo$@ $(TEST_GUI_CXXFLAGS) .\controls\webtest.cpp
+
+$(OBJS)\test_gui_windowtest.obj: .\controls\windowtest.cpp
+ $(CXX) /c /nologo /TP /Fo$@ $(TEST_GUI_CXXFLAGS) .\controls\windowtest.cpp
+
+$(OBJS)\test_gui_dialogtest.obj: .\controls\dialogtest.cpp
+ $(CXX) /c /nologo /TP /Fo$@ $(TEST_GUI_CXXFLAGS) .\controls\dialogtest.cpp
+
+$(OBJS)\test_gui_clone.obj: .\events\clone.cpp
+ $(CXX) /c /nologo /TP /Fo$@ $(TEST_GUI_CXXFLAGS) .\events\clone.cpp
+
+$(OBJS)\test_gui_evtlooptest.obj: .\events\evtlooptest.cpp
+ $(CXX) /c /nologo /TP /Fo$@ $(TEST_GUI_CXXFLAGS) .\events\evtlooptest.cpp
+
+$(OBJS)\test_gui_propagation.obj: .\events\propagation.cpp
+ $(CXX) /c /nologo /TP /Fo$@ $(TEST_GUI_CXXFLAGS) .\events\propagation.cpp
+
+$(OBJS)\test_gui_keyboard.obj: .\events\keyboard.cpp
+ $(CXX) /c /nologo /TP /Fo$@ $(TEST_GUI_CXXFLAGS) .\events\keyboard.cpp
+
+$(OBJS)\test_gui_exec.obj: .\exec\exec.cpp
+ $(CXX) /c /nologo /TP /Fo$@ $(TEST_GUI_CXXFLAGS) .\exec\exec.cpp
+
+$(OBJS)\test_gui_fonttest.obj: .\font\fonttest.cpp
+ $(CXX) /c /nologo /TP /Fo$@ $(TEST_GUI_CXXFLAGS) .\font\fonttest.cpp
+
+$(OBJS)\test_gui_image.obj: .\image\image.cpp
+ $(CXX) /c /nologo /TP /Fo$@ $(TEST_GUI_CXXFLAGS) .\image\image.cpp
+
+$(OBJS)\test_gui_rawbmp.obj: .\image\rawbmp.cpp
+ $(CXX) /c /nologo /TP /Fo$@ $(TEST_GUI_CXXFLAGS) .\image\rawbmp.cpp
+
+$(OBJS)\test_gui_htmlparser.obj: .\html\htmlparser.cpp
+ $(CXX) /c /nologo /TP /Fo$@ $(TEST_GUI_CXXFLAGS) .\html\htmlparser.cpp
+
+$(OBJS)\test_gui_htmlwindow.obj: .\html\htmlwindow.cpp
+ $(CXX) /c /nologo /TP /Fo$@ $(TEST_GUI_CXXFLAGS) .\html\htmlwindow.cpp
+
+$(OBJS)\test_gui_accelentry.obj: .\menu\accelentry.cpp
+ $(CXX) /c /nologo /TP /Fo$@ $(TEST_GUI_CXXFLAGS) .\menu\accelentry.cpp
+
+$(OBJS)\test_gui_menu.obj: .\menu\menu.cpp
+ $(CXX) /c /nologo /TP /Fo$@ $(TEST_GUI_CXXFLAGS) .\menu\menu.cpp
+
+$(OBJS)\test_gui_guifuncs.obj: .\misc\guifuncs.cpp
+ $(CXX) /c /nologo /TP /Fo$@ $(TEST_GUI_CXXFLAGS) .\misc\guifuncs.cpp
+
+$(OBJS)\test_gui_selstoretest.obj: .\misc\selstoretest.cpp
+ $(CXX) /c /nologo /TP /Fo$@ $(TEST_GUI_CXXFLAGS) .\misc\selstoretest.cpp
+
+$(OBJS)\test_gui_garbage.obj: .\misc\garbage.cpp
+ $(CXX) /c /nologo /TP /Fo$@ $(TEST_GUI_CXXFLAGS) .\misc\garbage.cpp
+
+$(OBJS)\test_gui_safearrayconverttest.obj: .\misc\safearrayconverttest.cpp
+ $(CXX) /c /nologo /TP /Fo$@ $(TEST_GUI_CXXFLAGS) .\misc\safearrayconverttest.cpp
+
+$(OBJS)\test_gui_settings.obj: .\misc\settings.cpp
+ $(CXX) /c /nologo /TP /Fo$@ $(TEST_GUI_CXXFLAGS) .\misc\settings.cpp
+
+$(OBJS)\test_gui_socket.obj: .\net\socket.cpp
+ $(CXX) /c /nologo /TP /Fo$@ $(TEST_GUI_CXXFLAGS) .\net\socket.cpp
+
+$(OBJS)\test_gui_boxsizer.obj: .\sizers\boxsizer.cpp
+ $(CXX) /c /nologo /TP /Fo$@ $(TEST_GUI_CXXFLAGS) .\sizers\boxsizer.cpp
+
+$(OBJS)\test_gui_wrapsizer.obj: .\sizers\wrapsizer.cpp
+ $(CXX) /c /nologo /TP /Fo$@ $(TEST_GUI_CXXFLAGS) .\sizers\wrapsizer.cpp
+
+$(OBJS)\test_gui_toplevel.obj: .\toplevel\toplevel.cpp
+ $(CXX) /c /nologo /TP /Fo$@ $(TEST_GUI_CXXFLAGS) .\toplevel\toplevel.cpp
+
+$(OBJS)\test_gui_valnum.obj: .\validators\valnum.cpp
+ $(CXX) /c /nologo /TP /Fo$@ $(TEST_GUI_CXXFLAGS) .\validators\valnum.cpp
+
+$(OBJS)\test_gui_clientsize.obj: .\window\clientsize.cpp
+ $(CXX) /c /nologo /TP /Fo$@ $(TEST_GUI_CXXFLAGS) .\window\clientsize.cpp
+
+$(OBJS)\test_gui_setsize.obj: .\window\setsize.cpp
+ $(CXX) /c /nologo /TP /Fo$@ $(TEST_GUI_CXXFLAGS) .\window\setsize.cpp
+
+$(OBJS)\test_gui_xrctest.obj: .\xml\xrctest.cpp
+ $(CXX) /c /nologo /TP /Fo$@ $(TEST_GUI_CXXFLAGS) .\xml\xrctest.cpp
+
diff --git a/tests/test_vc7_printfbench.vcproj b/tests/test_vc7_printfbench.vcproj
index 4c4f8dbee6..3516a90233 100644
--- a/tests/test_vc7_printfbench.vcproj
+++ b/tests/test_vc7_printfbench.vcproj
@@ -1,620 +1,620 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/tests/test_vc7_test.vcproj b/tests/test_vc7_test.vcproj
index e1e4af4bc1..af0c66e679 100644
--- a/tests/test_vc7_test.vcproj
+++ b/tests/test_vc7_test.vcproj
@@ -1,583 +1,583 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/tests/test_vc7_test_drawing.vcproj b/tests/test_vc7_test_drawing.vcproj
index 2733b85037..6c0fd03164 100644
--- a/tests/test_vc7_test_drawing.vcproj
+++ b/tests/test_vc7_test_drawing.vcproj
@@ -1,346 +1,346 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/tests/test_vc7_test_drawingplugin.vcproj b/tests/test_vc7_test_drawingplugin.vcproj
index c35af8b70b..c4fae3c251 100644
--- a/tests/test_vc7_test_drawingplugin.vcproj
+++ b/tests/test_vc7_test_drawingplugin.vcproj
@@ -1,164 +1,164 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/tests/test_vc7_test_gui.vcproj b/tests/test_vc7_test_gui.vcproj
index eaa61c3bb7..d3129454f4 100644
--- a/tests/test_vc7_test_gui.vcproj
+++ b/tests/test_vc7_test_gui.vcproj
@@ -1,603 +1,603 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/tests/test_vc8_printfbench.vcproj b/tests/test_vc8_printfbench.vcproj
index 7ff0d47fd9..8bba12a3a4 100644
--- a/tests/test_vc8_printfbench.vcproj
+++ b/tests/test_vc8_printfbench.vcproj
@@ -1,900 +1,900 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/tests/test_vc8_test.vcproj b/tests/test_vc8_test.vcproj
index 7c15c0e01c..1ad54b5ec3 100644
--- a/tests/test_vc8_test.vcproj
+++ b/tests/test_vc8_test.vcproj
@@ -1,1243 +1,1243 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/tests/test_vc8_test_drawing.vcproj b/tests/test_vc8_test_drawing.vcproj
index c95c0759a0..2df4be0578 100644
--- a/tests/test_vc8_test_drawing.vcproj
+++ b/tests/test_vc8_test_drawing.vcproj
@@ -1,927 +1,927 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/tests/test_vc8_test_drawingplugin.vcproj b/tests/test_vc8_test_drawingplugin.vcproj
index 42cfb08f7c..6e4722c2d8 100644
--- a/tests/test_vc8_test_drawingplugin.vcproj
+++ b/tests/test_vc8_test_drawingplugin.vcproj
@@ -1,405 +1,405 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/tests/test_vc8_test_gui.vcproj b/tests/test_vc8_test_gui.vcproj
index e09f02bf21..07ef45774b 100644
--- a/tests/test_vc8_test_gui.vcproj
+++ b/tests/test_vc8_test_gui.vcproj
@@ -1,1269 +1,1269 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/tests/test_vc9_printfbench.vcproj b/tests/test_vc9_printfbench.vcproj
index 2f5704a9c3..e5e941e4d1 100644
--- a/tests/test_vc9_printfbench.vcproj
+++ b/tests/test_vc9_printfbench.vcproj
@@ -1,872 +1,872 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/tests/test_vc9_test.vcproj b/tests/test_vc9_test.vcproj
index bc314f0daa..2fd3a42963 100644
--- a/tests/test_vc9_test.vcproj
+++ b/tests/test_vc9_test.vcproj
@@ -1,1215 +1,1215 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/tests/test_vc9_test_drawing.vcproj b/tests/test_vc9_test_drawing.vcproj
index a877c452e3..6dc001a834 100644
--- a/tests/test_vc9_test_drawing.vcproj
+++ b/tests/test_vc9_test_drawing.vcproj
@@ -1,899 +1,899 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/tests/test_vc9_test_drawingplugin.vcproj b/tests/test_vc9_test_drawingplugin.vcproj
index e49f3dc77b..b864272a56 100644
--- a/tests/test_vc9_test_drawingplugin.vcproj
+++ b/tests/test_vc9_test_drawingplugin.vcproj
@@ -1,403 +1,403 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/tests/test_vc9_test_gui.vcproj b/tests/test_vc9_test_gui.vcproj
index 1539f1f5eb..f4b5ad2263 100644
--- a/tests/test_vc9_test_gui.vcproj
+++ b/tests/test_vc9_test_gui.vcproj
@@ -1,1241 +1,1241 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/utils/emulator/src/emulator_vc7.vcproj b/utils/emulator/src/emulator_vc7.vcproj
index fb73ac2acc..de52c0d90c 100644
--- a/utils/emulator/src/emulator_vc7.vcproj
+++ b/utils/emulator/src/emulator_vc7.vcproj
@@ -1,303 +1,303 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/utils/emulator/src/emulator_vc8.vcproj b/utils/emulator/src/emulator_vc8.vcproj
index ca4f896716..f2e110e9c4 100644
--- a/utils/emulator/src/emulator_vc8.vcproj
+++ b/utils/emulator/src/emulator_vc8.vcproj
@@ -1,829 +1,829 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/utils/emulator/src/emulator_vc9.vcproj b/utils/emulator/src/emulator_vc9.vcproj
index 6ebd6b65b5..9556e8ba72 100644
--- a/utils/emulator/src/emulator_vc9.vcproj
+++ b/utils/emulator/src/emulator_vc9.vcproj
@@ -1,801 +1,801 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/utils/emulator/src/makefile.bcc b/utils/emulator/src/makefile.bcc
index ed19e4751d..49d9ba07d2 100644
--- a/utils/emulator/src/makefile.bcc
+++ b/utils/emulator/src/makefile.bcc
@@ -1,243 +1,243 @@
-# =========================================================================
-# This makefile was generated by
-# Bakefile 0.2.9 (http://www.bakefile.org)
-# 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: ###
-
-WX_RELEASE_NODOT = 31
-COMPILER_PREFIX = bcc
-OBJS = \
- $(COMPILER_PREFIX)$(COMPILER_VERSION)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)
-LIBDIRNAME = \
- .\..\..\..\lib\$(COMPILER_PREFIX)$(COMPILER_VERSION)_$(LIBTYPE_SUFFIX)$(CFG)
-SETUPHDIR = \
- $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)
-WXEMULATOR_CXXFLAGS = $(__RUNTIME_LIBS_7) -I$(BCCDIR)\include $(__DEBUGINFO) \
- $(__OPTIMIZEFLAG_2) $(__THREADSFLAG_6) -D__WXMSW__ $(__WXUNIV_DEFINE_p) \
- $(__DEBUG_DEFINE_p) $(__NDEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) \
- $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) \
- -I$(SETUPHDIR) -I.\..\..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES_p) -I. \
- $(__DLLFLAG_p) -I.\..\..\..\samples -DNOPCH $(CPPFLAGS) $(CXXFLAGS)
-WXEMULATOR_OBJECTS = \
- $(OBJS)\wxemulator_emulator.obj
-
-### Conditionally set variables: ###
-
-!if "$(USE_GUI)" == "0"
-PORTNAME = base
-!endif
-!if "$(USE_GUI)" == "1"
-PORTNAME = msw$(TOOLKIT_VERSION)
-!endif
-!if "$(OFFICIAL_BUILD)" == "1"
-COMPILER_VERSION = ERROR-COMPILER-VERSION-MUST-BE-SET-FOR-OFFICIAL-BUILD
-!endif
-!if "$(BUILD)" == "debug"
-WXDEBUGFLAG = d
-!endif
-!if "$(UNICODE)" == "1"
-WXUNICODEFLAG = u
-!endif
-!if "$(WXUNIV)" == "1"
-WXUNIVNAME = univ
-!endif
-!if "$(SHARED)" == "1"
-WXDLLFLAG = dll
-!endif
-!if "$(SHARED)" == "0"
-LIBTYPE_SUFFIX = lib
-!endif
-!if "$(SHARED)" == "1"
-LIBTYPE_SUFFIX = dll
-!endif
-!if "$(MONOLITHIC)" == "0"
-EXTRALIBS_FOR_BASE =
-!endif
-!if "$(MONOLITHIC)" == "1"
-EXTRALIBS_FOR_BASE =
-!endif
-!if "$(BUILD)" == "debug"
-__OPTIMIZEFLAG_2 = -Od
-!endif
-!if "$(BUILD)" == "release"
-__OPTIMIZEFLAG_2 = -O2
-!endif
-!if "$(USE_THREADS)" == "0"
-__THREADSFLAG_5 =
-!endif
-!if "$(USE_THREADS)" == "1"
-__THREADSFLAG_5 = mt
-!endif
-!if "$(USE_THREADS)" == "0"
-__THREADSFLAG_6 =
-!endif
-!if "$(USE_THREADS)" == "1"
-__THREADSFLAG_6 = -tWM
-!endif
-!if "$(RUNTIME_LIBS)" == "dynamic"
-__RUNTIME_LIBS_7 = -tWR
-!endif
-!if "$(RUNTIME_LIBS)" == "static"
-__RUNTIME_LIBS_7 =
-!endif
-!if "$(RUNTIME_LIBS)" == "dynamic"
-__RUNTIME_LIBS_8 = i
-!endif
-!if "$(RUNTIME_LIBS)" == "static"
-__RUNTIME_LIBS_8 =
-!endif
-!if "$(WXUNIV)" == "1"
-__WXUNIV_DEFINE_p = -D__WXUNIVERSAL__
-!endif
-!if "$(WXUNIV)" == "1"
-__WXUNIV_DEFINE_p_1 = -d__WXUNIVERSAL__
-!endif
-!if "$(DEBUG_FLAG)" == "0"
-__DEBUG_DEFINE_p = -DwxDEBUG_LEVEL=0
-!endif
-!if "$(DEBUG_FLAG)" == "0"
-__DEBUG_DEFINE_p_1 = -dwxDEBUG_LEVEL=0
-!endif
-!if "$(BUILD)" == "release"
-__NDEBUG_DEFINE_p = -DNDEBUG
-!endif
-!if "$(BUILD)" == "release"
-__NDEBUG_DEFINE_p_1 = -dNDEBUG
-!endif
-!if "$(USE_EXCEPTIONS)" == "0"
-__EXCEPTIONS_DEFINE_p = -DwxNO_EXCEPTIONS
-!endif
-!if "$(USE_EXCEPTIONS)" == "0"
-__EXCEPTIONS_DEFINE_p_1 = -dwxNO_EXCEPTIONS
-!endif
-!if "$(USE_RTTI)" == "0"
-__RTTI_DEFINE_p = -DwxNO_RTTI
-!endif
-!if "$(USE_RTTI)" == "0"
-__RTTI_DEFINE_p_1 = -dwxNO_RTTI
-!endif
-!if "$(USE_THREADS)" == "0"
-__THREAD_DEFINE_p = -DwxNO_THREADS
-!endif
-!if "$(USE_THREADS)" == "0"
-__THREAD_DEFINE_p_1 = -dwxNO_THREADS
-!endif
-!if "$(UNICODE)" == "0"
-__UNICODE_DEFINE_p = -DwxUSE_UNICODE=0
-!endif
-!if "$(UNICODE)" == "1"
-__UNICODE_DEFINE_p = -D_UNICODE
-!endif
-!if "$(UNICODE)" == "0"
-__UNICODE_DEFINE_p_1 = -dwxUSE_UNICODE=0
-!endif
-!if "$(UNICODE)" == "1"
-__UNICODE_DEFINE_p_1 = -d_UNICODE
-!endif
-!if "$(USE_CAIRO)" == "1"
-____CAIRO_INCLUDEDIR_FILENAMES_p = -I$(CAIRO_ROOT)\include\cairo
-!endif
-!if "$(USE_CAIRO)" == "1"
-____CAIRO_INCLUDEDIR_FILENAMES_1_p = -i$(CAIRO_ROOT)\include\cairo
-!endif
-!if "$(SHARED)" == "1"
-__DLLFLAG_p = -DWXUSINGDLL
-!endif
-!if "$(SHARED)" == "1"
-__DLLFLAG_p_1 = -dWXUSINGDLL
-!endif
-!if "$(MONOLITHIC)" == "0"
-__WXLIB_CORE_p = \
- wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib
-!endif
-!if "$(MONOLITHIC)" == "0"
-__WXLIB_BASE_p = \
- wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib
-!endif
-!if "$(MONOLITHIC)" == "1"
-__WXLIB_MONO_p = \
- wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib
-!endif
-!if "$(MONOLITHIC)" == "1" && "$(USE_STC)" == "1"
-__LIB_SCINTILLA_IF_MONO_p = wxscintilla$(WXDEBUGFLAG).lib
-!endif
-!if "$(USE_GUI)" == "1"
-__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib
-!endif
-!if "$(USE_GUI)" == "1"
-__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib
-!endif
-!if "$(USE_GUI)" == "1"
-__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib
-!endif
-!if "$(USE_CAIRO)" == "1"
-__CAIRO_LIB_p = cairo.lib
-!endif
-!if "$(USE_CAIRO)" == "1"
-____CAIRO_LIBDIR_FILENAMES_p = -L$(CAIRO_ROOT)\lib
-!endif
-!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default"
-__DEBUGINFO = -v
-!endif
-!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default"
-__DEBUGINFO = -v-
-!endif
-!if "$(DEBUG_INFO)" == "0"
-__DEBUGINFO = -v-
-!endif
-!if "$(DEBUG_INFO)" == "1"
-__DEBUGINFO = -v
-!endif
-
-
-all: $(OBJS)
-$(OBJS):
- -if not exist $(OBJS) mkdir $(OBJS)
-
-### Targets: ###
-
-all: $(OBJS)\wxemulator.exe data
-
-clean:
- -if exist $(OBJS)\*.obj del $(OBJS)\*.obj
- -if exist $(OBJS)\*.res del $(OBJS)\*.res
- -if exist $(OBJS)\*.csm del $(OBJS)\*.csm
- -if exist $(OBJS)\wxemulator.exe del $(OBJS)\wxemulator.exe
- -if exist $(OBJS)\wxemulator.tds del $(OBJS)\wxemulator.tds
- -if exist $(OBJS)\wxemulator.ilc del $(OBJS)\wxemulator.ilc
- -if exist $(OBJS)\wxemulator.ild del $(OBJS)\wxemulator.ild
- -if exist $(OBJS)\wxemulator.ilf del $(OBJS)\wxemulator.ilf
- -if exist $(OBJS)\wxemulator.ils del $(OBJS)\wxemulator.ils
-
-$(OBJS)\wxemulator.exe: $(WXEMULATOR_OBJECTS) $(OBJS)\wxemulator_sample.res
- ilink32 -Tpe -q -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUGINFO) -L$(LIBDIRNAME) -aa $(____CAIRO_LIBDIR_FILENAMES_p) $(LDFLAGS) @&&|
- c0w32.obj $(WXEMULATOR_OBJECTS),$@,, $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_SCINTILLA_IF_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__CAIRO_LIB_p) ole2w32.lib oleacc.lib import32.lib cw32$(__THREADSFLAG_5)$(__RUNTIME_LIBS_8).lib,, $(OBJS)\wxemulator_sample.res
-|
-
-data:
- if not exist $(OBJS) mkdir $(OBJS)
- for %f in (default.wxe ipaq.wxe bluegradient.jpg ipaq01.jpg) do if not exist $(OBJS)\%f copy .\%f $(OBJS)
-
-$(OBJS)\wxemulator_sample.res: .\..\..\..\samples\sample.rc
- brcc32 -32 -r -fo$@ -i$(BCCDIR)\include -d__WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__NDEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) -i$(SETUPHDIR) -i.\..\..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES_1_p) -i. $(__DLLFLAG_p_1) -i.\..\..\..\samples -i$(BCCDIR)\include\windows\sdk -dNOPCH .\..\..\..\samples\sample.rc
-
-$(OBJS)\wxemulator_emulator.obj: .\emulator.cpp
- $(CXX) -q -c -P -o$@ $(WXEMULATOR_CXXFLAGS) .\emulator.cpp
-
+# =========================================================================
+# This makefile was generated by
+# Bakefile 0.2.9 (http://www.bakefile.org)
+# 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: ###
+
+WX_RELEASE_NODOT = 31
+COMPILER_PREFIX = bcc
+OBJS = \
+ $(COMPILER_PREFIX)$(COMPILER_VERSION)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)
+LIBDIRNAME = \
+ .\..\..\..\lib\$(COMPILER_PREFIX)$(COMPILER_VERSION)_$(LIBTYPE_SUFFIX)$(CFG)
+SETUPHDIR = \
+ $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)
+WXEMULATOR_CXXFLAGS = $(__RUNTIME_LIBS_7) -I$(BCCDIR)\include $(__DEBUGINFO) \
+ $(__OPTIMIZEFLAG_2) $(__THREADSFLAG_6) -D__WXMSW__ $(__WXUNIV_DEFINE_p) \
+ $(__DEBUG_DEFINE_p) $(__NDEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) \
+ $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) \
+ -I$(SETUPHDIR) -I.\..\..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES_p) -I. \
+ $(__DLLFLAG_p) -I.\..\..\..\samples -DNOPCH $(CPPFLAGS) $(CXXFLAGS)
+WXEMULATOR_OBJECTS = \
+ $(OBJS)\wxemulator_emulator.obj
+
+### Conditionally set variables: ###
+
+!if "$(USE_GUI)" == "0"
+PORTNAME = base
+!endif
+!if "$(USE_GUI)" == "1"
+PORTNAME = msw$(TOOLKIT_VERSION)
+!endif
+!if "$(OFFICIAL_BUILD)" == "1"
+COMPILER_VERSION = ERROR-COMPILER-VERSION-MUST-BE-SET-FOR-OFFICIAL-BUILD
+!endif
+!if "$(BUILD)" == "debug"
+WXDEBUGFLAG = d
+!endif
+!if "$(UNICODE)" == "1"
+WXUNICODEFLAG = u
+!endif
+!if "$(WXUNIV)" == "1"
+WXUNIVNAME = univ
+!endif
+!if "$(SHARED)" == "1"
+WXDLLFLAG = dll
+!endif
+!if "$(SHARED)" == "0"
+LIBTYPE_SUFFIX = lib
+!endif
+!if "$(SHARED)" == "1"
+LIBTYPE_SUFFIX = dll
+!endif
+!if "$(MONOLITHIC)" == "0"
+EXTRALIBS_FOR_BASE =
+!endif
+!if "$(MONOLITHIC)" == "1"
+EXTRALIBS_FOR_BASE =
+!endif
+!if "$(BUILD)" == "debug"
+__OPTIMIZEFLAG_2 = -Od
+!endif
+!if "$(BUILD)" == "release"
+__OPTIMIZEFLAG_2 = -O2
+!endif
+!if "$(USE_THREADS)" == "0"
+__THREADSFLAG_5 =
+!endif
+!if "$(USE_THREADS)" == "1"
+__THREADSFLAG_5 = mt
+!endif
+!if "$(USE_THREADS)" == "0"
+__THREADSFLAG_6 =
+!endif
+!if "$(USE_THREADS)" == "1"
+__THREADSFLAG_6 = -tWM
+!endif
+!if "$(RUNTIME_LIBS)" == "dynamic"
+__RUNTIME_LIBS_7 = -tWR
+!endif
+!if "$(RUNTIME_LIBS)" == "static"
+__RUNTIME_LIBS_7 =
+!endif
+!if "$(RUNTIME_LIBS)" == "dynamic"
+__RUNTIME_LIBS_8 = i
+!endif
+!if "$(RUNTIME_LIBS)" == "static"
+__RUNTIME_LIBS_8 =
+!endif
+!if "$(WXUNIV)" == "1"
+__WXUNIV_DEFINE_p = -D__WXUNIVERSAL__
+!endif
+!if "$(WXUNIV)" == "1"
+__WXUNIV_DEFINE_p_1 = -d__WXUNIVERSAL__
+!endif
+!if "$(DEBUG_FLAG)" == "0"
+__DEBUG_DEFINE_p = -DwxDEBUG_LEVEL=0
+!endif
+!if "$(DEBUG_FLAG)" == "0"
+__DEBUG_DEFINE_p_1 = -dwxDEBUG_LEVEL=0
+!endif
+!if "$(BUILD)" == "release"
+__NDEBUG_DEFINE_p = -DNDEBUG
+!endif
+!if "$(BUILD)" == "release"
+__NDEBUG_DEFINE_p_1 = -dNDEBUG
+!endif
+!if "$(USE_EXCEPTIONS)" == "0"
+__EXCEPTIONS_DEFINE_p = -DwxNO_EXCEPTIONS
+!endif
+!if "$(USE_EXCEPTIONS)" == "0"
+__EXCEPTIONS_DEFINE_p_1 = -dwxNO_EXCEPTIONS
+!endif
+!if "$(USE_RTTI)" == "0"
+__RTTI_DEFINE_p = -DwxNO_RTTI
+!endif
+!if "$(USE_RTTI)" == "0"
+__RTTI_DEFINE_p_1 = -dwxNO_RTTI
+!endif
+!if "$(USE_THREADS)" == "0"
+__THREAD_DEFINE_p = -DwxNO_THREADS
+!endif
+!if "$(USE_THREADS)" == "0"
+__THREAD_DEFINE_p_1 = -dwxNO_THREADS
+!endif
+!if "$(UNICODE)" == "0"
+__UNICODE_DEFINE_p = -DwxUSE_UNICODE=0
+!endif
+!if "$(UNICODE)" == "1"
+__UNICODE_DEFINE_p = -D_UNICODE
+!endif
+!if "$(UNICODE)" == "0"
+__UNICODE_DEFINE_p_1 = -dwxUSE_UNICODE=0
+!endif
+!if "$(UNICODE)" == "1"
+__UNICODE_DEFINE_p_1 = -d_UNICODE
+!endif
+!if "$(USE_CAIRO)" == "1"
+____CAIRO_INCLUDEDIR_FILENAMES_p = -I$(CAIRO_ROOT)\include\cairo
+!endif
+!if "$(USE_CAIRO)" == "1"
+____CAIRO_INCLUDEDIR_FILENAMES_1_p = -i$(CAIRO_ROOT)\include\cairo
+!endif
+!if "$(SHARED)" == "1"
+__DLLFLAG_p = -DWXUSINGDLL
+!endif
+!if "$(SHARED)" == "1"
+__DLLFLAG_p_1 = -dWXUSINGDLL
+!endif
+!if "$(MONOLITHIC)" == "0"
+__WXLIB_CORE_p = \
+ wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib
+!endif
+!if "$(MONOLITHIC)" == "0"
+__WXLIB_BASE_p = \
+ wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib
+!endif
+!if "$(MONOLITHIC)" == "1"
+__WXLIB_MONO_p = \
+ wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib
+!endif
+!if "$(MONOLITHIC)" == "1" && "$(USE_STC)" == "1"
+__LIB_SCINTILLA_IF_MONO_p = wxscintilla$(WXDEBUGFLAG).lib
+!endif
+!if "$(USE_GUI)" == "1"
+__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib
+!endif
+!if "$(USE_GUI)" == "1"
+__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib
+!endif
+!if "$(USE_GUI)" == "1"
+__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib
+!endif
+!if "$(USE_CAIRO)" == "1"
+__CAIRO_LIB_p = cairo.lib
+!endif
+!if "$(USE_CAIRO)" == "1"
+____CAIRO_LIBDIR_FILENAMES_p = -L$(CAIRO_ROOT)\lib
+!endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default"
+__DEBUGINFO = -v
+!endif
+!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default"
+__DEBUGINFO = -v-
+!endif
+!if "$(DEBUG_INFO)" == "0"
+__DEBUGINFO = -v-
+!endif
+!if "$(DEBUG_INFO)" == "1"
+__DEBUGINFO = -v
+!endif
+
+
+all: $(OBJS)
+$(OBJS):
+ -if not exist $(OBJS) mkdir $(OBJS)
+
+### Targets: ###
+
+all: $(OBJS)\wxemulator.exe data
+
+clean:
+ -if exist $(OBJS)\*.obj del $(OBJS)\*.obj
+ -if exist $(OBJS)\*.res del $(OBJS)\*.res
+ -if exist $(OBJS)\*.csm del $(OBJS)\*.csm
+ -if exist $(OBJS)\wxemulator.exe del $(OBJS)\wxemulator.exe
+ -if exist $(OBJS)\wxemulator.tds del $(OBJS)\wxemulator.tds
+ -if exist $(OBJS)\wxemulator.ilc del $(OBJS)\wxemulator.ilc
+ -if exist $(OBJS)\wxemulator.ild del $(OBJS)\wxemulator.ild
+ -if exist $(OBJS)\wxemulator.ilf del $(OBJS)\wxemulator.ilf
+ -if exist $(OBJS)\wxemulator.ils del $(OBJS)\wxemulator.ils
+
+$(OBJS)\wxemulator.exe: $(WXEMULATOR_OBJECTS) $(OBJS)\wxemulator_sample.res
+ ilink32 -Tpe -q -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUGINFO) -L$(LIBDIRNAME) -aa $(____CAIRO_LIBDIR_FILENAMES_p) $(LDFLAGS) @&&|
+ c0w32.obj $(WXEMULATOR_OBJECTS),$@,, $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_SCINTILLA_IF_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__CAIRO_LIB_p) ole2w32.lib oleacc.lib import32.lib cw32$(__THREADSFLAG_5)$(__RUNTIME_LIBS_8).lib,, $(OBJS)\wxemulator_sample.res
+|
+
+data:
+ if not exist $(OBJS) mkdir $(OBJS)
+ for %f in (default.wxe ipaq.wxe bluegradient.jpg ipaq01.jpg) do if not exist $(OBJS)\%f copy .\%f $(OBJS)
+
+$(OBJS)\wxemulator_sample.res: .\..\..\..\samples\sample.rc
+ brcc32 -32 -r -fo$@ -i$(BCCDIR)\include -d__WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__NDEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) -i$(SETUPHDIR) -i.\..\..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES_1_p) -i. $(__DLLFLAG_p_1) -i.\..\..\..\samples -i$(BCCDIR)\include\windows\sdk -dNOPCH .\..\..\..\samples\sample.rc
+
+$(OBJS)\wxemulator_emulator.obj: .\emulator.cpp
+ $(CXX) -q -c -P -o$@ $(WXEMULATOR_CXXFLAGS) .\emulator.cpp
+
diff --git a/utils/emulator/src/makefile.gcc b/utils/emulator/src/makefile.gcc
index 635229ce40..227a0c8bb2 100644
--- a/utils/emulator/src/makefile.gcc
+++ b/utils/emulator/src/makefile.gcc
@@ -1,239 +1,239 @@
-# =========================================================================
-# This makefile was generated by
-# Bakefile 0.2.9 (http://www.bakefile.org)
-# Do not modify, all changes will be overwritten!
-# =========================================================================
-
-include ../../../build/msw/config.gcc
-
-# -------------------------------------------------------------------------
-# Do not modify the rest of this file!
-# -------------------------------------------------------------------------
-
-### Variables: ###
-
-CPPDEPS = -MT$@ -MF$@.d -MD -MP
-WX_RELEASE_NODOT = 31
-COMPILER_PREFIX = gcc
-OBJS = \
- $(COMPILER_PREFIX)$(COMPILER_VERSION)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)
-LIBDIRNAME = \
- .\..\..\..\lib\$(COMPILER_PREFIX)$(COMPILER_VERSION)_$(LIBTYPE_SUFFIX)$(CFG)
-SETUPHDIR = \
- $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)
-WXEMULATOR_CXXFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG_2) $(__THREADSFLAG) \
- $(GCCFLAGS) -DHAVE_W32API_H -D__WXMSW__ $(__WXUNIV_DEFINE_p) \
- $(__DEBUG_DEFINE_p) $(__NDEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) \
- $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) \
- -I$(SETUPHDIR) -I.\..\..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES_p) -W \
- -Wall -I. $(__DLLFLAG_p) -I.\..\..\..\samples -DNOPCH $(__RTTIFLAG_5) \
- $(__EXCEPTIONSFLAG_6) -Wno-ctor-dtor-privacy $(CPPFLAGS) $(CXXFLAGS)
-WXEMULATOR_OBJECTS = \
- $(OBJS)\wxemulator_sample_rc.o \
- $(OBJS)\wxemulator_emulator.o
-
-### Conditionally set variables: ###
-
-ifeq ($(GCC_VERSION),2.95)
-GCCFLAGS = -fvtable-thunks
-endif
-ifeq ($(USE_GUI),0)
-PORTNAME = base
-endif
-ifeq ($(USE_GUI),1)
-PORTNAME = msw$(TOOLKIT_VERSION)
-endif
-ifeq ($(OFFICIAL_BUILD),1)
-COMPILER_VERSION = ERROR-COMPILER-VERSION-MUST-BE-SET-FOR-OFFICIAL-BUILD
-endif
-ifeq ($(BUILD),debug)
-WXDEBUGFLAG = d
-endif
-ifeq ($(UNICODE),1)
-WXUNICODEFLAG = u
-endif
-ifeq ($(WXUNIV),1)
-WXUNIVNAME = univ
-endif
-ifeq ($(SHARED),1)
-WXDLLFLAG = dll
-endif
-ifeq ($(SHARED),0)
-LIBTYPE_SUFFIX = lib
-endif
-ifeq ($(SHARED),1)
-LIBTYPE_SUFFIX = dll
-endif
-ifeq ($(MONOLITHIC),0)
-EXTRALIBS_FOR_BASE =
-endif
-ifeq ($(MONOLITHIC),1)
-EXTRALIBS_FOR_BASE =
-endif
-ifeq ($(BUILD),debug)
-__OPTIMIZEFLAG_2 = -O0
-endif
-ifeq ($(BUILD),release)
-__OPTIMIZEFLAG_2 = -O2
-endif
-ifeq ($(USE_RTTI),0)
-__RTTIFLAG_5 = -fno-rtti
-endif
-ifeq ($(USE_RTTI),1)
-__RTTIFLAG_5 =
-endif
-ifeq ($(USE_EXCEPTIONS),0)
-__EXCEPTIONSFLAG_6 = -fno-exceptions
-endif
-ifeq ($(USE_EXCEPTIONS),1)
-__EXCEPTIONSFLAG_6 =
-endif
-ifeq ($(WXUNIV),1)
-__WXUNIV_DEFINE_p = -D__WXUNIVERSAL__
-endif
-ifeq ($(WXUNIV),1)
-__WXUNIV_DEFINE_p_1 = --define __WXUNIVERSAL__
-endif
-ifeq ($(DEBUG_FLAG),0)
-__DEBUG_DEFINE_p = -DwxDEBUG_LEVEL=0
-endif
-ifeq ($(DEBUG_FLAG),0)
-__DEBUG_DEFINE_p_1 = --define wxDEBUG_LEVEL=0
-endif
-ifeq ($(BUILD),release)
-__NDEBUG_DEFINE_p = -DNDEBUG
-endif
-ifeq ($(BUILD),release)
-__NDEBUG_DEFINE_p_1 = --define NDEBUG
-endif
-ifeq ($(USE_EXCEPTIONS),0)
-__EXCEPTIONS_DEFINE_p = -DwxNO_EXCEPTIONS
-endif
-ifeq ($(USE_EXCEPTIONS),0)
-__EXCEPTIONS_DEFINE_p_1 = --define wxNO_EXCEPTIONS
-endif
-ifeq ($(USE_RTTI),0)
-__RTTI_DEFINE_p = -DwxNO_RTTI
-endif
-ifeq ($(USE_RTTI),0)
-__RTTI_DEFINE_p_1 = --define wxNO_RTTI
-endif
-ifeq ($(USE_THREADS),0)
-__THREAD_DEFINE_p = -DwxNO_THREADS
-endif
-ifeq ($(USE_THREADS),0)
-__THREAD_DEFINE_p_1 = --define wxNO_THREADS
-endif
-ifeq ($(UNICODE),0)
-__UNICODE_DEFINE_p = -DwxUSE_UNICODE=0
-endif
-ifeq ($(UNICODE),1)
-__UNICODE_DEFINE_p = -D_UNICODE
-endif
-ifeq ($(UNICODE),0)
-__UNICODE_DEFINE_p_1 = --define wxUSE_UNICODE=0
-endif
-ifeq ($(UNICODE),1)
-__UNICODE_DEFINE_p_1 = --define _UNICODE
-endif
-ifeq ($(USE_CAIRO),1)
-____CAIRO_INCLUDEDIR_FILENAMES_p = -I$(CAIRO_ROOT)\include\cairo
-endif
-ifeq ($(USE_CAIRO),1)
-__CAIRO_INCLUDEDIR_p = --include-dir $(CAIRO_ROOT)/include/cairo
-endif
-ifeq ($(SHARED),1)
-__DLLFLAG_p = -DWXUSINGDLL
-endif
-ifeq ($(SHARED),1)
-__DLLFLAG_p_1 = --define WXUSINGDLL
-endif
-ifeq ($(MONOLITHIC),0)
-__WXLIB_CORE_p = \
- -lwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core
-endif
-ifeq ($(MONOLITHIC),0)
-__WXLIB_BASE_p = \
- -lwxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)
-endif
-ifeq ($(MONOLITHIC),1)
-__WXLIB_MONO_p = \
- -lwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)
-endif
-ifeq ($(MONOLITHIC),1)
-ifeq ($(USE_STC),1)
-__LIB_SCINTILLA_IF_MONO_p = -lwxscintilla$(WXDEBUGFLAG)
-endif
-endif
-ifeq ($(USE_GUI),1)
-__LIB_TIFF_p = -lwxtiff$(WXDEBUGFLAG)
-endif
-ifeq ($(USE_GUI),1)
-__LIB_JPEG_p = -lwxjpeg$(WXDEBUGFLAG)
-endif
-ifeq ($(USE_GUI),1)
-__LIB_PNG_p = -lwxpng$(WXDEBUGFLAG)
-endif
-ifeq ($(USE_CAIRO),1)
-__CAIRO_LIB_p = -lcairo
-endif
-ifeq ($(USE_CAIRO),1)
-____CAIRO_LIBDIR_FILENAMES_p = -L$(CAIRO_ROOT)\lib
-endif
-ifeq ($(BUILD),debug)
-ifeq ($(DEBUG_INFO),default)
-__DEBUGINFO = -g
-endif
-endif
-ifeq ($(BUILD),release)
-ifeq ($(DEBUG_INFO),default)
-__DEBUGINFO =
-endif
-endif
-ifeq ($(DEBUG_INFO),0)
-__DEBUGINFO =
-endif
-ifeq ($(DEBUG_INFO),1)
-__DEBUGINFO = -g
-endif
-ifeq ($(USE_THREADS),0)
-__THREADSFLAG =
-endif
-ifeq ($(USE_THREADS),1)
-__THREADSFLAG = -mthreads
-endif
-
-
-all: $(OBJS)
-$(OBJS):
- -if not exist $(OBJS) mkdir $(OBJS)
-
-### Targets: ###
-
-all: $(OBJS)\wxemulator.exe data
-
-clean:
- -if exist $(OBJS)\*.o del $(OBJS)\*.o
- -if exist $(OBJS)\*.d del $(OBJS)\*.d
- -if exist $(OBJS)\wxemulator.exe del $(OBJS)\wxemulator.exe
-
-$(OBJS)\wxemulator.exe: $(WXEMULATOR_OBJECTS) $(OBJS)\wxemulator_sample_rc.o
- $(CXX) -o $@ $(WXEMULATOR_OBJECTS) $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) -Wl,--subsystem,windows -mwindows $(____CAIRO_LIBDIR_FILENAMES_p) $(LDFLAGS) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_SCINTILLA_IF_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(EXTRALIBS_FOR_BASE) $(__CAIRO_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32 -lwininet
-
-data:
- if not exist $(OBJS) mkdir $(OBJS)
- for %%f in (default.wxe ipaq.wxe bluegradient.jpg ipaq01.jpg) do if not exist $(OBJS)\%%f copy .\%%f $(OBJS)
-
-$(OBJS)\wxemulator_sample_rc.o: ./../../../samples/sample.rc
- $(WINDRES) -i$< -o$@ --define __WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__NDEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) --include-dir $(SETUPHDIR) --include-dir ./../../../include $(__CAIRO_INCLUDEDIR_p) --include-dir . $(__DLLFLAG_p_1) --include-dir ./../../../samples --define NOPCH
-
-$(OBJS)\wxemulator_emulator.o: ./emulator.cpp
- $(CXX) -c -o $@ $(WXEMULATOR_CXXFLAGS) $(CPPDEPS) $<
-
-.PHONY: all clean data
-
-
-SHELL := $(COMSPEC)
-
-# Dependencies tracking:
--include $(OBJS)/*.d
+# =========================================================================
+# This makefile was generated by
+# Bakefile 0.2.9 (http://www.bakefile.org)
+# Do not modify, all changes will be overwritten!
+# =========================================================================
+
+include ../../../build/msw/config.gcc
+
+# -------------------------------------------------------------------------
+# Do not modify the rest of this file!
+# -------------------------------------------------------------------------
+
+### Variables: ###
+
+CPPDEPS = -MT$@ -MF$@.d -MD -MP
+WX_RELEASE_NODOT = 31
+COMPILER_PREFIX = gcc
+OBJS = \
+ $(COMPILER_PREFIX)$(COMPILER_VERSION)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)
+LIBDIRNAME = \
+ .\..\..\..\lib\$(COMPILER_PREFIX)$(COMPILER_VERSION)_$(LIBTYPE_SUFFIX)$(CFG)
+SETUPHDIR = \
+ $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)
+WXEMULATOR_CXXFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG_2) $(__THREADSFLAG) \
+ $(GCCFLAGS) -DHAVE_W32API_H -D__WXMSW__ $(__WXUNIV_DEFINE_p) \
+ $(__DEBUG_DEFINE_p) $(__NDEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) \
+ $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) \
+ -I$(SETUPHDIR) -I.\..\..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES_p) -W \
+ -Wall -I. $(__DLLFLAG_p) -I.\..\..\..\samples -DNOPCH $(__RTTIFLAG_5) \
+ $(__EXCEPTIONSFLAG_6) -Wno-ctor-dtor-privacy $(CPPFLAGS) $(CXXFLAGS)
+WXEMULATOR_OBJECTS = \
+ $(OBJS)\wxemulator_sample_rc.o \
+ $(OBJS)\wxemulator_emulator.o
+
+### Conditionally set variables: ###
+
+ifeq ($(GCC_VERSION),2.95)
+GCCFLAGS = -fvtable-thunks
+endif
+ifeq ($(USE_GUI),0)
+PORTNAME = base
+endif
+ifeq ($(USE_GUI),1)
+PORTNAME = msw$(TOOLKIT_VERSION)
+endif
+ifeq ($(OFFICIAL_BUILD),1)
+COMPILER_VERSION = ERROR-COMPILER-VERSION-MUST-BE-SET-FOR-OFFICIAL-BUILD
+endif
+ifeq ($(BUILD),debug)
+WXDEBUGFLAG = d
+endif
+ifeq ($(UNICODE),1)
+WXUNICODEFLAG = u
+endif
+ifeq ($(WXUNIV),1)
+WXUNIVNAME = univ
+endif
+ifeq ($(SHARED),1)
+WXDLLFLAG = dll
+endif
+ifeq ($(SHARED),0)
+LIBTYPE_SUFFIX = lib
+endif
+ifeq ($(SHARED),1)
+LIBTYPE_SUFFIX = dll
+endif
+ifeq ($(MONOLITHIC),0)
+EXTRALIBS_FOR_BASE =
+endif
+ifeq ($(MONOLITHIC),1)
+EXTRALIBS_FOR_BASE =
+endif
+ifeq ($(BUILD),debug)
+__OPTIMIZEFLAG_2 = -O0
+endif
+ifeq ($(BUILD),release)
+__OPTIMIZEFLAG_2 = -O2
+endif
+ifeq ($(USE_RTTI),0)
+__RTTIFLAG_5 = -fno-rtti
+endif
+ifeq ($(USE_RTTI),1)
+__RTTIFLAG_5 =
+endif
+ifeq ($(USE_EXCEPTIONS),0)
+__EXCEPTIONSFLAG_6 = -fno-exceptions
+endif
+ifeq ($(USE_EXCEPTIONS),1)
+__EXCEPTIONSFLAG_6 =
+endif
+ifeq ($(WXUNIV),1)
+__WXUNIV_DEFINE_p = -D__WXUNIVERSAL__
+endif
+ifeq ($(WXUNIV),1)
+__WXUNIV_DEFINE_p_1 = --define __WXUNIVERSAL__
+endif
+ifeq ($(DEBUG_FLAG),0)
+__DEBUG_DEFINE_p = -DwxDEBUG_LEVEL=0
+endif
+ifeq ($(DEBUG_FLAG),0)
+__DEBUG_DEFINE_p_1 = --define wxDEBUG_LEVEL=0
+endif
+ifeq ($(BUILD),release)
+__NDEBUG_DEFINE_p = -DNDEBUG
+endif
+ifeq ($(BUILD),release)
+__NDEBUG_DEFINE_p_1 = --define NDEBUG
+endif
+ifeq ($(USE_EXCEPTIONS),0)
+__EXCEPTIONS_DEFINE_p = -DwxNO_EXCEPTIONS
+endif
+ifeq ($(USE_EXCEPTIONS),0)
+__EXCEPTIONS_DEFINE_p_1 = --define wxNO_EXCEPTIONS
+endif
+ifeq ($(USE_RTTI),0)
+__RTTI_DEFINE_p = -DwxNO_RTTI
+endif
+ifeq ($(USE_RTTI),0)
+__RTTI_DEFINE_p_1 = --define wxNO_RTTI
+endif
+ifeq ($(USE_THREADS),0)
+__THREAD_DEFINE_p = -DwxNO_THREADS
+endif
+ifeq ($(USE_THREADS),0)
+__THREAD_DEFINE_p_1 = --define wxNO_THREADS
+endif
+ifeq ($(UNICODE),0)
+__UNICODE_DEFINE_p = -DwxUSE_UNICODE=0
+endif
+ifeq ($(UNICODE),1)
+__UNICODE_DEFINE_p = -D_UNICODE
+endif
+ifeq ($(UNICODE),0)
+__UNICODE_DEFINE_p_1 = --define wxUSE_UNICODE=0
+endif
+ifeq ($(UNICODE),1)
+__UNICODE_DEFINE_p_1 = --define _UNICODE
+endif
+ifeq ($(USE_CAIRO),1)
+____CAIRO_INCLUDEDIR_FILENAMES_p = -I$(CAIRO_ROOT)\include\cairo
+endif
+ifeq ($(USE_CAIRO),1)
+__CAIRO_INCLUDEDIR_p = --include-dir $(CAIRO_ROOT)/include/cairo
+endif
+ifeq ($(SHARED),1)
+__DLLFLAG_p = -DWXUSINGDLL
+endif
+ifeq ($(SHARED),1)
+__DLLFLAG_p_1 = --define WXUSINGDLL
+endif
+ifeq ($(MONOLITHIC),0)
+__WXLIB_CORE_p = \
+ -lwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core
+endif
+ifeq ($(MONOLITHIC),0)
+__WXLIB_BASE_p = \
+ -lwxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)
+endif
+ifeq ($(MONOLITHIC),1)
+__WXLIB_MONO_p = \
+ -lwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)
+endif
+ifeq ($(MONOLITHIC),1)
+ifeq ($(USE_STC),1)
+__LIB_SCINTILLA_IF_MONO_p = -lwxscintilla$(WXDEBUGFLAG)
+endif
+endif
+ifeq ($(USE_GUI),1)
+__LIB_TIFF_p = -lwxtiff$(WXDEBUGFLAG)
+endif
+ifeq ($(USE_GUI),1)
+__LIB_JPEG_p = -lwxjpeg$(WXDEBUGFLAG)
+endif
+ifeq ($(USE_GUI),1)
+__LIB_PNG_p = -lwxpng$(WXDEBUGFLAG)
+endif
+ifeq ($(USE_CAIRO),1)
+__CAIRO_LIB_p = -lcairo
+endif
+ifeq ($(USE_CAIRO),1)
+____CAIRO_LIBDIR_FILENAMES_p = -L$(CAIRO_ROOT)\lib
+endif
+ifeq ($(BUILD),debug)
+ifeq ($(DEBUG_INFO),default)
+__DEBUGINFO = -g
+endif
+endif
+ifeq ($(BUILD),release)
+ifeq ($(DEBUG_INFO),default)
+__DEBUGINFO =
+endif
+endif
+ifeq ($(DEBUG_INFO),0)
+__DEBUGINFO =
+endif
+ifeq ($(DEBUG_INFO),1)
+__DEBUGINFO = -g
+endif
+ifeq ($(USE_THREADS),0)
+__THREADSFLAG =
+endif
+ifeq ($(USE_THREADS),1)
+__THREADSFLAG = -mthreads
+endif
+
+
+all: $(OBJS)
+$(OBJS):
+ -if not exist $(OBJS) mkdir $(OBJS)
+
+### Targets: ###
+
+all: $(OBJS)\wxemulator.exe data
+
+clean:
+ -if exist $(OBJS)\*.o del $(OBJS)\*.o
+ -if exist $(OBJS)\*.d del $(OBJS)\*.d
+ -if exist $(OBJS)\wxemulator.exe del $(OBJS)\wxemulator.exe
+
+$(OBJS)\wxemulator.exe: $(WXEMULATOR_OBJECTS) $(OBJS)\wxemulator_sample_rc.o
+ $(CXX) -o $@ $(WXEMULATOR_OBJECTS) $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) -Wl,--subsystem,windows -mwindows $(____CAIRO_LIBDIR_FILENAMES_p) $(LDFLAGS) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_SCINTILLA_IF_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(EXTRALIBS_FOR_BASE) $(__CAIRO_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32 -lwininet
+
+data:
+ if not exist $(OBJS) mkdir $(OBJS)
+ for %%f in (default.wxe ipaq.wxe bluegradient.jpg ipaq01.jpg) do if not exist $(OBJS)\%%f copy .\%%f $(OBJS)
+
+$(OBJS)\wxemulator_sample_rc.o: ./../../../samples/sample.rc
+ $(WINDRES) -i$< -o$@ --define __WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__NDEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) --include-dir $(SETUPHDIR) --include-dir ./../../../include $(__CAIRO_INCLUDEDIR_p) --include-dir . $(__DLLFLAG_p_1) --include-dir ./../../../samples --define NOPCH
+
+$(OBJS)\wxemulator_emulator.o: ./emulator.cpp
+ $(CXX) -c -o $@ $(WXEMULATOR_CXXFLAGS) $(CPPDEPS) $<
+
+.PHONY: all clean data
+
+
+SHELL := $(COMSPEC)
+
+# Dependencies tracking:
+-include $(OBJS)/*.d
diff --git a/utils/emulator/src/makefile.vc b/utils/emulator/src/makefile.vc
index b75e760958..35afa6099c 100644
--- a/utils/emulator/src/makefile.vc
+++ b/utils/emulator/src/makefile.vc
@@ -1,366 +1,366 @@
-# =========================================================================
-# This makefile was generated by
-# Bakefile 0.2.9 (http://www.bakefile.org)
-# Do not modify, all changes will be overwritten!
-# =========================================================================
-
-!include <../../../build/msw/config.vc>
-
-# -------------------------------------------------------------------------
-# Do not modify the rest of this file!
-# -------------------------------------------------------------------------
-
-### Variables: ###
-
-WX_RELEASE_NODOT = 31
-COMPILER_PREFIX = vc
-OBJS = \
- $(COMPILER_PREFIX)$(COMPILER_VERSION)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)$(ARCH_SUFFIX)
-LIBDIRNAME = \
- .\..\..\..\lib\$(COMPILER_PREFIX)$(COMPILER_VERSION)$(ARCH_SUFFIX)_$(LIBTYPE_SUFFIX)$(CFG)
-SETUPHDIR = \
- $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)
-WXEMULATOR_CXXFLAGS = /M$(__RUNTIME_LIBS_10)$(__DEBUGRUNTIME_4) /DWIN32 \
- $(__DEBUGINFO_0) /Fd$(OBJS)\wxemulator.pdb $(____DEBUGRUNTIME_3_p) \
- $(__OPTIMIZEFLAG_6) /D_CRT_SECURE_NO_DEPRECATE=1 \
- /D_CRT_NON_CONFORMING_SWPRINTFS=1 /D_SCL_SECURE_NO_WARNINGS=1 \
- $(__NO_VC_CRTDBG_p) /D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \
- $(__NDEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \
- $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) /I$(SETUPHDIR) \
- /I.\..\..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES_p) /W4 /I. \
- $(__DLLFLAG_p) /D_WINDOWS /I.\..\..\..\samples /DNOPCH $(__RTTIFLAG_11) \
- $(__EXCEPTIONSFLAG_12) $(CPPFLAGS) $(CXXFLAGS)
-WXEMULATOR_OBJECTS = \
- $(OBJS)\wxemulator_emulator.obj
-WXEMULATOR_RESOURCES = \
- $(OBJS)\wxemulator_sample.res
-
-### Conditionally set variables: ###
-
-!if "$(TARGET_CPU)" == "AMD64"
-ARCH_SUFFIX = _x64
-!endif
-!if "$(TARGET_CPU)" == "IA64"
-ARCH_SUFFIX = _ia64
-!endif
-!if "$(TARGET_CPU)" == "X64"
-ARCH_SUFFIX = _x64
-!endif
-!if "$(TARGET_CPU)" == "amd64"
-ARCH_SUFFIX = _x64
-!endif
-!if "$(TARGET_CPU)" == "ia64"
-ARCH_SUFFIX = _ia64
-!endif
-!if "$(TARGET_CPU)" == "x64"
-ARCH_SUFFIX = _x64
-!endif
-!if "$(USE_GUI)" == "0"
-PORTNAME = base
-!endif
-!if "$(USE_GUI)" == "1"
-PORTNAME = msw$(TOOLKIT_VERSION)
-!endif
-!if "$(OFFICIAL_BUILD)" == "1"
-COMPILER_VERSION = ERROR-COMPILER-VERSION-MUST-BE-SET-FOR-OFFICIAL-BUILD
-!endif
-!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default"
-WXDEBUGFLAG = d
-!endif
-!if "$(DEBUG_RUNTIME_LIBS)" == "1"
-WXDEBUGFLAG = d
-!endif
-!if "$(UNICODE)" == "1"
-WXUNICODEFLAG = u
-!endif
-!if "$(WXUNIV)" == "1"
-WXUNIVNAME = univ
-!endif
-!if "$(SHARED)" == "1"
-WXDLLFLAG = dll
-!endif
-!if "$(SHARED)" == "0"
-LIBTYPE_SUFFIX = lib
-!endif
-!if "$(SHARED)" == "1"
-LIBTYPE_SUFFIX = dll
-!endif
-!if "$(TARGET_CPU)" == "AMD64"
-LINK_TARGET_CPU = /MACHINE:X64
-!endif
-!if "$(TARGET_CPU)" == "IA64"
-LINK_TARGET_CPU = /MACHINE:IA64
-!endif
-!if "$(TARGET_CPU)" == "X64"
-LINK_TARGET_CPU = /MACHINE:X64
-!endif
-!if "$(TARGET_CPU)" == "amd64"
-LINK_TARGET_CPU = /MACHINE:X64
-!endif
-!if "$(TARGET_CPU)" == "ia64"
-LINK_TARGET_CPU = /MACHINE:IA64
-!endif
-!if "$(TARGET_CPU)" == "x64"
-LINK_TARGET_CPU = /MACHINE:X64
-!endif
-!if "$(MONOLITHIC)" == "0"
-EXTRALIBS_FOR_BASE =
-!endif
-!if "$(MONOLITHIC)" == "1"
-EXTRALIBS_FOR_BASE =
-!endif
-!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default"
-__DEBUGINFO_0 = /Zi
-!endif
-!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default"
-__DEBUGINFO_0 =
-!endif
-!if "$(DEBUG_INFO)" == "0"
-__DEBUGINFO_0 =
-!endif
-!if "$(DEBUG_INFO)" == "1"
-__DEBUGINFO_0 = /Zi
-!endif
-!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default"
-__DEBUGINFO_1 = /DEBUG
-!endif
-!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default"
-__DEBUGINFO_1 =
-!endif
-!if "$(DEBUG_INFO)" == "0"
-__DEBUGINFO_1 =
-!endif
-!if "$(DEBUG_INFO)" == "1"
-__DEBUGINFO_1 = /DEBUG
-!endif
-!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default"
-__DEBUGINFO_2 = $(__DEBUGRUNTIME_5)
-!endif
-!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default"
-__DEBUGINFO_2 =
-!endif
-!if "$(DEBUG_INFO)" == "0"
-__DEBUGINFO_2 =
-!endif
-!if "$(DEBUG_INFO)" == "1"
-__DEBUGINFO_2 = $(__DEBUGRUNTIME_5)
-!endif
-!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default"
-____DEBUGRUNTIME_3_p = /D_DEBUG
-!endif
-!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default"
-____DEBUGRUNTIME_3_p =
-!endif
-!if "$(DEBUG_RUNTIME_LIBS)" == "0"
-____DEBUGRUNTIME_3_p =
-!endif
-!if "$(DEBUG_RUNTIME_LIBS)" == "1"
-____DEBUGRUNTIME_3_p = /D_DEBUG
-!endif
-!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default"
-____DEBUGRUNTIME_3_p_1 = /d _DEBUG
-!endif
-!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default"
-____DEBUGRUNTIME_3_p_1 =
-!endif
-!if "$(DEBUG_RUNTIME_LIBS)" == "0"
-____DEBUGRUNTIME_3_p_1 =
-!endif
-!if "$(DEBUG_RUNTIME_LIBS)" == "1"
-____DEBUGRUNTIME_3_p_1 = /d _DEBUG
-!endif
-!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default"
-__DEBUGRUNTIME_4 = d
-!endif
-!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default"
-__DEBUGRUNTIME_4 =
-!endif
-!if "$(DEBUG_RUNTIME_LIBS)" == "0"
-__DEBUGRUNTIME_4 =
-!endif
-!if "$(DEBUG_RUNTIME_LIBS)" == "1"
-__DEBUGRUNTIME_4 = d
-!endif
-!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default"
-__DEBUGRUNTIME_5 =
-!endif
-!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default"
-__DEBUGRUNTIME_5 = /opt:ref /opt:icf
-!endif
-!if "$(DEBUG_RUNTIME_LIBS)" == "0"
-__DEBUGRUNTIME_5 = /opt:ref /opt:icf
-!endif
-!if "$(DEBUG_RUNTIME_LIBS)" == "1"
-__DEBUGRUNTIME_5 =
-!endif
-!if "$(BUILD)" == "debug"
-__OPTIMIZEFLAG_6 = /Od
-!endif
-!if "$(BUILD)" == "release"
-__OPTIMIZEFLAG_6 = /O2
-!endif
-!if "$(USE_THREADS)" == "0"
-__THREADSFLAG_9 = L
-!endif
-!if "$(USE_THREADS)" == "1"
-__THREADSFLAG_9 = T
-!endif
-!if "$(RUNTIME_LIBS)" == "dynamic"
-__RUNTIME_LIBS_10 = D
-!endif
-!if "$(RUNTIME_LIBS)" == "static"
-__RUNTIME_LIBS_10 = $(__THREADSFLAG_9)
-!endif
-!if "$(USE_RTTI)" == "0"
-__RTTIFLAG_11 =
-!endif
-!if "$(USE_RTTI)" == "1"
-__RTTIFLAG_11 = /GR
-!endif
-!if "$(USE_EXCEPTIONS)" == "0"
-__EXCEPTIONSFLAG_12 =
-!endif
-!if "$(USE_EXCEPTIONS)" == "1"
-__EXCEPTIONSFLAG_12 = /EHsc
-!endif
-!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "0"
-__NO_VC_CRTDBG_p = /D__NO_VC_CRTDBG__
-!endif
-!if "$(BUILD)" == "release" && "$(DEBUG_FLAG)" == "1"
-__NO_VC_CRTDBG_p = /D__NO_VC_CRTDBG__
-!endif
-!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "0"
-__NO_VC_CRTDBG_p_1 = /d __NO_VC_CRTDBG__
-!endif
-!if "$(BUILD)" == "release" && "$(DEBUG_FLAG)" == "1"
-__NO_VC_CRTDBG_p_1 = /d __NO_VC_CRTDBG__
-!endif
-!if "$(WXUNIV)" == "1"
-__WXUNIV_DEFINE_p = /D__WXUNIVERSAL__
-!endif
-!if "$(WXUNIV)" == "1"
-__WXUNIV_DEFINE_p_1 = /d __WXUNIVERSAL__
-!endif
-!if "$(DEBUG_FLAG)" == "0"
-__DEBUG_DEFINE_p = /DwxDEBUG_LEVEL=0
-!endif
-!if "$(DEBUG_FLAG)" == "0"
-__DEBUG_DEFINE_p_1 = /d wxDEBUG_LEVEL=0
-!endif
-!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default"
-__NDEBUG_DEFINE_p = /DNDEBUG
-!endif
-!if "$(DEBUG_RUNTIME_LIBS)" == "0"
-__NDEBUG_DEFINE_p = /DNDEBUG
-!endif
-!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default"
-__NDEBUG_DEFINE_p_1 = /d NDEBUG
-!endif
-!if "$(DEBUG_RUNTIME_LIBS)" == "0"
-__NDEBUG_DEFINE_p_1 = /d NDEBUG
-!endif
-!if "$(USE_EXCEPTIONS)" == "0"
-__EXCEPTIONS_DEFINE_p = /DwxNO_EXCEPTIONS
-!endif
-!if "$(USE_EXCEPTIONS)" == "0"
-__EXCEPTIONS_DEFINE_p_1 = /d wxNO_EXCEPTIONS
-!endif
-!if "$(USE_RTTI)" == "0"
-__RTTI_DEFINE_p = /DwxNO_RTTI
-!endif
-!if "$(USE_RTTI)" == "0"
-__RTTI_DEFINE_p_1 = /d wxNO_RTTI
-!endif
-!if "$(USE_THREADS)" == "0"
-__THREAD_DEFINE_p = /DwxNO_THREADS
-!endif
-!if "$(USE_THREADS)" == "0"
-__THREAD_DEFINE_p_1 = /d wxNO_THREADS
-!endif
-!if "$(UNICODE)" == "0"
-__UNICODE_DEFINE_p = /DwxUSE_UNICODE=0
-!endif
-!if "$(UNICODE)" == "1"
-__UNICODE_DEFINE_p = /D_UNICODE
-!endif
-!if "$(UNICODE)" == "0"
-__UNICODE_DEFINE_p_1 = /d wxUSE_UNICODE=0
-!endif
-!if "$(UNICODE)" == "1"
-__UNICODE_DEFINE_p_1 = /d _UNICODE
-!endif
-!if "$(USE_CAIRO)" == "1"
-____CAIRO_INCLUDEDIR_FILENAMES_p = /I$(CAIRO_ROOT)\include\cairo
-!endif
-!if "$(USE_CAIRO)" == "1"
-____CAIRO_INCLUDEDIR_FILENAMES_1_p = /i $(CAIRO_ROOT)\include\cairo
-!endif
-!if "$(SHARED)" == "1"
-__DLLFLAG_p = /DWXUSINGDLL
-!endif
-!if "$(SHARED)" == "1"
-__DLLFLAG_p_1 = /d WXUSINGDLL
-!endif
-!if "$(MONOLITHIC)" == "0"
-__WXLIB_CORE_p = \
- wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib
-!endif
-!if "$(MONOLITHIC)" == "0"
-__WXLIB_BASE_p = \
- wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib
-!endif
-!if "$(MONOLITHIC)" == "1"
-__WXLIB_MONO_p = \
- wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib
-!endif
-!if "$(MONOLITHIC)" == "1" && "$(USE_STC)" == "1"
-__LIB_SCINTILLA_IF_MONO_p = wxscintilla$(WXDEBUGFLAG).lib
-!endif
-!if "$(USE_GUI)" == "1"
-__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib
-!endif
-!if "$(USE_GUI)" == "1"
-__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib
-!endif
-!if "$(USE_GUI)" == "1"
-__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib
-!endif
-!if "$(USE_CAIRO)" == "1"
-__CAIRO_LIB_p = cairo.lib
-!endif
-!if "$(USE_CAIRO)" == "1"
-____CAIRO_LIBDIR_FILENAMES_p = /LIBPATH:$(CAIRO_ROOT)\lib
-!endif
-
-
-all: $(OBJS)
-$(OBJS):
- -if not exist $(OBJS) mkdir $(OBJS)
-
-### Targets: ###
-
-all: $(OBJS)\wxemulator.exe data
-
-clean:
- -if exist $(OBJS)\*.obj del $(OBJS)\*.obj
- -if exist $(OBJS)\*.res del $(OBJS)\*.res
- -if exist $(OBJS)\*.pch del $(OBJS)\*.pch
- -if exist $(OBJS)\wxemulator.exe del $(OBJS)\wxemulator.exe
- -if exist $(OBJS)\wxemulator.ilk del $(OBJS)\wxemulator.ilk
- -if exist $(OBJS)\wxemulator.pdb del $(OBJS)\wxemulator.pdb
-
-$(OBJS)\wxemulator.exe: $(WXEMULATOR_OBJECTS) $(OBJS)\wxemulator_sample.res
- link /NOLOGO /OUT:$@ $(__DEBUGINFO_1) /pdb:"$(OBJS)\wxemulator.pdb" $(__DEBUGINFO_2) $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:WINDOWS $(____CAIRO_LIBDIR_FILENAMES_p) $(LDFLAGS) @<<
- $(WXEMULATOR_OBJECTS) $(WXEMULATOR_RESOURCES) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_SCINTILLA_IF_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__CAIRO_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib
-<<
-
-data:
- if not exist $(OBJS) mkdir $(OBJS)
- for %f in (default.wxe ipaq.wxe bluegradient.jpg ipaq01.jpg) do if not exist $(OBJS)\%f copy .\%f $(OBJS)
-
-$(OBJS)\wxemulator_sample.res: .\..\..\..\samples\sample.rc
- rc /fo$@ /d WIN32 $(____DEBUGRUNTIME_3_p_1) /d _CRT_SECURE_NO_DEPRECATE=1 /d _CRT_NON_CONFORMING_SWPRINTFS=1 /d _SCL_SECURE_NO_WARNINGS=1 $(__NO_VC_CRTDBG_p_1) /d __WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__NDEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) /i $(SETUPHDIR) /i .\..\..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES_1_p) /i . $(__DLLFLAG_p_1) /d _WINDOWS /i .\..\..\..\samples /d NOPCH .\..\..\..\samples\sample.rc
-
-$(OBJS)\wxemulator_emulator.obj: .\emulator.cpp
- $(CXX) /c /nologo /TP /Fo$@ $(WXEMULATOR_CXXFLAGS) .\emulator.cpp
-
+# =========================================================================
+# This makefile was generated by
+# Bakefile 0.2.9 (http://www.bakefile.org)
+# Do not modify, all changes will be overwritten!
+# =========================================================================
+
+!include <../../../build/msw/config.vc>
+
+# -------------------------------------------------------------------------
+# Do not modify the rest of this file!
+# -------------------------------------------------------------------------
+
+### Variables: ###
+
+WX_RELEASE_NODOT = 31
+COMPILER_PREFIX = vc
+OBJS = \
+ $(COMPILER_PREFIX)$(COMPILER_VERSION)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)$(ARCH_SUFFIX)
+LIBDIRNAME = \
+ .\..\..\..\lib\$(COMPILER_PREFIX)$(COMPILER_VERSION)$(ARCH_SUFFIX)_$(LIBTYPE_SUFFIX)$(CFG)
+SETUPHDIR = \
+ $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)
+WXEMULATOR_CXXFLAGS = /M$(__RUNTIME_LIBS_10)$(__DEBUGRUNTIME_4) /DWIN32 \
+ $(__DEBUGINFO_0) /Fd$(OBJS)\wxemulator.pdb $(____DEBUGRUNTIME_3_p) \
+ $(__OPTIMIZEFLAG_6) /D_CRT_SECURE_NO_DEPRECATE=1 \
+ /D_CRT_NON_CONFORMING_SWPRINTFS=1 /D_SCL_SECURE_NO_WARNINGS=1 \
+ $(__NO_VC_CRTDBG_p) /D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \
+ $(__NDEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \
+ $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) /I$(SETUPHDIR) \
+ /I.\..\..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES_p) /W4 /I. \
+ $(__DLLFLAG_p) /D_WINDOWS /I.\..\..\..\samples /DNOPCH $(__RTTIFLAG_11) \
+ $(__EXCEPTIONSFLAG_12) $(CPPFLAGS) $(CXXFLAGS)
+WXEMULATOR_OBJECTS = \
+ $(OBJS)\wxemulator_emulator.obj
+WXEMULATOR_RESOURCES = \
+ $(OBJS)\wxemulator_sample.res
+
+### Conditionally set variables: ###
+
+!if "$(TARGET_CPU)" == "AMD64"
+ARCH_SUFFIX = _x64
+!endif
+!if "$(TARGET_CPU)" == "IA64"
+ARCH_SUFFIX = _ia64
+!endif
+!if "$(TARGET_CPU)" == "X64"
+ARCH_SUFFIX = _x64
+!endif
+!if "$(TARGET_CPU)" == "amd64"
+ARCH_SUFFIX = _x64
+!endif
+!if "$(TARGET_CPU)" == "ia64"
+ARCH_SUFFIX = _ia64
+!endif
+!if "$(TARGET_CPU)" == "x64"
+ARCH_SUFFIX = _x64
+!endif
+!if "$(USE_GUI)" == "0"
+PORTNAME = base
+!endif
+!if "$(USE_GUI)" == "1"
+PORTNAME = msw$(TOOLKIT_VERSION)
+!endif
+!if "$(OFFICIAL_BUILD)" == "1"
+COMPILER_VERSION = ERROR-COMPILER-VERSION-MUST-BE-SET-FOR-OFFICIAL-BUILD
+!endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default"
+WXDEBUGFLAG = d
+!endif
+!if "$(DEBUG_RUNTIME_LIBS)" == "1"
+WXDEBUGFLAG = d
+!endif
+!if "$(UNICODE)" == "1"
+WXUNICODEFLAG = u
+!endif
+!if "$(WXUNIV)" == "1"
+WXUNIVNAME = univ
+!endif
+!if "$(SHARED)" == "1"
+WXDLLFLAG = dll
+!endif
+!if "$(SHARED)" == "0"
+LIBTYPE_SUFFIX = lib
+!endif
+!if "$(SHARED)" == "1"
+LIBTYPE_SUFFIX = dll
+!endif
+!if "$(TARGET_CPU)" == "AMD64"
+LINK_TARGET_CPU = /MACHINE:X64
+!endif
+!if "$(TARGET_CPU)" == "IA64"
+LINK_TARGET_CPU = /MACHINE:IA64
+!endif
+!if "$(TARGET_CPU)" == "X64"
+LINK_TARGET_CPU = /MACHINE:X64
+!endif
+!if "$(TARGET_CPU)" == "amd64"
+LINK_TARGET_CPU = /MACHINE:X64
+!endif
+!if "$(TARGET_CPU)" == "ia64"
+LINK_TARGET_CPU = /MACHINE:IA64
+!endif
+!if "$(TARGET_CPU)" == "x64"
+LINK_TARGET_CPU = /MACHINE:X64
+!endif
+!if "$(MONOLITHIC)" == "0"
+EXTRALIBS_FOR_BASE =
+!endif
+!if "$(MONOLITHIC)" == "1"
+EXTRALIBS_FOR_BASE =
+!endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default"
+__DEBUGINFO_0 = /Zi
+!endif
+!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default"
+__DEBUGINFO_0 =
+!endif
+!if "$(DEBUG_INFO)" == "0"
+__DEBUGINFO_0 =
+!endif
+!if "$(DEBUG_INFO)" == "1"
+__DEBUGINFO_0 = /Zi
+!endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default"
+__DEBUGINFO_1 = /DEBUG
+!endif
+!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default"
+__DEBUGINFO_1 =
+!endif
+!if "$(DEBUG_INFO)" == "0"
+__DEBUGINFO_1 =
+!endif
+!if "$(DEBUG_INFO)" == "1"
+__DEBUGINFO_1 = /DEBUG
+!endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default"
+__DEBUGINFO_2 = $(__DEBUGRUNTIME_5)
+!endif
+!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default"
+__DEBUGINFO_2 =
+!endif
+!if "$(DEBUG_INFO)" == "0"
+__DEBUGINFO_2 =
+!endif
+!if "$(DEBUG_INFO)" == "1"
+__DEBUGINFO_2 = $(__DEBUGRUNTIME_5)
+!endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default"
+____DEBUGRUNTIME_3_p = /D_DEBUG
+!endif
+!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default"
+____DEBUGRUNTIME_3_p =
+!endif
+!if "$(DEBUG_RUNTIME_LIBS)" == "0"
+____DEBUGRUNTIME_3_p =
+!endif
+!if "$(DEBUG_RUNTIME_LIBS)" == "1"
+____DEBUGRUNTIME_3_p = /D_DEBUG
+!endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default"
+____DEBUGRUNTIME_3_p_1 = /d _DEBUG
+!endif
+!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default"
+____DEBUGRUNTIME_3_p_1 =
+!endif
+!if "$(DEBUG_RUNTIME_LIBS)" == "0"
+____DEBUGRUNTIME_3_p_1 =
+!endif
+!if "$(DEBUG_RUNTIME_LIBS)" == "1"
+____DEBUGRUNTIME_3_p_1 = /d _DEBUG
+!endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default"
+__DEBUGRUNTIME_4 = d
+!endif
+!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default"
+__DEBUGRUNTIME_4 =
+!endif
+!if "$(DEBUG_RUNTIME_LIBS)" == "0"
+__DEBUGRUNTIME_4 =
+!endif
+!if "$(DEBUG_RUNTIME_LIBS)" == "1"
+__DEBUGRUNTIME_4 = d
+!endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default"
+__DEBUGRUNTIME_5 =
+!endif
+!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default"
+__DEBUGRUNTIME_5 = /opt:ref /opt:icf
+!endif
+!if "$(DEBUG_RUNTIME_LIBS)" == "0"
+__DEBUGRUNTIME_5 = /opt:ref /opt:icf
+!endif
+!if "$(DEBUG_RUNTIME_LIBS)" == "1"
+__DEBUGRUNTIME_5 =
+!endif
+!if "$(BUILD)" == "debug"
+__OPTIMIZEFLAG_6 = /Od
+!endif
+!if "$(BUILD)" == "release"
+__OPTIMIZEFLAG_6 = /O2
+!endif
+!if "$(USE_THREADS)" == "0"
+__THREADSFLAG_9 = L
+!endif
+!if "$(USE_THREADS)" == "1"
+__THREADSFLAG_9 = T
+!endif
+!if "$(RUNTIME_LIBS)" == "dynamic"
+__RUNTIME_LIBS_10 = D
+!endif
+!if "$(RUNTIME_LIBS)" == "static"
+__RUNTIME_LIBS_10 = $(__THREADSFLAG_9)
+!endif
+!if "$(USE_RTTI)" == "0"
+__RTTIFLAG_11 =
+!endif
+!if "$(USE_RTTI)" == "1"
+__RTTIFLAG_11 = /GR
+!endif
+!if "$(USE_EXCEPTIONS)" == "0"
+__EXCEPTIONSFLAG_12 =
+!endif
+!if "$(USE_EXCEPTIONS)" == "1"
+__EXCEPTIONSFLAG_12 = /EHsc
+!endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "0"
+__NO_VC_CRTDBG_p = /D__NO_VC_CRTDBG__
+!endif
+!if "$(BUILD)" == "release" && "$(DEBUG_FLAG)" == "1"
+__NO_VC_CRTDBG_p = /D__NO_VC_CRTDBG__
+!endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "0"
+__NO_VC_CRTDBG_p_1 = /d __NO_VC_CRTDBG__
+!endif
+!if "$(BUILD)" == "release" && "$(DEBUG_FLAG)" == "1"
+__NO_VC_CRTDBG_p_1 = /d __NO_VC_CRTDBG__
+!endif
+!if "$(WXUNIV)" == "1"
+__WXUNIV_DEFINE_p = /D__WXUNIVERSAL__
+!endif
+!if "$(WXUNIV)" == "1"
+__WXUNIV_DEFINE_p_1 = /d __WXUNIVERSAL__
+!endif
+!if "$(DEBUG_FLAG)" == "0"
+__DEBUG_DEFINE_p = /DwxDEBUG_LEVEL=0
+!endif
+!if "$(DEBUG_FLAG)" == "0"
+__DEBUG_DEFINE_p_1 = /d wxDEBUG_LEVEL=0
+!endif
+!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default"
+__NDEBUG_DEFINE_p = /DNDEBUG
+!endif
+!if "$(DEBUG_RUNTIME_LIBS)" == "0"
+__NDEBUG_DEFINE_p = /DNDEBUG
+!endif
+!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default"
+__NDEBUG_DEFINE_p_1 = /d NDEBUG
+!endif
+!if "$(DEBUG_RUNTIME_LIBS)" == "0"
+__NDEBUG_DEFINE_p_1 = /d NDEBUG
+!endif
+!if "$(USE_EXCEPTIONS)" == "0"
+__EXCEPTIONS_DEFINE_p = /DwxNO_EXCEPTIONS
+!endif
+!if "$(USE_EXCEPTIONS)" == "0"
+__EXCEPTIONS_DEFINE_p_1 = /d wxNO_EXCEPTIONS
+!endif
+!if "$(USE_RTTI)" == "0"
+__RTTI_DEFINE_p = /DwxNO_RTTI
+!endif
+!if "$(USE_RTTI)" == "0"
+__RTTI_DEFINE_p_1 = /d wxNO_RTTI
+!endif
+!if "$(USE_THREADS)" == "0"
+__THREAD_DEFINE_p = /DwxNO_THREADS
+!endif
+!if "$(USE_THREADS)" == "0"
+__THREAD_DEFINE_p_1 = /d wxNO_THREADS
+!endif
+!if "$(UNICODE)" == "0"
+__UNICODE_DEFINE_p = /DwxUSE_UNICODE=0
+!endif
+!if "$(UNICODE)" == "1"
+__UNICODE_DEFINE_p = /D_UNICODE
+!endif
+!if "$(UNICODE)" == "0"
+__UNICODE_DEFINE_p_1 = /d wxUSE_UNICODE=0
+!endif
+!if "$(UNICODE)" == "1"
+__UNICODE_DEFINE_p_1 = /d _UNICODE
+!endif
+!if "$(USE_CAIRO)" == "1"
+____CAIRO_INCLUDEDIR_FILENAMES_p = /I$(CAIRO_ROOT)\include\cairo
+!endif
+!if "$(USE_CAIRO)" == "1"
+____CAIRO_INCLUDEDIR_FILENAMES_1_p = /i $(CAIRO_ROOT)\include\cairo
+!endif
+!if "$(SHARED)" == "1"
+__DLLFLAG_p = /DWXUSINGDLL
+!endif
+!if "$(SHARED)" == "1"
+__DLLFLAG_p_1 = /d WXUSINGDLL
+!endif
+!if "$(MONOLITHIC)" == "0"
+__WXLIB_CORE_p = \
+ wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib
+!endif
+!if "$(MONOLITHIC)" == "0"
+__WXLIB_BASE_p = \
+ wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib
+!endif
+!if "$(MONOLITHIC)" == "1"
+__WXLIB_MONO_p = \
+ wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib
+!endif
+!if "$(MONOLITHIC)" == "1" && "$(USE_STC)" == "1"
+__LIB_SCINTILLA_IF_MONO_p = wxscintilla$(WXDEBUGFLAG).lib
+!endif
+!if "$(USE_GUI)" == "1"
+__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib
+!endif
+!if "$(USE_GUI)" == "1"
+__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib
+!endif
+!if "$(USE_GUI)" == "1"
+__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib
+!endif
+!if "$(USE_CAIRO)" == "1"
+__CAIRO_LIB_p = cairo.lib
+!endif
+!if "$(USE_CAIRO)" == "1"
+____CAIRO_LIBDIR_FILENAMES_p = /LIBPATH:$(CAIRO_ROOT)\lib
+!endif
+
+
+all: $(OBJS)
+$(OBJS):
+ -if not exist $(OBJS) mkdir $(OBJS)
+
+### Targets: ###
+
+all: $(OBJS)\wxemulator.exe data
+
+clean:
+ -if exist $(OBJS)\*.obj del $(OBJS)\*.obj
+ -if exist $(OBJS)\*.res del $(OBJS)\*.res
+ -if exist $(OBJS)\*.pch del $(OBJS)\*.pch
+ -if exist $(OBJS)\wxemulator.exe del $(OBJS)\wxemulator.exe
+ -if exist $(OBJS)\wxemulator.ilk del $(OBJS)\wxemulator.ilk
+ -if exist $(OBJS)\wxemulator.pdb del $(OBJS)\wxemulator.pdb
+
+$(OBJS)\wxemulator.exe: $(WXEMULATOR_OBJECTS) $(OBJS)\wxemulator_sample.res
+ link /NOLOGO /OUT:$@ $(__DEBUGINFO_1) /pdb:"$(OBJS)\wxemulator.pdb" $(__DEBUGINFO_2) $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:WINDOWS $(____CAIRO_LIBDIR_FILENAMES_p) $(LDFLAGS) @<<
+ $(WXEMULATOR_OBJECTS) $(WXEMULATOR_RESOURCES) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_SCINTILLA_IF_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__CAIRO_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib
+<<
+
+data:
+ if not exist $(OBJS) mkdir $(OBJS)
+ for %f in (default.wxe ipaq.wxe bluegradient.jpg ipaq01.jpg) do if not exist $(OBJS)\%f copy .\%f $(OBJS)
+
+$(OBJS)\wxemulator_sample.res: .\..\..\..\samples\sample.rc
+ rc /fo$@ /d WIN32 $(____DEBUGRUNTIME_3_p_1) /d _CRT_SECURE_NO_DEPRECATE=1 /d _CRT_NON_CONFORMING_SWPRINTFS=1 /d _SCL_SECURE_NO_WARNINGS=1 $(__NO_VC_CRTDBG_p_1) /d __WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__NDEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) /i $(SETUPHDIR) /i .\..\..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES_1_p) /i . $(__DLLFLAG_p_1) /d _WINDOWS /i .\..\..\..\samples /d NOPCH .\..\..\..\samples\sample.rc
+
+$(OBJS)\wxemulator_emulator.obj: .\emulator.cpp
+ $(CXX) /c /nologo /TP /Fo$@ $(WXEMULATOR_CXXFLAGS) .\emulator.cpp
+
diff --git a/utils/execmon/execmon_vc7.sln b/utils/execmon/execmon_vc7.sln
index 2f2364c7ce..b2839241a7 100644
--- a/utils/execmon/execmon_vc7.sln
+++ b/utils/execmon/execmon_vc7.sln
@@ -1,25 +1,25 @@
-Microsoft Visual Studio Solution File, Format Version 8.00
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "execmon", "execmon_vc7.vcproj", "{C52B1010-5B36-55C4-90F9-F6DCD0DF1DAB}"
-EndProject
-Global
- GlobalSection(SolutionConfigurationPlatforms) = preSolution
- Debug|Win32 = Debug|Win32
- Release|Win32 = Release|Win32
- DLL Debug|Win32 = DLL Debug|Win32
- DLL Release|Win32 = DLL Release|Win32
- EndGlobalSection
- GlobalSection(ProjectConfigurationPlatforms) = postSolution
- {C52B1010-5B36-55C4-90F9-F6DCD0DF1DAB}.Debug|Win32.ActiveCfg = Debug|Win32
- {C52B1010-5B36-55C4-90F9-F6DCD0DF1DAB}.Debug|Win32.Build.0 = Debug|Win32
- {C52B1010-5B36-55C4-90F9-F6DCD0DF1DAB}.Release|Win32.ActiveCfg = Release|Win32
- {C52B1010-5B36-55C4-90F9-F6DCD0DF1DAB}.Release|Win32.Build.0 = Release|Win32
- {C52B1010-5B36-55C4-90F9-F6DCD0DF1DAB}.DLL Debug|Win32.ActiveCfg = DLL Debug|Win32
- {C52B1010-5B36-55C4-90F9-F6DCD0DF1DAB}.DLL Debug|Win32.Build.0 = DLL Debug|Win32
- {C52B1010-5B36-55C4-90F9-F6DCD0DF1DAB}.DLL Release|Win32.ActiveCfg = DLL Release|Win32
- {C52B1010-5B36-55C4-90F9-F6DCD0DF1DAB}.DLL Release|Win32.Build.0 = DLL Release|Win32
- EndGlobalSection
- GlobalSection(SolutionProperties) = preSolution
- HideSolutionNode = FALSE
- EndGlobalSection
-EndGlobal
-
+Microsoft Visual Studio Solution File, Format Version 8.00
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "execmon", "execmon_vc7.vcproj", "{C52B1010-5B36-55C4-90F9-F6DCD0DF1DAB}"
+EndProject
+Global
+ GlobalSection(SolutionConfigurationPlatforms) = preSolution
+ Debug|Win32 = Debug|Win32
+ Release|Win32 = Release|Win32
+ DLL Debug|Win32 = DLL Debug|Win32
+ DLL Release|Win32 = DLL Release|Win32
+ EndGlobalSection
+ GlobalSection(ProjectConfigurationPlatforms) = postSolution
+ {C52B1010-5B36-55C4-90F9-F6DCD0DF1DAB}.Debug|Win32.ActiveCfg = Debug|Win32
+ {C52B1010-5B36-55C4-90F9-F6DCD0DF1DAB}.Debug|Win32.Build.0 = Debug|Win32
+ {C52B1010-5B36-55C4-90F9-F6DCD0DF1DAB}.Release|Win32.ActiveCfg = Release|Win32
+ {C52B1010-5B36-55C4-90F9-F6DCD0DF1DAB}.Release|Win32.Build.0 = Release|Win32
+ {C52B1010-5B36-55C4-90F9-F6DCD0DF1DAB}.DLL Debug|Win32.ActiveCfg = DLL Debug|Win32
+ {C52B1010-5B36-55C4-90F9-F6DCD0DF1DAB}.DLL Debug|Win32.Build.0 = DLL Debug|Win32
+ {C52B1010-5B36-55C4-90F9-F6DCD0DF1DAB}.DLL Release|Win32.ActiveCfg = DLL Release|Win32
+ {C52B1010-5B36-55C4-90F9-F6DCD0DF1DAB}.DLL Release|Win32.Build.0 = DLL Release|Win32
+ EndGlobalSection
+ GlobalSection(SolutionProperties) = preSolution
+ HideSolutionNode = FALSE
+ EndGlobalSection
+EndGlobal
+
diff --git a/utils/execmon/execmon_vc7.vcproj b/utils/execmon/execmon_vc7.vcproj
index 044998e3d4..31df496911 100644
--- a/utils/execmon/execmon_vc7.vcproj
+++ b/utils/execmon/execmon_vc7.vcproj
@@ -1,295 +1,295 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/utils/execmon/execmon_vc8.sln b/utils/execmon/execmon_vc8.sln
index d68c479a04..f0ca1183b3 100644
--- a/utils/execmon/execmon_vc8.sln
+++ b/utils/execmon/execmon_vc8.sln
@@ -1,38 +1,38 @@
-Microsoft Visual Studio Solution File, Format Version 9.00
-# Visual Studio 2005
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "execmon", "execmon_vc8.vcproj", "{77853792-0C62-5E96-A5B5-BA0F518B7572}"
-EndProject
-Global
- GlobalSection(SolutionConfigurationPlatforms) = preSolution
- Debug|Win32 = Debug|Win32
- Debug|x64 = Debug|x64
- Release|Win32 = Release|Win32
- Release|x64 = Release|x64
- DLL Debug|Win32 = DLL Debug|Win32
- DLL Debug|x64 = DLL Debug|x64
- DLL Release|Win32 = DLL Release|Win32
- DLL Release|x64 = DLL Release|x64
- EndGlobalSection
- GlobalSection(ProjectConfigurationPlatforms) = postSolution
- {77853792-0C62-5E96-A5B5-BA0F518B7572}.Debug|Win32.ActiveCfg = Debug|Win32
- {77853792-0C62-5E96-A5B5-BA0F518B7572}.Debug|Win32.Build.0 = Debug|Win32
- {77853792-0C62-5E96-A5B5-BA0F518B7572}.Debug|x64.ActiveCfg = Debug|x64
- {77853792-0C62-5E96-A5B5-BA0F518B7572}.Debug|x64.Build.0 = Debug|x64
- {77853792-0C62-5E96-A5B5-BA0F518B7572}.Release|Win32.ActiveCfg = Release|Win32
- {77853792-0C62-5E96-A5B5-BA0F518B7572}.Release|Win32.Build.0 = Release|Win32
- {77853792-0C62-5E96-A5B5-BA0F518B7572}.Release|x64.ActiveCfg = Release|x64
- {77853792-0C62-5E96-A5B5-BA0F518B7572}.Release|x64.Build.0 = Release|x64
- {77853792-0C62-5E96-A5B5-BA0F518B7572}.DLL Debug|Win32.ActiveCfg = DLL Debug|Win32
- {77853792-0C62-5E96-A5B5-BA0F518B7572}.DLL Debug|Win32.Build.0 = DLL Debug|Win32
- {77853792-0C62-5E96-A5B5-BA0F518B7572}.DLL Debug|x64.ActiveCfg = DLL Debug|x64
- {77853792-0C62-5E96-A5B5-BA0F518B7572}.DLL Debug|x64.Build.0 = DLL Debug|x64
- {77853792-0C62-5E96-A5B5-BA0F518B7572}.DLL Release|Win32.ActiveCfg = DLL Release|Win32
- {77853792-0C62-5E96-A5B5-BA0F518B7572}.DLL Release|Win32.Build.0 = DLL Release|Win32
- {77853792-0C62-5E96-A5B5-BA0F518B7572}.DLL Release|x64.ActiveCfg = DLL Release|x64
- {77853792-0C62-5E96-A5B5-BA0F518B7572}.DLL Release|x64.Build.0 = DLL Release|x64
- EndGlobalSection
- GlobalSection(SolutionProperties) = preSolution
- HideSolutionNode = FALSE
- EndGlobalSection
-EndGlobal
-
+Microsoft Visual Studio Solution File, Format Version 9.00
+# Visual Studio 2005
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "execmon", "execmon_vc8.vcproj", "{77853792-0C62-5E96-A5B5-BA0F518B7572}"
+EndProject
+Global
+ GlobalSection(SolutionConfigurationPlatforms) = preSolution
+ Debug|Win32 = Debug|Win32
+ Debug|x64 = Debug|x64
+ Release|Win32 = Release|Win32
+ Release|x64 = Release|x64
+ DLL Debug|Win32 = DLL Debug|Win32
+ DLL Debug|x64 = DLL Debug|x64
+ DLL Release|Win32 = DLL Release|Win32
+ DLL Release|x64 = DLL Release|x64
+ EndGlobalSection
+ GlobalSection(ProjectConfigurationPlatforms) = postSolution
+ {77853792-0C62-5E96-A5B5-BA0F518B7572}.Debug|Win32.ActiveCfg = Debug|Win32
+ {77853792-0C62-5E96-A5B5-BA0F518B7572}.Debug|Win32.Build.0 = Debug|Win32
+ {77853792-0C62-5E96-A5B5-BA0F518B7572}.Debug|x64.ActiveCfg = Debug|x64
+ {77853792-0C62-5E96-A5B5-BA0F518B7572}.Debug|x64.Build.0 = Debug|x64
+ {77853792-0C62-5E96-A5B5-BA0F518B7572}.Release|Win32.ActiveCfg = Release|Win32
+ {77853792-0C62-5E96-A5B5-BA0F518B7572}.Release|Win32.Build.0 = Release|Win32
+ {77853792-0C62-5E96-A5B5-BA0F518B7572}.Release|x64.ActiveCfg = Release|x64
+ {77853792-0C62-5E96-A5B5-BA0F518B7572}.Release|x64.Build.0 = Release|x64
+ {77853792-0C62-5E96-A5B5-BA0F518B7572}.DLL Debug|Win32.ActiveCfg = DLL Debug|Win32
+ {77853792-0C62-5E96-A5B5-BA0F518B7572}.DLL Debug|Win32.Build.0 = DLL Debug|Win32
+ {77853792-0C62-5E96-A5B5-BA0F518B7572}.DLL Debug|x64.ActiveCfg = DLL Debug|x64
+ {77853792-0C62-5E96-A5B5-BA0F518B7572}.DLL Debug|x64.Build.0 = DLL Debug|x64
+ {77853792-0C62-5E96-A5B5-BA0F518B7572}.DLL Release|Win32.ActiveCfg = DLL Release|Win32
+ {77853792-0C62-5E96-A5B5-BA0F518B7572}.DLL Release|Win32.Build.0 = DLL Release|Win32
+ {77853792-0C62-5E96-A5B5-BA0F518B7572}.DLL Release|x64.ActiveCfg = DLL Release|x64
+ {77853792-0C62-5E96-A5B5-BA0F518B7572}.DLL Release|x64.Build.0 = DLL Release|x64
+ EndGlobalSection
+ GlobalSection(SolutionProperties) = preSolution
+ HideSolutionNode = FALSE
+ EndGlobalSection
+EndGlobal
+
diff --git a/utils/execmon/execmon_vc8.vcproj b/utils/execmon/execmon_vc8.vcproj
index ba118eb8e7..df50ff9263 100644
--- a/utils/execmon/execmon_vc8.vcproj
+++ b/utils/execmon/execmon_vc8.vcproj
@@ -1,819 +1,819 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/utils/execmon/execmon_vc9.sln b/utils/execmon/execmon_vc9.sln
index 22fe3bdb1a..3f0d647c1e 100644
--- a/utils/execmon/execmon_vc9.sln
+++ b/utils/execmon/execmon_vc9.sln
@@ -1,38 +1,38 @@
-Microsoft Visual Studio Solution File, Format Version 10.00
-# Visual Studio 2008
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "execmon", "execmon_vc9.vcproj", "{8AF5279F-6710-5392-A32E-993D957C55F8}"
-EndProject
-Global
- GlobalSection(SolutionConfigurationPlatforms) = preSolution
- Debug|Win32 = Debug|Win32
- Debug|x64 = Debug|x64
- Release|Win32 = Release|Win32
- Release|x64 = Release|x64
- DLL Debug|Win32 = DLL Debug|Win32
- DLL Debug|x64 = DLL Debug|x64
- DLL Release|Win32 = DLL Release|Win32
- DLL Release|x64 = DLL Release|x64
- EndGlobalSection
- GlobalSection(ProjectConfigurationPlatforms) = postSolution
- {8AF5279F-6710-5392-A32E-993D957C55F8}.Debug|Win32.ActiveCfg = Debug|Win32
- {8AF5279F-6710-5392-A32E-993D957C55F8}.Debug|Win32.Build.0 = Debug|Win32
- {8AF5279F-6710-5392-A32E-993D957C55F8}.Debug|x64.ActiveCfg = Debug|x64
- {8AF5279F-6710-5392-A32E-993D957C55F8}.Debug|x64.Build.0 = Debug|x64
- {8AF5279F-6710-5392-A32E-993D957C55F8}.Release|Win32.ActiveCfg = Release|Win32
- {8AF5279F-6710-5392-A32E-993D957C55F8}.Release|Win32.Build.0 = Release|Win32
- {8AF5279F-6710-5392-A32E-993D957C55F8}.Release|x64.ActiveCfg = Release|x64
- {8AF5279F-6710-5392-A32E-993D957C55F8}.Release|x64.Build.0 = Release|x64
- {8AF5279F-6710-5392-A32E-993D957C55F8}.DLL Debug|Win32.ActiveCfg = DLL Debug|Win32
- {8AF5279F-6710-5392-A32E-993D957C55F8}.DLL Debug|Win32.Build.0 = DLL Debug|Win32
- {8AF5279F-6710-5392-A32E-993D957C55F8}.DLL Debug|x64.ActiveCfg = DLL Debug|x64
- {8AF5279F-6710-5392-A32E-993D957C55F8}.DLL Debug|x64.Build.0 = DLL Debug|x64
- {8AF5279F-6710-5392-A32E-993D957C55F8}.DLL Release|Win32.ActiveCfg = DLL Release|Win32
- {8AF5279F-6710-5392-A32E-993D957C55F8}.DLL Release|Win32.Build.0 = DLL Release|Win32
- {8AF5279F-6710-5392-A32E-993D957C55F8}.DLL Release|x64.ActiveCfg = DLL Release|x64
- {8AF5279F-6710-5392-A32E-993D957C55F8}.DLL Release|x64.Build.0 = DLL Release|x64
- EndGlobalSection
- GlobalSection(SolutionProperties) = preSolution
- HideSolutionNode = FALSE
- EndGlobalSection
-EndGlobal
-
+Microsoft Visual Studio Solution File, Format Version 10.00
+# Visual Studio 2008
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "execmon", "execmon_vc9.vcproj", "{8AF5279F-6710-5392-A32E-993D957C55F8}"
+EndProject
+Global
+ GlobalSection(SolutionConfigurationPlatforms) = preSolution
+ Debug|Win32 = Debug|Win32
+ Debug|x64 = Debug|x64
+ Release|Win32 = Release|Win32
+ Release|x64 = Release|x64
+ DLL Debug|Win32 = DLL Debug|Win32
+ DLL Debug|x64 = DLL Debug|x64
+ DLL Release|Win32 = DLL Release|Win32
+ DLL Release|x64 = DLL Release|x64
+ EndGlobalSection
+ GlobalSection(ProjectConfigurationPlatforms) = postSolution
+ {8AF5279F-6710-5392-A32E-993D957C55F8}.Debug|Win32.ActiveCfg = Debug|Win32
+ {8AF5279F-6710-5392-A32E-993D957C55F8}.Debug|Win32.Build.0 = Debug|Win32
+ {8AF5279F-6710-5392-A32E-993D957C55F8}.Debug|x64.ActiveCfg = Debug|x64
+ {8AF5279F-6710-5392-A32E-993D957C55F8}.Debug|x64.Build.0 = Debug|x64
+ {8AF5279F-6710-5392-A32E-993D957C55F8}.Release|Win32.ActiveCfg = Release|Win32
+ {8AF5279F-6710-5392-A32E-993D957C55F8}.Release|Win32.Build.0 = Release|Win32
+ {8AF5279F-6710-5392-A32E-993D957C55F8}.Release|x64.ActiveCfg = Release|x64
+ {8AF5279F-6710-5392-A32E-993D957C55F8}.Release|x64.Build.0 = Release|x64
+ {8AF5279F-6710-5392-A32E-993D957C55F8}.DLL Debug|Win32.ActiveCfg = DLL Debug|Win32
+ {8AF5279F-6710-5392-A32E-993D957C55F8}.DLL Debug|Win32.Build.0 = DLL Debug|Win32
+ {8AF5279F-6710-5392-A32E-993D957C55F8}.DLL Debug|x64.ActiveCfg = DLL Debug|x64
+ {8AF5279F-6710-5392-A32E-993D957C55F8}.DLL Debug|x64.Build.0 = DLL Debug|x64
+ {8AF5279F-6710-5392-A32E-993D957C55F8}.DLL Release|Win32.ActiveCfg = DLL Release|Win32
+ {8AF5279F-6710-5392-A32E-993D957C55F8}.DLL Release|Win32.Build.0 = DLL Release|Win32
+ {8AF5279F-6710-5392-A32E-993D957C55F8}.DLL Release|x64.ActiveCfg = DLL Release|x64
+ {8AF5279F-6710-5392-A32E-993D957C55F8}.DLL Release|x64.Build.0 = DLL Release|x64
+ EndGlobalSection
+ GlobalSection(SolutionProperties) = preSolution
+ HideSolutionNode = FALSE
+ EndGlobalSection
+EndGlobal
+
diff --git a/utils/execmon/execmon_vc9.vcproj b/utils/execmon/execmon_vc9.vcproj
index f3820f0273..71941dfb64 100644
--- a/utils/execmon/execmon_vc9.vcproj
+++ b/utils/execmon/execmon_vc9.vcproj
@@ -1,791 +1,791 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/utils/execmon/makefile.bcc b/utils/execmon/makefile.bcc
index 7ab360fa69..f51ebcf562 100644
--- a/utils/execmon/makefile.bcc
+++ b/utils/execmon/makefile.bcc
@@ -1,201 +1,201 @@
-# =========================================================================
-# This makefile was generated by
-# Bakefile 0.2.9 (http://www.bakefile.org)
-# 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: ###
-
-WX_RELEASE_NODOT = 31
-COMPILER_PREFIX = bcc
-OBJS = \
- $(COMPILER_PREFIX)$(COMPILER_VERSION)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)
-LIBDIRNAME = \
- .\..\..\lib\$(COMPILER_PREFIX)$(COMPILER_VERSION)_$(LIBTYPE_SUFFIX)$(CFG)
-SETUPHDIR = \
- $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)
-EXECMON_CXXFLAGS = $(__RUNTIME_LIBS_7) -I$(BCCDIR)\include $(__DEBUGINFO) \
- $(__OPTIMIZEFLAG_2) $(__THREADSFLAG_6) -D__WXMSW__ $(__WXUNIV_DEFINE_p) \
- $(__DEBUG_DEFINE_p) $(__NDEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) \
- $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) \
- -I$(SETUPHDIR) -I.\..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES_p) -I. \
- $(__DLLFLAG_p) -DwxUSE_GUI=0 $(CPPFLAGS) $(CXXFLAGS)
-EXECMON_OBJECTS = \
- $(OBJS)\execmon_execmon.obj
-
-### Conditionally set variables: ###
-
-!if "$(USE_GUI)" == "0"
-PORTNAME = base
-!endif
-!if "$(USE_GUI)" == "1"
-PORTNAME = msw$(TOOLKIT_VERSION)
-!endif
-!if "$(OFFICIAL_BUILD)" == "1"
-COMPILER_VERSION = ERROR-COMPILER-VERSION-MUST-BE-SET-FOR-OFFICIAL-BUILD
-!endif
-!if "$(BUILD)" == "debug"
-WXDEBUGFLAG = d
-!endif
-!if "$(UNICODE)" == "1"
-WXUNICODEFLAG = u
-!endif
-!if "$(WXUNIV)" == "1"
-WXUNIVNAME = univ
-!endif
-!if "$(SHARED)" == "1"
-WXDLLFLAG = dll
-!endif
-!if "$(SHARED)" == "0"
-LIBTYPE_SUFFIX = lib
-!endif
-!if "$(SHARED)" == "1"
-LIBTYPE_SUFFIX = dll
-!endif
-!if "$(MONOLITHIC)" == "0"
-EXTRALIBS_FOR_BASE =
-!endif
-!if "$(MONOLITHIC)" == "1"
-EXTRALIBS_FOR_BASE =
-!endif
-!if "$(USE_XRC)" == "1"
-__execmon___depname = $(OBJS)\execmon.exe
-!endif
-!if "$(BUILD)" == "debug"
-__OPTIMIZEFLAG_2 = -Od
-!endif
-!if "$(BUILD)" == "release"
-__OPTIMIZEFLAG_2 = -O2
-!endif
-!if "$(USE_THREADS)" == "0"
-__THREADSFLAG_5 =
-!endif
-!if "$(USE_THREADS)" == "1"
-__THREADSFLAG_5 = mt
-!endif
-!if "$(USE_THREADS)" == "0"
-__THREADSFLAG_6 =
-!endif
-!if "$(USE_THREADS)" == "1"
-__THREADSFLAG_6 = -tWM
-!endif
-!if "$(RUNTIME_LIBS)" == "dynamic"
-__RUNTIME_LIBS_7 = -tWR
-!endif
-!if "$(RUNTIME_LIBS)" == "static"
-__RUNTIME_LIBS_7 =
-!endif
-!if "$(RUNTIME_LIBS)" == "dynamic"
-__RUNTIME_LIBS_8 = i
-!endif
-!if "$(RUNTIME_LIBS)" == "static"
-__RUNTIME_LIBS_8 =
-!endif
-!if "$(WXUNIV)" == "1"
-__WXUNIV_DEFINE_p = -D__WXUNIVERSAL__
-!endif
-!if "$(DEBUG_FLAG)" == "0"
-__DEBUG_DEFINE_p = -DwxDEBUG_LEVEL=0
-!endif
-!if "$(BUILD)" == "release"
-__NDEBUG_DEFINE_p = -DNDEBUG
-!endif
-!if "$(USE_EXCEPTIONS)" == "0"
-__EXCEPTIONS_DEFINE_p = -DwxNO_EXCEPTIONS
-!endif
-!if "$(USE_RTTI)" == "0"
-__RTTI_DEFINE_p = -DwxNO_RTTI
-!endif
-!if "$(USE_THREADS)" == "0"
-__THREAD_DEFINE_p = -DwxNO_THREADS
-!endif
-!if "$(UNICODE)" == "0"
-__UNICODE_DEFINE_p = -DwxUSE_UNICODE=0
-!endif
-!if "$(UNICODE)" == "1"
-__UNICODE_DEFINE_p = -D_UNICODE
-!endif
-!if "$(USE_CAIRO)" == "1"
-____CAIRO_INCLUDEDIR_FILENAMES_p = -I$(CAIRO_ROOT)\include\cairo
-!endif
-!if "$(SHARED)" == "1"
-__DLLFLAG_p = -DWXUSINGDLL
-!endif
-!if "$(MONOLITHIC)" == "0"
-__WXLIB_BASE_p = \
- wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib
-!endif
-!if "$(MONOLITHIC)" == "1"
-__WXLIB_MONO_p = \
- wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib
-!endif
-!if "$(MONOLITHIC)" == "1"
-__LIB_PNG_IF_MONO_p = $(__LIB_PNG_p)
-!endif
-!if "$(USE_GUI)" == "1"
-__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib
-!endif
-!if "$(USE_CAIRO)" == "1"
-__CAIRO_LIB_p = cairo.lib
-!endif
-!if "$(USE_CAIRO)" == "1"
-____CAIRO_LIBDIR_FILENAMES_p = -L$(CAIRO_ROOT)\lib
-!endif
-!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default"
-__DEBUGINFO = -v
-!endif
-!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default"
-__DEBUGINFO = -v-
-!endif
-!if "$(DEBUG_INFO)" == "0"
-__DEBUGINFO = -v-
-!endif
-!if "$(DEBUG_INFO)" == "1"
-__DEBUGINFO = -v
-!endif
-
-
-all: $(OBJS)
-$(OBJS):
- -if not exist $(OBJS) mkdir $(OBJS)
-
-### Targets: ###
-
-all: $(__execmon___depname)
-
-clean:
- -if exist $(OBJS)\*.obj del $(OBJS)\*.obj
- -if exist $(OBJS)\*.res del $(OBJS)\*.res
- -if exist $(OBJS)\*.csm del $(OBJS)\*.csm
- -if exist $(OBJS)\execmon.exe del $(OBJS)\execmon.exe
- -if exist $(OBJS)\execmon.tds del $(OBJS)\execmon.tds
- -if exist $(OBJS)\execmon.ilc del $(OBJS)\execmon.ilc
- -if exist $(OBJS)\execmon.ild del $(OBJS)\execmon.ild
- -if exist $(OBJS)\execmon.ilf del $(OBJS)\execmon.ilf
- -if exist $(OBJS)\execmon.ils del $(OBJS)\execmon.ils
-
-!if "$(USE_XRC)" == "1"
-$(OBJS)\execmon.exe: $(EXECMON_OBJECTS)
- ilink32 -Tpe -q -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUGINFO) -L$(LIBDIRNAME) -ap $(____CAIRO_LIBDIR_FILENAMES_p) $(LDFLAGS) @&&|
- c0x32.obj $(EXECMON_OBJECTS),$@,, $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_PNG_IF_MONO_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__CAIRO_LIB_p) ole2w32.lib oleacc.lib import32.lib cw32$(__THREADSFLAG_5)$(__RUNTIME_LIBS_8).lib,,
-|
-!endif
-
-$(OBJS)\execmon_execmon.obj: .\execmon.cpp
- $(CXX) -q -c -P -o$@ $(EXECMON_CXXFLAGS) .\execmon.cpp
-
+# =========================================================================
+# This makefile was generated by
+# Bakefile 0.2.9 (http://www.bakefile.org)
+# 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: ###
+
+WX_RELEASE_NODOT = 31
+COMPILER_PREFIX = bcc
+OBJS = \
+ $(COMPILER_PREFIX)$(COMPILER_VERSION)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)
+LIBDIRNAME = \
+ .\..\..\lib\$(COMPILER_PREFIX)$(COMPILER_VERSION)_$(LIBTYPE_SUFFIX)$(CFG)
+SETUPHDIR = \
+ $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)
+EXECMON_CXXFLAGS = $(__RUNTIME_LIBS_7) -I$(BCCDIR)\include $(__DEBUGINFO) \
+ $(__OPTIMIZEFLAG_2) $(__THREADSFLAG_6) -D__WXMSW__ $(__WXUNIV_DEFINE_p) \
+ $(__DEBUG_DEFINE_p) $(__NDEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) \
+ $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) \
+ -I$(SETUPHDIR) -I.\..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES_p) -I. \
+ $(__DLLFLAG_p) -DwxUSE_GUI=0 $(CPPFLAGS) $(CXXFLAGS)
+EXECMON_OBJECTS = \
+ $(OBJS)\execmon_execmon.obj
+
+### Conditionally set variables: ###
+
+!if "$(USE_GUI)" == "0"
+PORTNAME = base
+!endif
+!if "$(USE_GUI)" == "1"
+PORTNAME = msw$(TOOLKIT_VERSION)
+!endif
+!if "$(OFFICIAL_BUILD)" == "1"
+COMPILER_VERSION = ERROR-COMPILER-VERSION-MUST-BE-SET-FOR-OFFICIAL-BUILD
+!endif
+!if "$(BUILD)" == "debug"
+WXDEBUGFLAG = d
+!endif
+!if "$(UNICODE)" == "1"
+WXUNICODEFLAG = u
+!endif
+!if "$(WXUNIV)" == "1"
+WXUNIVNAME = univ
+!endif
+!if "$(SHARED)" == "1"
+WXDLLFLAG = dll
+!endif
+!if "$(SHARED)" == "0"
+LIBTYPE_SUFFIX = lib
+!endif
+!if "$(SHARED)" == "1"
+LIBTYPE_SUFFIX = dll
+!endif
+!if "$(MONOLITHIC)" == "0"
+EXTRALIBS_FOR_BASE =
+!endif
+!if "$(MONOLITHIC)" == "1"
+EXTRALIBS_FOR_BASE =
+!endif
+!if "$(USE_XRC)" == "1"
+__execmon___depname = $(OBJS)\execmon.exe
+!endif
+!if "$(BUILD)" == "debug"
+__OPTIMIZEFLAG_2 = -Od
+!endif
+!if "$(BUILD)" == "release"
+__OPTIMIZEFLAG_2 = -O2
+!endif
+!if "$(USE_THREADS)" == "0"
+__THREADSFLAG_5 =
+!endif
+!if "$(USE_THREADS)" == "1"
+__THREADSFLAG_5 = mt
+!endif
+!if "$(USE_THREADS)" == "0"
+__THREADSFLAG_6 =
+!endif
+!if "$(USE_THREADS)" == "1"
+__THREADSFLAG_6 = -tWM
+!endif
+!if "$(RUNTIME_LIBS)" == "dynamic"
+__RUNTIME_LIBS_7 = -tWR
+!endif
+!if "$(RUNTIME_LIBS)" == "static"
+__RUNTIME_LIBS_7 =
+!endif
+!if "$(RUNTIME_LIBS)" == "dynamic"
+__RUNTIME_LIBS_8 = i
+!endif
+!if "$(RUNTIME_LIBS)" == "static"
+__RUNTIME_LIBS_8 =
+!endif
+!if "$(WXUNIV)" == "1"
+__WXUNIV_DEFINE_p = -D__WXUNIVERSAL__
+!endif
+!if "$(DEBUG_FLAG)" == "0"
+__DEBUG_DEFINE_p = -DwxDEBUG_LEVEL=0
+!endif
+!if "$(BUILD)" == "release"
+__NDEBUG_DEFINE_p = -DNDEBUG
+!endif
+!if "$(USE_EXCEPTIONS)" == "0"
+__EXCEPTIONS_DEFINE_p = -DwxNO_EXCEPTIONS
+!endif
+!if "$(USE_RTTI)" == "0"
+__RTTI_DEFINE_p = -DwxNO_RTTI
+!endif
+!if "$(USE_THREADS)" == "0"
+__THREAD_DEFINE_p = -DwxNO_THREADS
+!endif
+!if "$(UNICODE)" == "0"
+__UNICODE_DEFINE_p = -DwxUSE_UNICODE=0
+!endif
+!if "$(UNICODE)" == "1"
+__UNICODE_DEFINE_p = -D_UNICODE
+!endif
+!if "$(USE_CAIRO)" == "1"
+____CAIRO_INCLUDEDIR_FILENAMES_p = -I$(CAIRO_ROOT)\include\cairo
+!endif
+!if "$(SHARED)" == "1"
+__DLLFLAG_p = -DWXUSINGDLL
+!endif
+!if "$(MONOLITHIC)" == "0"
+__WXLIB_BASE_p = \
+ wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib
+!endif
+!if "$(MONOLITHIC)" == "1"
+__WXLIB_MONO_p = \
+ wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib
+!endif
+!if "$(MONOLITHIC)" == "1"
+__LIB_PNG_IF_MONO_p = $(__LIB_PNG_p)
+!endif
+!if "$(USE_GUI)" == "1"
+__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib
+!endif
+!if "$(USE_CAIRO)" == "1"
+__CAIRO_LIB_p = cairo.lib
+!endif
+!if "$(USE_CAIRO)" == "1"
+____CAIRO_LIBDIR_FILENAMES_p = -L$(CAIRO_ROOT)\lib
+!endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default"
+__DEBUGINFO = -v
+!endif
+!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default"
+__DEBUGINFO = -v-
+!endif
+!if "$(DEBUG_INFO)" == "0"
+__DEBUGINFO = -v-
+!endif
+!if "$(DEBUG_INFO)" == "1"
+__DEBUGINFO = -v
+!endif
+
+
+all: $(OBJS)
+$(OBJS):
+ -if not exist $(OBJS) mkdir $(OBJS)
+
+### Targets: ###
+
+all: $(__execmon___depname)
+
+clean:
+ -if exist $(OBJS)\*.obj del $(OBJS)\*.obj
+ -if exist $(OBJS)\*.res del $(OBJS)\*.res
+ -if exist $(OBJS)\*.csm del $(OBJS)\*.csm
+ -if exist $(OBJS)\execmon.exe del $(OBJS)\execmon.exe
+ -if exist $(OBJS)\execmon.tds del $(OBJS)\execmon.tds
+ -if exist $(OBJS)\execmon.ilc del $(OBJS)\execmon.ilc
+ -if exist $(OBJS)\execmon.ild del $(OBJS)\execmon.ild
+ -if exist $(OBJS)\execmon.ilf del $(OBJS)\execmon.ilf
+ -if exist $(OBJS)\execmon.ils del $(OBJS)\execmon.ils
+
+!if "$(USE_XRC)" == "1"
+$(OBJS)\execmon.exe: $(EXECMON_OBJECTS)
+ ilink32 -Tpe -q -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUGINFO) -L$(LIBDIRNAME) -ap $(____CAIRO_LIBDIR_FILENAMES_p) $(LDFLAGS) @&&|
+ c0x32.obj $(EXECMON_OBJECTS),$@,, $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_PNG_IF_MONO_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__CAIRO_LIB_p) ole2w32.lib oleacc.lib import32.lib cw32$(__THREADSFLAG_5)$(__RUNTIME_LIBS_8).lib,,
+|
+!endif
+
+$(OBJS)\execmon_execmon.obj: .\execmon.cpp
+ $(CXX) -q -c -P -o$@ $(EXECMON_CXXFLAGS) .\execmon.cpp
+
diff --git a/utils/execmon/makefile.gcc b/utils/execmon/makefile.gcc
index c4d629358e..054917c5c9 100644
--- a/utils/execmon/makefile.gcc
+++ b/utils/execmon/makefile.gcc
@@ -1,194 +1,194 @@
-# =========================================================================
-# This makefile was generated by
-# Bakefile 0.2.9 (http://www.bakefile.org)
-# Do not modify, all changes will be overwritten!
-# =========================================================================
-
-include ../../build/msw/config.gcc
-
-# -------------------------------------------------------------------------
-# Do not modify the rest of this file!
-# -------------------------------------------------------------------------
-
-### Variables: ###
-
-CPPDEPS = -MT$@ -MF$@.d -MD -MP
-WX_RELEASE_NODOT = 31
-COMPILER_PREFIX = gcc
-OBJS = \
- $(COMPILER_PREFIX)$(COMPILER_VERSION)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)
-LIBDIRNAME = \
- .\..\..\lib\$(COMPILER_PREFIX)$(COMPILER_VERSION)_$(LIBTYPE_SUFFIX)$(CFG)
-SETUPHDIR = \
- $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)
-EXECMON_CXXFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG_2) $(__THREADSFLAG) \
- $(GCCFLAGS) -DHAVE_W32API_H -D__WXMSW__ $(__WXUNIV_DEFINE_p) \
- $(__DEBUG_DEFINE_p) $(__NDEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) \
- $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) \
- -I$(SETUPHDIR) -I.\..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES_p) -W \
- -Wall -I. $(__DLLFLAG_p) -DwxUSE_GUI=0 $(__RTTIFLAG_5) $(__EXCEPTIONSFLAG_6) \
- -Wno-ctor-dtor-privacy $(CPPFLAGS) $(CXXFLAGS)
-EXECMON_OBJECTS = \
- $(OBJS)\execmon_execmon.o
-
-### Conditionally set variables: ###
-
-ifeq ($(GCC_VERSION),2.95)
-GCCFLAGS = -fvtable-thunks
-endif
-ifeq ($(USE_GUI),0)
-PORTNAME = base
-endif
-ifeq ($(USE_GUI),1)
-PORTNAME = msw$(TOOLKIT_VERSION)
-endif
-ifeq ($(OFFICIAL_BUILD),1)
-COMPILER_VERSION = ERROR-COMPILER-VERSION-MUST-BE-SET-FOR-OFFICIAL-BUILD
-endif
-ifeq ($(BUILD),debug)
-WXDEBUGFLAG = d
-endif
-ifeq ($(UNICODE),1)
-WXUNICODEFLAG = u
-endif
-ifeq ($(WXUNIV),1)
-WXUNIVNAME = univ
-endif
-ifeq ($(SHARED),1)
-WXDLLFLAG = dll
-endif
-ifeq ($(SHARED),0)
-LIBTYPE_SUFFIX = lib
-endif
-ifeq ($(SHARED),1)
-LIBTYPE_SUFFIX = dll
-endif
-ifeq ($(MONOLITHIC),0)
-EXTRALIBS_FOR_BASE =
-endif
-ifeq ($(MONOLITHIC),1)
-EXTRALIBS_FOR_BASE =
-endif
-ifeq ($(USE_XRC),1)
-__execmon___depname = $(OBJS)\execmon.exe
-endif
-ifeq ($(BUILD),debug)
-__OPTIMIZEFLAG_2 = -O0
-endif
-ifeq ($(BUILD),release)
-__OPTIMIZEFLAG_2 = -O2
-endif
-ifeq ($(USE_RTTI),0)
-__RTTIFLAG_5 = -fno-rtti
-endif
-ifeq ($(USE_RTTI),1)
-__RTTIFLAG_5 =
-endif
-ifeq ($(USE_EXCEPTIONS),0)
-__EXCEPTIONSFLAG_6 = -fno-exceptions
-endif
-ifeq ($(USE_EXCEPTIONS),1)
-__EXCEPTIONSFLAG_6 =
-endif
-ifeq ($(WXUNIV),1)
-__WXUNIV_DEFINE_p = -D__WXUNIVERSAL__
-endif
-ifeq ($(DEBUG_FLAG),0)
-__DEBUG_DEFINE_p = -DwxDEBUG_LEVEL=0
-endif
-ifeq ($(BUILD),release)
-__NDEBUG_DEFINE_p = -DNDEBUG
-endif
-ifeq ($(USE_EXCEPTIONS),0)
-__EXCEPTIONS_DEFINE_p = -DwxNO_EXCEPTIONS
-endif
-ifeq ($(USE_RTTI),0)
-__RTTI_DEFINE_p = -DwxNO_RTTI
-endif
-ifeq ($(USE_THREADS),0)
-__THREAD_DEFINE_p = -DwxNO_THREADS
-endif
-ifeq ($(UNICODE),0)
-__UNICODE_DEFINE_p = -DwxUSE_UNICODE=0
-endif
-ifeq ($(UNICODE),1)
-__UNICODE_DEFINE_p = -D_UNICODE
-endif
-ifeq ($(USE_CAIRO),1)
-____CAIRO_INCLUDEDIR_FILENAMES_p = -I$(CAIRO_ROOT)\include\cairo
-endif
-ifeq ($(SHARED),1)
-__DLLFLAG_p = -DWXUSINGDLL
-endif
-ifeq ($(MONOLITHIC),0)
-__WXLIB_BASE_p = \
- -lwxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)
-endif
-ifeq ($(MONOLITHIC),1)
-__WXLIB_MONO_p = \
- -lwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)
-endif
-ifeq ($(MONOLITHIC),1)
-__LIB_PNG_IF_MONO_p = $(__LIB_PNG_p)
-endif
-ifeq ($(USE_GUI),1)
-__LIB_PNG_p = -lwxpng$(WXDEBUGFLAG)
-endif
-ifeq ($(USE_CAIRO),1)
-__CAIRO_LIB_p = -lcairo
-endif
-ifeq ($(USE_CAIRO),1)
-____CAIRO_LIBDIR_FILENAMES_p = -L$(CAIRO_ROOT)\lib
-endif
-ifeq ($(BUILD),debug)
-ifeq ($(DEBUG_INFO),default)
-__DEBUGINFO = -g
-endif
-endif
-ifeq ($(BUILD),release)
-ifeq ($(DEBUG_INFO),default)
-__DEBUGINFO =
-endif
-endif
-ifeq ($(DEBUG_INFO),0)
-__DEBUGINFO =
-endif
-ifeq ($(DEBUG_INFO),1)
-__DEBUGINFO = -g
-endif
-ifeq ($(USE_THREADS),0)
-__THREADSFLAG =
-endif
-ifeq ($(USE_THREADS),1)
-__THREADSFLAG = -mthreads
-endif
-
-
-all: $(OBJS)
-$(OBJS):
- -if not exist $(OBJS) mkdir $(OBJS)
-
-### Targets: ###
-
-all: $(__execmon___depname)
-
-clean:
- -if exist $(OBJS)\*.o del $(OBJS)\*.o
- -if exist $(OBJS)\*.d del $(OBJS)\*.d
- -if exist $(OBJS)\execmon.exe del $(OBJS)\execmon.exe
-
-ifeq ($(USE_XRC),1)
-$(OBJS)\execmon.exe: $(EXECMON_OBJECTS)
- $(CXX) -o $@ $(EXECMON_OBJECTS) $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) $(____CAIRO_LIBDIR_FILENAMES_p) $(LDFLAGS) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_PNG_IF_MONO_p) -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(EXTRALIBS_FOR_BASE) $(__CAIRO_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32 -lwininet
-endif
-
-$(OBJS)\execmon_execmon.o: ./execmon.cpp
- $(CXX) -c -o $@ $(EXECMON_CXXFLAGS) $(CPPDEPS) $<
-
-.PHONY: all clean
-
-
-SHELL := $(COMSPEC)
-
-# Dependencies tracking:
--include $(OBJS)/*.d
+# =========================================================================
+# This makefile was generated by
+# Bakefile 0.2.9 (http://www.bakefile.org)
+# Do not modify, all changes will be overwritten!
+# =========================================================================
+
+include ../../build/msw/config.gcc
+
+# -------------------------------------------------------------------------
+# Do not modify the rest of this file!
+# -------------------------------------------------------------------------
+
+### Variables: ###
+
+CPPDEPS = -MT$@ -MF$@.d -MD -MP
+WX_RELEASE_NODOT = 31
+COMPILER_PREFIX = gcc
+OBJS = \
+ $(COMPILER_PREFIX)$(COMPILER_VERSION)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)
+LIBDIRNAME = \
+ .\..\..\lib\$(COMPILER_PREFIX)$(COMPILER_VERSION)_$(LIBTYPE_SUFFIX)$(CFG)
+SETUPHDIR = \
+ $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)
+EXECMON_CXXFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG_2) $(__THREADSFLAG) \
+ $(GCCFLAGS) -DHAVE_W32API_H -D__WXMSW__ $(__WXUNIV_DEFINE_p) \
+ $(__DEBUG_DEFINE_p) $(__NDEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) \
+ $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) \
+ -I$(SETUPHDIR) -I.\..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES_p) -W \
+ -Wall -I. $(__DLLFLAG_p) -DwxUSE_GUI=0 $(__RTTIFLAG_5) $(__EXCEPTIONSFLAG_6) \
+ -Wno-ctor-dtor-privacy $(CPPFLAGS) $(CXXFLAGS)
+EXECMON_OBJECTS = \
+ $(OBJS)\execmon_execmon.o
+
+### Conditionally set variables: ###
+
+ifeq ($(GCC_VERSION),2.95)
+GCCFLAGS = -fvtable-thunks
+endif
+ifeq ($(USE_GUI),0)
+PORTNAME = base
+endif
+ifeq ($(USE_GUI),1)
+PORTNAME = msw$(TOOLKIT_VERSION)
+endif
+ifeq ($(OFFICIAL_BUILD),1)
+COMPILER_VERSION = ERROR-COMPILER-VERSION-MUST-BE-SET-FOR-OFFICIAL-BUILD
+endif
+ifeq ($(BUILD),debug)
+WXDEBUGFLAG = d
+endif
+ifeq ($(UNICODE),1)
+WXUNICODEFLAG = u
+endif
+ifeq ($(WXUNIV),1)
+WXUNIVNAME = univ
+endif
+ifeq ($(SHARED),1)
+WXDLLFLAG = dll
+endif
+ifeq ($(SHARED),0)
+LIBTYPE_SUFFIX = lib
+endif
+ifeq ($(SHARED),1)
+LIBTYPE_SUFFIX = dll
+endif
+ifeq ($(MONOLITHIC),0)
+EXTRALIBS_FOR_BASE =
+endif
+ifeq ($(MONOLITHIC),1)
+EXTRALIBS_FOR_BASE =
+endif
+ifeq ($(USE_XRC),1)
+__execmon___depname = $(OBJS)\execmon.exe
+endif
+ifeq ($(BUILD),debug)
+__OPTIMIZEFLAG_2 = -O0
+endif
+ifeq ($(BUILD),release)
+__OPTIMIZEFLAG_2 = -O2
+endif
+ifeq ($(USE_RTTI),0)
+__RTTIFLAG_5 = -fno-rtti
+endif
+ifeq ($(USE_RTTI),1)
+__RTTIFLAG_5 =
+endif
+ifeq ($(USE_EXCEPTIONS),0)
+__EXCEPTIONSFLAG_6 = -fno-exceptions
+endif
+ifeq ($(USE_EXCEPTIONS),1)
+__EXCEPTIONSFLAG_6 =
+endif
+ifeq ($(WXUNIV),1)
+__WXUNIV_DEFINE_p = -D__WXUNIVERSAL__
+endif
+ifeq ($(DEBUG_FLAG),0)
+__DEBUG_DEFINE_p = -DwxDEBUG_LEVEL=0
+endif
+ifeq ($(BUILD),release)
+__NDEBUG_DEFINE_p = -DNDEBUG
+endif
+ifeq ($(USE_EXCEPTIONS),0)
+__EXCEPTIONS_DEFINE_p = -DwxNO_EXCEPTIONS
+endif
+ifeq ($(USE_RTTI),0)
+__RTTI_DEFINE_p = -DwxNO_RTTI
+endif
+ifeq ($(USE_THREADS),0)
+__THREAD_DEFINE_p = -DwxNO_THREADS
+endif
+ifeq ($(UNICODE),0)
+__UNICODE_DEFINE_p = -DwxUSE_UNICODE=0
+endif
+ifeq ($(UNICODE),1)
+__UNICODE_DEFINE_p = -D_UNICODE
+endif
+ifeq ($(USE_CAIRO),1)
+____CAIRO_INCLUDEDIR_FILENAMES_p = -I$(CAIRO_ROOT)\include\cairo
+endif
+ifeq ($(SHARED),1)
+__DLLFLAG_p = -DWXUSINGDLL
+endif
+ifeq ($(MONOLITHIC),0)
+__WXLIB_BASE_p = \
+ -lwxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)
+endif
+ifeq ($(MONOLITHIC),1)
+__WXLIB_MONO_p = \
+ -lwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)
+endif
+ifeq ($(MONOLITHIC),1)
+__LIB_PNG_IF_MONO_p = $(__LIB_PNG_p)
+endif
+ifeq ($(USE_GUI),1)
+__LIB_PNG_p = -lwxpng$(WXDEBUGFLAG)
+endif
+ifeq ($(USE_CAIRO),1)
+__CAIRO_LIB_p = -lcairo
+endif
+ifeq ($(USE_CAIRO),1)
+____CAIRO_LIBDIR_FILENAMES_p = -L$(CAIRO_ROOT)\lib
+endif
+ifeq ($(BUILD),debug)
+ifeq ($(DEBUG_INFO),default)
+__DEBUGINFO = -g
+endif
+endif
+ifeq ($(BUILD),release)
+ifeq ($(DEBUG_INFO),default)
+__DEBUGINFO =
+endif
+endif
+ifeq ($(DEBUG_INFO),0)
+__DEBUGINFO =
+endif
+ifeq ($(DEBUG_INFO),1)
+__DEBUGINFO = -g
+endif
+ifeq ($(USE_THREADS),0)
+__THREADSFLAG =
+endif
+ifeq ($(USE_THREADS),1)
+__THREADSFLAG = -mthreads
+endif
+
+
+all: $(OBJS)
+$(OBJS):
+ -if not exist $(OBJS) mkdir $(OBJS)
+
+### Targets: ###
+
+all: $(__execmon___depname)
+
+clean:
+ -if exist $(OBJS)\*.o del $(OBJS)\*.o
+ -if exist $(OBJS)\*.d del $(OBJS)\*.d
+ -if exist $(OBJS)\execmon.exe del $(OBJS)\execmon.exe
+
+ifeq ($(USE_XRC),1)
+$(OBJS)\execmon.exe: $(EXECMON_OBJECTS)
+ $(CXX) -o $@ $(EXECMON_OBJECTS) $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) $(____CAIRO_LIBDIR_FILENAMES_p) $(LDFLAGS) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_PNG_IF_MONO_p) -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(EXTRALIBS_FOR_BASE) $(__CAIRO_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32 -lwininet
+endif
+
+$(OBJS)\execmon_execmon.o: ./execmon.cpp
+ $(CXX) -c -o $@ $(EXECMON_CXXFLAGS) $(CPPDEPS) $<
+
+.PHONY: all clean
+
+
+SHELL := $(COMSPEC)
+
+# Dependencies tracking:
+-include $(OBJS)/*.d
diff --git a/utils/execmon/makefile.vc b/utils/execmon/makefile.vc
index edca67672b..f781f6e55a 100644
--- a/utils/execmon/makefile.vc
+++ b/utils/execmon/makefile.vc
@@ -1,301 +1,301 @@
-# =========================================================================
-# This makefile was generated by
-# Bakefile 0.2.9 (http://www.bakefile.org)
-# Do not modify, all changes will be overwritten!
-# =========================================================================
-
-!include <../../build/msw/config.vc>
-
-# -------------------------------------------------------------------------
-# Do not modify the rest of this file!
-# -------------------------------------------------------------------------
-
-### Variables: ###
-
-WX_RELEASE_NODOT = 31
-COMPILER_PREFIX = vc
-OBJS = \
- $(COMPILER_PREFIX)$(COMPILER_VERSION)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)$(ARCH_SUFFIX)
-LIBDIRNAME = \
- .\..\..\lib\$(COMPILER_PREFIX)$(COMPILER_VERSION)$(ARCH_SUFFIX)_$(LIBTYPE_SUFFIX)$(CFG)
-SETUPHDIR = \
- $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)
-EXECMON_CXXFLAGS = /M$(__RUNTIME_LIBS_10)$(__DEBUGRUNTIME_4) /DWIN32 \
- $(__DEBUGINFO_0) /Fd$(OBJS)\execmon.pdb $(____DEBUGRUNTIME_3_p) \
- $(__OPTIMIZEFLAG_6) /D_CRT_SECURE_NO_DEPRECATE=1 \
- /D_CRT_NON_CONFORMING_SWPRINTFS=1 /D_SCL_SECURE_NO_WARNINGS=1 \
- $(__NO_VC_CRTDBG_p) /D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \
- $(__NDEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \
- $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) /I$(SETUPHDIR) /I.\..\..\include \
- $(____CAIRO_INCLUDEDIR_FILENAMES_p) /W4 /I. $(__DLLFLAG_p) /D_CONSOLE \
- /DwxUSE_GUI=0 $(__RTTIFLAG_11) $(__EXCEPTIONSFLAG_12) $(CPPFLAGS) \
- $(CXXFLAGS)
-EXECMON_OBJECTS = \
- $(OBJS)\execmon_execmon.obj
-
-### Conditionally set variables: ###
-
-!if "$(TARGET_CPU)" == "AMD64"
-ARCH_SUFFIX = _x64
-!endif
-!if "$(TARGET_CPU)" == "IA64"
-ARCH_SUFFIX = _ia64
-!endif
-!if "$(TARGET_CPU)" == "X64"
-ARCH_SUFFIX = _x64
-!endif
-!if "$(TARGET_CPU)" == "amd64"
-ARCH_SUFFIX = _x64
-!endif
-!if "$(TARGET_CPU)" == "ia64"
-ARCH_SUFFIX = _ia64
-!endif
-!if "$(TARGET_CPU)" == "x64"
-ARCH_SUFFIX = _x64
-!endif
-!if "$(USE_GUI)" == "0"
-PORTNAME = base
-!endif
-!if "$(USE_GUI)" == "1"
-PORTNAME = msw$(TOOLKIT_VERSION)
-!endif
-!if "$(OFFICIAL_BUILD)" == "1"
-COMPILER_VERSION = ERROR-COMPILER-VERSION-MUST-BE-SET-FOR-OFFICIAL-BUILD
-!endif
-!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default"
-WXDEBUGFLAG = d
-!endif
-!if "$(DEBUG_RUNTIME_LIBS)" == "1"
-WXDEBUGFLAG = d
-!endif
-!if "$(UNICODE)" == "1"
-WXUNICODEFLAG = u
-!endif
-!if "$(WXUNIV)" == "1"
-WXUNIVNAME = univ
-!endif
-!if "$(SHARED)" == "1"
-WXDLLFLAG = dll
-!endif
-!if "$(SHARED)" == "0"
-LIBTYPE_SUFFIX = lib
-!endif
-!if "$(SHARED)" == "1"
-LIBTYPE_SUFFIX = dll
-!endif
-!if "$(TARGET_CPU)" == "AMD64"
-LINK_TARGET_CPU = /MACHINE:X64
-!endif
-!if "$(TARGET_CPU)" == "IA64"
-LINK_TARGET_CPU = /MACHINE:IA64
-!endif
-!if "$(TARGET_CPU)" == "X64"
-LINK_TARGET_CPU = /MACHINE:X64
-!endif
-!if "$(TARGET_CPU)" == "amd64"
-LINK_TARGET_CPU = /MACHINE:X64
-!endif
-!if "$(TARGET_CPU)" == "ia64"
-LINK_TARGET_CPU = /MACHINE:IA64
-!endif
-!if "$(TARGET_CPU)" == "x64"
-LINK_TARGET_CPU = /MACHINE:X64
-!endif
-!if "$(MONOLITHIC)" == "0"
-EXTRALIBS_FOR_BASE =
-!endif
-!if "$(MONOLITHIC)" == "1"
-EXTRALIBS_FOR_BASE =
-!endif
-!if "$(USE_XRC)" == "1"
-__execmon___depname = $(OBJS)\execmon.exe
-!endif
-!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default"
-__DEBUGINFO_0 = /Zi
-!endif
-!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default"
-__DEBUGINFO_0 =
-!endif
-!if "$(DEBUG_INFO)" == "0"
-__DEBUGINFO_0 =
-!endif
-!if "$(DEBUG_INFO)" == "1"
-__DEBUGINFO_0 = /Zi
-!endif
-!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default"
-__DEBUGINFO_1 = /DEBUG
-!endif
-!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default"
-__DEBUGINFO_1 =
-!endif
-!if "$(DEBUG_INFO)" == "0"
-__DEBUGINFO_1 =
-!endif
-!if "$(DEBUG_INFO)" == "1"
-__DEBUGINFO_1 = /DEBUG
-!endif
-!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default"
-__DEBUGINFO_2 = $(__DEBUGRUNTIME_5)
-!endif
-!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default"
-__DEBUGINFO_2 =
-!endif
-!if "$(DEBUG_INFO)" == "0"
-__DEBUGINFO_2 =
-!endif
-!if "$(DEBUG_INFO)" == "1"
-__DEBUGINFO_2 = $(__DEBUGRUNTIME_5)
-!endif
-!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default"
-____DEBUGRUNTIME_3_p = /D_DEBUG
-!endif
-!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default"
-____DEBUGRUNTIME_3_p =
-!endif
-!if "$(DEBUG_RUNTIME_LIBS)" == "0"
-____DEBUGRUNTIME_3_p =
-!endif
-!if "$(DEBUG_RUNTIME_LIBS)" == "1"
-____DEBUGRUNTIME_3_p = /D_DEBUG
-!endif
-!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default"
-__DEBUGRUNTIME_4 = d
-!endif
-!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default"
-__DEBUGRUNTIME_4 =
-!endif
-!if "$(DEBUG_RUNTIME_LIBS)" == "0"
-__DEBUGRUNTIME_4 =
-!endif
-!if "$(DEBUG_RUNTIME_LIBS)" == "1"
-__DEBUGRUNTIME_4 = d
-!endif
-!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default"
-__DEBUGRUNTIME_5 =
-!endif
-!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default"
-__DEBUGRUNTIME_5 = /opt:ref /opt:icf
-!endif
-!if "$(DEBUG_RUNTIME_LIBS)" == "0"
-__DEBUGRUNTIME_5 = /opt:ref /opt:icf
-!endif
-!if "$(DEBUG_RUNTIME_LIBS)" == "1"
-__DEBUGRUNTIME_5 =
-!endif
-!if "$(BUILD)" == "debug"
-__OPTIMIZEFLAG_6 = /Od
-!endif
-!if "$(BUILD)" == "release"
-__OPTIMIZEFLAG_6 = /O2
-!endif
-!if "$(USE_THREADS)" == "0"
-__THREADSFLAG_9 = L
-!endif
-!if "$(USE_THREADS)" == "1"
-__THREADSFLAG_9 = T
-!endif
-!if "$(RUNTIME_LIBS)" == "dynamic"
-__RUNTIME_LIBS_10 = D
-!endif
-!if "$(RUNTIME_LIBS)" == "static"
-__RUNTIME_LIBS_10 = $(__THREADSFLAG_9)
-!endif
-!if "$(USE_RTTI)" == "0"
-__RTTIFLAG_11 =
-!endif
-!if "$(USE_RTTI)" == "1"
-__RTTIFLAG_11 = /GR
-!endif
-!if "$(USE_EXCEPTIONS)" == "0"
-__EXCEPTIONSFLAG_12 =
-!endif
-!if "$(USE_EXCEPTIONS)" == "1"
-__EXCEPTIONSFLAG_12 = /EHsc
-!endif
-!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "0"
-__NO_VC_CRTDBG_p = /D__NO_VC_CRTDBG__
-!endif
-!if "$(BUILD)" == "release" && "$(DEBUG_FLAG)" == "1"
-__NO_VC_CRTDBG_p = /D__NO_VC_CRTDBG__
-!endif
-!if "$(WXUNIV)" == "1"
-__WXUNIV_DEFINE_p = /D__WXUNIVERSAL__
-!endif
-!if "$(DEBUG_FLAG)" == "0"
-__DEBUG_DEFINE_p = /DwxDEBUG_LEVEL=0
-!endif
-!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default"
-__NDEBUG_DEFINE_p = /DNDEBUG
-!endif
-!if "$(DEBUG_RUNTIME_LIBS)" == "0"
-__NDEBUG_DEFINE_p = /DNDEBUG
-!endif
-!if "$(USE_EXCEPTIONS)" == "0"
-__EXCEPTIONS_DEFINE_p = /DwxNO_EXCEPTIONS
-!endif
-!if "$(USE_RTTI)" == "0"
-__RTTI_DEFINE_p = /DwxNO_RTTI
-!endif
-!if "$(USE_THREADS)" == "0"
-__THREAD_DEFINE_p = /DwxNO_THREADS
-!endif
-!if "$(UNICODE)" == "0"
-__UNICODE_DEFINE_p = /DwxUSE_UNICODE=0
-!endif
-!if "$(UNICODE)" == "1"
-__UNICODE_DEFINE_p = /D_UNICODE
-!endif
-!if "$(USE_CAIRO)" == "1"
-____CAIRO_INCLUDEDIR_FILENAMES_p = /I$(CAIRO_ROOT)\include\cairo
-!endif
-!if "$(SHARED)" == "1"
-__DLLFLAG_p = /DWXUSINGDLL
-!endif
-!if "$(MONOLITHIC)" == "0"
-__WXLIB_BASE_p = \
- wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib
-!endif
-!if "$(MONOLITHIC)" == "1"
-__WXLIB_MONO_p = \
- wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib
-!endif
-!if "$(MONOLITHIC)" == "1"
-__LIB_PNG_IF_MONO_p = $(__LIB_PNG_p)
-!endif
-!if "$(USE_GUI)" == "1"
-__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib
-!endif
-!if "$(USE_CAIRO)" == "1"
-__CAIRO_LIB_p = cairo.lib
-!endif
-!if "$(USE_CAIRO)" == "1"
-____CAIRO_LIBDIR_FILENAMES_p = /LIBPATH:$(CAIRO_ROOT)\lib
-!endif
-
-
-all: $(OBJS)
-$(OBJS):
- -if not exist $(OBJS) mkdir $(OBJS)
-
-### Targets: ###
-
-all: $(__execmon___depname)
-
-clean:
- -if exist $(OBJS)\*.obj del $(OBJS)\*.obj
- -if exist $(OBJS)\*.res del $(OBJS)\*.res
- -if exist $(OBJS)\*.pch del $(OBJS)\*.pch
- -if exist $(OBJS)\execmon.exe del $(OBJS)\execmon.exe
- -if exist $(OBJS)\execmon.ilk del $(OBJS)\execmon.ilk
- -if exist $(OBJS)\execmon.pdb del $(OBJS)\execmon.pdb
-
-!if "$(USE_XRC)" == "1"
-$(OBJS)\execmon.exe: $(EXECMON_OBJECTS)
- link /NOLOGO /OUT:$@ $(__DEBUGINFO_1) /pdb:"$(OBJS)\execmon.pdb" $(__DEBUGINFO_2) $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:CONSOLE $(____CAIRO_LIBDIR_FILENAMES_p) $(LDFLAGS) @<<
- $(EXECMON_OBJECTS) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_PNG_IF_MONO_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__CAIRO_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib
-<<
-!endif
-
-$(OBJS)\execmon_execmon.obj: .\execmon.cpp
- $(CXX) /c /nologo /TP /Fo$@ $(EXECMON_CXXFLAGS) .\execmon.cpp
-
+# =========================================================================
+# This makefile was generated by
+# Bakefile 0.2.9 (http://www.bakefile.org)
+# Do not modify, all changes will be overwritten!
+# =========================================================================
+
+!include <../../build/msw/config.vc>
+
+# -------------------------------------------------------------------------
+# Do not modify the rest of this file!
+# -------------------------------------------------------------------------
+
+### Variables: ###
+
+WX_RELEASE_NODOT = 31
+COMPILER_PREFIX = vc
+OBJS = \
+ $(COMPILER_PREFIX)$(COMPILER_VERSION)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)$(ARCH_SUFFIX)
+LIBDIRNAME = \
+ .\..\..\lib\$(COMPILER_PREFIX)$(COMPILER_VERSION)$(ARCH_SUFFIX)_$(LIBTYPE_SUFFIX)$(CFG)
+SETUPHDIR = \
+ $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)
+EXECMON_CXXFLAGS = /M$(__RUNTIME_LIBS_10)$(__DEBUGRUNTIME_4) /DWIN32 \
+ $(__DEBUGINFO_0) /Fd$(OBJS)\execmon.pdb $(____DEBUGRUNTIME_3_p) \
+ $(__OPTIMIZEFLAG_6) /D_CRT_SECURE_NO_DEPRECATE=1 \
+ /D_CRT_NON_CONFORMING_SWPRINTFS=1 /D_SCL_SECURE_NO_WARNINGS=1 \
+ $(__NO_VC_CRTDBG_p) /D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \
+ $(__NDEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \
+ $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) /I$(SETUPHDIR) /I.\..\..\include \
+ $(____CAIRO_INCLUDEDIR_FILENAMES_p) /W4 /I. $(__DLLFLAG_p) /D_CONSOLE \
+ /DwxUSE_GUI=0 $(__RTTIFLAG_11) $(__EXCEPTIONSFLAG_12) $(CPPFLAGS) \
+ $(CXXFLAGS)
+EXECMON_OBJECTS = \
+ $(OBJS)\execmon_execmon.obj
+
+### Conditionally set variables: ###
+
+!if "$(TARGET_CPU)" == "AMD64"
+ARCH_SUFFIX = _x64
+!endif
+!if "$(TARGET_CPU)" == "IA64"
+ARCH_SUFFIX = _ia64
+!endif
+!if "$(TARGET_CPU)" == "X64"
+ARCH_SUFFIX = _x64
+!endif
+!if "$(TARGET_CPU)" == "amd64"
+ARCH_SUFFIX = _x64
+!endif
+!if "$(TARGET_CPU)" == "ia64"
+ARCH_SUFFIX = _ia64
+!endif
+!if "$(TARGET_CPU)" == "x64"
+ARCH_SUFFIX = _x64
+!endif
+!if "$(USE_GUI)" == "0"
+PORTNAME = base
+!endif
+!if "$(USE_GUI)" == "1"
+PORTNAME = msw$(TOOLKIT_VERSION)
+!endif
+!if "$(OFFICIAL_BUILD)" == "1"
+COMPILER_VERSION = ERROR-COMPILER-VERSION-MUST-BE-SET-FOR-OFFICIAL-BUILD
+!endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default"
+WXDEBUGFLAG = d
+!endif
+!if "$(DEBUG_RUNTIME_LIBS)" == "1"
+WXDEBUGFLAG = d
+!endif
+!if "$(UNICODE)" == "1"
+WXUNICODEFLAG = u
+!endif
+!if "$(WXUNIV)" == "1"
+WXUNIVNAME = univ
+!endif
+!if "$(SHARED)" == "1"
+WXDLLFLAG = dll
+!endif
+!if "$(SHARED)" == "0"
+LIBTYPE_SUFFIX = lib
+!endif
+!if "$(SHARED)" == "1"
+LIBTYPE_SUFFIX = dll
+!endif
+!if "$(TARGET_CPU)" == "AMD64"
+LINK_TARGET_CPU = /MACHINE:X64
+!endif
+!if "$(TARGET_CPU)" == "IA64"
+LINK_TARGET_CPU = /MACHINE:IA64
+!endif
+!if "$(TARGET_CPU)" == "X64"
+LINK_TARGET_CPU = /MACHINE:X64
+!endif
+!if "$(TARGET_CPU)" == "amd64"
+LINK_TARGET_CPU = /MACHINE:X64
+!endif
+!if "$(TARGET_CPU)" == "ia64"
+LINK_TARGET_CPU = /MACHINE:IA64
+!endif
+!if "$(TARGET_CPU)" == "x64"
+LINK_TARGET_CPU = /MACHINE:X64
+!endif
+!if "$(MONOLITHIC)" == "0"
+EXTRALIBS_FOR_BASE =
+!endif
+!if "$(MONOLITHIC)" == "1"
+EXTRALIBS_FOR_BASE =
+!endif
+!if "$(USE_XRC)" == "1"
+__execmon___depname = $(OBJS)\execmon.exe
+!endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default"
+__DEBUGINFO_0 = /Zi
+!endif
+!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default"
+__DEBUGINFO_0 =
+!endif
+!if "$(DEBUG_INFO)" == "0"
+__DEBUGINFO_0 =
+!endif
+!if "$(DEBUG_INFO)" == "1"
+__DEBUGINFO_0 = /Zi
+!endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default"
+__DEBUGINFO_1 = /DEBUG
+!endif
+!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default"
+__DEBUGINFO_1 =
+!endif
+!if "$(DEBUG_INFO)" == "0"
+__DEBUGINFO_1 =
+!endif
+!if "$(DEBUG_INFO)" == "1"
+__DEBUGINFO_1 = /DEBUG
+!endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default"
+__DEBUGINFO_2 = $(__DEBUGRUNTIME_5)
+!endif
+!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default"
+__DEBUGINFO_2 =
+!endif
+!if "$(DEBUG_INFO)" == "0"
+__DEBUGINFO_2 =
+!endif
+!if "$(DEBUG_INFO)" == "1"
+__DEBUGINFO_2 = $(__DEBUGRUNTIME_5)
+!endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default"
+____DEBUGRUNTIME_3_p = /D_DEBUG
+!endif
+!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default"
+____DEBUGRUNTIME_3_p =
+!endif
+!if "$(DEBUG_RUNTIME_LIBS)" == "0"
+____DEBUGRUNTIME_3_p =
+!endif
+!if "$(DEBUG_RUNTIME_LIBS)" == "1"
+____DEBUGRUNTIME_3_p = /D_DEBUG
+!endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default"
+__DEBUGRUNTIME_4 = d
+!endif
+!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default"
+__DEBUGRUNTIME_4 =
+!endif
+!if "$(DEBUG_RUNTIME_LIBS)" == "0"
+__DEBUGRUNTIME_4 =
+!endif
+!if "$(DEBUG_RUNTIME_LIBS)" == "1"
+__DEBUGRUNTIME_4 = d
+!endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default"
+__DEBUGRUNTIME_5 =
+!endif
+!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default"
+__DEBUGRUNTIME_5 = /opt:ref /opt:icf
+!endif
+!if "$(DEBUG_RUNTIME_LIBS)" == "0"
+__DEBUGRUNTIME_5 = /opt:ref /opt:icf
+!endif
+!if "$(DEBUG_RUNTIME_LIBS)" == "1"
+__DEBUGRUNTIME_5 =
+!endif
+!if "$(BUILD)" == "debug"
+__OPTIMIZEFLAG_6 = /Od
+!endif
+!if "$(BUILD)" == "release"
+__OPTIMIZEFLAG_6 = /O2
+!endif
+!if "$(USE_THREADS)" == "0"
+__THREADSFLAG_9 = L
+!endif
+!if "$(USE_THREADS)" == "1"
+__THREADSFLAG_9 = T
+!endif
+!if "$(RUNTIME_LIBS)" == "dynamic"
+__RUNTIME_LIBS_10 = D
+!endif
+!if "$(RUNTIME_LIBS)" == "static"
+__RUNTIME_LIBS_10 = $(__THREADSFLAG_9)
+!endif
+!if "$(USE_RTTI)" == "0"
+__RTTIFLAG_11 =
+!endif
+!if "$(USE_RTTI)" == "1"
+__RTTIFLAG_11 = /GR
+!endif
+!if "$(USE_EXCEPTIONS)" == "0"
+__EXCEPTIONSFLAG_12 =
+!endif
+!if "$(USE_EXCEPTIONS)" == "1"
+__EXCEPTIONSFLAG_12 = /EHsc
+!endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "0"
+__NO_VC_CRTDBG_p = /D__NO_VC_CRTDBG__
+!endif
+!if "$(BUILD)" == "release" && "$(DEBUG_FLAG)" == "1"
+__NO_VC_CRTDBG_p = /D__NO_VC_CRTDBG__
+!endif
+!if "$(WXUNIV)" == "1"
+__WXUNIV_DEFINE_p = /D__WXUNIVERSAL__
+!endif
+!if "$(DEBUG_FLAG)" == "0"
+__DEBUG_DEFINE_p = /DwxDEBUG_LEVEL=0
+!endif
+!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default"
+__NDEBUG_DEFINE_p = /DNDEBUG
+!endif
+!if "$(DEBUG_RUNTIME_LIBS)" == "0"
+__NDEBUG_DEFINE_p = /DNDEBUG
+!endif
+!if "$(USE_EXCEPTIONS)" == "0"
+__EXCEPTIONS_DEFINE_p = /DwxNO_EXCEPTIONS
+!endif
+!if "$(USE_RTTI)" == "0"
+__RTTI_DEFINE_p = /DwxNO_RTTI
+!endif
+!if "$(USE_THREADS)" == "0"
+__THREAD_DEFINE_p = /DwxNO_THREADS
+!endif
+!if "$(UNICODE)" == "0"
+__UNICODE_DEFINE_p = /DwxUSE_UNICODE=0
+!endif
+!if "$(UNICODE)" == "1"
+__UNICODE_DEFINE_p = /D_UNICODE
+!endif
+!if "$(USE_CAIRO)" == "1"
+____CAIRO_INCLUDEDIR_FILENAMES_p = /I$(CAIRO_ROOT)\include\cairo
+!endif
+!if "$(SHARED)" == "1"
+__DLLFLAG_p = /DWXUSINGDLL
+!endif
+!if "$(MONOLITHIC)" == "0"
+__WXLIB_BASE_p = \
+ wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib
+!endif
+!if "$(MONOLITHIC)" == "1"
+__WXLIB_MONO_p = \
+ wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib
+!endif
+!if "$(MONOLITHIC)" == "1"
+__LIB_PNG_IF_MONO_p = $(__LIB_PNG_p)
+!endif
+!if "$(USE_GUI)" == "1"
+__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib
+!endif
+!if "$(USE_CAIRO)" == "1"
+__CAIRO_LIB_p = cairo.lib
+!endif
+!if "$(USE_CAIRO)" == "1"
+____CAIRO_LIBDIR_FILENAMES_p = /LIBPATH:$(CAIRO_ROOT)\lib
+!endif
+
+
+all: $(OBJS)
+$(OBJS):
+ -if not exist $(OBJS) mkdir $(OBJS)
+
+### Targets: ###
+
+all: $(__execmon___depname)
+
+clean:
+ -if exist $(OBJS)\*.obj del $(OBJS)\*.obj
+ -if exist $(OBJS)\*.res del $(OBJS)\*.res
+ -if exist $(OBJS)\*.pch del $(OBJS)\*.pch
+ -if exist $(OBJS)\execmon.exe del $(OBJS)\execmon.exe
+ -if exist $(OBJS)\execmon.ilk del $(OBJS)\execmon.ilk
+ -if exist $(OBJS)\execmon.pdb del $(OBJS)\execmon.pdb
+
+!if "$(USE_XRC)" == "1"
+$(OBJS)\execmon.exe: $(EXECMON_OBJECTS)
+ link /NOLOGO /OUT:$@ $(__DEBUGINFO_1) /pdb:"$(OBJS)\execmon.pdb" $(__DEBUGINFO_2) $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:CONSOLE $(____CAIRO_LIBDIR_FILENAMES_p) $(LDFLAGS) @<<
+ $(EXECMON_OBJECTS) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_PNG_IF_MONO_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__CAIRO_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib
+<<
+!endif
+
+$(OBJS)\execmon_execmon.obj: .\execmon.cpp
+ $(CXX) /c /nologo /TP /Fo$@ $(EXECMON_CXXFLAGS) .\execmon.cpp
+
diff --git a/utils/helpview/src/helpview_vc7.vcproj b/utils/helpview/src/helpview_vc7.vcproj
index 2b61a88df3..2e7f3e7d13 100644
--- a/utils/helpview/src/helpview_vc7.vcproj
+++ b/utils/helpview/src/helpview_vc7.vcproj
@@ -1,303 +1,303 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/utils/helpview/src/helpview_vc8.vcproj b/utils/helpview/src/helpview_vc8.vcproj
index e8c51a62ca..04fe319388 100644
--- a/utils/helpview/src/helpview_vc8.vcproj
+++ b/utils/helpview/src/helpview_vc8.vcproj
@@ -1,829 +1,829 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/utils/helpview/src/helpview_vc9.vcproj b/utils/helpview/src/helpview_vc9.vcproj
index ba46182871..9f5f3304b6 100644
--- a/utils/helpview/src/helpview_vc9.vcproj
+++ b/utils/helpview/src/helpview_vc9.vcproj
@@ -1,801 +1,801 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/utils/helpview/src/makefile.bcc b/utils/helpview/src/makefile.bcc
index 368d3c38bd..9a020e7d43 100644
--- a/utils/helpview/src/makefile.bcc
+++ b/utils/helpview/src/makefile.bcc
@@ -1,251 +1,251 @@
-# =========================================================================
-# This makefile was generated by
-# Bakefile 0.2.9 (http://www.bakefile.org)
-# 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: ###
-
-WX_RELEASE_NODOT = 31
-COMPILER_PREFIX = bcc
-OBJS = \
- $(COMPILER_PREFIX)$(COMPILER_VERSION)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)
-LIBDIRNAME = \
- .\..\..\..\lib\$(COMPILER_PREFIX)$(COMPILER_VERSION)_$(LIBTYPE_SUFFIX)$(CFG)
-SETUPHDIR = \
- $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)
-HELPVIEW_CXXFLAGS = $(__RUNTIME_LIBS_7) -I$(BCCDIR)\include $(__DEBUGINFO) \
- $(__OPTIMIZEFLAG_2) $(__THREADSFLAG_6) -D__WXMSW__ $(__WXUNIV_DEFINE_p) \
- $(__DEBUG_DEFINE_p) $(__NDEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) \
- $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) \
- -I$(SETUPHDIR) -I.\..\..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES_p) -I. \
- $(__DLLFLAG_p) -I.\..\..\..\samples -DNOPCH $(CPPFLAGS) $(CXXFLAGS)
-HELPVIEW_OBJECTS = \
- $(OBJS)\helpview_helpview.obj
-
-### Conditionally set variables: ###
-
-!if "$(USE_GUI)" == "0"
-PORTNAME = base
-!endif
-!if "$(USE_GUI)" == "1"
-PORTNAME = msw$(TOOLKIT_VERSION)
-!endif
-!if "$(OFFICIAL_BUILD)" == "1"
-COMPILER_VERSION = ERROR-COMPILER-VERSION-MUST-BE-SET-FOR-OFFICIAL-BUILD
-!endif
-!if "$(BUILD)" == "debug"
-WXDEBUGFLAG = d
-!endif
-!if "$(UNICODE)" == "1"
-WXUNICODEFLAG = u
-!endif
-!if "$(WXUNIV)" == "1"
-WXUNIVNAME = univ
-!endif
-!if "$(SHARED)" == "1"
-WXDLLFLAG = dll
-!endif
-!if "$(SHARED)" == "0"
-LIBTYPE_SUFFIX = lib
-!endif
-!if "$(SHARED)" == "1"
-LIBTYPE_SUFFIX = dll
-!endif
-!if "$(MONOLITHIC)" == "0"
-EXTRALIBS_FOR_BASE =
-!endif
-!if "$(MONOLITHIC)" == "1"
-EXTRALIBS_FOR_BASE =
-!endif
-!if "$(BUILD)" == "debug"
-__OPTIMIZEFLAG_2 = -Od
-!endif
-!if "$(BUILD)" == "release"
-__OPTIMIZEFLAG_2 = -O2
-!endif
-!if "$(USE_THREADS)" == "0"
-__THREADSFLAG_5 =
-!endif
-!if "$(USE_THREADS)" == "1"
-__THREADSFLAG_5 = mt
-!endif
-!if "$(USE_THREADS)" == "0"
-__THREADSFLAG_6 =
-!endif
-!if "$(USE_THREADS)" == "1"
-__THREADSFLAG_6 = -tWM
-!endif
-!if "$(RUNTIME_LIBS)" == "dynamic"
-__RUNTIME_LIBS_7 = -tWR
-!endif
-!if "$(RUNTIME_LIBS)" == "static"
-__RUNTIME_LIBS_7 =
-!endif
-!if "$(RUNTIME_LIBS)" == "dynamic"
-__RUNTIME_LIBS_8 = i
-!endif
-!if "$(RUNTIME_LIBS)" == "static"
-__RUNTIME_LIBS_8 =
-!endif
-!if "$(WXUNIV)" == "1"
-__WXUNIV_DEFINE_p = -D__WXUNIVERSAL__
-!endif
-!if "$(WXUNIV)" == "1"
-__WXUNIV_DEFINE_p_1 = -d__WXUNIVERSAL__
-!endif
-!if "$(DEBUG_FLAG)" == "0"
-__DEBUG_DEFINE_p = -DwxDEBUG_LEVEL=0
-!endif
-!if "$(DEBUG_FLAG)" == "0"
-__DEBUG_DEFINE_p_1 = -dwxDEBUG_LEVEL=0
-!endif
-!if "$(BUILD)" == "release"
-__NDEBUG_DEFINE_p = -DNDEBUG
-!endif
-!if "$(BUILD)" == "release"
-__NDEBUG_DEFINE_p_1 = -dNDEBUG
-!endif
-!if "$(USE_EXCEPTIONS)" == "0"
-__EXCEPTIONS_DEFINE_p = -DwxNO_EXCEPTIONS
-!endif
-!if "$(USE_EXCEPTIONS)" == "0"
-__EXCEPTIONS_DEFINE_p_1 = -dwxNO_EXCEPTIONS
-!endif
-!if "$(USE_RTTI)" == "0"
-__RTTI_DEFINE_p = -DwxNO_RTTI
-!endif
-!if "$(USE_RTTI)" == "0"
-__RTTI_DEFINE_p_1 = -dwxNO_RTTI
-!endif
-!if "$(USE_THREADS)" == "0"
-__THREAD_DEFINE_p = -DwxNO_THREADS
-!endif
-!if "$(USE_THREADS)" == "0"
-__THREAD_DEFINE_p_1 = -dwxNO_THREADS
-!endif
-!if "$(UNICODE)" == "0"
-__UNICODE_DEFINE_p = -DwxUSE_UNICODE=0
-!endif
-!if "$(UNICODE)" == "1"
-__UNICODE_DEFINE_p = -D_UNICODE
-!endif
-!if "$(UNICODE)" == "0"
-__UNICODE_DEFINE_p_1 = -dwxUSE_UNICODE=0
-!endif
-!if "$(UNICODE)" == "1"
-__UNICODE_DEFINE_p_1 = -d_UNICODE
-!endif
-!if "$(USE_CAIRO)" == "1"
-____CAIRO_INCLUDEDIR_FILENAMES_p = -I$(CAIRO_ROOT)\include\cairo
-!endif
-!if "$(USE_CAIRO)" == "1"
-____CAIRO_INCLUDEDIR_FILENAMES_1_p = -i$(CAIRO_ROOT)\include\cairo
-!endif
-!if "$(SHARED)" == "1"
-__DLLFLAG_p = -DWXUSINGDLL
-!endif
-!if "$(SHARED)" == "1"
-__DLLFLAG_p_1 = -dWXUSINGDLL
-!endif
-!if "$(MONOLITHIC)" == "0"
-__WXLIB_HTML_p = \
- wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_html.lib
-!endif
-!if "$(MONOLITHIC)" == "0"
-__WXLIB_CORE_p = \
- wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib
-!endif
-!if "$(MONOLITHIC)" == "0"
-__WXLIB_NET_p = \
- wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_net.lib
-!endif
-!if "$(MONOLITHIC)" == "0"
-__WXLIB_BASE_p = \
- wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib
-!endif
-!if "$(MONOLITHIC)" == "1"
-__WXLIB_MONO_p = \
- wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib
-!endif
-!if "$(MONOLITHIC)" == "1" && "$(USE_STC)" == "1"
-__LIB_SCINTILLA_IF_MONO_p = wxscintilla$(WXDEBUGFLAG).lib
-!endif
-!if "$(USE_GUI)" == "1"
-__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib
-!endif
-!if "$(USE_GUI)" == "1"
-__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib
-!endif
-!if "$(USE_GUI)" == "1"
-__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib
-!endif
-!if "$(USE_CAIRO)" == "1"
-__CAIRO_LIB_p = cairo.lib
-!endif
-!if "$(USE_CAIRO)" == "1"
-____CAIRO_LIBDIR_FILENAMES_p = -L$(CAIRO_ROOT)\lib
-!endif
-!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default"
-__DEBUGINFO = -v
-!endif
-!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default"
-__DEBUGINFO = -v-
-!endif
-!if "$(DEBUG_INFO)" == "0"
-__DEBUGINFO = -v-
-!endif
-!if "$(DEBUG_INFO)" == "1"
-__DEBUGINFO = -v
-!endif
-
-
-all: $(OBJS)
-$(OBJS):
- -if not exist $(OBJS) mkdir $(OBJS)
-
-### Targets: ###
-
-all: $(OBJS)\helpview.exe data
-
-clean:
- -if exist $(OBJS)\*.obj del $(OBJS)\*.obj
- -if exist $(OBJS)\*.res del $(OBJS)\*.res
- -if exist $(OBJS)\*.csm del $(OBJS)\*.csm
- -if exist $(OBJS)\helpview.exe del $(OBJS)\helpview.exe
- -if exist $(OBJS)\helpview.tds del $(OBJS)\helpview.tds
- -if exist $(OBJS)\helpview.ilc del $(OBJS)\helpview.ilc
- -if exist $(OBJS)\helpview.ild del $(OBJS)\helpview.ild
- -if exist $(OBJS)\helpview.ilf del $(OBJS)\helpview.ilf
- -if exist $(OBJS)\helpview.ils del $(OBJS)\helpview.ils
-
-$(OBJS)\helpview.exe: $(HELPVIEW_OBJECTS) $(OBJS)\helpview_helpview.res
- ilink32 -Tpe -q -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUGINFO) -L$(LIBDIRNAME) -aa $(____CAIRO_LIBDIR_FILENAMES_p) $(LDFLAGS) @&&|
- c0w32.obj $(HELPVIEW_OBJECTS),$@,, $(__WXLIB_HTML_p) $(__WXLIB_CORE_p) $(__WXLIB_NET_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_SCINTILLA_IF_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__CAIRO_LIB_p) ole2w32.lib oleacc.lib import32.lib cw32$(__THREADSFLAG_5)$(__RUNTIME_LIBS_8).lib,, $(OBJS)\helpview_helpview.res
-|
-
-data:
- if not exist $(OBJS) mkdir $(OBJS)
- for %f in (test.zip) do if not exist $(OBJS)\%f copy .\%f $(OBJS)
-
-$(OBJS)\helpview_helpview.obj: .\helpview.cpp
- $(CXX) -q -c -P -o$@ $(HELPVIEW_CXXFLAGS) .\helpview.cpp
-
-$(OBJS)\helpview_helpview.res: .\helpview.rc
- brcc32 -32 -r -fo$@ -i$(BCCDIR)\include -d__WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__NDEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) -i$(SETUPHDIR) -i.\..\..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES_1_p) -i. $(__DLLFLAG_p_1) -i.\..\..\..\samples -i$(BCCDIR)\include\windows\sdk -dNOPCH .\helpview.rc
-
+# =========================================================================
+# This makefile was generated by
+# Bakefile 0.2.9 (http://www.bakefile.org)
+# 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: ###
+
+WX_RELEASE_NODOT = 31
+COMPILER_PREFIX = bcc
+OBJS = \
+ $(COMPILER_PREFIX)$(COMPILER_VERSION)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)
+LIBDIRNAME = \
+ .\..\..\..\lib\$(COMPILER_PREFIX)$(COMPILER_VERSION)_$(LIBTYPE_SUFFIX)$(CFG)
+SETUPHDIR = \
+ $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)
+HELPVIEW_CXXFLAGS = $(__RUNTIME_LIBS_7) -I$(BCCDIR)\include $(__DEBUGINFO) \
+ $(__OPTIMIZEFLAG_2) $(__THREADSFLAG_6) -D__WXMSW__ $(__WXUNIV_DEFINE_p) \
+ $(__DEBUG_DEFINE_p) $(__NDEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) \
+ $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) \
+ -I$(SETUPHDIR) -I.\..\..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES_p) -I. \
+ $(__DLLFLAG_p) -I.\..\..\..\samples -DNOPCH $(CPPFLAGS) $(CXXFLAGS)
+HELPVIEW_OBJECTS = \
+ $(OBJS)\helpview_helpview.obj
+
+### Conditionally set variables: ###
+
+!if "$(USE_GUI)" == "0"
+PORTNAME = base
+!endif
+!if "$(USE_GUI)" == "1"
+PORTNAME = msw$(TOOLKIT_VERSION)
+!endif
+!if "$(OFFICIAL_BUILD)" == "1"
+COMPILER_VERSION = ERROR-COMPILER-VERSION-MUST-BE-SET-FOR-OFFICIAL-BUILD
+!endif
+!if "$(BUILD)" == "debug"
+WXDEBUGFLAG = d
+!endif
+!if "$(UNICODE)" == "1"
+WXUNICODEFLAG = u
+!endif
+!if "$(WXUNIV)" == "1"
+WXUNIVNAME = univ
+!endif
+!if "$(SHARED)" == "1"
+WXDLLFLAG = dll
+!endif
+!if "$(SHARED)" == "0"
+LIBTYPE_SUFFIX = lib
+!endif
+!if "$(SHARED)" == "1"
+LIBTYPE_SUFFIX = dll
+!endif
+!if "$(MONOLITHIC)" == "0"
+EXTRALIBS_FOR_BASE =
+!endif
+!if "$(MONOLITHIC)" == "1"
+EXTRALIBS_FOR_BASE =
+!endif
+!if "$(BUILD)" == "debug"
+__OPTIMIZEFLAG_2 = -Od
+!endif
+!if "$(BUILD)" == "release"
+__OPTIMIZEFLAG_2 = -O2
+!endif
+!if "$(USE_THREADS)" == "0"
+__THREADSFLAG_5 =
+!endif
+!if "$(USE_THREADS)" == "1"
+__THREADSFLAG_5 = mt
+!endif
+!if "$(USE_THREADS)" == "0"
+__THREADSFLAG_6 =
+!endif
+!if "$(USE_THREADS)" == "1"
+__THREADSFLAG_6 = -tWM
+!endif
+!if "$(RUNTIME_LIBS)" == "dynamic"
+__RUNTIME_LIBS_7 = -tWR
+!endif
+!if "$(RUNTIME_LIBS)" == "static"
+__RUNTIME_LIBS_7 =
+!endif
+!if "$(RUNTIME_LIBS)" == "dynamic"
+__RUNTIME_LIBS_8 = i
+!endif
+!if "$(RUNTIME_LIBS)" == "static"
+__RUNTIME_LIBS_8 =
+!endif
+!if "$(WXUNIV)" == "1"
+__WXUNIV_DEFINE_p = -D__WXUNIVERSAL__
+!endif
+!if "$(WXUNIV)" == "1"
+__WXUNIV_DEFINE_p_1 = -d__WXUNIVERSAL__
+!endif
+!if "$(DEBUG_FLAG)" == "0"
+__DEBUG_DEFINE_p = -DwxDEBUG_LEVEL=0
+!endif
+!if "$(DEBUG_FLAG)" == "0"
+__DEBUG_DEFINE_p_1 = -dwxDEBUG_LEVEL=0
+!endif
+!if "$(BUILD)" == "release"
+__NDEBUG_DEFINE_p = -DNDEBUG
+!endif
+!if "$(BUILD)" == "release"
+__NDEBUG_DEFINE_p_1 = -dNDEBUG
+!endif
+!if "$(USE_EXCEPTIONS)" == "0"
+__EXCEPTIONS_DEFINE_p = -DwxNO_EXCEPTIONS
+!endif
+!if "$(USE_EXCEPTIONS)" == "0"
+__EXCEPTIONS_DEFINE_p_1 = -dwxNO_EXCEPTIONS
+!endif
+!if "$(USE_RTTI)" == "0"
+__RTTI_DEFINE_p = -DwxNO_RTTI
+!endif
+!if "$(USE_RTTI)" == "0"
+__RTTI_DEFINE_p_1 = -dwxNO_RTTI
+!endif
+!if "$(USE_THREADS)" == "0"
+__THREAD_DEFINE_p = -DwxNO_THREADS
+!endif
+!if "$(USE_THREADS)" == "0"
+__THREAD_DEFINE_p_1 = -dwxNO_THREADS
+!endif
+!if "$(UNICODE)" == "0"
+__UNICODE_DEFINE_p = -DwxUSE_UNICODE=0
+!endif
+!if "$(UNICODE)" == "1"
+__UNICODE_DEFINE_p = -D_UNICODE
+!endif
+!if "$(UNICODE)" == "0"
+__UNICODE_DEFINE_p_1 = -dwxUSE_UNICODE=0
+!endif
+!if "$(UNICODE)" == "1"
+__UNICODE_DEFINE_p_1 = -d_UNICODE
+!endif
+!if "$(USE_CAIRO)" == "1"
+____CAIRO_INCLUDEDIR_FILENAMES_p = -I$(CAIRO_ROOT)\include\cairo
+!endif
+!if "$(USE_CAIRO)" == "1"
+____CAIRO_INCLUDEDIR_FILENAMES_1_p = -i$(CAIRO_ROOT)\include\cairo
+!endif
+!if "$(SHARED)" == "1"
+__DLLFLAG_p = -DWXUSINGDLL
+!endif
+!if "$(SHARED)" == "1"
+__DLLFLAG_p_1 = -dWXUSINGDLL
+!endif
+!if "$(MONOLITHIC)" == "0"
+__WXLIB_HTML_p = \
+ wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_html.lib
+!endif
+!if "$(MONOLITHIC)" == "0"
+__WXLIB_CORE_p = \
+ wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib
+!endif
+!if "$(MONOLITHIC)" == "0"
+__WXLIB_NET_p = \
+ wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_net.lib
+!endif
+!if "$(MONOLITHIC)" == "0"
+__WXLIB_BASE_p = \
+ wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib
+!endif
+!if "$(MONOLITHIC)" == "1"
+__WXLIB_MONO_p = \
+ wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib
+!endif
+!if "$(MONOLITHIC)" == "1" && "$(USE_STC)" == "1"
+__LIB_SCINTILLA_IF_MONO_p = wxscintilla$(WXDEBUGFLAG).lib
+!endif
+!if "$(USE_GUI)" == "1"
+__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib
+!endif
+!if "$(USE_GUI)" == "1"
+__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib
+!endif
+!if "$(USE_GUI)" == "1"
+__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib
+!endif
+!if "$(USE_CAIRO)" == "1"
+__CAIRO_LIB_p = cairo.lib
+!endif
+!if "$(USE_CAIRO)" == "1"
+____CAIRO_LIBDIR_FILENAMES_p = -L$(CAIRO_ROOT)\lib
+!endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default"
+__DEBUGINFO = -v
+!endif
+!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default"
+__DEBUGINFO = -v-
+!endif
+!if "$(DEBUG_INFO)" == "0"
+__DEBUGINFO = -v-
+!endif
+!if "$(DEBUG_INFO)" == "1"
+__DEBUGINFO = -v
+!endif
+
+
+all: $(OBJS)
+$(OBJS):
+ -if not exist $(OBJS) mkdir $(OBJS)
+
+### Targets: ###
+
+all: $(OBJS)\helpview.exe data
+
+clean:
+ -if exist $(OBJS)\*.obj del $(OBJS)\*.obj
+ -if exist $(OBJS)\*.res del $(OBJS)\*.res
+ -if exist $(OBJS)\*.csm del $(OBJS)\*.csm
+ -if exist $(OBJS)\helpview.exe del $(OBJS)\helpview.exe
+ -if exist $(OBJS)\helpview.tds del $(OBJS)\helpview.tds
+ -if exist $(OBJS)\helpview.ilc del $(OBJS)\helpview.ilc
+ -if exist $(OBJS)\helpview.ild del $(OBJS)\helpview.ild
+ -if exist $(OBJS)\helpview.ilf del $(OBJS)\helpview.ilf
+ -if exist $(OBJS)\helpview.ils del $(OBJS)\helpview.ils
+
+$(OBJS)\helpview.exe: $(HELPVIEW_OBJECTS) $(OBJS)\helpview_helpview.res
+ ilink32 -Tpe -q -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUGINFO) -L$(LIBDIRNAME) -aa $(____CAIRO_LIBDIR_FILENAMES_p) $(LDFLAGS) @&&|
+ c0w32.obj $(HELPVIEW_OBJECTS),$@,, $(__WXLIB_HTML_p) $(__WXLIB_CORE_p) $(__WXLIB_NET_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_SCINTILLA_IF_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__CAIRO_LIB_p) ole2w32.lib oleacc.lib import32.lib cw32$(__THREADSFLAG_5)$(__RUNTIME_LIBS_8).lib,, $(OBJS)\helpview_helpview.res
+|
+
+data:
+ if not exist $(OBJS) mkdir $(OBJS)
+ for %f in (test.zip) do if not exist $(OBJS)\%f copy .\%f $(OBJS)
+
+$(OBJS)\helpview_helpview.obj: .\helpview.cpp
+ $(CXX) -q -c -P -o$@ $(HELPVIEW_CXXFLAGS) .\helpview.cpp
+
+$(OBJS)\helpview_helpview.res: .\helpview.rc
+ brcc32 -32 -r -fo$@ -i$(BCCDIR)\include -d__WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__NDEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) -i$(SETUPHDIR) -i.\..\..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES_1_p) -i. $(__DLLFLAG_p_1) -i.\..\..\..\samples -i$(BCCDIR)\include\windows\sdk -dNOPCH .\helpview.rc
+
diff --git a/utils/helpview/src/makefile.gcc b/utils/helpview/src/makefile.gcc
index 9181f398a6..68f827da51 100644
--- a/utils/helpview/src/makefile.gcc
+++ b/utils/helpview/src/makefile.gcc
@@ -1,247 +1,247 @@
-# =========================================================================
-# This makefile was generated by
-# Bakefile 0.2.9 (http://www.bakefile.org)
-# Do not modify, all changes will be overwritten!
-# =========================================================================
-
-include ../../../build/msw/config.gcc
-
-# -------------------------------------------------------------------------
-# Do not modify the rest of this file!
-# -------------------------------------------------------------------------
-
-### Variables: ###
-
-CPPDEPS = -MT$@ -MF$@.d -MD -MP
-WX_RELEASE_NODOT = 31
-COMPILER_PREFIX = gcc
-OBJS = \
- $(COMPILER_PREFIX)$(COMPILER_VERSION)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)
-LIBDIRNAME = \
- .\..\..\..\lib\$(COMPILER_PREFIX)$(COMPILER_VERSION)_$(LIBTYPE_SUFFIX)$(CFG)
-SETUPHDIR = \
- $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)
-HELPVIEW_CXXFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG_2) $(__THREADSFLAG) \
- $(GCCFLAGS) -DHAVE_W32API_H -D__WXMSW__ $(__WXUNIV_DEFINE_p) \
- $(__DEBUG_DEFINE_p) $(__NDEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) \
- $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) \
- -I$(SETUPHDIR) -I.\..\..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES_p) -W \
- -Wall -I. $(__DLLFLAG_p) -I.\..\..\..\samples -DNOPCH $(__RTTIFLAG_5) \
- $(__EXCEPTIONSFLAG_6) -Wno-ctor-dtor-privacy $(CPPFLAGS) $(CXXFLAGS)
-HELPVIEW_OBJECTS = \
- $(OBJS)\helpview_helpview.o \
- $(OBJS)\helpview_helpview_rc.o
-
-### Conditionally set variables: ###
-
-ifeq ($(GCC_VERSION),2.95)
-GCCFLAGS = -fvtable-thunks
-endif
-ifeq ($(USE_GUI),0)
-PORTNAME = base
-endif
-ifeq ($(USE_GUI),1)
-PORTNAME = msw$(TOOLKIT_VERSION)
-endif
-ifeq ($(OFFICIAL_BUILD),1)
-COMPILER_VERSION = ERROR-COMPILER-VERSION-MUST-BE-SET-FOR-OFFICIAL-BUILD
-endif
-ifeq ($(BUILD),debug)
-WXDEBUGFLAG = d
-endif
-ifeq ($(UNICODE),1)
-WXUNICODEFLAG = u
-endif
-ifeq ($(WXUNIV),1)
-WXUNIVNAME = univ
-endif
-ifeq ($(SHARED),1)
-WXDLLFLAG = dll
-endif
-ifeq ($(SHARED),0)
-LIBTYPE_SUFFIX = lib
-endif
-ifeq ($(SHARED),1)
-LIBTYPE_SUFFIX = dll
-endif
-ifeq ($(MONOLITHIC),0)
-EXTRALIBS_FOR_BASE =
-endif
-ifeq ($(MONOLITHIC),1)
-EXTRALIBS_FOR_BASE =
-endif
-ifeq ($(BUILD),debug)
-__OPTIMIZEFLAG_2 = -O0
-endif
-ifeq ($(BUILD),release)
-__OPTIMIZEFLAG_2 = -O2
-endif
-ifeq ($(USE_RTTI),0)
-__RTTIFLAG_5 = -fno-rtti
-endif
-ifeq ($(USE_RTTI),1)
-__RTTIFLAG_5 =
-endif
-ifeq ($(USE_EXCEPTIONS),0)
-__EXCEPTIONSFLAG_6 = -fno-exceptions
-endif
-ifeq ($(USE_EXCEPTIONS),1)
-__EXCEPTIONSFLAG_6 =
-endif
-ifeq ($(WXUNIV),1)
-__WXUNIV_DEFINE_p = -D__WXUNIVERSAL__
-endif
-ifeq ($(WXUNIV),1)
-__WXUNIV_DEFINE_p_1 = --define __WXUNIVERSAL__
-endif
-ifeq ($(DEBUG_FLAG),0)
-__DEBUG_DEFINE_p = -DwxDEBUG_LEVEL=0
-endif
-ifeq ($(DEBUG_FLAG),0)
-__DEBUG_DEFINE_p_1 = --define wxDEBUG_LEVEL=0
-endif
-ifeq ($(BUILD),release)
-__NDEBUG_DEFINE_p = -DNDEBUG
-endif
-ifeq ($(BUILD),release)
-__NDEBUG_DEFINE_p_1 = --define NDEBUG
-endif
-ifeq ($(USE_EXCEPTIONS),0)
-__EXCEPTIONS_DEFINE_p = -DwxNO_EXCEPTIONS
-endif
-ifeq ($(USE_EXCEPTIONS),0)
-__EXCEPTIONS_DEFINE_p_1 = --define wxNO_EXCEPTIONS
-endif
-ifeq ($(USE_RTTI),0)
-__RTTI_DEFINE_p = -DwxNO_RTTI
-endif
-ifeq ($(USE_RTTI),0)
-__RTTI_DEFINE_p_1 = --define wxNO_RTTI
-endif
-ifeq ($(USE_THREADS),0)
-__THREAD_DEFINE_p = -DwxNO_THREADS
-endif
-ifeq ($(USE_THREADS),0)
-__THREAD_DEFINE_p_1 = --define wxNO_THREADS
-endif
-ifeq ($(UNICODE),0)
-__UNICODE_DEFINE_p = -DwxUSE_UNICODE=0
-endif
-ifeq ($(UNICODE),1)
-__UNICODE_DEFINE_p = -D_UNICODE
-endif
-ifeq ($(UNICODE),0)
-__UNICODE_DEFINE_p_1 = --define wxUSE_UNICODE=0
-endif
-ifeq ($(UNICODE),1)
-__UNICODE_DEFINE_p_1 = --define _UNICODE
-endif
-ifeq ($(USE_CAIRO),1)
-____CAIRO_INCLUDEDIR_FILENAMES_p = -I$(CAIRO_ROOT)\include\cairo
-endif
-ifeq ($(USE_CAIRO),1)
-__CAIRO_INCLUDEDIR_p = --include-dir $(CAIRO_ROOT)/include/cairo
-endif
-ifeq ($(SHARED),1)
-__DLLFLAG_p = -DWXUSINGDLL
-endif
-ifeq ($(SHARED),1)
-__DLLFLAG_p_1 = --define WXUSINGDLL
-endif
-ifeq ($(MONOLITHIC),0)
-__WXLIB_HTML_p = \
- -lwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_html
-endif
-ifeq ($(MONOLITHIC),0)
-__WXLIB_CORE_p = \
- -lwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core
-endif
-ifeq ($(MONOLITHIC),0)
-__WXLIB_NET_p = \
- -lwxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_net
-endif
-ifeq ($(MONOLITHIC),0)
-__WXLIB_BASE_p = \
- -lwxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)
-endif
-ifeq ($(MONOLITHIC),1)
-__WXLIB_MONO_p = \
- -lwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)
-endif
-ifeq ($(MONOLITHIC),1)
-ifeq ($(USE_STC),1)
-__LIB_SCINTILLA_IF_MONO_p = -lwxscintilla$(WXDEBUGFLAG)
-endif
-endif
-ifeq ($(USE_GUI),1)
-__LIB_TIFF_p = -lwxtiff$(WXDEBUGFLAG)
-endif
-ifeq ($(USE_GUI),1)
-__LIB_JPEG_p = -lwxjpeg$(WXDEBUGFLAG)
-endif
-ifeq ($(USE_GUI),1)
-__LIB_PNG_p = -lwxpng$(WXDEBUGFLAG)
-endif
-ifeq ($(USE_CAIRO),1)
-__CAIRO_LIB_p = -lcairo
-endif
-ifeq ($(USE_CAIRO),1)
-____CAIRO_LIBDIR_FILENAMES_p = -L$(CAIRO_ROOT)\lib
-endif
-ifeq ($(BUILD),debug)
-ifeq ($(DEBUG_INFO),default)
-__DEBUGINFO = -g
-endif
-endif
-ifeq ($(BUILD),release)
-ifeq ($(DEBUG_INFO),default)
-__DEBUGINFO =
-endif
-endif
-ifeq ($(DEBUG_INFO),0)
-__DEBUGINFO =
-endif
-ifeq ($(DEBUG_INFO),1)
-__DEBUGINFO = -g
-endif
-ifeq ($(USE_THREADS),0)
-__THREADSFLAG =
-endif
-ifeq ($(USE_THREADS),1)
-__THREADSFLAG = -mthreads
-endif
-
-
-all: $(OBJS)
-$(OBJS):
- -if not exist $(OBJS) mkdir $(OBJS)
-
-### Targets: ###
-
-all: $(OBJS)\helpview.exe data
-
-clean:
- -if exist $(OBJS)\*.o del $(OBJS)\*.o
- -if exist $(OBJS)\*.d del $(OBJS)\*.d
- -if exist $(OBJS)\helpview.exe del $(OBJS)\helpview.exe
-
-$(OBJS)\helpview.exe: $(HELPVIEW_OBJECTS) $(OBJS)\helpview_helpview_rc.o
- $(CXX) -o $@ $(HELPVIEW_OBJECTS) $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) -Wl,--subsystem,windows -mwindows $(____CAIRO_LIBDIR_FILENAMES_p) $(LDFLAGS) $(__WXLIB_HTML_p) $(__WXLIB_CORE_p) $(__WXLIB_NET_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_SCINTILLA_IF_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(EXTRALIBS_FOR_BASE) $(__CAIRO_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32 -lwininet
-
-data:
- if not exist $(OBJS) mkdir $(OBJS)
- for %%f in (test.zip) do if not exist $(OBJS)\%%f copy .\%%f $(OBJS)
-
-$(OBJS)\helpview_helpview.o: ./helpview.cpp
- $(CXX) -c -o $@ $(HELPVIEW_CXXFLAGS) $(CPPDEPS) $<
-
-$(OBJS)\helpview_helpview_rc.o: ./helpview.rc
- $(WINDRES) -i$< -o$@ --define __WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__NDEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) --include-dir $(SETUPHDIR) --include-dir ./../../../include $(__CAIRO_INCLUDEDIR_p) --include-dir . $(__DLLFLAG_p_1) --include-dir ./../../../samples --define NOPCH
-
-.PHONY: all clean data
-
-
-SHELL := $(COMSPEC)
-
-# Dependencies tracking:
--include $(OBJS)/*.d
+# =========================================================================
+# This makefile was generated by
+# Bakefile 0.2.9 (http://www.bakefile.org)
+# Do not modify, all changes will be overwritten!
+# =========================================================================
+
+include ../../../build/msw/config.gcc
+
+# -------------------------------------------------------------------------
+# Do not modify the rest of this file!
+# -------------------------------------------------------------------------
+
+### Variables: ###
+
+CPPDEPS = -MT$@ -MF$@.d -MD -MP
+WX_RELEASE_NODOT = 31
+COMPILER_PREFIX = gcc
+OBJS = \
+ $(COMPILER_PREFIX)$(COMPILER_VERSION)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)
+LIBDIRNAME = \
+ .\..\..\..\lib\$(COMPILER_PREFIX)$(COMPILER_VERSION)_$(LIBTYPE_SUFFIX)$(CFG)
+SETUPHDIR = \
+ $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)
+HELPVIEW_CXXFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG_2) $(__THREADSFLAG) \
+ $(GCCFLAGS) -DHAVE_W32API_H -D__WXMSW__ $(__WXUNIV_DEFINE_p) \
+ $(__DEBUG_DEFINE_p) $(__NDEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) \
+ $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) \
+ -I$(SETUPHDIR) -I.\..\..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES_p) -W \
+ -Wall -I. $(__DLLFLAG_p) -I.\..\..\..\samples -DNOPCH $(__RTTIFLAG_5) \
+ $(__EXCEPTIONSFLAG_6) -Wno-ctor-dtor-privacy $(CPPFLAGS) $(CXXFLAGS)
+HELPVIEW_OBJECTS = \
+ $(OBJS)\helpview_helpview.o \
+ $(OBJS)\helpview_helpview_rc.o
+
+### Conditionally set variables: ###
+
+ifeq ($(GCC_VERSION),2.95)
+GCCFLAGS = -fvtable-thunks
+endif
+ifeq ($(USE_GUI),0)
+PORTNAME = base
+endif
+ifeq ($(USE_GUI),1)
+PORTNAME = msw$(TOOLKIT_VERSION)
+endif
+ifeq ($(OFFICIAL_BUILD),1)
+COMPILER_VERSION = ERROR-COMPILER-VERSION-MUST-BE-SET-FOR-OFFICIAL-BUILD
+endif
+ifeq ($(BUILD),debug)
+WXDEBUGFLAG = d
+endif
+ifeq ($(UNICODE),1)
+WXUNICODEFLAG = u
+endif
+ifeq ($(WXUNIV),1)
+WXUNIVNAME = univ
+endif
+ifeq ($(SHARED),1)
+WXDLLFLAG = dll
+endif
+ifeq ($(SHARED),0)
+LIBTYPE_SUFFIX = lib
+endif
+ifeq ($(SHARED),1)
+LIBTYPE_SUFFIX = dll
+endif
+ifeq ($(MONOLITHIC),0)
+EXTRALIBS_FOR_BASE =
+endif
+ifeq ($(MONOLITHIC),1)
+EXTRALIBS_FOR_BASE =
+endif
+ifeq ($(BUILD),debug)
+__OPTIMIZEFLAG_2 = -O0
+endif
+ifeq ($(BUILD),release)
+__OPTIMIZEFLAG_2 = -O2
+endif
+ifeq ($(USE_RTTI),0)
+__RTTIFLAG_5 = -fno-rtti
+endif
+ifeq ($(USE_RTTI),1)
+__RTTIFLAG_5 =
+endif
+ifeq ($(USE_EXCEPTIONS),0)
+__EXCEPTIONSFLAG_6 = -fno-exceptions
+endif
+ifeq ($(USE_EXCEPTIONS),1)
+__EXCEPTIONSFLAG_6 =
+endif
+ifeq ($(WXUNIV),1)
+__WXUNIV_DEFINE_p = -D__WXUNIVERSAL__
+endif
+ifeq ($(WXUNIV),1)
+__WXUNIV_DEFINE_p_1 = --define __WXUNIVERSAL__
+endif
+ifeq ($(DEBUG_FLAG),0)
+__DEBUG_DEFINE_p = -DwxDEBUG_LEVEL=0
+endif
+ifeq ($(DEBUG_FLAG),0)
+__DEBUG_DEFINE_p_1 = --define wxDEBUG_LEVEL=0
+endif
+ifeq ($(BUILD),release)
+__NDEBUG_DEFINE_p = -DNDEBUG
+endif
+ifeq ($(BUILD),release)
+__NDEBUG_DEFINE_p_1 = --define NDEBUG
+endif
+ifeq ($(USE_EXCEPTIONS),0)
+__EXCEPTIONS_DEFINE_p = -DwxNO_EXCEPTIONS
+endif
+ifeq ($(USE_EXCEPTIONS),0)
+__EXCEPTIONS_DEFINE_p_1 = --define wxNO_EXCEPTIONS
+endif
+ifeq ($(USE_RTTI),0)
+__RTTI_DEFINE_p = -DwxNO_RTTI
+endif
+ifeq ($(USE_RTTI),0)
+__RTTI_DEFINE_p_1 = --define wxNO_RTTI
+endif
+ifeq ($(USE_THREADS),0)
+__THREAD_DEFINE_p = -DwxNO_THREADS
+endif
+ifeq ($(USE_THREADS),0)
+__THREAD_DEFINE_p_1 = --define wxNO_THREADS
+endif
+ifeq ($(UNICODE),0)
+__UNICODE_DEFINE_p = -DwxUSE_UNICODE=0
+endif
+ifeq ($(UNICODE),1)
+__UNICODE_DEFINE_p = -D_UNICODE
+endif
+ifeq ($(UNICODE),0)
+__UNICODE_DEFINE_p_1 = --define wxUSE_UNICODE=0
+endif
+ifeq ($(UNICODE),1)
+__UNICODE_DEFINE_p_1 = --define _UNICODE
+endif
+ifeq ($(USE_CAIRO),1)
+____CAIRO_INCLUDEDIR_FILENAMES_p = -I$(CAIRO_ROOT)\include\cairo
+endif
+ifeq ($(USE_CAIRO),1)
+__CAIRO_INCLUDEDIR_p = --include-dir $(CAIRO_ROOT)/include/cairo
+endif
+ifeq ($(SHARED),1)
+__DLLFLAG_p = -DWXUSINGDLL
+endif
+ifeq ($(SHARED),1)
+__DLLFLAG_p_1 = --define WXUSINGDLL
+endif
+ifeq ($(MONOLITHIC),0)
+__WXLIB_HTML_p = \
+ -lwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_html
+endif
+ifeq ($(MONOLITHIC),0)
+__WXLIB_CORE_p = \
+ -lwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core
+endif
+ifeq ($(MONOLITHIC),0)
+__WXLIB_NET_p = \
+ -lwxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_net
+endif
+ifeq ($(MONOLITHIC),0)
+__WXLIB_BASE_p = \
+ -lwxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)
+endif
+ifeq ($(MONOLITHIC),1)
+__WXLIB_MONO_p = \
+ -lwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)
+endif
+ifeq ($(MONOLITHIC),1)
+ifeq ($(USE_STC),1)
+__LIB_SCINTILLA_IF_MONO_p = -lwxscintilla$(WXDEBUGFLAG)
+endif
+endif
+ifeq ($(USE_GUI),1)
+__LIB_TIFF_p = -lwxtiff$(WXDEBUGFLAG)
+endif
+ifeq ($(USE_GUI),1)
+__LIB_JPEG_p = -lwxjpeg$(WXDEBUGFLAG)
+endif
+ifeq ($(USE_GUI),1)
+__LIB_PNG_p = -lwxpng$(WXDEBUGFLAG)
+endif
+ifeq ($(USE_CAIRO),1)
+__CAIRO_LIB_p = -lcairo
+endif
+ifeq ($(USE_CAIRO),1)
+____CAIRO_LIBDIR_FILENAMES_p = -L$(CAIRO_ROOT)\lib
+endif
+ifeq ($(BUILD),debug)
+ifeq ($(DEBUG_INFO),default)
+__DEBUGINFO = -g
+endif
+endif
+ifeq ($(BUILD),release)
+ifeq ($(DEBUG_INFO),default)
+__DEBUGINFO =
+endif
+endif
+ifeq ($(DEBUG_INFO),0)
+__DEBUGINFO =
+endif
+ifeq ($(DEBUG_INFO),1)
+__DEBUGINFO = -g
+endif
+ifeq ($(USE_THREADS),0)
+__THREADSFLAG =
+endif
+ifeq ($(USE_THREADS),1)
+__THREADSFLAG = -mthreads
+endif
+
+
+all: $(OBJS)
+$(OBJS):
+ -if not exist $(OBJS) mkdir $(OBJS)
+
+### Targets: ###
+
+all: $(OBJS)\helpview.exe data
+
+clean:
+ -if exist $(OBJS)\*.o del $(OBJS)\*.o
+ -if exist $(OBJS)\*.d del $(OBJS)\*.d
+ -if exist $(OBJS)\helpview.exe del $(OBJS)\helpview.exe
+
+$(OBJS)\helpview.exe: $(HELPVIEW_OBJECTS) $(OBJS)\helpview_helpview_rc.o
+ $(CXX) -o $@ $(HELPVIEW_OBJECTS) $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) -Wl,--subsystem,windows -mwindows $(____CAIRO_LIBDIR_FILENAMES_p) $(LDFLAGS) $(__WXLIB_HTML_p) $(__WXLIB_CORE_p) $(__WXLIB_NET_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_SCINTILLA_IF_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(EXTRALIBS_FOR_BASE) $(__CAIRO_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32 -lwininet
+
+data:
+ if not exist $(OBJS) mkdir $(OBJS)
+ for %%f in (test.zip) do if not exist $(OBJS)\%%f copy .\%%f $(OBJS)
+
+$(OBJS)\helpview_helpview.o: ./helpview.cpp
+ $(CXX) -c -o $@ $(HELPVIEW_CXXFLAGS) $(CPPDEPS) $<
+
+$(OBJS)\helpview_helpview_rc.o: ./helpview.rc
+ $(WINDRES) -i$< -o$@ --define __WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__NDEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) --include-dir $(SETUPHDIR) --include-dir ./../../../include $(__CAIRO_INCLUDEDIR_p) --include-dir . $(__DLLFLAG_p_1) --include-dir ./../../../samples --define NOPCH
+
+.PHONY: all clean data
+
+
+SHELL := $(COMSPEC)
+
+# Dependencies tracking:
+-include $(OBJS)/*.d
diff --git a/utils/helpview/src/makefile.vc b/utils/helpview/src/makefile.vc
index db6700350a..2d6dc18ff4 100644
--- a/utils/helpview/src/makefile.vc
+++ b/utils/helpview/src/makefile.vc
@@ -1,374 +1,374 @@
-# =========================================================================
-# This makefile was generated by
-# Bakefile 0.2.9 (http://www.bakefile.org)
-# Do not modify, all changes will be overwritten!
-# =========================================================================
-
-!include <../../../build/msw/config.vc>
-
-# -------------------------------------------------------------------------
-# Do not modify the rest of this file!
-# -------------------------------------------------------------------------
-
-### Variables: ###
-
-WX_RELEASE_NODOT = 31
-COMPILER_PREFIX = vc
-OBJS = \
- $(COMPILER_PREFIX)$(COMPILER_VERSION)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)$(ARCH_SUFFIX)
-LIBDIRNAME = \
- .\..\..\..\lib\$(COMPILER_PREFIX)$(COMPILER_VERSION)$(ARCH_SUFFIX)_$(LIBTYPE_SUFFIX)$(CFG)
-SETUPHDIR = \
- $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)
-HELPVIEW_CXXFLAGS = /M$(__RUNTIME_LIBS_10)$(__DEBUGRUNTIME_4) /DWIN32 \
- $(__DEBUGINFO_0) /Fd$(OBJS)\helpview.pdb $(____DEBUGRUNTIME_3_p) \
- $(__OPTIMIZEFLAG_6) /D_CRT_SECURE_NO_DEPRECATE=1 \
- /D_CRT_NON_CONFORMING_SWPRINTFS=1 /D_SCL_SECURE_NO_WARNINGS=1 \
- $(__NO_VC_CRTDBG_p) /D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \
- $(__NDEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \
- $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) /I$(SETUPHDIR) \
- /I.\..\..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES_p) /W4 /I. \
- $(__DLLFLAG_p) /D_WINDOWS /I.\..\..\..\samples /DNOPCH $(__RTTIFLAG_11) \
- $(__EXCEPTIONSFLAG_12) $(CPPFLAGS) $(CXXFLAGS)
-HELPVIEW_OBJECTS = \
- $(OBJS)\helpview_helpview.obj
-HELPVIEW_RESOURCES = \
- $(OBJS)\helpview_helpview.res
-
-### Conditionally set variables: ###
-
-!if "$(TARGET_CPU)" == "AMD64"
-ARCH_SUFFIX = _x64
-!endif
-!if "$(TARGET_CPU)" == "IA64"
-ARCH_SUFFIX = _ia64
-!endif
-!if "$(TARGET_CPU)" == "X64"
-ARCH_SUFFIX = _x64
-!endif
-!if "$(TARGET_CPU)" == "amd64"
-ARCH_SUFFIX = _x64
-!endif
-!if "$(TARGET_CPU)" == "ia64"
-ARCH_SUFFIX = _ia64
-!endif
-!if "$(TARGET_CPU)" == "x64"
-ARCH_SUFFIX = _x64
-!endif
-!if "$(USE_GUI)" == "0"
-PORTNAME = base
-!endif
-!if "$(USE_GUI)" == "1"
-PORTNAME = msw$(TOOLKIT_VERSION)
-!endif
-!if "$(OFFICIAL_BUILD)" == "1"
-COMPILER_VERSION = ERROR-COMPILER-VERSION-MUST-BE-SET-FOR-OFFICIAL-BUILD
-!endif
-!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default"
-WXDEBUGFLAG = d
-!endif
-!if "$(DEBUG_RUNTIME_LIBS)" == "1"
-WXDEBUGFLAG = d
-!endif
-!if "$(UNICODE)" == "1"
-WXUNICODEFLAG = u
-!endif
-!if "$(WXUNIV)" == "1"
-WXUNIVNAME = univ
-!endif
-!if "$(SHARED)" == "1"
-WXDLLFLAG = dll
-!endif
-!if "$(SHARED)" == "0"
-LIBTYPE_SUFFIX = lib
-!endif
-!if "$(SHARED)" == "1"
-LIBTYPE_SUFFIX = dll
-!endif
-!if "$(TARGET_CPU)" == "AMD64"
-LINK_TARGET_CPU = /MACHINE:X64
-!endif
-!if "$(TARGET_CPU)" == "IA64"
-LINK_TARGET_CPU = /MACHINE:IA64
-!endif
-!if "$(TARGET_CPU)" == "X64"
-LINK_TARGET_CPU = /MACHINE:X64
-!endif
-!if "$(TARGET_CPU)" == "amd64"
-LINK_TARGET_CPU = /MACHINE:X64
-!endif
-!if "$(TARGET_CPU)" == "ia64"
-LINK_TARGET_CPU = /MACHINE:IA64
-!endif
-!if "$(TARGET_CPU)" == "x64"
-LINK_TARGET_CPU = /MACHINE:X64
-!endif
-!if "$(MONOLITHIC)" == "0"
-EXTRALIBS_FOR_BASE =
-!endif
-!if "$(MONOLITHIC)" == "1"
-EXTRALIBS_FOR_BASE =
-!endif
-!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default"
-__DEBUGINFO_0 = /Zi
-!endif
-!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default"
-__DEBUGINFO_0 =
-!endif
-!if "$(DEBUG_INFO)" == "0"
-__DEBUGINFO_0 =
-!endif
-!if "$(DEBUG_INFO)" == "1"
-__DEBUGINFO_0 = /Zi
-!endif
-!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default"
-__DEBUGINFO_1 = /DEBUG
-!endif
-!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default"
-__DEBUGINFO_1 =
-!endif
-!if "$(DEBUG_INFO)" == "0"
-__DEBUGINFO_1 =
-!endif
-!if "$(DEBUG_INFO)" == "1"
-__DEBUGINFO_1 = /DEBUG
-!endif
-!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default"
-__DEBUGINFO_2 = $(__DEBUGRUNTIME_5)
-!endif
-!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default"
-__DEBUGINFO_2 =
-!endif
-!if "$(DEBUG_INFO)" == "0"
-__DEBUGINFO_2 =
-!endif
-!if "$(DEBUG_INFO)" == "1"
-__DEBUGINFO_2 = $(__DEBUGRUNTIME_5)
-!endif
-!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default"
-____DEBUGRUNTIME_3_p = /D_DEBUG
-!endif
-!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default"
-____DEBUGRUNTIME_3_p =
-!endif
-!if "$(DEBUG_RUNTIME_LIBS)" == "0"
-____DEBUGRUNTIME_3_p =
-!endif
-!if "$(DEBUG_RUNTIME_LIBS)" == "1"
-____DEBUGRUNTIME_3_p = /D_DEBUG
-!endif
-!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default"
-____DEBUGRUNTIME_3_p_1 = /d _DEBUG
-!endif
-!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default"
-____DEBUGRUNTIME_3_p_1 =
-!endif
-!if "$(DEBUG_RUNTIME_LIBS)" == "0"
-____DEBUGRUNTIME_3_p_1 =
-!endif
-!if "$(DEBUG_RUNTIME_LIBS)" == "1"
-____DEBUGRUNTIME_3_p_1 = /d _DEBUG
-!endif
-!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default"
-__DEBUGRUNTIME_4 = d
-!endif
-!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default"
-__DEBUGRUNTIME_4 =
-!endif
-!if "$(DEBUG_RUNTIME_LIBS)" == "0"
-__DEBUGRUNTIME_4 =
-!endif
-!if "$(DEBUG_RUNTIME_LIBS)" == "1"
-__DEBUGRUNTIME_4 = d
-!endif
-!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default"
-__DEBUGRUNTIME_5 =
-!endif
-!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default"
-__DEBUGRUNTIME_5 = /opt:ref /opt:icf
-!endif
-!if "$(DEBUG_RUNTIME_LIBS)" == "0"
-__DEBUGRUNTIME_5 = /opt:ref /opt:icf
-!endif
-!if "$(DEBUG_RUNTIME_LIBS)" == "1"
-__DEBUGRUNTIME_5 =
-!endif
-!if "$(BUILD)" == "debug"
-__OPTIMIZEFLAG_6 = /Od
-!endif
-!if "$(BUILD)" == "release"
-__OPTIMIZEFLAG_6 = /O2
-!endif
-!if "$(USE_THREADS)" == "0"
-__THREADSFLAG_9 = L
-!endif
-!if "$(USE_THREADS)" == "1"
-__THREADSFLAG_9 = T
-!endif
-!if "$(RUNTIME_LIBS)" == "dynamic"
-__RUNTIME_LIBS_10 = D
-!endif
-!if "$(RUNTIME_LIBS)" == "static"
-__RUNTIME_LIBS_10 = $(__THREADSFLAG_9)
-!endif
-!if "$(USE_RTTI)" == "0"
-__RTTIFLAG_11 =
-!endif
-!if "$(USE_RTTI)" == "1"
-__RTTIFLAG_11 = /GR
-!endif
-!if "$(USE_EXCEPTIONS)" == "0"
-__EXCEPTIONSFLAG_12 =
-!endif
-!if "$(USE_EXCEPTIONS)" == "1"
-__EXCEPTIONSFLAG_12 = /EHsc
-!endif
-!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "0"
-__NO_VC_CRTDBG_p = /D__NO_VC_CRTDBG__
-!endif
-!if "$(BUILD)" == "release" && "$(DEBUG_FLAG)" == "1"
-__NO_VC_CRTDBG_p = /D__NO_VC_CRTDBG__
-!endif
-!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "0"
-__NO_VC_CRTDBG_p_1 = /d __NO_VC_CRTDBG__
-!endif
-!if "$(BUILD)" == "release" && "$(DEBUG_FLAG)" == "1"
-__NO_VC_CRTDBG_p_1 = /d __NO_VC_CRTDBG__
-!endif
-!if "$(WXUNIV)" == "1"
-__WXUNIV_DEFINE_p = /D__WXUNIVERSAL__
-!endif
-!if "$(WXUNIV)" == "1"
-__WXUNIV_DEFINE_p_1 = /d __WXUNIVERSAL__
-!endif
-!if "$(DEBUG_FLAG)" == "0"
-__DEBUG_DEFINE_p = /DwxDEBUG_LEVEL=0
-!endif
-!if "$(DEBUG_FLAG)" == "0"
-__DEBUG_DEFINE_p_1 = /d wxDEBUG_LEVEL=0
-!endif
-!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default"
-__NDEBUG_DEFINE_p = /DNDEBUG
-!endif
-!if "$(DEBUG_RUNTIME_LIBS)" == "0"
-__NDEBUG_DEFINE_p = /DNDEBUG
-!endif
-!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default"
-__NDEBUG_DEFINE_p_1 = /d NDEBUG
-!endif
-!if "$(DEBUG_RUNTIME_LIBS)" == "0"
-__NDEBUG_DEFINE_p_1 = /d NDEBUG
-!endif
-!if "$(USE_EXCEPTIONS)" == "0"
-__EXCEPTIONS_DEFINE_p = /DwxNO_EXCEPTIONS
-!endif
-!if "$(USE_EXCEPTIONS)" == "0"
-__EXCEPTIONS_DEFINE_p_1 = /d wxNO_EXCEPTIONS
-!endif
-!if "$(USE_RTTI)" == "0"
-__RTTI_DEFINE_p = /DwxNO_RTTI
-!endif
-!if "$(USE_RTTI)" == "0"
-__RTTI_DEFINE_p_1 = /d wxNO_RTTI
-!endif
-!if "$(USE_THREADS)" == "0"
-__THREAD_DEFINE_p = /DwxNO_THREADS
-!endif
-!if "$(USE_THREADS)" == "0"
-__THREAD_DEFINE_p_1 = /d wxNO_THREADS
-!endif
-!if "$(UNICODE)" == "0"
-__UNICODE_DEFINE_p = /DwxUSE_UNICODE=0
-!endif
-!if "$(UNICODE)" == "1"
-__UNICODE_DEFINE_p = /D_UNICODE
-!endif
-!if "$(UNICODE)" == "0"
-__UNICODE_DEFINE_p_1 = /d wxUSE_UNICODE=0
-!endif
-!if "$(UNICODE)" == "1"
-__UNICODE_DEFINE_p_1 = /d _UNICODE
-!endif
-!if "$(USE_CAIRO)" == "1"
-____CAIRO_INCLUDEDIR_FILENAMES_p = /I$(CAIRO_ROOT)\include\cairo
-!endif
-!if "$(USE_CAIRO)" == "1"
-____CAIRO_INCLUDEDIR_FILENAMES_1_p = /i $(CAIRO_ROOT)\include\cairo
-!endif
-!if "$(SHARED)" == "1"
-__DLLFLAG_p = /DWXUSINGDLL
-!endif
-!if "$(SHARED)" == "1"
-__DLLFLAG_p_1 = /d WXUSINGDLL
-!endif
-!if "$(MONOLITHIC)" == "0"
-__WXLIB_HTML_p = \
- wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_html.lib
-!endif
-!if "$(MONOLITHIC)" == "0"
-__WXLIB_CORE_p = \
- wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib
-!endif
-!if "$(MONOLITHIC)" == "0"
-__WXLIB_NET_p = \
- wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_net.lib
-!endif
-!if "$(MONOLITHIC)" == "0"
-__WXLIB_BASE_p = \
- wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib
-!endif
-!if "$(MONOLITHIC)" == "1"
-__WXLIB_MONO_p = \
- wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib
-!endif
-!if "$(MONOLITHIC)" == "1" && "$(USE_STC)" == "1"
-__LIB_SCINTILLA_IF_MONO_p = wxscintilla$(WXDEBUGFLAG).lib
-!endif
-!if "$(USE_GUI)" == "1"
-__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib
-!endif
-!if "$(USE_GUI)" == "1"
-__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib
-!endif
-!if "$(USE_GUI)" == "1"
-__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib
-!endif
-!if "$(USE_CAIRO)" == "1"
-__CAIRO_LIB_p = cairo.lib
-!endif
-!if "$(USE_CAIRO)" == "1"
-____CAIRO_LIBDIR_FILENAMES_p = /LIBPATH:$(CAIRO_ROOT)\lib
-!endif
-
-
-all: $(OBJS)
-$(OBJS):
- -if not exist $(OBJS) mkdir $(OBJS)
-
-### Targets: ###
-
-all: $(OBJS)\helpview.exe data
-
-clean:
- -if exist $(OBJS)\*.obj del $(OBJS)\*.obj
- -if exist $(OBJS)\*.res del $(OBJS)\*.res
- -if exist $(OBJS)\*.pch del $(OBJS)\*.pch
- -if exist $(OBJS)\helpview.exe del $(OBJS)\helpview.exe
- -if exist $(OBJS)\helpview.ilk del $(OBJS)\helpview.ilk
- -if exist $(OBJS)\helpview.pdb del $(OBJS)\helpview.pdb
-
-$(OBJS)\helpview.exe: $(HELPVIEW_OBJECTS) $(OBJS)\helpview_helpview.res
- link /NOLOGO /OUT:$@ $(__DEBUGINFO_1) /pdb:"$(OBJS)\helpview.pdb" $(__DEBUGINFO_2) $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:WINDOWS $(____CAIRO_LIBDIR_FILENAMES_p) $(LDFLAGS) @<<
- $(HELPVIEW_OBJECTS) $(HELPVIEW_RESOURCES) $(__WXLIB_HTML_p) $(__WXLIB_CORE_p) $(__WXLIB_NET_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_SCINTILLA_IF_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__CAIRO_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib
-<<
-
-data:
- if not exist $(OBJS) mkdir $(OBJS)
- for %f in (test.zip) do if not exist $(OBJS)\%f copy .\%f $(OBJS)
-
-$(OBJS)\helpview_helpview.obj: .\helpview.cpp
- $(CXX) /c /nologo /TP /Fo$@ $(HELPVIEW_CXXFLAGS) .\helpview.cpp
-
-$(OBJS)\helpview_helpview.res: .\helpview.rc
- rc /fo$@ /d WIN32 $(____DEBUGRUNTIME_3_p_1) /d _CRT_SECURE_NO_DEPRECATE=1 /d _CRT_NON_CONFORMING_SWPRINTFS=1 /d _SCL_SECURE_NO_WARNINGS=1 $(__NO_VC_CRTDBG_p_1) /d __WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__NDEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) /i $(SETUPHDIR) /i .\..\..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES_1_p) /i . $(__DLLFLAG_p_1) /d _WINDOWS /i .\..\..\..\samples /d NOPCH .\helpview.rc
-
+# =========================================================================
+# This makefile was generated by
+# Bakefile 0.2.9 (http://www.bakefile.org)
+# Do not modify, all changes will be overwritten!
+# =========================================================================
+
+!include <../../../build/msw/config.vc>
+
+# -------------------------------------------------------------------------
+# Do not modify the rest of this file!
+# -------------------------------------------------------------------------
+
+### Variables: ###
+
+WX_RELEASE_NODOT = 31
+COMPILER_PREFIX = vc
+OBJS = \
+ $(COMPILER_PREFIX)$(COMPILER_VERSION)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)$(ARCH_SUFFIX)
+LIBDIRNAME = \
+ .\..\..\..\lib\$(COMPILER_PREFIX)$(COMPILER_VERSION)$(ARCH_SUFFIX)_$(LIBTYPE_SUFFIX)$(CFG)
+SETUPHDIR = \
+ $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)
+HELPVIEW_CXXFLAGS = /M$(__RUNTIME_LIBS_10)$(__DEBUGRUNTIME_4) /DWIN32 \
+ $(__DEBUGINFO_0) /Fd$(OBJS)\helpview.pdb $(____DEBUGRUNTIME_3_p) \
+ $(__OPTIMIZEFLAG_6) /D_CRT_SECURE_NO_DEPRECATE=1 \
+ /D_CRT_NON_CONFORMING_SWPRINTFS=1 /D_SCL_SECURE_NO_WARNINGS=1 \
+ $(__NO_VC_CRTDBG_p) /D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \
+ $(__NDEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \
+ $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) /I$(SETUPHDIR) \
+ /I.\..\..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES_p) /W4 /I. \
+ $(__DLLFLAG_p) /D_WINDOWS /I.\..\..\..\samples /DNOPCH $(__RTTIFLAG_11) \
+ $(__EXCEPTIONSFLAG_12) $(CPPFLAGS) $(CXXFLAGS)
+HELPVIEW_OBJECTS = \
+ $(OBJS)\helpview_helpview.obj
+HELPVIEW_RESOURCES = \
+ $(OBJS)\helpview_helpview.res
+
+### Conditionally set variables: ###
+
+!if "$(TARGET_CPU)" == "AMD64"
+ARCH_SUFFIX = _x64
+!endif
+!if "$(TARGET_CPU)" == "IA64"
+ARCH_SUFFIX = _ia64
+!endif
+!if "$(TARGET_CPU)" == "X64"
+ARCH_SUFFIX = _x64
+!endif
+!if "$(TARGET_CPU)" == "amd64"
+ARCH_SUFFIX = _x64
+!endif
+!if "$(TARGET_CPU)" == "ia64"
+ARCH_SUFFIX = _ia64
+!endif
+!if "$(TARGET_CPU)" == "x64"
+ARCH_SUFFIX = _x64
+!endif
+!if "$(USE_GUI)" == "0"
+PORTNAME = base
+!endif
+!if "$(USE_GUI)" == "1"
+PORTNAME = msw$(TOOLKIT_VERSION)
+!endif
+!if "$(OFFICIAL_BUILD)" == "1"
+COMPILER_VERSION = ERROR-COMPILER-VERSION-MUST-BE-SET-FOR-OFFICIAL-BUILD
+!endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default"
+WXDEBUGFLAG = d
+!endif
+!if "$(DEBUG_RUNTIME_LIBS)" == "1"
+WXDEBUGFLAG = d
+!endif
+!if "$(UNICODE)" == "1"
+WXUNICODEFLAG = u
+!endif
+!if "$(WXUNIV)" == "1"
+WXUNIVNAME = univ
+!endif
+!if "$(SHARED)" == "1"
+WXDLLFLAG = dll
+!endif
+!if "$(SHARED)" == "0"
+LIBTYPE_SUFFIX = lib
+!endif
+!if "$(SHARED)" == "1"
+LIBTYPE_SUFFIX = dll
+!endif
+!if "$(TARGET_CPU)" == "AMD64"
+LINK_TARGET_CPU = /MACHINE:X64
+!endif
+!if "$(TARGET_CPU)" == "IA64"
+LINK_TARGET_CPU = /MACHINE:IA64
+!endif
+!if "$(TARGET_CPU)" == "X64"
+LINK_TARGET_CPU = /MACHINE:X64
+!endif
+!if "$(TARGET_CPU)" == "amd64"
+LINK_TARGET_CPU = /MACHINE:X64
+!endif
+!if "$(TARGET_CPU)" == "ia64"
+LINK_TARGET_CPU = /MACHINE:IA64
+!endif
+!if "$(TARGET_CPU)" == "x64"
+LINK_TARGET_CPU = /MACHINE:X64
+!endif
+!if "$(MONOLITHIC)" == "0"
+EXTRALIBS_FOR_BASE =
+!endif
+!if "$(MONOLITHIC)" == "1"
+EXTRALIBS_FOR_BASE =
+!endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default"
+__DEBUGINFO_0 = /Zi
+!endif
+!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default"
+__DEBUGINFO_0 =
+!endif
+!if "$(DEBUG_INFO)" == "0"
+__DEBUGINFO_0 =
+!endif
+!if "$(DEBUG_INFO)" == "1"
+__DEBUGINFO_0 = /Zi
+!endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default"
+__DEBUGINFO_1 = /DEBUG
+!endif
+!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default"
+__DEBUGINFO_1 =
+!endif
+!if "$(DEBUG_INFO)" == "0"
+__DEBUGINFO_1 =
+!endif
+!if "$(DEBUG_INFO)" == "1"
+__DEBUGINFO_1 = /DEBUG
+!endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default"
+__DEBUGINFO_2 = $(__DEBUGRUNTIME_5)
+!endif
+!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default"
+__DEBUGINFO_2 =
+!endif
+!if "$(DEBUG_INFO)" == "0"
+__DEBUGINFO_2 =
+!endif
+!if "$(DEBUG_INFO)" == "1"
+__DEBUGINFO_2 = $(__DEBUGRUNTIME_5)
+!endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default"
+____DEBUGRUNTIME_3_p = /D_DEBUG
+!endif
+!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default"
+____DEBUGRUNTIME_3_p =
+!endif
+!if "$(DEBUG_RUNTIME_LIBS)" == "0"
+____DEBUGRUNTIME_3_p =
+!endif
+!if "$(DEBUG_RUNTIME_LIBS)" == "1"
+____DEBUGRUNTIME_3_p = /D_DEBUG
+!endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default"
+____DEBUGRUNTIME_3_p_1 = /d _DEBUG
+!endif
+!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default"
+____DEBUGRUNTIME_3_p_1 =
+!endif
+!if "$(DEBUG_RUNTIME_LIBS)" == "0"
+____DEBUGRUNTIME_3_p_1 =
+!endif
+!if "$(DEBUG_RUNTIME_LIBS)" == "1"
+____DEBUGRUNTIME_3_p_1 = /d _DEBUG
+!endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default"
+__DEBUGRUNTIME_4 = d
+!endif
+!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default"
+__DEBUGRUNTIME_4 =
+!endif
+!if "$(DEBUG_RUNTIME_LIBS)" == "0"
+__DEBUGRUNTIME_4 =
+!endif
+!if "$(DEBUG_RUNTIME_LIBS)" == "1"
+__DEBUGRUNTIME_4 = d
+!endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default"
+__DEBUGRUNTIME_5 =
+!endif
+!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default"
+__DEBUGRUNTIME_5 = /opt:ref /opt:icf
+!endif
+!if "$(DEBUG_RUNTIME_LIBS)" == "0"
+__DEBUGRUNTIME_5 = /opt:ref /opt:icf
+!endif
+!if "$(DEBUG_RUNTIME_LIBS)" == "1"
+__DEBUGRUNTIME_5 =
+!endif
+!if "$(BUILD)" == "debug"
+__OPTIMIZEFLAG_6 = /Od
+!endif
+!if "$(BUILD)" == "release"
+__OPTIMIZEFLAG_6 = /O2
+!endif
+!if "$(USE_THREADS)" == "0"
+__THREADSFLAG_9 = L
+!endif
+!if "$(USE_THREADS)" == "1"
+__THREADSFLAG_9 = T
+!endif
+!if "$(RUNTIME_LIBS)" == "dynamic"
+__RUNTIME_LIBS_10 = D
+!endif
+!if "$(RUNTIME_LIBS)" == "static"
+__RUNTIME_LIBS_10 = $(__THREADSFLAG_9)
+!endif
+!if "$(USE_RTTI)" == "0"
+__RTTIFLAG_11 =
+!endif
+!if "$(USE_RTTI)" == "1"
+__RTTIFLAG_11 = /GR
+!endif
+!if "$(USE_EXCEPTIONS)" == "0"
+__EXCEPTIONSFLAG_12 =
+!endif
+!if "$(USE_EXCEPTIONS)" == "1"
+__EXCEPTIONSFLAG_12 = /EHsc
+!endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "0"
+__NO_VC_CRTDBG_p = /D__NO_VC_CRTDBG__
+!endif
+!if "$(BUILD)" == "release" && "$(DEBUG_FLAG)" == "1"
+__NO_VC_CRTDBG_p = /D__NO_VC_CRTDBG__
+!endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "0"
+__NO_VC_CRTDBG_p_1 = /d __NO_VC_CRTDBG__
+!endif
+!if "$(BUILD)" == "release" && "$(DEBUG_FLAG)" == "1"
+__NO_VC_CRTDBG_p_1 = /d __NO_VC_CRTDBG__
+!endif
+!if "$(WXUNIV)" == "1"
+__WXUNIV_DEFINE_p = /D__WXUNIVERSAL__
+!endif
+!if "$(WXUNIV)" == "1"
+__WXUNIV_DEFINE_p_1 = /d __WXUNIVERSAL__
+!endif
+!if "$(DEBUG_FLAG)" == "0"
+__DEBUG_DEFINE_p = /DwxDEBUG_LEVEL=0
+!endif
+!if "$(DEBUG_FLAG)" == "0"
+__DEBUG_DEFINE_p_1 = /d wxDEBUG_LEVEL=0
+!endif
+!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default"
+__NDEBUG_DEFINE_p = /DNDEBUG
+!endif
+!if "$(DEBUG_RUNTIME_LIBS)" == "0"
+__NDEBUG_DEFINE_p = /DNDEBUG
+!endif
+!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default"
+__NDEBUG_DEFINE_p_1 = /d NDEBUG
+!endif
+!if "$(DEBUG_RUNTIME_LIBS)" == "0"
+__NDEBUG_DEFINE_p_1 = /d NDEBUG
+!endif
+!if "$(USE_EXCEPTIONS)" == "0"
+__EXCEPTIONS_DEFINE_p = /DwxNO_EXCEPTIONS
+!endif
+!if "$(USE_EXCEPTIONS)" == "0"
+__EXCEPTIONS_DEFINE_p_1 = /d wxNO_EXCEPTIONS
+!endif
+!if "$(USE_RTTI)" == "0"
+__RTTI_DEFINE_p = /DwxNO_RTTI
+!endif
+!if "$(USE_RTTI)" == "0"
+__RTTI_DEFINE_p_1 = /d wxNO_RTTI
+!endif
+!if "$(USE_THREADS)" == "0"
+__THREAD_DEFINE_p = /DwxNO_THREADS
+!endif
+!if "$(USE_THREADS)" == "0"
+__THREAD_DEFINE_p_1 = /d wxNO_THREADS
+!endif
+!if "$(UNICODE)" == "0"
+__UNICODE_DEFINE_p = /DwxUSE_UNICODE=0
+!endif
+!if "$(UNICODE)" == "1"
+__UNICODE_DEFINE_p = /D_UNICODE
+!endif
+!if "$(UNICODE)" == "0"
+__UNICODE_DEFINE_p_1 = /d wxUSE_UNICODE=0
+!endif
+!if "$(UNICODE)" == "1"
+__UNICODE_DEFINE_p_1 = /d _UNICODE
+!endif
+!if "$(USE_CAIRO)" == "1"
+____CAIRO_INCLUDEDIR_FILENAMES_p = /I$(CAIRO_ROOT)\include\cairo
+!endif
+!if "$(USE_CAIRO)" == "1"
+____CAIRO_INCLUDEDIR_FILENAMES_1_p = /i $(CAIRO_ROOT)\include\cairo
+!endif
+!if "$(SHARED)" == "1"
+__DLLFLAG_p = /DWXUSINGDLL
+!endif
+!if "$(SHARED)" == "1"
+__DLLFLAG_p_1 = /d WXUSINGDLL
+!endif
+!if "$(MONOLITHIC)" == "0"
+__WXLIB_HTML_p = \
+ wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_html.lib
+!endif
+!if "$(MONOLITHIC)" == "0"
+__WXLIB_CORE_p = \
+ wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib
+!endif
+!if "$(MONOLITHIC)" == "0"
+__WXLIB_NET_p = \
+ wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_net.lib
+!endif
+!if "$(MONOLITHIC)" == "0"
+__WXLIB_BASE_p = \
+ wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib
+!endif
+!if "$(MONOLITHIC)" == "1"
+__WXLIB_MONO_p = \
+ wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib
+!endif
+!if "$(MONOLITHIC)" == "1" && "$(USE_STC)" == "1"
+__LIB_SCINTILLA_IF_MONO_p = wxscintilla$(WXDEBUGFLAG).lib
+!endif
+!if "$(USE_GUI)" == "1"
+__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib
+!endif
+!if "$(USE_GUI)" == "1"
+__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib
+!endif
+!if "$(USE_GUI)" == "1"
+__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib
+!endif
+!if "$(USE_CAIRO)" == "1"
+__CAIRO_LIB_p = cairo.lib
+!endif
+!if "$(USE_CAIRO)" == "1"
+____CAIRO_LIBDIR_FILENAMES_p = /LIBPATH:$(CAIRO_ROOT)\lib
+!endif
+
+
+all: $(OBJS)
+$(OBJS):
+ -if not exist $(OBJS) mkdir $(OBJS)
+
+### Targets: ###
+
+all: $(OBJS)\helpview.exe data
+
+clean:
+ -if exist $(OBJS)\*.obj del $(OBJS)\*.obj
+ -if exist $(OBJS)\*.res del $(OBJS)\*.res
+ -if exist $(OBJS)\*.pch del $(OBJS)\*.pch
+ -if exist $(OBJS)\helpview.exe del $(OBJS)\helpview.exe
+ -if exist $(OBJS)\helpview.ilk del $(OBJS)\helpview.ilk
+ -if exist $(OBJS)\helpview.pdb del $(OBJS)\helpview.pdb
+
+$(OBJS)\helpview.exe: $(HELPVIEW_OBJECTS) $(OBJS)\helpview_helpview.res
+ link /NOLOGO /OUT:$@ $(__DEBUGINFO_1) /pdb:"$(OBJS)\helpview.pdb" $(__DEBUGINFO_2) $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:WINDOWS $(____CAIRO_LIBDIR_FILENAMES_p) $(LDFLAGS) @<<
+ $(HELPVIEW_OBJECTS) $(HELPVIEW_RESOURCES) $(__WXLIB_HTML_p) $(__WXLIB_CORE_p) $(__WXLIB_NET_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_SCINTILLA_IF_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__CAIRO_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib
+<<
+
+data:
+ if not exist $(OBJS) mkdir $(OBJS)
+ for %f in (test.zip) do if not exist $(OBJS)\%f copy .\%f $(OBJS)
+
+$(OBJS)\helpview_helpview.obj: .\helpview.cpp
+ $(CXX) /c /nologo /TP /Fo$@ $(HELPVIEW_CXXFLAGS) .\helpview.cpp
+
+$(OBJS)\helpview_helpview.res: .\helpview.rc
+ rc /fo$@ /d WIN32 $(____DEBUGRUNTIME_3_p_1) /d _CRT_SECURE_NO_DEPRECATE=1 /d _CRT_NON_CONFORMING_SWPRINTFS=1 /d _SCL_SECURE_NO_WARNINGS=1 $(__NO_VC_CRTDBG_p_1) /d __WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__NDEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) /i $(SETUPHDIR) /i .\..\..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES_1_p) /i . $(__DLLFLAG_p_1) /d _WINDOWS /i .\..\..\..\samples /d NOPCH .\helpview.rc
+
diff --git a/utils/hhp2cached/hhp2cached_vc7.vcproj b/utils/hhp2cached/hhp2cached_vc7.vcproj
index 1c7e263d82..6e5f667d64 100644
--- a/utils/hhp2cached/hhp2cached_vc7.vcproj
+++ b/utils/hhp2cached/hhp2cached_vc7.vcproj
@@ -1,303 +1,303 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/utils/hhp2cached/hhp2cached_vc8.vcproj b/utils/hhp2cached/hhp2cached_vc8.vcproj
index 7d5a13b91e..f5d09960bc 100644
--- a/utils/hhp2cached/hhp2cached_vc8.vcproj
+++ b/utils/hhp2cached/hhp2cached_vc8.vcproj
@@ -1,829 +1,829 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/utils/hhp2cached/hhp2cached_vc9.vcproj b/utils/hhp2cached/hhp2cached_vc9.vcproj
index f130bf3720..66919b20ad 100644
--- a/utils/hhp2cached/hhp2cached_vc9.vcproj
+++ b/utils/hhp2cached/hhp2cached_vc9.vcproj
@@ -1,801 +1,801 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/utils/hhp2cached/makefile.bcc b/utils/hhp2cached/makefile.bcc
index 12b99c6d49..f821ef368d 100644
--- a/utils/hhp2cached/makefile.bcc
+++ b/utils/hhp2cached/makefile.bcc
@@ -1,243 +1,243 @@
-# =========================================================================
-# This makefile was generated by
-# Bakefile 0.2.9 (http://www.bakefile.org)
-# 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: ###
-
-WX_RELEASE_NODOT = 31
-COMPILER_PREFIX = bcc
-OBJS = \
- $(COMPILER_PREFIX)$(COMPILER_VERSION)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)
-LIBDIRNAME = \
- .\..\..\lib\$(COMPILER_PREFIX)$(COMPILER_VERSION)_$(LIBTYPE_SUFFIX)$(CFG)
-SETUPHDIR = \
- $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)
-HHP2CACHED_CXXFLAGS = $(__RUNTIME_LIBS_7) -I$(BCCDIR)\include $(__DEBUGINFO) \
- $(__OPTIMIZEFLAG_2) $(__THREADSFLAG_6) -D__WXMSW__ $(__WXUNIV_DEFINE_p) \
- $(__DEBUG_DEFINE_p) $(__NDEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) \
- $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) \
- -I$(SETUPHDIR) -I.\..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES_p) -I. \
- $(__DLLFLAG_p) -I.\..\..\samples -DNOPCH $(CPPFLAGS) $(CXXFLAGS)
-HHP2CACHED_OBJECTS = \
- $(OBJS)\hhp2cached_hhp2cached.obj
-
-### Conditionally set variables: ###
-
-!if "$(USE_GUI)" == "0"
-PORTNAME = base
-!endif
-!if "$(USE_GUI)" == "1"
-PORTNAME = msw$(TOOLKIT_VERSION)
-!endif
-!if "$(OFFICIAL_BUILD)" == "1"
-COMPILER_VERSION = ERROR-COMPILER-VERSION-MUST-BE-SET-FOR-OFFICIAL-BUILD
-!endif
-!if "$(BUILD)" == "debug"
-WXDEBUGFLAG = d
-!endif
-!if "$(UNICODE)" == "1"
-WXUNICODEFLAG = u
-!endif
-!if "$(WXUNIV)" == "1"
-WXUNIVNAME = univ
-!endif
-!if "$(SHARED)" == "1"
-WXDLLFLAG = dll
-!endif
-!if "$(SHARED)" == "0"
-LIBTYPE_SUFFIX = lib
-!endif
-!if "$(SHARED)" == "1"
-LIBTYPE_SUFFIX = dll
-!endif
-!if "$(MONOLITHIC)" == "0"
-EXTRALIBS_FOR_BASE =
-!endif
-!if "$(MONOLITHIC)" == "1"
-EXTRALIBS_FOR_BASE =
-!endif
-!if "$(BUILD)" == "debug"
-__OPTIMIZEFLAG_2 = -Od
-!endif
-!if "$(BUILD)" == "release"
-__OPTIMIZEFLAG_2 = -O2
-!endif
-!if "$(USE_THREADS)" == "0"
-__THREADSFLAG_5 =
-!endif
-!if "$(USE_THREADS)" == "1"
-__THREADSFLAG_5 = mt
-!endif
-!if "$(USE_THREADS)" == "0"
-__THREADSFLAG_6 =
-!endif
-!if "$(USE_THREADS)" == "1"
-__THREADSFLAG_6 = -tWM
-!endif
-!if "$(RUNTIME_LIBS)" == "dynamic"
-__RUNTIME_LIBS_7 = -tWR
-!endif
-!if "$(RUNTIME_LIBS)" == "static"
-__RUNTIME_LIBS_7 =
-!endif
-!if "$(RUNTIME_LIBS)" == "dynamic"
-__RUNTIME_LIBS_8 = i
-!endif
-!if "$(RUNTIME_LIBS)" == "static"
-__RUNTIME_LIBS_8 =
-!endif
-!if "$(WXUNIV)" == "1"
-__WXUNIV_DEFINE_p = -D__WXUNIVERSAL__
-!endif
-!if "$(WXUNIV)" == "1"
-__WXUNIV_DEFINE_p_1 = -d__WXUNIVERSAL__
-!endif
-!if "$(DEBUG_FLAG)" == "0"
-__DEBUG_DEFINE_p = -DwxDEBUG_LEVEL=0
-!endif
-!if "$(DEBUG_FLAG)" == "0"
-__DEBUG_DEFINE_p_1 = -dwxDEBUG_LEVEL=0
-!endif
-!if "$(BUILD)" == "release"
-__NDEBUG_DEFINE_p = -DNDEBUG
-!endif
-!if "$(BUILD)" == "release"
-__NDEBUG_DEFINE_p_1 = -dNDEBUG
-!endif
-!if "$(USE_EXCEPTIONS)" == "0"
-__EXCEPTIONS_DEFINE_p = -DwxNO_EXCEPTIONS
-!endif
-!if "$(USE_EXCEPTIONS)" == "0"
-__EXCEPTIONS_DEFINE_p_1 = -dwxNO_EXCEPTIONS
-!endif
-!if "$(USE_RTTI)" == "0"
-__RTTI_DEFINE_p = -DwxNO_RTTI
-!endif
-!if "$(USE_RTTI)" == "0"
-__RTTI_DEFINE_p_1 = -dwxNO_RTTI
-!endif
-!if "$(USE_THREADS)" == "0"
-__THREAD_DEFINE_p = -DwxNO_THREADS
-!endif
-!if "$(USE_THREADS)" == "0"
-__THREAD_DEFINE_p_1 = -dwxNO_THREADS
-!endif
-!if "$(UNICODE)" == "0"
-__UNICODE_DEFINE_p = -DwxUSE_UNICODE=0
-!endif
-!if "$(UNICODE)" == "1"
-__UNICODE_DEFINE_p = -D_UNICODE
-!endif
-!if "$(UNICODE)" == "0"
-__UNICODE_DEFINE_p_1 = -dwxUSE_UNICODE=0
-!endif
-!if "$(UNICODE)" == "1"
-__UNICODE_DEFINE_p_1 = -d_UNICODE
-!endif
-!if "$(USE_CAIRO)" == "1"
-____CAIRO_INCLUDEDIR_FILENAMES_p = -I$(CAIRO_ROOT)\include\cairo
-!endif
-!if "$(USE_CAIRO)" == "1"
-____CAIRO_INCLUDEDIR_FILENAMES_1_p = -i$(CAIRO_ROOT)\include\cairo
-!endif
-!if "$(SHARED)" == "1"
-__DLLFLAG_p = -DWXUSINGDLL
-!endif
-!if "$(SHARED)" == "1"
-__DLLFLAG_p_1 = -dWXUSINGDLL
-!endif
-!if "$(MONOLITHIC)" == "0"
-__WXLIB_HTML_p = \
- wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_html.lib
-!endif
-!if "$(MONOLITHIC)" == "0"
-__WXLIB_CORE_p = \
- wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib
-!endif
-!if "$(MONOLITHIC)" == "0"
-__WXLIB_BASE_p = \
- wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib
-!endif
-!if "$(MONOLITHIC)" == "1"
-__WXLIB_MONO_p = \
- wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib
-!endif
-!if "$(MONOLITHIC)" == "1" && "$(USE_STC)" == "1"
-__LIB_SCINTILLA_IF_MONO_p = wxscintilla$(WXDEBUGFLAG).lib
-!endif
-!if "$(USE_GUI)" == "1"
-__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib
-!endif
-!if "$(USE_GUI)" == "1"
-__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib
-!endif
-!if "$(USE_GUI)" == "1"
-__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib
-!endif
-!if "$(USE_CAIRO)" == "1"
-__CAIRO_LIB_p = cairo.lib
-!endif
-!if "$(USE_CAIRO)" == "1"
-____CAIRO_LIBDIR_FILENAMES_p = -L$(CAIRO_ROOT)\lib
-!endif
-!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default"
-__DEBUGINFO = -v
-!endif
-!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default"
-__DEBUGINFO = -v-
-!endif
-!if "$(DEBUG_INFO)" == "0"
-__DEBUGINFO = -v-
-!endif
-!if "$(DEBUG_INFO)" == "1"
-__DEBUGINFO = -v
-!endif
-
-
-all: $(OBJS)
-$(OBJS):
- -if not exist $(OBJS) mkdir $(OBJS)
-
-### Targets: ###
-
-all: $(OBJS)\hhp2cached.exe
-
-clean:
- -if exist $(OBJS)\*.obj del $(OBJS)\*.obj
- -if exist $(OBJS)\*.res del $(OBJS)\*.res
- -if exist $(OBJS)\*.csm del $(OBJS)\*.csm
- -if exist $(OBJS)\hhp2cached.exe del $(OBJS)\hhp2cached.exe
- -if exist $(OBJS)\hhp2cached.tds del $(OBJS)\hhp2cached.tds
- -if exist $(OBJS)\hhp2cached.ilc del $(OBJS)\hhp2cached.ilc
- -if exist $(OBJS)\hhp2cached.ild del $(OBJS)\hhp2cached.ild
- -if exist $(OBJS)\hhp2cached.ilf del $(OBJS)\hhp2cached.ilf
- -if exist $(OBJS)\hhp2cached.ils del $(OBJS)\hhp2cached.ils
-
-$(OBJS)\hhp2cached.exe: $(HHP2CACHED_OBJECTS) $(OBJS)\hhp2cached_hhp2cached.res
- ilink32 -Tpe -q -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUGINFO) -L$(LIBDIRNAME) -aa $(____CAIRO_LIBDIR_FILENAMES_p) $(LDFLAGS) @&&|
- c0w32.obj $(HHP2CACHED_OBJECTS),$@,, $(__WXLIB_HTML_p) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_SCINTILLA_IF_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__CAIRO_LIB_p) ole2w32.lib oleacc.lib import32.lib cw32$(__THREADSFLAG_5)$(__RUNTIME_LIBS_8).lib,, $(OBJS)\hhp2cached_hhp2cached.res
-|
-
-$(OBJS)\hhp2cached_hhp2cached.obj: .\hhp2cached.cpp
- $(CXX) -q -c -P -o$@ $(HHP2CACHED_CXXFLAGS) .\hhp2cached.cpp
-
-$(OBJS)\hhp2cached_hhp2cached.res: .\hhp2cached.rc
- brcc32 -32 -r -fo$@ -i$(BCCDIR)\include -d__WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__NDEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) -i$(SETUPHDIR) -i.\..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES_1_p) -i. $(__DLLFLAG_p_1) -i.\..\..\samples -i$(BCCDIR)\include\windows\sdk -dNOPCH .\hhp2cached.rc
-
+# =========================================================================
+# This makefile was generated by
+# Bakefile 0.2.9 (http://www.bakefile.org)
+# 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: ###
+
+WX_RELEASE_NODOT = 31
+COMPILER_PREFIX = bcc
+OBJS = \
+ $(COMPILER_PREFIX)$(COMPILER_VERSION)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)
+LIBDIRNAME = \
+ .\..\..\lib\$(COMPILER_PREFIX)$(COMPILER_VERSION)_$(LIBTYPE_SUFFIX)$(CFG)
+SETUPHDIR = \
+ $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)
+HHP2CACHED_CXXFLAGS = $(__RUNTIME_LIBS_7) -I$(BCCDIR)\include $(__DEBUGINFO) \
+ $(__OPTIMIZEFLAG_2) $(__THREADSFLAG_6) -D__WXMSW__ $(__WXUNIV_DEFINE_p) \
+ $(__DEBUG_DEFINE_p) $(__NDEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) \
+ $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) \
+ -I$(SETUPHDIR) -I.\..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES_p) -I. \
+ $(__DLLFLAG_p) -I.\..\..\samples -DNOPCH $(CPPFLAGS) $(CXXFLAGS)
+HHP2CACHED_OBJECTS = \
+ $(OBJS)\hhp2cached_hhp2cached.obj
+
+### Conditionally set variables: ###
+
+!if "$(USE_GUI)" == "0"
+PORTNAME = base
+!endif
+!if "$(USE_GUI)" == "1"
+PORTNAME = msw$(TOOLKIT_VERSION)
+!endif
+!if "$(OFFICIAL_BUILD)" == "1"
+COMPILER_VERSION = ERROR-COMPILER-VERSION-MUST-BE-SET-FOR-OFFICIAL-BUILD
+!endif
+!if "$(BUILD)" == "debug"
+WXDEBUGFLAG = d
+!endif
+!if "$(UNICODE)" == "1"
+WXUNICODEFLAG = u
+!endif
+!if "$(WXUNIV)" == "1"
+WXUNIVNAME = univ
+!endif
+!if "$(SHARED)" == "1"
+WXDLLFLAG = dll
+!endif
+!if "$(SHARED)" == "0"
+LIBTYPE_SUFFIX = lib
+!endif
+!if "$(SHARED)" == "1"
+LIBTYPE_SUFFIX = dll
+!endif
+!if "$(MONOLITHIC)" == "0"
+EXTRALIBS_FOR_BASE =
+!endif
+!if "$(MONOLITHIC)" == "1"
+EXTRALIBS_FOR_BASE =
+!endif
+!if "$(BUILD)" == "debug"
+__OPTIMIZEFLAG_2 = -Od
+!endif
+!if "$(BUILD)" == "release"
+__OPTIMIZEFLAG_2 = -O2
+!endif
+!if "$(USE_THREADS)" == "0"
+__THREADSFLAG_5 =
+!endif
+!if "$(USE_THREADS)" == "1"
+__THREADSFLAG_5 = mt
+!endif
+!if "$(USE_THREADS)" == "0"
+__THREADSFLAG_6 =
+!endif
+!if "$(USE_THREADS)" == "1"
+__THREADSFLAG_6 = -tWM
+!endif
+!if "$(RUNTIME_LIBS)" == "dynamic"
+__RUNTIME_LIBS_7 = -tWR
+!endif
+!if "$(RUNTIME_LIBS)" == "static"
+__RUNTIME_LIBS_7 =
+!endif
+!if "$(RUNTIME_LIBS)" == "dynamic"
+__RUNTIME_LIBS_8 = i
+!endif
+!if "$(RUNTIME_LIBS)" == "static"
+__RUNTIME_LIBS_8 =
+!endif
+!if "$(WXUNIV)" == "1"
+__WXUNIV_DEFINE_p = -D__WXUNIVERSAL__
+!endif
+!if "$(WXUNIV)" == "1"
+__WXUNIV_DEFINE_p_1 = -d__WXUNIVERSAL__
+!endif
+!if "$(DEBUG_FLAG)" == "0"
+__DEBUG_DEFINE_p = -DwxDEBUG_LEVEL=0
+!endif
+!if "$(DEBUG_FLAG)" == "0"
+__DEBUG_DEFINE_p_1 = -dwxDEBUG_LEVEL=0
+!endif
+!if "$(BUILD)" == "release"
+__NDEBUG_DEFINE_p = -DNDEBUG
+!endif
+!if "$(BUILD)" == "release"
+__NDEBUG_DEFINE_p_1 = -dNDEBUG
+!endif
+!if "$(USE_EXCEPTIONS)" == "0"
+__EXCEPTIONS_DEFINE_p = -DwxNO_EXCEPTIONS
+!endif
+!if "$(USE_EXCEPTIONS)" == "0"
+__EXCEPTIONS_DEFINE_p_1 = -dwxNO_EXCEPTIONS
+!endif
+!if "$(USE_RTTI)" == "0"
+__RTTI_DEFINE_p = -DwxNO_RTTI
+!endif
+!if "$(USE_RTTI)" == "0"
+__RTTI_DEFINE_p_1 = -dwxNO_RTTI
+!endif
+!if "$(USE_THREADS)" == "0"
+__THREAD_DEFINE_p = -DwxNO_THREADS
+!endif
+!if "$(USE_THREADS)" == "0"
+__THREAD_DEFINE_p_1 = -dwxNO_THREADS
+!endif
+!if "$(UNICODE)" == "0"
+__UNICODE_DEFINE_p = -DwxUSE_UNICODE=0
+!endif
+!if "$(UNICODE)" == "1"
+__UNICODE_DEFINE_p = -D_UNICODE
+!endif
+!if "$(UNICODE)" == "0"
+__UNICODE_DEFINE_p_1 = -dwxUSE_UNICODE=0
+!endif
+!if "$(UNICODE)" == "1"
+__UNICODE_DEFINE_p_1 = -d_UNICODE
+!endif
+!if "$(USE_CAIRO)" == "1"
+____CAIRO_INCLUDEDIR_FILENAMES_p = -I$(CAIRO_ROOT)\include\cairo
+!endif
+!if "$(USE_CAIRO)" == "1"
+____CAIRO_INCLUDEDIR_FILENAMES_1_p = -i$(CAIRO_ROOT)\include\cairo
+!endif
+!if "$(SHARED)" == "1"
+__DLLFLAG_p = -DWXUSINGDLL
+!endif
+!if "$(SHARED)" == "1"
+__DLLFLAG_p_1 = -dWXUSINGDLL
+!endif
+!if "$(MONOLITHIC)" == "0"
+__WXLIB_HTML_p = \
+ wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_html.lib
+!endif
+!if "$(MONOLITHIC)" == "0"
+__WXLIB_CORE_p = \
+ wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib
+!endif
+!if "$(MONOLITHIC)" == "0"
+__WXLIB_BASE_p = \
+ wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib
+!endif
+!if "$(MONOLITHIC)" == "1"
+__WXLIB_MONO_p = \
+ wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib
+!endif
+!if "$(MONOLITHIC)" == "1" && "$(USE_STC)" == "1"
+__LIB_SCINTILLA_IF_MONO_p = wxscintilla$(WXDEBUGFLAG).lib
+!endif
+!if "$(USE_GUI)" == "1"
+__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib
+!endif
+!if "$(USE_GUI)" == "1"
+__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib
+!endif
+!if "$(USE_GUI)" == "1"
+__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib
+!endif
+!if "$(USE_CAIRO)" == "1"
+__CAIRO_LIB_p = cairo.lib
+!endif
+!if "$(USE_CAIRO)" == "1"
+____CAIRO_LIBDIR_FILENAMES_p = -L$(CAIRO_ROOT)\lib
+!endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default"
+__DEBUGINFO = -v
+!endif
+!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default"
+__DEBUGINFO = -v-
+!endif
+!if "$(DEBUG_INFO)" == "0"
+__DEBUGINFO = -v-
+!endif
+!if "$(DEBUG_INFO)" == "1"
+__DEBUGINFO = -v
+!endif
+
+
+all: $(OBJS)
+$(OBJS):
+ -if not exist $(OBJS) mkdir $(OBJS)
+
+### Targets: ###
+
+all: $(OBJS)\hhp2cached.exe
+
+clean:
+ -if exist $(OBJS)\*.obj del $(OBJS)\*.obj
+ -if exist $(OBJS)\*.res del $(OBJS)\*.res
+ -if exist $(OBJS)\*.csm del $(OBJS)\*.csm
+ -if exist $(OBJS)\hhp2cached.exe del $(OBJS)\hhp2cached.exe
+ -if exist $(OBJS)\hhp2cached.tds del $(OBJS)\hhp2cached.tds
+ -if exist $(OBJS)\hhp2cached.ilc del $(OBJS)\hhp2cached.ilc
+ -if exist $(OBJS)\hhp2cached.ild del $(OBJS)\hhp2cached.ild
+ -if exist $(OBJS)\hhp2cached.ilf del $(OBJS)\hhp2cached.ilf
+ -if exist $(OBJS)\hhp2cached.ils del $(OBJS)\hhp2cached.ils
+
+$(OBJS)\hhp2cached.exe: $(HHP2CACHED_OBJECTS) $(OBJS)\hhp2cached_hhp2cached.res
+ ilink32 -Tpe -q -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUGINFO) -L$(LIBDIRNAME) -aa $(____CAIRO_LIBDIR_FILENAMES_p) $(LDFLAGS) @&&|
+ c0w32.obj $(HHP2CACHED_OBJECTS),$@,, $(__WXLIB_HTML_p) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_SCINTILLA_IF_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__CAIRO_LIB_p) ole2w32.lib oleacc.lib import32.lib cw32$(__THREADSFLAG_5)$(__RUNTIME_LIBS_8).lib,, $(OBJS)\hhp2cached_hhp2cached.res
+|
+
+$(OBJS)\hhp2cached_hhp2cached.obj: .\hhp2cached.cpp
+ $(CXX) -q -c -P -o$@ $(HHP2CACHED_CXXFLAGS) .\hhp2cached.cpp
+
+$(OBJS)\hhp2cached_hhp2cached.res: .\hhp2cached.rc
+ brcc32 -32 -r -fo$@ -i$(BCCDIR)\include -d__WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__NDEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) -i$(SETUPHDIR) -i.\..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES_1_p) -i. $(__DLLFLAG_p_1) -i.\..\..\samples -i$(BCCDIR)\include\windows\sdk -dNOPCH .\hhp2cached.rc
+
diff --git a/utils/hhp2cached/makefile.gcc b/utils/hhp2cached/makefile.gcc
index 8d2adc8464..12e3e4e193 100644
--- a/utils/hhp2cached/makefile.gcc
+++ b/utils/hhp2cached/makefile.gcc
@@ -1,239 +1,239 @@
-# =========================================================================
-# This makefile was generated by
-# Bakefile 0.2.9 (http://www.bakefile.org)
-# Do not modify, all changes will be overwritten!
-# =========================================================================
-
-include ../../build/msw/config.gcc
-
-# -------------------------------------------------------------------------
-# Do not modify the rest of this file!
-# -------------------------------------------------------------------------
-
-### Variables: ###
-
-CPPDEPS = -MT$@ -MF$@.d -MD -MP
-WX_RELEASE_NODOT = 31
-COMPILER_PREFIX = gcc
-OBJS = \
- $(COMPILER_PREFIX)$(COMPILER_VERSION)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)
-LIBDIRNAME = \
- .\..\..\lib\$(COMPILER_PREFIX)$(COMPILER_VERSION)_$(LIBTYPE_SUFFIX)$(CFG)
-SETUPHDIR = \
- $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)
-HHP2CACHED_CXXFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG_2) $(__THREADSFLAG) \
- $(GCCFLAGS) -DHAVE_W32API_H -D__WXMSW__ $(__WXUNIV_DEFINE_p) \
- $(__DEBUG_DEFINE_p) $(__NDEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) \
- $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) \
- -I$(SETUPHDIR) -I.\..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES_p) -W \
- -Wall -I. $(__DLLFLAG_p) -I.\..\..\samples -DNOPCH $(__RTTIFLAG_5) \
- $(__EXCEPTIONSFLAG_6) -Wno-ctor-dtor-privacy $(CPPFLAGS) $(CXXFLAGS)
-HHP2CACHED_OBJECTS = \
- $(OBJS)\hhp2cached_hhp2cached.o \
- $(OBJS)\hhp2cached_hhp2cached_rc.o
-
-### Conditionally set variables: ###
-
-ifeq ($(GCC_VERSION),2.95)
-GCCFLAGS = -fvtable-thunks
-endif
-ifeq ($(USE_GUI),0)
-PORTNAME = base
-endif
-ifeq ($(USE_GUI),1)
-PORTNAME = msw$(TOOLKIT_VERSION)
-endif
-ifeq ($(OFFICIAL_BUILD),1)
-COMPILER_VERSION = ERROR-COMPILER-VERSION-MUST-BE-SET-FOR-OFFICIAL-BUILD
-endif
-ifeq ($(BUILD),debug)
-WXDEBUGFLAG = d
-endif
-ifeq ($(UNICODE),1)
-WXUNICODEFLAG = u
-endif
-ifeq ($(WXUNIV),1)
-WXUNIVNAME = univ
-endif
-ifeq ($(SHARED),1)
-WXDLLFLAG = dll
-endif
-ifeq ($(SHARED),0)
-LIBTYPE_SUFFIX = lib
-endif
-ifeq ($(SHARED),1)
-LIBTYPE_SUFFIX = dll
-endif
-ifeq ($(MONOLITHIC),0)
-EXTRALIBS_FOR_BASE =
-endif
-ifeq ($(MONOLITHIC),1)
-EXTRALIBS_FOR_BASE =
-endif
-ifeq ($(BUILD),debug)
-__OPTIMIZEFLAG_2 = -O0
-endif
-ifeq ($(BUILD),release)
-__OPTIMIZEFLAG_2 = -O2
-endif
-ifeq ($(USE_RTTI),0)
-__RTTIFLAG_5 = -fno-rtti
-endif
-ifeq ($(USE_RTTI),1)
-__RTTIFLAG_5 =
-endif
-ifeq ($(USE_EXCEPTIONS),0)
-__EXCEPTIONSFLAG_6 = -fno-exceptions
-endif
-ifeq ($(USE_EXCEPTIONS),1)
-__EXCEPTIONSFLAG_6 =
-endif
-ifeq ($(WXUNIV),1)
-__WXUNIV_DEFINE_p = -D__WXUNIVERSAL__
-endif
-ifeq ($(WXUNIV),1)
-__WXUNIV_DEFINE_p_1 = --define __WXUNIVERSAL__
-endif
-ifeq ($(DEBUG_FLAG),0)
-__DEBUG_DEFINE_p = -DwxDEBUG_LEVEL=0
-endif
-ifeq ($(DEBUG_FLAG),0)
-__DEBUG_DEFINE_p_1 = --define wxDEBUG_LEVEL=0
-endif
-ifeq ($(BUILD),release)
-__NDEBUG_DEFINE_p = -DNDEBUG
-endif
-ifeq ($(BUILD),release)
-__NDEBUG_DEFINE_p_1 = --define NDEBUG
-endif
-ifeq ($(USE_EXCEPTIONS),0)
-__EXCEPTIONS_DEFINE_p = -DwxNO_EXCEPTIONS
-endif
-ifeq ($(USE_EXCEPTIONS),0)
-__EXCEPTIONS_DEFINE_p_1 = --define wxNO_EXCEPTIONS
-endif
-ifeq ($(USE_RTTI),0)
-__RTTI_DEFINE_p = -DwxNO_RTTI
-endif
-ifeq ($(USE_RTTI),0)
-__RTTI_DEFINE_p_1 = --define wxNO_RTTI
-endif
-ifeq ($(USE_THREADS),0)
-__THREAD_DEFINE_p = -DwxNO_THREADS
-endif
-ifeq ($(USE_THREADS),0)
-__THREAD_DEFINE_p_1 = --define wxNO_THREADS
-endif
-ifeq ($(UNICODE),0)
-__UNICODE_DEFINE_p = -DwxUSE_UNICODE=0
-endif
-ifeq ($(UNICODE),1)
-__UNICODE_DEFINE_p = -D_UNICODE
-endif
-ifeq ($(UNICODE),0)
-__UNICODE_DEFINE_p_1 = --define wxUSE_UNICODE=0
-endif
-ifeq ($(UNICODE),1)
-__UNICODE_DEFINE_p_1 = --define _UNICODE
-endif
-ifeq ($(USE_CAIRO),1)
-____CAIRO_INCLUDEDIR_FILENAMES_p = -I$(CAIRO_ROOT)\include\cairo
-endif
-ifeq ($(USE_CAIRO),1)
-__CAIRO_INCLUDEDIR_p = --include-dir $(CAIRO_ROOT)/include/cairo
-endif
-ifeq ($(SHARED),1)
-__DLLFLAG_p = -DWXUSINGDLL
-endif
-ifeq ($(SHARED),1)
-__DLLFLAG_p_1 = --define WXUSINGDLL
-endif
-ifeq ($(MONOLITHIC),0)
-__WXLIB_HTML_p = \
- -lwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_html
-endif
-ifeq ($(MONOLITHIC),0)
-__WXLIB_CORE_p = \
- -lwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core
-endif
-ifeq ($(MONOLITHIC),0)
-__WXLIB_BASE_p = \
- -lwxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)
-endif
-ifeq ($(MONOLITHIC),1)
-__WXLIB_MONO_p = \
- -lwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)
-endif
-ifeq ($(MONOLITHIC),1)
-ifeq ($(USE_STC),1)
-__LIB_SCINTILLA_IF_MONO_p = -lwxscintilla$(WXDEBUGFLAG)
-endif
-endif
-ifeq ($(USE_GUI),1)
-__LIB_TIFF_p = -lwxtiff$(WXDEBUGFLAG)
-endif
-ifeq ($(USE_GUI),1)
-__LIB_JPEG_p = -lwxjpeg$(WXDEBUGFLAG)
-endif
-ifeq ($(USE_GUI),1)
-__LIB_PNG_p = -lwxpng$(WXDEBUGFLAG)
-endif
-ifeq ($(USE_CAIRO),1)
-__CAIRO_LIB_p = -lcairo
-endif
-ifeq ($(USE_CAIRO),1)
-____CAIRO_LIBDIR_FILENAMES_p = -L$(CAIRO_ROOT)\lib
-endif
-ifeq ($(BUILD),debug)
-ifeq ($(DEBUG_INFO),default)
-__DEBUGINFO = -g
-endif
-endif
-ifeq ($(BUILD),release)
-ifeq ($(DEBUG_INFO),default)
-__DEBUGINFO =
-endif
-endif
-ifeq ($(DEBUG_INFO),0)
-__DEBUGINFO =
-endif
-ifeq ($(DEBUG_INFO),1)
-__DEBUGINFO = -g
-endif
-ifeq ($(USE_THREADS),0)
-__THREADSFLAG =
-endif
-ifeq ($(USE_THREADS),1)
-__THREADSFLAG = -mthreads
-endif
-
-
-all: $(OBJS)
-$(OBJS):
- -if not exist $(OBJS) mkdir $(OBJS)
-
-### Targets: ###
-
-all: $(OBJS)\hhp2cached.exe
-
-clean:
- -if exist $(OBJS)\*.o del $(OBJS)\*.o
- -if exist $(OBJS)\*.d del $(OBJS)\*.d
- -if exist $(OBJS)\hhp2cached.exe del $(OBJS)\hhp2cached.exe
-
-$(OBJS)\hhp2cached.exe: $(HHP2CACHED_OBJECTS) $(OBJS)\hhp2cached_hhp2cached_rc.o
- $(CXX) -o $@ $(HHP2CACHED_OBJECTS) $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) -Wl,--subsystem,windows -mwindows $(____CAIRO_LIBDIR_FILENAMES_p) $(LDFLAGS) $(__WXLIB_HTML_p) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_SCINTILLA_IF_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(EXTRALIBS_FOR_BASE) $(__CAIRO_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32 -lwininet
-
-$(OBJS)\hhp2cached_hhp2cached.o: ./hhp2cached.cpp
- $(CXX) -c -o $@ $(HHP2CACHED_CXXFLAGS) $(CPPDEPS) $<
-
-$(OBJS)\hhp2cached_hhp2cached_rc.o: ./hhp2cached.rc
- $(WINDRES) -i$< -o$@ --define __WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__NDEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) --include-dir $(SETUPHDIR) --include-dir ./../../include $(__CAIRO_INCLUDEDIR_p) --include-dir . $(__DLLFLAG_p_1) --include-dir ./../../samples --define NOPCH
-
-.PHONY: all clean
-
-
-SHELL := $(COMSPEC)
-
-# Dependencies tracking:
--include $(OBJS)/*.d
+# =========================================================================
+# This makefile was generated by
+# Bakefile 0.2.9 (http://www.bakefile.org)
+# Do not modify, all changes will be overwritten!
+# =========================================================================
+
+include ../../build/msw/config.gcc
+
+# -------------------------------------------------------------------------
+# Do not modify the rest of this file!
+# -------------------------------------------------------------------------
+
+### Variables: ###
+
+CPPDEPS = -MT$@ -MF$@.d -MD -MP
+WX_RELEASE_NODOT = 31
+COMPILER_PREFIX = gcc
+OBJS = \
+ $(COMPILER_PREFIX)$(COMPILER_VERSION)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)
+LIBDIRNAME = \
+ .\..\..\lib\$(COMPILER_PREFIX)$(COMPILER_VERSION)_$(LIBTYPE_SUFFIX)$(CFG)
+SETUPHDIR = \
+ $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)
+HHP2CACHED_CXXFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG_2) $(__THREADSFLAG) \
+ $(GCCFLAGS) -DHAVE_W32API_H -D__WXMSW__ $(__WXUNIV_DEFINE_p) \
+ $(__DEBUG_DEFINE_p) $(__NDEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) \
+ $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) \
+ -I$(SETUPHDIR) -I.\..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES_p) -W \
+ -Wall -I. $(__DLLFLAG_p) -I.\..\..\samples -DNOPCH $(__RTTIFLAG_5) \
+ $(__EXCEPTIONSFLAG_6) -Wno-ctor-dtor-privacy $(CPPFLAGS) $(CXXFLAGS)
+HHP2CACHED_OBJECTS = \
+ $(OBJS)\hhp2cached_hhp2cached.o \
+ $(OBJS)\hhp2cached_hhp2cached_rc.o
+
+### Conditionally set variables: ###
+
+ifeq ($(GCC_VERSION),2.95)
+GCCFLAGS = -fvtable-thunks
+endif
+ifeq ($(USE_GUI),0)
+PORTNAME = base
+endif
+ifeq ($(USE_GUI),1)
+PORTNAME = msw$(TOOLKIT_VERSION)
+endif
+ifeq ($(OFFICIAL_BUILD),1)
+COMPILER_VERSION = ERROR-COMPILER-VERSION-MUST-BE-SET-FOR-OFFICIAL-BUILD
+endif
+ifeq ($(BUILD),debug)
+WXDEBUGFLAG = d
+endif
+ifeq ($(UNICODE),1)
+WXUNICODEFLAG = u
+endif
+ifeq ($(WXUNIV),1)
+WXUNIVNAME = univ
+endif
+ifeq ($(SHARED),1)
+WXDLLFLAG = dll
+endif
+ifeq ($(SHARED),0)
+LIBTYPE_SUFFIX = lib
+endif
+ifeq ($(SHARED),1)
+LIBTYPE_SUFFIX = dll
+endif
+ifeq ($(MONOLITHIC),0)
+EXTRALIBS_FOR_BASE =
+endif
+ifeq ($(MONOLITHIC),1)
+EXTRALIBS_FOR_BASE =
+endif
+ifeq ($(BUILD),debug)
+__OPTIMIZEFLAG_2 = -O0
+endif
+ifeq ($(BUILD),release)
+__OPTIMIZEFLAG_2 = -O2
+endif
+ifeq ($(USE_RTTI),0)
+__RTTIFLAG_5 = -fno-rtti
+endif
+ifeq ($(USE_RTTI),1)
+__RTTIFLAG_5 =
+endif
+ifeq ($(USE_EXCEPTIONS),0)
+__EXCEPTIONSFLAG_6 = -fno-exceptions
+endif
+ifeq ($(USE_EXCEPTIONS),1)
+__EXCEPTIONSFLAG_6 =
+endif
+ifeq ($(WXUNIV),1)
+__WXUNIV_DEFINE_p = -D__WXUNIVERSAL__
+endif
+ifeq ($(WXUNIV),1)
+__WXUNIV_DEFINE_p_1 = --define __WXUNIVERSAL__
+endif
+ifeq ($(DEBUG_FLAG),0)
+__DEBUG_DEFINE_p = -DwxDEBUG_LEVEL=0
+endif
+ifeq ($(DEBUG_FLAG),0)
+__DEBUG_DEFINE_p_1 = --define wxDEBUG_LEVEL=0
+endif
+ifeq ($(BUILD),release)
+__NDEBUG_DEFINE_p = -DNDEBUG
+endif
+ifeq ($(BUILD),release)
+__NDEBUG_DEFINE_p_1 = --define NDEBUG
+endif
+ifeq ($(USE_EXCEPTIONS),0)
+__EXCEPTIONS_DEFINE_p = -DwxNO_EXCEPTIONS
+endif
+ifeq ($(USE_EXCEPTIONS),0)
+__EXCEPTIONS_DEFINE_p_1 = --define wxNO_EXCEPTIONS
+endif
+ifeq ($(USE_RTTI),0)
+__RTTI_DEFINE_p = -DwxNO_RTTI
+endif
+ifeq ($(USE_RTTI),0)
+__RTTI_DEFINE_p_1 = --define wxNO_RTTI
+endif
+ifeq ($(USE_THREADS),0)
+__THREAD_DEFINE_p = -DwxNO_THREADS
+endif
+ifeq ($(USE_THREADS),0)
+__THREAD_DEFINE_p_1 = --define wxNO_THREADS
+endif
+ifeq ($(UNICODE),0)
+__UNICODE_DEFINE_p = -DwxUSE_UNICODE=0
+endif
+ifeq ($(UNICODE),1)
+__UNICODE_DEFINE_p = -D_UNICODE
+endif
+ifeq ($(UNICODE),0)
+__UNICODE_DEFINE_p_1 = --define wxUSE_UNICODE=0
+endif
+ifeq ($(UNICODE),1)
+__UNICODE_DEFINE_p_1 = --define _UNICODE
+endif
+ifeq ($(USE_CAIRO),1)
+____CAIRO_INCLUDEDIR_FILENAMES_p = -I$(CAIRO_ROOT)\include\cairo
+endif
+ifeq ($(USE_CAIRO),1)
+__CAIRO_INCLUDEDIR_p = --include-dir $(CAIRO_ROOT)/include/cairo
+endif
+ifeq ($(SHARED),1)
+__DLLFLAG_p = -DWXUSINGDLL
+endif
+ifeq ($(SHARED),1)
+__DLLFLAG_p_1 = --define WXUSINGDLL
+endif
+ifeq ($(MONOLITHIC),0)
+__WXLIB_HTML_p = \
+ -lwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_html
+endif
+ifeq ($(MONOLITHIC),0)
+__WXLIB_CORE_p = \
+ -lwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core
+endif
+ifeq ($(MONOLITHIC),0)
+__WXLIB_BASE_p = \
+ -lwxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)
+endif
+ifeq ($(MONOLITHIC),1)
+__WXLIB_MONO_p = \
+ -lwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)
+endif
+ifeq ($(MONOLITHIC),1)
+ifeq ($(USE_STC),1)
+__LIB_SCINTILLA_IF_MONO_p = -lwxscintilla$(WXDEBUGFLAG)
+endif
+endif
+ifeq ($(USE_GUI),1)
+__LIB_TIFF_p = -lwxtiff$(WXDEBUGFLAG)
+endif
+ifeq ($(USE_GUI),1)
+__LIB_JPEG_p = -lwxjpeg$(WXDEBUGFLAG)
+endif
+ifeq ($(USE_GUI),1)
+__LIB_PNG_p = -lwxpng$(WXDEBUGFLAG)
+endif
+ifeq ($(USE_CAIRO),1)
+__CAIRO_LIB_p = -lcairo
+endif
+ifeq ($(USE_CAIRO),1)
+____CAIRO_LIBDIR_FILENAMES_p = -L$(CAIRO_ROOT)\lib
+endif
+ifeq ($(BUILD),debug)
+ifeq ($(DEBUG_INFO),default)
+__DEBUGINFO = -g
+endif
+endif
+ifeq ($(BUILD),release)
+ifeq ($(DEBUG_INFO),default)
+__DEBUGINFO =
+endif
+endif
+ifeq ($(DEBUG_INFO),0)
+__DEBUGINFO =
+endif
+ifeq ($(DEBUG_INFO),1)
+__DEBUGINFO = -g
+endif
+ifeq ($(USE_THREADS),0)
+__THREADSFLAG =
+endif
+ifeq ($(USE_THREADS),1)
+__THREADSFLAG = -mthreads
+endif
+
+
+all: $(OBJS)
+$(OBJS):
+ -if not exist $(OBJS) mkdir $(OBJS)
+
+### Targets: ###
+
+all: $(OBJS)\hhp2cached.exe
+
+clean:
+ -if exist $(OBJS)\*.o del $(OBJS)\*.o
+ -if exist $(OBJS)\*.d del $(OBJS)\*.d
+ -if exist $(OBJS)\hhp2cached.exe del $(OBJS)\hhp2cached.exe
+
+$(OBJS)\hhp2cached.exe: $(HHP2CACHED_OBJECTS) $(OBJS)\hhp2cached_hhp2cached_rc.o
+ $(CXX) -o $@ $(HHP2CACHED_OBJECTS) $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) -Wl,--subsystem,windows -mwindows $(____CAIRO_LIBDIR_FILENAMES_p) $(LDFLAGS) $(__WXLIB_HTML_p) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_SCINTILLA_IF_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(EXTRALIBS_FOR_BASE) $(__CAIRO_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32 -lwininet
+
+$(OBJS)\hhp2cached_hhp2cached.o: ./hhp2cached.cpp
+ $(CXX) -c -o $@ $(HHP2CACHED_CXXFLAGS) $(CPPDEPS) $<
+
+$(OBJS)\hhp2cached_hhp2cached_rc.o: ./hhp2cached.rc
+ $(WINDRES) -i$< -o$@ --define __WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__NDEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) --include-dir $(SETUPHDIR) --include-dir ./../../include $(__CAIRO_INCLUDEDIR_p) --include-dir . $(__DLLFLAG_p_1) --include-dir ./../../samples --define NOPCH
+
+.PHONY: all clean
+
+
+SHELL := $(COMSPEC)
+
+# Dependencies tracking:
+-include $(OBJS)/*.d
diff --git a/utils/hhp2cached/makefile.vc b/utils/hhp2cached/makefile.vc
index 07da260750..d7c98c17f4 100644
--- a/utils/hhp2cached/makefile.vc
+++ b/utils/hhp2cached/makefile.vc
@@ -1,366 +1,366 @@
-# =========================================================================
-# This makefile was generated by
-# Bakefile 0.2.9 (http://www.bakefile.org)
-# Do not modify, all changes will be overwritten!
-# =========================================================================
-
-!include <../../build/msw/config.vc>
-
-# -------------------------------------------------------------------------
-# Do not modify the rest of this file!
-# -------------------------------------------------------------------------
-
-### Variables: ###
-
-WX_RELEASE_NODOT = 31
-COMPILER_PREFIX = vc
-OBJS = \
- $(COMPILER_PREFIX)$(COMPILER_VERSION)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)$(ARCH_SUFFIX)
-LIBDIRNAME = \
- .\..\..\lib\$(COMPILER_PREFIX)$(COMPILER_VERSION)$(ARCH_SUFFIX)_$(LIBTYPE_SUFFIX)$(CFG)
-SETUPHDIR = \
- $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)
-HHP2CACHED_CXXFLAGS = /M$(__RUNTIME_LIBS_10)$(__DEBUGRUNTIME_4) /DWIN32 \
- $(__DEBUGINFO_0) /Fd$(OBJS)\hhp2cached.pdb $(____DEBUGRUNTIME_3_p) \
- $(__OPTIMIZEFLAG_6) /D_CRT_SECURE_NO_DEPRECATE=1 \
- /D_CRT_NON_CONFORMING_SWPRINTFS=1 /D_SCL_SECURE_NO_WARNINGS=1 \
- $(__NO_VC_CRTDBG_p) /D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \
- $(__NDEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \
- $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) /I$(SETUPHDIR) /I.\..\..\include \
- $(____CAIRO_INCLUDEDIR_FILENAMES_p) /W4 /I. $(__DLLFLAG_p) /D_WINDOWS \
- /I.\..\..\samples /DNOPCH $(__RTTIFLAG_11) $(__EXCEPTIONSFLAG_12) \
- $(CPPFLAGS) $(CXXFLAGS)
-HHP2CACHED_OBJECTS = \
- $(OBJS)\hhp2cached_hhp2cached.obj
-HHP2CACHED_RESOURCES = \
- $(OBJS)\hhp2cached_hhp2cached.res
-
-### Conditionally set variables: ###
-
-!if "$(TARGET_CPU)" == "AMD64"
-ARCH_SUFFIX = _x64
-!endif
-!if "$(TARGET_CPU)" == "IA64"
-ARCH_SUFFIX = _ia64
-!endif
-!if "$(TARGET_CPU)" == "X64"
-ARCH_SUFFIX = _x64
-!endif
-!if "$(TARGET_CPU)" == "amd64"
-ARCH_SUFFIX = _x64
-!endif
-!if "$(TARGET_CPU)" == "ia64"
-ARCH_SUFFIX = _ia64
-!endif
-!if "$(TARGET_CPU)" == "x64"
-ARCH_SUFFIX = _x64
-!endif
-!if "$(USE_GUI)" == "0"
-PORTNAME = base
-!endif
-!if "$(USE_GUI)" == "1"
-PORTNAME = msw$(TOOLKIT_VERSION)
-!endif
-!if "$(OFFICIAL_BUILD)" == "1"
-COMPILER_VERSION = ERROR-COMPILER-VERSION-MUST-BE-SET-FOR-OFFICIAL-BUILD
-!endif
-!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default"
-WXDEBUGFLAG = d
-!endif
-!if "$(DEBUG_RUNTIME_LIBS)" == "1"
-WXDEBUGFLAG = d
-!endif
-!if "$(UNICODE)" == "1"
-WXUNICODEFLAG = u
-!endif
-!if "$(WXUNIV)" == "1"
-WXUNIVNAME = univ
-!endif
-!if "$(SHARED)" == "1"
-WXDLLFLAG = dll
-!endif
-!if "$(SHARED)" == "0"
-LIBTYPE_SUFFIX = lib
-!endif
-!if "$(SHARED)" == "1"
-LIBTYPE_SUFFIX = dll
-!endif
-!if "$(TARGET_CPU)" == "AMD64"
-LINK_TARGET_CPU = /MACHINE:X64
-!endif
-!if "$(TARGET_CPU)" == "IA64"
-LINK_TARGET_CPU = /MACHINE:IA64
-!endif
-!if "$(TARGET_CPU)" == "X64"
-LINK_TARGET_CPU = /MACHINE:X64
-!endif
-!if "$(TARGET_CPU)" == "amd64"
-LINK_TARGET_CPU = /MACHINE:X64
-!endif
-!if "$(TARGET_CPU)" == "ia64"
-LINK_TARGET_CPU = /MACHINE:IA64
-!endif
-!if "$(TARGET_CPU)" == "x64"
-LINK_TARGET_CPU = /MACHINE:X64
-!endif
-!if "$(MONOLITHIC)" == "0"
-EXTRALIBS_FOR_BASE =
-!endif
-!if "$(MONOLITHIC)" == "1"
-EXTRALIBS_FOR_BASE =
-!endif
-!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default"
-__DEBUGINFO_0 = /Zi
-!endif
-!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default"
-__DEBUGINFO_0 =
-!endif
-!if "$(DEBUG_INFO)" == "0"
-__DEBUGINFO_0 =
-!endif
-!if "$(DEBUG_INFO)" == "1"
-__DEBUGINFO_0 = /Zi
-!endif
-!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default"
-__DEBUGINFO_1 = /DEBUG
-!endif
-!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default"
-__DEBUGINFO_1 =
-!endif
-!if "$(DEBUG_INFO)" == "0"
-__DEBUGINFO_1 =
-!endif
-!if "$(DEBUG_INFO)" == "1"
-__DEBUGINFO_1 = /DEBUG
-!endif
-!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default"
-__DEBUGINFO_2 = $(__DEBUGRUNTIME_5)
-!endif
-!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default"
-__DEBUGINFO_2 =
-!endif
-!if "$(DEBUG_INFO)" == "0"
-__DEBUGINFO_2 =
-!endif
-!if "$(DEBUG_INFO)" == "1"
-__DEBUGINFO_2 = $(__DEBUGRUNTIME_5)
-!endif
-!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default"
-____DEBUGRUNTIME_3_p = /D_DEBUG
-!endif
-!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default"
-____DEBUGRUNTIME_3_p =
-!endif
-!if "$(DEBUG_RUNTIME_LIBS)" == "0"
-____DEBUGRUNTIME_3_p =
-!endif
-!if "$(DEBUG_RUNTIME_LIBS)" == "1"
-____DEBUGRUNTIME_3_p = /D_DEBUG
-!endif
-!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default"
-____DEBUGRUNTIME_3_p_1 = /d _DEBUG
-!endif
-!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default"
-____DEBUGRUNTIME_3_p_1 =
-!endif
-!if "$(DEBUG_RUNTIME_LIBS)" == "0"
-____DEBUGRUNTIME_3_p_1 =
-!endif
-!if "$(DEBUG_RUNTIME_LIBS)" == "1"
-____DEBUGRUNTIME_3_p_1 = /d _DEBUG
-!endif
-!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default"
-__DEBUGRUNTIME_4 = d
-!endif
-!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default"
-__DEBUGRUNTIME_4 =
-!endif
-!if "$(DEBUG_RUNTIME_LIBS)" == "0"
-__DEBUGRUNTIME_4 =
-!endif
-!if "$(DEBUG_RUNTIME_LIBS)" == "1"
-__DEBUGRUNTIME_4 = d
-!endif
-!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default"
-__DEBUGRUNTIME_5 =
-!endif
-!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default"
-__DEBUGRUNTIME_5 = /opt:ref /opt:icf
-!endif
-!if "$(DEBUG_RUNTIME_LIBS)" == "0"
-__DEBUGRUNTIME_5 = /opt:ref /opt:icf
-!endif
-!if "$(DEBUG_RUNTIME_LIBS)" == "1"
-__DEBUGRUNTIME_5 =
-!endif
-!if "$(BUILD)" == "debug"
-__OPTIMIZEFLAG_6 = /Od
-!endif
-!if "$(BUILD)" == "release"
-__OPTIMIZEFLAG_6 = /O2
-!endif
-!if "$(USE_THREADS)" == "0"
-__THREADSFLAG_9 = L
-!endif
-!if "$(USE_THREADS)" == "1"
-__THREADSFLAG_9 = T
-!endif
-!if "$(RUNTIME_LIBS)" == "dynamic"
-__RUNTIME_LIBS_10 = D
-!endif
-!if "$(RUNTIME_LIBS)" == "static"
-__RUNTIME_LIBS_10 = $(__THREADSFLAG_9)
-!endif
-!if "$(USE_RTTI)" == "0"
-__RTTIFLAG_11 =
-!endif
-!if "$(USE_RTTI)" == "1"
-__RTTIFLAG_11 = /GR
-!endif
-!if "$(USE_EXCEPTIONS)" == "0"
-__EXCEPTIONSFLAG_12 =
-!endif
-!if "$(USE_EXCEPTIONS)" == "1"
-__EXCEPTIONSFLAG_12 = /EHsc
-!endif
-!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "0"
-__NO_VC_CRTDBG_p = /D__NO_VC_CRTDBG__
-!endif
-!if "$(BUILD)" == "release" && "$(DEBUG_FLAG)" == "1"
-__NO_VC_CRTDBG_p = /D__NO_VC_CRTDBG__
-!endif
-!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "0"
-__NO_VC_CRTDBG_p_1 = /d __NO_VC_CRTDBG__
-!endif
-!if "$(BUILD)" == "release" && "$(DEBUG_FLAG)" == "1"
-__NO_VC_CRTDBG_p_1 = /d __NO_VC_CRTDBG__
-!endif
-!if "$(WXUNIV)" == "1"
-__WXUNIV_DEFINE_p = /D__WXUNIVERSAL__
-!endif
-!if "$(WXUNIV)" == "1"
-__WXUNIV_DEFINE_p_1 = /d __WXUNIVERSAL__
-!endif
-!if "$(DEBUG_FLAG)" == "0"
-__DEBUG_DEFINE_p = /DwxDEBUG_LEVEL=0
-!endif
-!if "$(DEBUG_FLAG)" == "0"
-__DEBUG_DEFINE_p_1 = /d wxDEBUG_LEVEL=0
-!endif
-!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default"
-__NDEBUG_DEFINE_p = /DNDEBUG
-!endif
-!if "$(DEBUG_RUNTIME_LIBS)" == "0"
-__NDEBUG_DEFINE_p = /DNDEBUG
-!endif
-!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default"
-__NDEBUG_DEFINE_p_1 = /d NDEBUG
-!endif
-!if "$(DEBUG_RUNTIME_LIBS)" == "0"
-__NDEBUG_DEFINE_p_1 = /d NDEBUG
-!endif
-!if "$(USE_EXCEPTIONS)" == "0"
-__EXCEPTIONS_DEFINE_p = /DwxNO_EXCEPTIONS
-!endif
-!if "$(USE_EXCEPTIONS)" == "0"
-__EXCEPTIONS_DEFINE_p_1 = /d wxNO_EXCEPTIONS
-!endif
-!if "$(USE_RTTI)" == "0"
-__RTTI_DEFINE_p = /DwxNO_RTTI
-!endif
-!if "$(USE_RTTI)" == "0"
-__RTTI_DEFINE_p_1 = /d wxNO_RTTI
-!endif
-!if "$(USE_THREADS)" == "0"
-__THREAD_DEFINE_p = /DwxNO_THREADS
-!endif
-!if "$(USE_THREADS)" == "0"
-__THREAD_DEFINE_p_1 = /d wxNO_THREADS
-!endif
-!if "$(UNICODE)" == "0"
-__UNICODE_DEFINE_p = /DwxUSE_UNICODE=0
-!endif
-!if "$(UNICODE)" == "1"
-__UNICODE_DEFINE_p = /D_UNICODE
-!endif
-!if "$(UNICODE)" == "0"
-__UNICODE_DEFINE_p_1 = /d wxUSE_UNICODE=0
-!endif
-!if "$(UNICODE)" == "1"
-__UNICODE_DEFINE_p_1 = /d _UNICODE
-!endif
-!if "$(USE_CAIRO)" == "1"
-____CAIRO_INCLUDEDIR_FILENAMES_p = /I$(CAIRO_ROOT)\include\cairo
-!endif
-!if "$(USE_CAIRO)" == "1"
-____CAIRO_INCLUDEDIR_FILENAMES_1_p = /i $(CAIRO_ROOT)\include\cairo
-!endif
-!if "$(SHARED)" == "1"
-__DLLFLAG_p = /DWXUSINGDLL
-!endif
-!if "$(SHARED)" == "1"
-__DLLFLAG_p_1 = /d WXUSINGDLL
-!endif
-!if "$(MONOLITHIC)" == "0"
-__WXLIB_HTML_p = \
- wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_html.lib
-!endif
-!if "$(MONOLITHIC)" == "0"
-__WXLIB_CORE_p = \
- wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib
-!endif
-!if "$(MONOLITHIC)" == "0"
-__WXLIB_BASE_p = \
- wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib
-!endif
-!if "$(MONOLITHIC)" == "1"
-__WXLIB_MONO_p = \
- wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib
-!endif
-!if "$(MONOLITHIC)" == "1" && "$(USE_STC)" == "1"
-__LIB_SCINTILLA_IF_MONO_p = wxscintilla$(WXDEBUGFLAG).lib
-!endif
-!if "$(USE_GUI)" == "1"
-__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib
-!endif
-!if "$(USE_GUI)" == "1"
-__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib
-!endif
-!if "$(USE_GUI)" == "1"
-__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib
-!endif
-!if "$(USE_CAIRO)" == "1"
-__CAIRO_LIB_p = cairo.lib
-!endif
-!if "$(USE_CAIRO)" == "1"
-____CAIRO_LIBDIR_FILENAMES_p = /LIBPATH:$(CAIRO_ROOT)\lib
-!endif
-
-
-all: $(OBJS)
-$(OBJS):
- -if not exist $(OBJS) mkdir $(OBJS)
-
-### Targets: ###
-
-all: $(OBJS)\hhp2cached.exe
-
-clean:
- -if exist $(OBJS)\*.obj del $(OBJS)\*.obj
- -if exist $(OBJS)\*.res del $(OBJS)\*.res
- -if exist $(OBJS)\*.pch del $(OBJS)\*.pch
- -if exist $(OBJS)\hhp2cached.exe del $(OBJS)\hhp2cached.exe
- -if exist $(OBJS)\hhp2cached.ilk del $(OBJS)\hhp2cached.ilk
- -if exist $(OBJS)\hhp2cached.pdb del $(OBJS)\hhp2cached.pdb
-
-$(OBJS)\hhp2cached.exe: $(HHP2CACHED_OBJECTS) $(OBJS)\hhp2cached_hhp2cached.res
- link /NOLOGO /OUT:$@ $(__DEBUGINFO_1) /pdb:"$(OBJS)\hhp2cached.pdb" $(__DEBUGINFO_2) $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:WINDOWS $(____CAIRO_LIBDIR_FILENAMES_p) $(LDFLAGS) @<<
- $(HHP2CACHED_OBJECTS) $(HHP2CACHED_RESOURCES) $(__WXLIB_HTML_p) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_SCINTILLA_IF_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__CAIRO_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib
-<<
-
-$(OBJS)\hhp2cached_hhp2cached.obj: .\hhp2cached.cpp
- $(CXX) /c /nologo /TP /Fo$@ $(HHP2CACHED_CXXFLAGS) .\hhp2cached.cpp
-
-$(OBJS)\hhp2cached_hhp2cached.res: .\hhp2cached.rc
- rc /fo$@ /d WIN32 $(____DEBUGRUNTIME_3_p_1) /d _CRT_SECURE_NO_DEPRECATE=1 /d _CRT_NON_CONFORMING_SWPRINTFS=1 /d _SCL_SECURE_NO_WARNINGS=1 $(__NO_VC_CRTDBG_p_1) /d __WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__NDEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) /i $(SETUPHDIR) /i .\..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES_1_p) /i . $(__DLLFLAG_p_1) /d _WINDOWS /i .\..\..\samples /d NOPCH .\hhp2cached.rc
-
+# =========================================================================
+# This makefile was generated by
+# Bakefile 0.2.9 (http://www.bakefile.org)
+# Do not modify, all changes will be overwritten!
+# =========================================================================
+
+!include <../../build/msw/config.vc>
+
+# -------------------------------------------------------------------------
+# Do not modify the rest of this file!
+# -------------------------------------------------------------------------
+
+### Variables: ###
+
+WX_RELEASE_NODOT = 31
+COMPILER_PREFIX = vc
+OBJS = \
+ $(COMPILER_PREFIX)$(COMPILER_VERSION)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)$(ARCH_SUFFIX)
+LIBDIRNAME = \
+ .\..\..\lib\$(COMPILER_PREFIX)$(COMPILER_VERSION)$(ARCH_SUFFIX)_$(LIBTYPE_SUFFIX)$(CFG)
+SETUPHDIR = \
+ $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)
+HHP2CACHED_CXXFLAGS = /M$(__RUNTIME_LIBS_10)$(__DEBUGRUNTIME_4) /DWIN32 \
+ $(__DEBUGINFO_0) /Fd$(OBJS)\hhp2cached.pdb $(____DEBUGRUNTIME_3_p) \
+ $(__OPTIMIZEFLAG_6) /D_CRT_SECURE_NO_DEPRECATE=1 \
+ /D_CRT_NON_CONFORMING_SWPRINTFS=1 /D_SCL_SECURE_NO_WARNINGS=1 \
+ $(__NO_VC_CRTDBG_p) /D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \
+ $(__NDEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \
+ $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) /I$(SETUPHDIR) /I.\..\..\include \
+ $(____CAIRO_INCLUDEDIR_FILENAMES_p) /W4 /I. $(__DLLFLAG_p) /D_WINDOWS \
+ /I.\..\..\samples /DNOPCH $(__RTTIFLAG_11) $(__EXCEPTIONSFLAG_12) \
+ $(CPPFLAGS) $(CXXFLAGS)
+HHP2CACHED_OBJECTS = \
+ $(OBJS)\hhp2cached_hhp2cached.obj
+HHP2CACHED_RESOURCES = \
+ $(OBJS)\hhp2cached_hhp2cached.res
+
+### Conditionally set variables: ###
+
+!if "$(TARGET_CPU)" == "AMD64"
+ARCH_SUFFIX = _x64
+!endif
+!if "$(TARGET_CPU)" == "IA64"
+ARCH_SUFFIX = _ia64
+!endif
+!if "$(TARGET_CPU)" == "X64"
+ARCH_SUFFIX = _x64
+!endif
+!if "$(TARGET_CPU)" == "amd64"
+ARCH_SUFFIX = _x64
+!endif
+!if "$(TARGET_CPU)" == "ia64"
+ARCH_SUFFIX = _ia64
+!endif
+!if "$(TARGET_CPU)" == "x64"
+ARCH_SUFFIX = _x64
+!endif
+!if "$(USE_GUI)" == "0"
+PORTNAME = base
+!endif
+!if "$(USE_GUI)" == "1"
+PORTNAME = msw$(TOOLKIT_VERSION)
+!endif
+!if "$(OFFICIAL_BUILD)" == "1"
+COMPILER_VERSION = ERROR-COMPILER-VERSION-MUST-BE-SET-FOR-OFFICIAL-BUILD
+!endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default"
+WXDEBUGFLAG = d
+!endif
+!if "$(DEBUG_RUNTIME_LIBS)" == "1"
+WXDEBUGFLAG = d
+!endif
+!if "$(UNICODE)" == "1"
+WXUNICODEFLAG = u
+!endif
+!if "$(WXUNIV)" == "1"
+WXUNIVNAME = univ
+!endif
+!if "$(SHARED)" == "1"
+WXDLLFLAG = dll
+!endif
+!if "$(SHARED)" == "0"
+LIBTYPE_SUFFIX = lib
+!endif
+!if "$(SHARED)" == "1"
+LIBTYPE_SUFFIX = dll
+!endif
+!if "$(TARGET_CPU)" == "AMD64"
+LINK_TARGET_CPU = /MACHINE:X64
+!endif
+!if "$(TARGET_CPU)" == "IA64"
+LINK_TARGET_CPU = /MACHINE:IA64
+!endif
+!if "$(TARGET_CPU)" == "X64"
+LINK_TARGET_CPU = /MACHINE:X64
+!endif
+!if "$(TARGET_CPU)" == "amd64"
+LINK_TARGET_CPU = /MACHINE:X64
+!endif
+!if "$(TARGET_CPU)" == "ia64"
+LINK_TARGET_CPU = /MACHINE:IA64
+!endif
+!if "$(TARGET_CPU)" == "x64"
+LINK_TARGET_CPU = /MACHINE:X64
+!endif
+!if "$(MONOLITHIC)" == "0"
+EXTRALIBS_FOR_BASE =
+!endif
+!if "$(MONOLITHIC)" == "1"
+EXTRALIBS_FOR_BASE =
+!endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default"
+__DEBUGINFO_0 = /Zi
+!endif
+!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default"
+__DEBUGINFO_0 =
+!endif
+!if "$(DEBUG_INFO)" == "0"
+__DEBUGINFO_0 =
+!endif
+!if "$(DEBUG_INFO)" == "1"
+__DEBUGINFO_0 = /Zi
+!endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default"
+__DEBUGINFO_1 = /DEBUG
+!endif
+!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default"
+__DEBUGINFO_1 =
+!endif
+!if "$(DEBUG_INFO)" == "0"
+__DEBUGINFO_1 =
+!endif
+!if "$(DEBUG_INFO)" == "1"
+__DEBUGINFO_1 = /DEBUG
+!endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default"
+__DEBUGINFO_2 = $(__DEBUGRUNTIME_5)
+!endif
+!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default"
+__DEBUGINFO_2 =
+!endif
+!if "$(DEBUG_INFO)" == "0"
+__DEBUGINFO_2 =
+!endif
+!if "$(DEBUG_INFO)" == "1"
+__DEBUGINFO_2 = $(__DEBUGRUNTIME_5)
+!endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default"
+____DEBUGRUNTIME_3_p = /D_DEBUG
+!endif
+!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default"
+____DEBUGRUNTIME_3_p =
+!endif
+!if "$(DEBUG_RUNTIME_LIBS)" == "0"
+____DEBUGRUNTIME_3_p =
+!endif
+!if "$(DEBUG_RUNTIME_LIBS)" == "1"
+____DEBUGRUNTIME_3_p = /D_DEBUG
+!endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default"
+____DEBUGRUNTIME_3_p_1 = /d _DEBUG
+!endif
+!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default"
+____DEBUGRUNTIME_3_p_1 =
+!endif
+!if "$(DEBUG_RUNTIME_LIBS)" == "0"
+____DEBUGRUNTIME_3_p_1 =
+!endif
+!if "$(DEBUG_RUNTIME_LIBS)" == "1"
+____DEBUGRUNTIME_3_p_1 = /d _DEBUG
+!endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default"
+__DEBUGRUNTIME_4 = d
+!endif
+!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default"
+__DEBUGRUNTIME_4 =
+!endif
+!if "$(DEBUG_RUNTIME_LIBS)" == "0"
+__DEBUGRUNTIME_4 =
+!endif
+!if "$(DEBUG_RUNTIME_LIBS)" == "1"
+__DEBUGRUNTIME_4 = d
+!endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default"
+__DEBUGRUNTIME_5 =
+!endif
+!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default"
+__DEBUGRUNTIME_5 = /opt:ref /opt:icf
+!endif
+!if "$(DEBUG_RUNTIME_LIBS)" == "0"
+__DEBUGRUNTIME_5 = /opt:ref /opt:icf
+!endif
+!if "$(DEBUG_RUNTIME_LIBS)" == "1"
+__DEBUGRUNTIME_5 =
+!endif
+!if "$(BUILD)" == "debug"
+__OPTIMIZEFLAG_6 = /Od
+!endif
+!if "$(BUILD)" == "release"
+__OPTIMIZEFLAG_6 = /O2
+!endif
+!if "$(USE_THREADS)" == "0"
+__THREADSFLAG_9 = L
+!endif
+!if "$(USE_THREADS)" == "1"
+__THREADSFLAG_9 = T
+!endif
+!if "$(RUNTIME_LIBS)" == "dynamic"
+__RUNTIME_LIBS_10 = D
+!endif
+!if "$(RUNTIME_LIBS)" == "static"
+__RUNTIME_LIBS_10 = $(__THREADSFLAG_9)
+!endif
+!if "$(USE_RTTI)" == "0"
+__RTTIFLAG_11 =
+!endif
+!if "$(USE_RTTI)" == "1"
+__RTTIFLAG_11 = /GR
+!endif
+!if "$(USE_EXCEPTIONS)" == "0"
+__EXCEPTIONSFLAG_12 =
+!endif
+!if "$(USE_EXCEPTIONS)" == "1"
+__EXCEPTIONSFLAG_12 = /EHsc
+!endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "0"
+__NO_VC_CRTDBG_p = /D__NO_VC_CRTDBG__
+!endif
+!if "$(BUILD)" == "release" && "$(DEBUG_FLAG)" == "1"
+__NO_VC_CRTDBG_p = /D__NO_VC_CRTDBG__
+!endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "0"
+__NO_VC_CRTDBG_p_1 = /d __NO_VC_CRTDBG__
+!endif
+!if "$(BUILD)" == "release" && "$(DEBUG_FLAG)" == "1"
+__NO_VC_CRTDBG_p_1 = /d __NO_VC_CRTDBG__
+!endif
+!if "$(WXUNIV)" == "1"
+__WXUNIV_DEFINE_p = /D__WXUNIVERSAL__
+!endif
+!if "$(WXUNIV)" == "1"
+__WXUNIV_DEFINE_p_1 = /d __WXUNIVERSAL__
+!endif
+!if "$(DEBUG_FLAG)" == "0"
+__DEBUG_DEFINE_p = /DwxDEBUG_LEVEL=0
+!endif
+!if "$(DEBUG_FLAG)" == "0"
+__DEBUG_DEFINE_p_1 = /d wxDEBUG_LEVEL=0
+!endif
+!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default"
+__NDEBUG_DEFINE_p = /DNDEBUG
+!endif
+!if "$(DEBUG_RUNTIME_LIBS)" == "0"
+__NDEBUG_DEFINE_p = /DNDEBUG
+!endif
+!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default"
+__NDEBUG_DEFINE_p_1 = /d NDEBUG
+!endif
+!if "$(DEBUG_RUNTIME_LIBS)" == "0"
+__NDEBUG_DEFINE_p_1 = /d NDEBUG
+!endif
+!if "$(USE_EXCEPTIONS)" == "0"
+__EXCEPTIONS_DEFINE_p = /DwxNO_EXCEPTIONS
+!endif
+!if "$(USE_EXCEPTIONS)" == "0"
+__EXCEPTIONS_DEFINE_p_1 = /d wxNO_EXCEPTIONS
+!endif
+!if "$(USE_RTTI)" == "0"
+__RTTI_DEFINE_p = /DwxNO_RTTI
+!endif
+!if "$(USE_RTTI)" == "0"
+__RTTI_DEFINE_p_1 = /d wxNO_RTTI
+!endif
+!if "$(USE_THREADS)" == "0"
+__THREAD_DEFINE_p = /DwxNO_THREADS
+!endif
+!if "$(USE_THREADS)" == "0"
+__THREAD_DEFINE_p_1 = /d wxNO_THREADS
+!endif
+!if "$(UNICODE)" == "0"
+__UNICODE_DEFINE_p = /DwxUSE_UNICODE=0
+!endif
+!if "$(UNICODE)" == "1"
+__UNICODE_DEFINE_p = /D_UNICODE
+!endif
+!if "$(UNICODE)" == "0"
+__UNICODE_DEFINE_p_1 = /d wxUSE_UNICODE=0
+!endif
+!if "$(UNICODE)" == "1"
+__UNICODE_DEFINE_p_1 = /d _UNICODE
+!endif
+!if "$(USE_CAIRO)" == "1"
+____CAIRO_INCLUDEDIR_FILENAMES_p = /I$(CAIRO_ROOT)\include\cairo
+!endif
+!if "$(USE_CAIRO)" == "1"
+____CAIRO_INCLUDEDIR_FILENAMES_1_p = /i $(CAIRO_ROOT)\include\cairo
+!endif
+!if "$(SHARED)" == "1"
+__DLLFLAG_p = /DWXUSINGDLL
+!endif
+!if "$(SHARED)" == "1"
+__DLLFLAG_p_1 = /d WXUSINGDLL
+!endif
+!if "$(MONOLITHIC)" == "0"
+__WXLIB_HTML_p = \
+ wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_html.lib
+!endif
+!if "$(MONOLITHIC)" == "0"
+__WXLIB_CORE_p = \
+ wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib
+!endif
+!if "$(MONOLITHIC)" == "0"
+__WXLIB_BASE_p = \
+ wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib
+!endif
+!if "$(MONOLITHIC)" == "1"
+__WXLIB_MONO_p = \
+ wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib
+!endif
+!if "$(MONOLITHIC)" == "1" && "$(USE_STC)" == "1"
+__LIB_SCINTILLA_IF_MONO_p = wxscintilla$(WXDEBUGFLAG).lib
+!endif
+!if "$(USE_GUI)" == "1"
+__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib
+!endif
+!if "$(USE_GUI)" == "1"
+__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib
+!endif
+!if "$(USE_GUI)" == "1"
+__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib
+!endif
+!if "$(USE_CAIRO)" == "1"
+__CAIRO_LIB_p = cairo.lib
+!endif
+!if "$(USE_CAIRO)" == "1"
+____CAIRO_LIBDIR_FILENAMES_p = /LIBPATH:$(CAIRO_ROOT)\lib
+!endif
+
+
+all: $(OBJS)
+$(OBJS):
+ -if not exist $(OBJS) mkdir $(OBJS)
+
+### Targets: ###
+
+all: $(OBJS)\hhp2cached.exe
+
+clean:
+ -if exist $(OBJS)\*.obj del $(OBJS)\*.obj
+ -if exist $(OBJS)\*.res del $(OBJS)\*.res
+ -if exist $(OBJS)\*.pch del $(OBJS)\*.pch
+ -if exist $(OBJS)\hhp2cached.exe del $(OBJS)\hhp2cached.exe
+ -if exist $(OBJS)\hhp2cached.ilk del $(OBJS)\hhp2cached.ilk
+ -if exist $(OBJS)\hhp2cached.pdb del $(OBJS)\hhp2cached.pdb
+
+$(OBJS)\hhp2cached.exe: $(HHP2CACHED_OBJECTS) $(OBJS)\hhp2cached_hhp2cached.res
+ link /NOLOGO /OUT:$@ $(__DEBUGINFO_1) /pdb:"$(OBJS)\hhp2cached.pdb" $(__DEBUGINFO_2) $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:WINDOWS $(____CAIRO_LIBDIR_FILENAMES_p) $(LDFLAGS) @<<
+ $(HHP2CACHED_OBJECTS) $(HHP2CACHED_RESOURCES) $(__WXLIB_HTML_p) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_SCINTILLA_IF_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__CAIRO_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib
+<<
+
+$(OBJS)\hhp2cached_hhp2cached.obj: .\hhp2cached.cpp
+ $(CXX) /c /nologo /TP /Fo$@ $(HHP2CACHED_CXXFLAGS) .\hhp2cached.cpp
+
+$(OBJS)\hhp2cached_hhp2cached.res: .\hhp2cached.rc
+ rc /fo$@ /d WIN32 $(____DEBUGRUNTIME_3_p_1) /d _CRT_SECURE_NO_DEPRECATE=1 /d _CRT_NON_CONFORMING_SWPRINTFS=1 /d _SCL_SECURE_NO_WARNINGS=1 $(__NO_VC_CRTDBG_p_1) /d __WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__NDEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) /i $(SETUPHDIR) /i .\..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES_1_p) /i . $(__DLLFLAG_p_1) /d _WINDOWS /i .\..\..\samples /d NOPCH .\hhp2cached.rc
+
diff --git a/utils/ifacecheck/src/ifacecheck_vc7.sln b/utils/ifacecheck/src/ifacecheck_vc7.sln
index 83ce83e60b..11aa24b474 100644
--- a/utils/ifacecheck/src/ifacecheck_vc7.sln
+++ b/utils/ifacecheck/src/ifacecheck_vc7.sln
@@ -1,25 +1,25 @@
-Microsoft Visual Studio Solution File, Format Version 8.00
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ifacecheck", "ifacecheck_vc7.vcproj", "{355B6651-9A8E-5D72-A3E9-DAB21650C0FC}"
-EndProject
-Global
- GlobalSection(SolutionConfigurationPlatforms) = preSolution
- Debug|Win32 = Debug|Win32
- Release|Win32 = Release|Win32
- DLL Debug|Win32 = DLL Debug|Win32
- DLL Release|Win32 = DLL Release|Win32
- EndGlobalSection
- GlobalSection(ProjectConfigurationPlatforms) = postSolution
- {355B6651-9A8E-5D72-A3E9-DAB21650C0FC}.Debug|Win32.ActiveCfg = Debug|Win32
- {355B6651-9A8E-5D72-A3E9-DAB21650C0FC}.Debug|Win32.Build.0 = Debug|Win32
- {355B6651-9A8E-5D72-A3E9-DAB21650C0FC}.Release|Win32.ActiveCfg = Release|Win32
- {355B6651-9A8E-5D72-A3E9-DAB21650C0FC}.Release|Win32.Build.0 = Release|Win32
- {355B6651-9A8E-5D72-A3E9-DAB21650C0FC}.DLL Debug|Win32.ActiveCfg = DLL Debug|Win32
- {355B6651-9A8E-5D72-A3E9-DAB21650C0FC}.DLL Debug|Win32.Build.0 = DLL Debug|Win32
- {355B6651-9A8E-5D72-A3E9-DAB21650C0FC}.DLL Release|Win32.ActiveCfg = DLL Release|Win32
- {355B6651-9A8E-5D72-A3E9-DAB21650C0FC}.DLL Release|Win32.Build.0 = DLL Release|Win32
- EndGlobalSection
- GlobalSection(SolutionProperties) = preSolution
- HideSolutionNode = FALSE
- EndGlobalSection
-EndGlobal
-
+Microsoft Visual Studio Solution File, Format Version 8.00
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ifacecheck", "ifacecheck_vc7.vcproj", "{355B6651-9A8E-5D72-A3E9-DAB21650C0FC}"
+EndProject
+Global
+ GlobalSection(SolutionConfigurationPlatforms) = preSolution
+ Debug|Win32 = Debug|Win32
+ Release|Win32 = Release|Win32
+ DLL Debug|Win32 = DLL Debug|Win32
+ DLL Release|Win32 = DLL Release|Win32
+ EndGlobalSection
+ GlobalSection(ProjectConfigurationPlatforms) = postSolution
+ {355B6651-9A8E-5D72-A3E9-DAB21650C0FC}.Debug|Win32.ActiveCfg = Debug|Win32
+ {355B6651-9A8E-5D72-A3E9-DAB21650C0FC}.Debug|Win32.Build.0 = Debug|Win32
+ {355B6651-9A8E-5D72-A3E9-DAB21650C0FC}.Release|Win32.ActiveCfg = Release|Win32
+ {355B6651-9A8E-5D72-A3E9-DAB21650C0FC}.Release|Win32.Build.0 = Release|Win32
+ {355B6651-9A8E-5D72-A3E9-DAB21650C0FC}.DLL Debug|Win32.ActiveCfg = DLL Debug|Win32
+ {355B6651-9A8E-5D72-A3E9-DAB21650C0FC}.DLL Debug|Win32.Build.0 = DLL Debug|Win32
+ {355B6651-9A8E-5D72-A3E9-DAB21650C0FC}.DLL Release|Win32.ActiveCfg = DLL Release|Win32
+ {355B6651-9A8E-5D72-A3E9-DAB21650C0FC}.DLL Release|Win32.Build.0 = DLL Release|Win32
+ EndGlobalSection
+ GlobalSection(SolutionProperties) = preSolution
+ HideSolutionNode = FALSE
+ EndGlobalSection
+EndGlobal
+
diff --git a/utils/ifacecheck/src/ifacecheck_vc7.vcproj b/utils/ifacecheck/src/ifacecheck_vc7.vcproj
index 1230de51f5..ab5c33628a 100644
--- a/utils/ifacecheck/src/ifacecheck_vc7.vcproj
+++ b/utils/ifacecheck/src/ifacecheck_vc7.vcproj
@@ -1,306 +1,306 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/utils/ifacecheck/src/ifacecheck_vc8.sln b/utils/ifacecheck/src/ifacecheck_vc8.sln
index 4d6fe64505..a9891b82e7 100644
--- a/utils/ifacecheck/src/ifacecheck_vc8.sln
+++ b/utils/ifacecheck/src/ifacecheck_vc8.sln
@@ -1,38 +1,38 @@
-Microsoft Visual Studio Solution File, Format Version 9.00
-# Visual Studio 2005
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ifacecheck", "ifacecheck_vc8.vcproj", "{82C85703-712C-59F7-9E08-9F8EDE5D9DDF}"
-EndProject
-Global
- GlobalSection(SolutionConfigurationPlatforms) = preSolution
- Debug|Win32 = Debug|Win32
- Debug|x64 = Debug|x64
- Release|Win32 = Release|Win32
- Release|x64 = Release|x64
- DLL Debug|Win32 = DLL Debug|Win32
- DLL Debug|x64 = DLL Debug|x64
- DLL Release|Win32 = DLL Release|Win32
- DLL Release|x64 = DLL Release|x64
- EndGlobalSection
- GlobalSection(ProjectConfigurationPlatforms) = postSolution
- {82C85703-712C-59F7-9E08-9F8EDE5D9DDF}.Debug|Win32.ActiveCfg = Debug|Win32
- {82C85703-712C-59F7-9E08-9F8EDE5D9DDF}.Debug|Win32.Build.0 = Debug|Win32
- {82C85703-712C-59F7-9E08-9F8EDE5D9DDF}.Debug|x64.ActiveCfg = Debug|x64
- {82C85703-712C-59F7-9E08-9F8EDE5D9DDF}.Debug|x64.Build.0 = Debug|x64
- {82C85703-712C-59F7-9E08-9F8EDE5D9DDF}.Release|Win32.ActiveCfg = Release|Win32
- {82C85703-712C-59F7-9E08-9F8EDE5D9DDF}.Release|Win32.Build.0 = Release|Win32
- {82C85703-712C-59F7-9E08-9F8EDE5D9DDF}.Release|x64.ActiveCfg = Release|x64
- {82C85703-712C-59F7-9E08-9F8EDE5D9DDF}.Release|x64.Build.0 = Release|x64
- {82C85703-712C-59F7-9E08-9F8EDE5D9DDF}.DLL Debug|Win32.ActiveCfg = DLL Debug|Win32
- {82C85703-712C-59F7-9E08-9F8EDE5D9DDF}.DLL Debug|Win32.Build.0 = DLL Debug|Win32
- {82C85703-712C-59F7-9E08-9F8EDE5D9DDF}.DLL Debug|x64.ActiveCfg = DLL Debug|x64
- {82C85703-712C-59F7-9E08-9F8EDE5D9DDF}.DLL Debug|x64.Build.0 = DLL Debug|x64
- {82C85703-712C-59F7-9E08-9F8EDE5D9DDF}.DLL Release|Win32.ActiveCfg = DLL Release|Win32
- {82C85703-712C-59F7-9E08-9F8EDE5D9DDF}.DLL Release|Win32.Build.0 = DLL Release|Win32
- {82C85703-712C-59F7-9E08-9F8EDE5D9DDF}.DLL Release|x64.ActiveCfg = DLL Release|x64
- {82C85703-712C-59F7-9E08-9F8EDE5D9DDF}.DLL Release|x64.Build.0 = DLL Release|x64
- EndGlobalSection
- GlobalSection(SolutionProperties) = preSolution
- HideSolutionNode = FALSE
- EndGlobalSection
-EndGlobal
-
+Microsoft Visual Studio Solution File, Format Version 9.00
+# Visual Studio 2005
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ifacecheck", "ifacecheck_vc8.vcproj", "{82C85703-712C-59F7-9E08-9F8EDE5D9DDF}"
+EndProject
+Global
+ GlobalSection(SolutionConfigurationPlatforms) = preSolution
+ Debug|Win32 = Debug|Win32
+ Debug|x64 = Debug|x64
+ Release|Win32 = Release|Win32
+ Release|x64 = Release|x64
+ DLL Debug|Win32 = DLL Debug|Win32
+ DLL Debug|x64 = DLL Debug|x64
+ DLL Release|Win32 = DLL Release|Win32
+ DLL Release|x64 = DLL Release|x64
+ EndGlobalSection
+ GlobalSection(ProjectConfigurationPlatforms) = postSolution
+ {82C85703-712C-59F7-9E08-9F8EDE5D9DDF}.Debug|Win32.ActiveCfg = Debug|Win32
+ {82C85703-712C-59F7-9E08-9F8EDE5D9DDF}.Debug|Win32.Build.0 = Debug|Win32
+ {82C85703-712C-59F7-9E08-9F8EDE5D9DDF}.Debug|x64.ActiveCfg = Debug|x64
+ {82C85703-712C-59F7-9E08-9F8EDE5D9DDF}.Debug|x64.Build.0 = Debug|x64
+ {82C85703-712C-59F7-9E08-9F8EDE5D9DDF}.Release|Win32.ActiveCfg = Release|Win32
+ {82C85703-712C-59F7-9E08-9F8EDE5D9DDF}.Release|Win32.Build.0 = Release|Win32
+ {82C85703-712C-59F7-9E08-9F8EDE5D9DDF}.Release|x64.ActiveCfg = Release|x64
+ {82C85703-712C-59F7-9E08-9F8EDE5D9DDF}.Release|x64.Build.0 = Release|x64
+ {82C85703-712C-59F7-9E08-9F8EDE5D9DDF}.DLL Debug|Win32.ActiveCfg = DLL Debug|Win32
+ {82C85703-712C-59F7-9E08-9F8EDE5D9DDF}.DLL Debug|Win32.Build.0 = DLL Debug|Win32
+ {82C85703-712C-59F7-9E08-9F8EDE5D9DDF}.DLL Debug|x64.ActiveCfg = DLL Debug|x64
+ {82C85703-712C-59F7-9E08-9F8EDE5D9DDF}.DLL Debug|x64.Build.0 = DLL Debug|x64
+ {82C85703-712C-59F7-9E08-9F8EDE5D9DDF}.DLL Release|Win32.ActiveCfg = DLL Release|Win32
+ {82C85703-712C-59F7-9E08-9F8EDE5D9DDF}.DLL Release|Win32.Build.0 = DLL Release|Win32
+ {82C85703-712C-59F7-9E08-9F8EDE5D9DDF}.DLL Release|x64.ActiveCfg = DLL Release|x64
+ {82C85703-712C-59F7-9E08-9F8EDE5D9DDF}.DLL Release|x64.Build.0 = DLL Release|x64
+ EndGlobalSection
+ GlobalSection(SolutionProperties) = preSolution
+ HideSolutionNode = FALSE
+ EndGlobalSection
+EndGlobal
+
diff --git a/utils/ifacecheck/src/ifacecheck_vc8.vcproj b/utils/ifacecheck/src/ifacecheck_vc8.vcproj
index c76ac38c3b..74cdea4bab 100644
--- a/utils/ifacecheck/src/ifacecheck_vc8.vcproj
+++ b/utils/ifacecheck/src/ifacecheck_vc8.vcproj
@@ -1,833 +1,833 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/utils/ifacecheck/src/ifacecheck_vc9.sln b/utils/ifacecheck/src/ifacecheck_vc9.sln
index c674eaec60..4c83dfdc9a 100644
--- a/utils/ifacecheck/src/ifacecheck_vc9.sln
+++ b/utils/ifacecheck/src/ifacecheck_vc9.sln
@@ -1,38 +1,38 @@
-Microsoft Visual Studio Solution File, Format Version 10.00
-# Visual Studio 2008
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ifacecheck", "ifacecheck_vc9.vcproj", "{C15BEEE5-A7F4-59AF-88F0-B9C94DFA8EAA}"
-EndProject
-Global
- GlobalSection(SolutionConfigurationPlatforms) = preSolution
- Debug|Win32 = Debug|Win32
- Debug|x64 = Debug|x64
- Release|Win32 = Release|Win32
- Release|x64 = Release|x64
- DLL Debug|Win32 = DLL Debug|Win32
- DLL Debug|x64 = DLL Debug|x64
- DLL Release|Win32 = DLL Release|Win32
- DLL Release|x64 = DLL Release|x64
- EndGlobalSection
- GlobalSection(ProjectConfigurationPlatforms) = postSolution
- {C15BEEE5-A7F4-59AF-88F0-B9C94DFA8EAA}.Debug|Win32.ActiveCfg = Debug|Win32
- {C15BEEE5-A7F4-59AF-88F0-B9C94DFA8EAA}.Debug|Win32.Build.0 = Debug|Win32
- {C15BEEE5-A7F4-59AF-88F0-B9C94DFA8EAA}.Debug|x64.ActiveCfg = Debug|x64
- {C15BEEE5-A7F4-59AF-88F0-B9C94DFA8EAA}.Debug|x64.Build.0 = Debug|x64
- {C15BEEE5-A7F4-59AF-88F0-B9C94DFA8EAA}.Release|Win32.ActiveCfg = Release|Win32
- {C15BEEE5-A7F4-59AF-88F0-B9C94DFA8EAA}.Release|Win32.Build.0 = Release|Win32
- {C15BEEE5-A7F4-59AF-88F0-B9C94DFA8EAA}.Release|x64.ActiveCfg = Release|x64
- {C15BEEE5-A7F4-59AF-88F0-B9C94DFA8EAA}.Release|x64.Build.0 = Release|x64
- {C15BEEE5-A7F4-59AF-88F0-B9C94DFA8EAA}.DLL Debug|Win32.ActiveCfg = DLL Debug|Win32
- {C15BEEE5-A7F4-59AF-88F0-B9C94DFA8EAA}.DLL Debug|Win32.Build.0 = DLL Debug|Win32
- {C15BEEE5-A7F4-59AF-88F0-B9C94DFA8EAA}.DLL Debug|x64.ActiveCfg = DLL Debug|x64
- {C15BEEE5-A7F4-59AF-88F0-B9C94DFA8EAA}.DLL Debug|x64.Build.0 = DLL Debug|x64
- {C15BEEE5-A7F4-59AF-88F0-B9C94DFA8EAA}.DLL Release|Win32.ActiveCfg = DLL Release|Win32
- {C15BEEE5-A7F4-59AF-88F0-B9C94DFA8EAA}.DLL Release|Win32.Build.0 = DLL Release|Win32
- {C15BEEE5-A7F4-59AF-88F0-B9C94DFA8EAA}.DLL Release|x64.ActiveCfg = DLL Release|x64
- {C15BEEE5-A7F4-59AF-88F0-B9C94DFA8EAA}.DLL Release|x64.Build.0 = DLL Release|x64
- EndGlobalSection
- GlobalSection(SolutionProperties) = preSolution
- HideSolutionNode = FALSE
- EndGlobalSection
-EndGlobal
-
+Microsoft Visual Studio Solution File, Format Version 10.00
+# Visual Studio 2008
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ifacecheck", "ifacecheck_vc9.vcproj", "{C15BEEE5-A7F4-59AF-88F0-B9C94DFA8EAA}"
+EndProject
+Global
+ GlobalSection(SolutionConfigurationPlatforms) = preSolution
+ Debug|Win32 = Debug|Win32
+ Debug|x64 = Debug|x64
+ Release|Win32 = Release|Win32
+ Release|x64 = Release|x64
+ DLL Debug|Win32 = DLL Debug|Win32
+ DLL Debug|x64 = DLL Debug|x64
+ DLL Release|Win32 = DLL Release|Win32
+ DLL Release|x64 = DLL Release|x64
+ EndGlobalSection
+ GlobalSection(ProjectConfigurationPlatforms) = postSolution
+ {C15BEEE5-A7F4-59AF-88F0-B9C94DFA8EAA}.Debug|Win32.ActiveCfg = Debug|Win32
+ {C15BEEE5-A7F4-59AF-88F0-B9C94DFA8EAA}.Debug|Win32.Build.0 = Debug|Win32
+ {C15BEEE5-A7F4-59AF-88F0-B9C94DFA8EAA}.Debug|x64.ActiveCfg = Debug|x64
+ {C15BEEE5-A7F4-59AF-88F0-B9C94DFA8EAA}.Debug|x64.Build.0 = Debug|x64
+ {C15BEEE5-A7F4-59AF-88F0-B9C94DFA8EAA}.Release|Win32.ActiveCfg = Release|Win32
+ {C15BEEE5-A7F4-59AF-88F0-B9C94DFA8EAA}.Release|Win32.Build.0 = Release|Win32
+ {C15BEEE5-A7F4-59AF-88F0-B9C94DFA8EAA}.Release|x64.ActiveCfg = Release|x64
+ {C15BEEE5-A7F4-59AF-88F0-B9C94DFA8EAA}.Release|x64.Build.0 = Release|x64
+ {C15BEEE5-A7F4-59AF-88F0-B9C94DFA8EAA}.DLL Debug|Win32.ActiveCfg = DLL Debug|Win32
+ {C15BEEE5-A7F4-59AF-88F0-B9C94DFA8EAA}.DLL Debug|Win32.Build.0 = DLL Debug|Win32
+ {C15BEEE5-A7F4-59AF-88F0-B9C94DFA8EAA}.DLL Debug|x64.ActiveCfg = DLL Debug|x64
+ {C15BEEE5-A7F4-59AF-88F0-B9C94DFA8EAA}.DLL Debug|x64.Build.0 = DLL Debug|x64
+ {C15BEEE5-A7F4-59AF-88F0-B9C94DFA8EAA}.DLL Release|Win32.ActiveCfg = DLL Release|Win32
+ {C15BEEE5-A7F4-59AF-88F0-B9C94DFA8EAA}.DLL Release|Win32.Build.0 = DLL Release|Win32
+ {C15BEEE5-A7F4-59AF-88F0-B9C94DFA8EAA}.DLL Release|x64.ActiveCfg = DLL Release|x64
+ {C15BEEE5-A7F4-59AF-88F0-B9C94DFA8EAA}.DLL Release|x64.Build.0 = DLL Release|x64
+ EndGlobalSection
+ GlobalSection(SolutionProperties) = preSolution
+ HideSolutionNode = FALSE
+ EndGlobalSection
+EndGlobal
+
diff --git a/utils/ifacecheck/src/ifacecheck_vc9.vcproj b/utils/ifacecheck/src/ifacecheck_vc9.vcproj
index 7a72fd2800..a94e93f6b1 100644
--- a/utils/ifacecheck/src/ifacecheck_vc9.vcproj
+++ b/utils/ifacecheck/src/ifacecheck_vc9.vcproj
@@ -1,805 +1,805 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/utils/ifacecheck/src/makefile.bcc b/utils/ifacecheck/src/makefile.bcc
index 3578b8b15d..b41888b75f 100644
--- a/utils/ifacecheck/src/makefile.bcc
+++ b/utils/ifacecheck/src/makefile.bcc
@@ -1,204 +1,204 @@
-# =========================================================================
-# This makefile was generated by
-# Bakefile 0.2.9 (http://www.bakefile.org)
-# 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: ###
-
-WX_RELEASE_NODOT = 31
-COMPILER_PREFIX = bcc
-OBJS = \
- $(COMPILER_PREFIX)$(COMPILER_VERSION)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)
-LIBDIRNAME = \
- .\..\..\..\lib\$(COMPILER_PREFIX)$(COMPILER_VERSION)_$(LIBTYPE_SUFFIX)$(CFG)
-SETUPHDIR = \
- $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)
-IFACECHECK_CXXFLAGS = $(__RUNTIME_LIBS_7) -I$(BCCDIR)\include $(__DEBUGINFO) \
- $(__OPTIMIZEFLAG_2) $(__THREADSFLAG_6) -D__WXMSW__ $(__WXUNIV_DEFINE_p) \
- $(__DEBUG_DEFINE_p) $(__NDEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) \
- $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) \
- -I$(SETUPHDIR) -I.\..\..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES_p) -I. \
- $(__DLLFLAG_p) -DwxUSE_GUI=0 $(CPPFLAGS) $(CXXFLAGS)
-IFACECHECK_OBJECTS = \
- $(OBJS)\ifacecheck_ifacecheck.obj \
- $(OBJS)\ifacecheck_xmlparser.obj
-
-### Conditionally set variables: ###
-
-!if "$(USE_GUI)" == "0"
-PORTNAME = base
-!endif
-!if "$(USE_GUI)" == "1"
-PORTNAME = msw$(TOOLKIT_VERSION)
-!endif
-!if "$(OFFICIAL_BUILD)" == "1"
-COMPILER_VERSION = ERROR-COMPILER-VERSION-MUST-BE-SET-FOR-OFFICIAL-BUILD
-!endif
-!if "$(BUILD)" == "debug"
-WXDEBUGFLAG = d
-!endif
-!if "$(UNICODE)" == "1"
-WXUNICODEFLAG = u
-!endif
-!if "$(WXUNIV)" == "1"
-WXUNIVNAME = univ
-!endif
-!if "$(SHARED)" == "1"
-WXDLLFLAG = dll
-!endif
-!if "$(SHARED)" == "0"
-LIBTYPE_SUFFIX = lib
-!endif
-!if "$(SHARED)" == "1"
-LIBTYPE_SUFFIX = dll
-!endif
-!if "$(MONOLITHIC)" == "0"
-EXTRALIBS_FOR_BASE =
-!endif
-!if "$(MONOLITHIC)" == "1"
-EXTRALIBS_FOR_BASE =
-!endif
-!if "$(BUILD)" == "debug"
-__OPTIMIZEFLAG_2 = -Od
-!endif
-!if "$(BUILD)" == "release"
-__OPTIMIZEFLAG_2 = -O2
-!endif
-!if "$(USE_THREADS)" == "0"
-__THREADSFLAG_5 =
-!endif
-!if "$(USE_THREADS)" == "1"
-__THREADSFLAG_5 = mt
-!endif
-!if "$(USE_THREADS)" == "0"
-__THREADSFLAG_6 =
-!endif
-!if "$(USE_THREADS)" == "1"
-__THREADSFLAG_6 = -tWM
-!endif
-!if "$(RUNTIME_LIBS)" == "dynamic"
-__RUNTIME_LIBS_7 = -tWR
-!endif
-!if "$(RUNTIME_LIBS)" == "static"
-__RUNTIME_LIBS_7 =
-!endif
-!if "$(RUNTIME_LIBS)" == "dynamic"
-__RUNTIME_LIBS_8 = i
-!endif
-!if "$(RUNTIME_LIBS)" == "static"
-__RUNTIME_LIBS_8 =
-!endif
-!if "$(WXUNIV)" == "1"
-__WXUNIV_DEFINE_p = -D__WXUNIVERSAL__
-!endif
-!if "$(DEBUG_FLAG)" == "0"
-__DEBUG_DEFINE_p = -DwxDEBUG_LEVEL=0
-!endif
-!if "$(BUILD)" == "release"
-__NDEBUG_DEFINE_p = -DNDEBUG
-!endif
-!if "$(USE_EXCEPTIONS)" == "0"
-__EXCEPTIONS_DEFINE_p = -DwxNO_EXCEPTIONS
-!endif
-!if "$(USE_RTTI)" == "0"
-__RTTI_DEFINE_p = -DwxNO_RTTI
-!endif
-!if "$(USE_THREADS)" == "0"
-__THREAD_DEFINE_p = -DwxNO_THREADS
-!endif
-!if "$(UNICODE)" == "0"
-__UNICODE_DEFINE_p = -DwxUSE_UNICODE=0
-!endif
-!if "$(UNICODE)" == "1"
-__UNICODE_DEFINE_p = -D_UNICODE
-!endif
-!if "$(USE_CAIRO)" == "1"
-____CAIRO_INCLUDEDIR_FILENAMES_p = -I$(CAIRO_ROOT)\include\cairo
-!endif
-!if "$(SHARED)" == "1"
-__DLLFLAG_p = -DWXUSINGDLL
-!endif
-!if "$(MONOLITHIC)" == "0"
-__WXLIB_XML_p = \
- wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xml.lib
-!endif
-!if "$(MONOLITHIC)" == "0"
-__WXLIB_BASE_p = \
- wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib
-!endif
-!if "$(MONOLITHIC)" == "1"
-__WXLIB_MONO_p = \
- wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib
-!endif
-!if "$(MONOLITHIC)" == "1"
-__LIB_PNG_IF_MONO_p = $(__LIB_PNG_p)
-!endif
-!if "$(USE_GUI)" == "1"
-__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib
-!endif
-!if "$(USE_CAIRO)" == "1"
-__CAIRO_LIB_p = cairo.lib
-!endif
-!if "$(USE_CAIRO)" == "1"
-____CAIRO_LIBDIR_FILENAMES_p = -L$(CAIRO_ROOT)\lib
-!endif
-!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default"
-__DEBUGINFO = -v
-!endif
-!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default"
-__DEBUGINFO = -v-
-!endif
-!if "$(DEBUG_INFO)" == "0"
-__DEBUGINFO = -v-
-!endif
-!if "$(DEBUG_INFO)" == "1"
-__DEBUGINFO = -v
-!endif
-
-
-all: $(OBJS)
-$(OBJS):
- -if not exist $(OBJS) mkdir $(OBJS)
-
-### Targets: ###
-
-all: $(OBJS)\ifacecheck.exe
-
-clean:
- -if exist $(OBJS)\*.obj del $(OBJS)\*.obj
- -if exist $(OBJS)\*.res del $(OBJS)\*.res
- -if exist $(OBJS)\*.csm del $(OBJS)\*.csm
- -if exist $(OBJS)\ifacecheck.exe del $(OBJS)\ifacecheck.exe
- -if exist $(OBJS)\ifacecheck.tds del $(OBJS)\ifacecheck.tds
- -if exist $(OBJS)\ifacecheck.ilc del $(OBJS)\ifacecheck.ilc
- -if exist $(OBJS)\ifacecheck.ild del $(OBJS)\ifacecheck.ild
- -if exist $(OBJS)\ifacecheck.ilf del $(OBJS)\ifacecheck.ilf
- -if exist $(OBJS)\ifacecheck.ils del $(OBJS)\ifacecheck.ils
-
-$(OBJS)\ifacecheck.exe: $(IFACECHECK_OBJECTS)
- ilink32 -Tpe -q -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUGINFO) -L$(LIBDIRNAME) -ap $(____CAIRO_LIBDIR_FILENAMES_p) $(LDFLAGS) @&&|
- c0x32.obj $(IFACECHECK_OBJECTS),$@,, $(__WXLIB_XML_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_PNG_IF_MONO_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__CAIRO_LIB_p) ole2w32.lib oleacc.lib import32.lib cw32$(__THREADSFLAG_5)$(__RUNTIME_LIBS_8).lib,,
-|
-
-$(OBJS)\ifacecheck_ifacecheck.obj: .\ifacecheck.cpp
- $(CXX) -q -c -P -o$@ $(IFACECHECK_CXXFLAGS) .\ifacecheck.cpp
-
-$(OBJS)\ifacecheck_xmlparser.obj: .\xmlparser.cpp
- $(CXX) -q -c -P -o$@ $(IFACECHECK_CXXFLAGS) .\xmlparser.cpp
-
+# =========================================================================
+# This makefile was generated by
+# Bakefile 0.2.9 (http://www.bakefile.org)
+# 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: ###
+
+WX_RELEASE_NODOT = 31
+COMPILER_PREFIX = bcc
+OBJS = \
+ $(COMPILER_PREFIX)$(COMPILER_VERSION)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)
+LIBDIRNAME = \
+ .\..\..\..\lib\$(COMPILER_PREFIX)$(COMPILER_VERSION)_$(LIBTYPE_SUFFIX)$(CFG)
+SETUPHDIR = \
+ $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)
+IFACECHECK_CXXFLAGS = $(__RUNTIME_LIBS_7) -I$(BCCDIR)\include $(__DEBUGINFO) \
+ $(__OPTIMIZEFLAG_2) $(__THREADSFLAG_6) -D__WXMSW__ $(__WXUNIV_DEFINE_p) \
+ $(__DEBUG_DEFINE_p) $(__NDEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) \
+ $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) \
+ -I$(SETUPHDIR) -I.\..\..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES_p) -I. \
+ $(__DLLFLAG_p) -DwxUSE_GUI=0 $(CPPFLAGS) $(CXXFLAGS)
+IFACECHECK_OBJECTS = \
+ $(OBJS)\ifacecheck_ifacecheck.obj \
+ $(OBJS)\ifacecheck_xmlparser.obj
+
+### Conditionally set variables: ###
+
+!if "$(USE_GUI)" == "0"
+PORTNAME = base
+!endif
+!if "$(USE_GUI)" == "1"
+PORTNAME = msw$(TOOLKIT_VERSION)
+!endif
+!if "$(OFFICIAL_BUILD)" == "1"
+COMPILER_VERSION = ERROR-COMPILER-VERSION-MUST-BE-SET-FOR-OFFICIAL-BUILD
+!endif
+!if "$(BUILD)" == "debug"
+WXDEBUGFLAG = d
+!endif
+!if "$(UNICODE)" == "1"
+WXUNICODEFLAG = u
+!endif
+!if "$(WXUNIV)" == "1"
+WXUNIVNAME = univ
+!endif
+!if "$(SHARED)" == "1"
+WXDLLFLAG = dll
+!endif
+!if "$(SHARED)" == "0"
+LIBTYPE_SUFFIX = lib
+!endif
+!if "$(SHARED)" == "1"
+LIBTYPE_SUFFIX = dll
+!endif
+!if "$(MONOLITHIC)" == "0"
+EXTRALIBS_FOR_BASE =
+!endif
+!if "$(MONOLITHIC)" == "1"
+EXTRALIBS_FOR_BASE =
+!endif
+!if "$(BUILD)" == "debug"
+__OPTIMIZEFLAG_2 = -Od
+!endif
+!if "$(BUILD)" == "release"
+__OPTIMIZEFLAG_2 = -O2
+!endif
+!if "$(USE_THREADS)" == "0"
+__THREADSFLAG_5 =
+!endif
+!if "$(USE_THREADS)" == "1"
+__THREADSFLAG_5 = mt
+!endif
+!if "$(USE_THREADS)" == "0"
+__THREADSFLAG_6 =
+!endif
+!if "$(USE_THREADS)" == "1"
+__THREADSFLAG_6 = -tWM
+!endif
+!if "$(RUNTIME_LIBS)" == "dynamic"
+__RUNTIME_LIBS_7 = -tWR
+!endif
+!if "$(RUNTIME_LIBS)" == "static"
+__RUNTIME_LIBS_7 =
+!endif
+!if "$(RUNTIME_LIBS)" == "dynamic"
+__RUNTIME_LIBS_8 = i
+!endif
+!if "$(RUNTIME_LIBS)" == "static"
+__RUNTIME_LIBS_8 =
+!endif
+!if "$(WXUNIV)" == "1"
+__WXUNIV_DEFINE_p = -D__WXUNIVERSAL__
+!endif
+!if "$(DEBUG_FLAG)" == "0"
+__DEBUG_DEFINE_p = -DwxDEBUG_LEVEL=0
+!endif
+!if "$(BUILD)" == "release"
+__NDEBUG_DEFINE_p = -DNDEBUG
+!endif
+!if "$(USE_EXCEPTIONS)" == "0"
+__EXCEPTIONS_DEFINE_p = -DwxNO_EXCEPTIONS
+!endif
+!if "$(USE_RTTI)" == "0"
+__RTTI_DEFINE_p = -DwxNO_RTTI
+!endif
+!if "$(USE_THREADS)" == "0"
+__THREAD_DEFINE_p = -DwxNO_THREADS
+!endif
+!if "$(UNICODE)" == "0"
+__UNICODE_DEFINE_p = -DwxUSE_UNICODE=0
+!endif
+!if "$(UNICODE)" == "1"
+__UNICODE_DEFINE_p = -D_UNICODE
+!endif
+!if "$(USE_CAIRO)" == "1"
+____CAIRO_INCLUDEDIR_FILENAMES_p = -I$(CAIRO_ROOT)\include\cairo
+!endif
+!if "$(SHARED)" == "1"
+__DLLFLAG_p = -DWXUSINGDLL
+!endif
+!if "$(MONOLITHIC)" == "0"
+__WXLIB_XML_p = \
+ wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xml.lib
+!endif
+!if "$(MONOLITHIC)" == "0"
+__WXLIB_BASE_p = \
+ wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib
+!endif
+!if "$(MONOLITHIC)" == "1"
+__WXLIB_MONO_p = \
+ wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib
+!endif
+!if "$(MONOLITHIC)" == "1"
+__LIB_PNG_IF_MONO_p = $(__LIB_PNG_p)
+!endif
+!if "$(USE_GUI)" == "1"
+__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib
+!endif
+!if "$(USE_CAIRO)" == "1"
+__CAIRO_LIB_p = cairo.lib
+!endif
+!if "$(USE_CAIRO)" == "1"
+____CAIRO_LIBDIR_FILENAMES_p = -L$(CAIRO_ROOT)\lib
+!endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default"
+__DEBUGINFO = -v
+!endif
+!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default"
+__DEBUGINFO = -v-
+!endif
+!if "$(DEBUG_INFO)" == "0"
+__DEBUGINFO = -v-
+!endif
+!if "$(DEBUG_INFO)" == "1"
+__DEBUGINFO = -v
+!endif
+
+
+all: $(OBJS)
+$(OBJS):
+ -if not exist $(OBJS) mkdir $(OBJS)
+
+### Targets: ###
+
+all: $(OBJS)\ifacecheck.exe
+
+clean:
+ -if exist $(OBJS)\*.obj del $(OBJS)\*.obj
+ -if exist $(OBJS)\*.res del $(OBJS)\*.res
+ -if exist $(OBJS)\*.csm del $(OBJS)\*.csm
+ -if exist $(OBJS)\ifacecheck.exe del $(OBJS)\ifacecheck.exe
+ -if exist $(OBJS)\ifacecheck.tds del $(OBJS)\ifacecheck.tds
+ -if exist $(OBJS)\ifacecheck.ilc del $(OBJS)\ifacecheck.ilc
+ -if exist $(OBJS)\ifacecheck.ild del $(OBJS)\ifacecheck.ild
+ -if exist $(OBJS)\ifacecheck.ilf del $(OBJS)\ifacecheck.ilf
+ -if exist $(OBJS)\ifacecheck.ils del $(OBJS)\ifacecheck.ils
+
+$(OBJS)\ifacecheck.exe: $(IFACECHECK_OBJECTS)
+ ilink32 -Tpe -q -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUGINFO) -L$(LIBDIRNAME) -ap $(____CAIRO_LIBDIR_FILENAMES_p) $(LDFLAGS) @&&|
+ c0x32.obj $(IFACECHECK_OBJECTS),$@,, $(__WXLIB_XML_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_PNG_IF_MONO_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__CAIRO_LIB_p) ole2w32.lib oleacc.lib import32.lib cw32$(__THREADSFLAG_5)$(__RUNTIME_LIBS_8).lib,,
+|
+
+$(OBJS)\ifacecheck_ifacecheck.obj: .\ifacecheck.cpp
+ $(CXX) -q -c -P -o$@ $(IFACECHECK_CXXFLAGS) .\ifacecheck.cpp
+
+$(OBJS)\ifacecheck_xmlparser.obj: .\xmlparser.cpp
+ $(CXX) -q -c -P -o$@ $(IFACECHECK_CXXFLAGS) .\xmlparser.cpp
+
diff --git a/utils/ifacecheck/src/makefile.gcc b/utils/ifacecheck/src/makefile.gcc
index 02f6b44851..0bf7e79725 100644
--- a/utils/ifacecheck/src/makefile.gcc
+++ b/utils/ifacecheck/src/makefile.gcc
@@ -1,197 +1,197 @@
-# =========================================================================
-# This makefile was generated by
-# Bakefile 0.2.9 (http://www.bakefile.org)
-# Do not modify, all changes will be overwritten!
-# =========================================================================
-
-include ../../../build/msw/config.gcc
-
-# -------------------------------------------------------------------------
-# Do not modify the rest of this file!
-# -------------------------------------------------------------------------
-
-### Variables: ###
-
-CPPDEPS = -MT$@ -MF$@.d -MD -MP
-WX_RELEASE_NODOT = 31
-COMPILER_PREFIX = gcc
-OBJS = \
- $(COMPILER_PREFIX)$(COMPILER_VERSION)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)
-LIBDIRNAME = \
- .\..\..\..\lib\$(COMPILER_PREFIX)$(COMPILER_VERSION)_$(LIBTYPE_SUFFIX)$(CFG)
-SETUPHDIR = \
- $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)
-IFACECHECK_CXXFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG_2) $(__THREADSFLAG) \
- $(GCCFLAGS) -DHAVE_W32API_H -D__WXMSW__ $(__WXUNIV_DEFINE_p) \
- $(__DEBUG_DEFINE_p) $(__NDEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) \
- $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) \
- -I$(SETUPHDIR) -I.\..\..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES_p) -W \
- -Wall -I. $(__DLLFLAG_p) -DwxUSE_GUI=0 $(__RTTIFLAG_5) $(__EXCEPTIONSFLAG_6) \
- -Wno-ctor-dtor-privacy $(CPPFLAGS) $(CXXFLAGS)
-IFACECHECK_OBJECTS = \
- $(OBJS)\ifacecheck_ifacecheck.o \
- $(OBJS)\ifacecheck_xmlparser.o
-
-### Conditionally set variables: ###
-
-ifeq ($(GCC_VERSION),2.95)
-GCCFLAGS = -fvtable-thunks
-endif
-ifeq ($(USE_GUI),0)
-PORTNAME = base
-endif
-ifeq ($(USE_GUI),1)
-PORTNAME = msw$(TOOLKIT_VERSION)
-endif
-ifeq ($(OFFICIAL_BUILD),1)
-COMPILER_VERSION = ERROR-COMPILER-VERSION-MUST-BE-SET-FOR-OFFICIAL-BUILD
-endif
-ifeq ($(BUILD),debug)
-WXDEBUGFLAG = d
-endif
-ifeq ($(UNICODE),1)
-WXUNICODEFLAG = u
-endif
-ifeq ($(WXUNIV),1)
-WXUNIVNAME = univ
-endif
-ifeq ($(SHARED),1)
-WXDLLFLAG = dll
-endif
-ifeq ($(SHARED),0)
-LIBTYPE_SUFFIX = lib
-endif
-ifeq ($(SHARED),1)
-LIBTYPE_SUFFIX = dll
-endif
-ifeq ($(MONOLITHIC),0)
-EXTRALIBS_FOR_BASE =
-endif
-ifeq ($(MONOLITHIC),1)
-EXTRALIBS_FOR_BASE =
-endif
-ifeq ($(BUILD),debug)
-__OPTIMIZEFLAG_2 = -O0
-endif
-ifeq ($(BUILD),release)
-__OPTIMIZEFLAG_2 = -O2
-endif
-ifeq ($(USE_RTTI),0)
-__RTTIFLAG_5 = -fno-rtti
-endif
-ifeq ($(USE_RTTI),1)
-__RTTIFLAG_5 =
-endif
-ifeq ($(USE_EXCEPTIONS),0)
-__EXCEPTIONSFLAG_6 = -fno-exceptions
-endif
-ifeq ($(USE_EXCEPTIONS),1)
-__EXCEPTIONSFLAG_6 =
-endif
-ifeq ($(WXUNIV),1)
-__WXUNIV_DEFINE_p = -D__WXUNIVERSAL__
-endif
-ifeq ($(DEBUG_FLAG),0)
-__DEBUG_DEFINE_p = -DwxDEBUG_LEVEL=0
-endif
-ifeq ($(BUILD),release)
-__NDEBUG_DEFINE_p = -DNDEBUG
-endif
-ifeq ($(USE_EXCEPTIONS),0)
-__EXCEPTIONS_DEFINE_p = -DwxNO_EXCEPTIONS
-endif
-ifeq ($(USE_RTTI),0)
-__RTTI_DEFINE_p = -DwxNO_RTTI
-endif
-ifeq ($(USE_THREADS),0)
-__THREAD_DEFINE_p = -DwxNO_THREADS
-endif
-ifeq ($(UNICODE),0)
-__UNICODE_DEFINE_p = -DwxUSE_UNICODE=0
-endif
-ifeq ($(UNICODE),1)
-__UNICODE_DEFINE_p = -D_UNICODE
-endif
-ifeq ($(USE_CAIRO),1)
-____CAIRO_INCLUDEDIR_FILENAMES_p = -I$(CAIRO_ROOT)\include\cairo
-endif
-ifeq ($(SHARED),1)
-__DLLFLAG_p = -DWXUSINGDLL
-endif
-ifeq ($(MONOLITHIC),0)
-__WXLIB_XML_p = \
- -lwxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xml
-endif
-ifeq ($(MONOLITHIC),0)
-__WXLIB_BASE_p = \
- -lwxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)
-endif
-ifeq ($(MONOLITHIC),1)
-__WXLIB_MONO_p = \
- -lwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)
-endif
-ifeq ($(MONOLITHIC),1)
-__LIB_PNG_IF_MONO_p = $(__LIB_PNG_p)
-endif
-ifeq ($(USE_GUI),1)
-__LIB_PNG_p = -lwxpng$(WXDEBUGFLAG)
-endif
-ifeq ($(USE_CAIRO),1)
-__CAIRO_LIB_p = -lcairo
-endif
-ifeq ($(USE_CAIRO),1)
-____CAIRO_LIBDIR_FILENAMES_p = -L$(CAIRO_ROOT)\lib
-endif
-ifeq ($(BUILD),debug)
-ifeq ($(DEBUG_INFO),default)
-__DEBUGINFO = -g
-endif
-endif
-ifeq ($(BUILD),release)
-ifeq ($(DEBUG_INFO),default)
-__DEBUGINFO =
-endif
-endif
-ifeq ($(DEBUG_INFO),0)
-__DEBUGINFO =
-endif
-ifeq ($(DEBUG_INFO),1)
-__DEBUGINFO = -g
-endif
-ifeq ($(USE_THREADS),0)
-__THREADSFLAG =
-endif
-ifeq ($(USE_THREADS),1)
-__THREADSFLAG = -mthreads
-endif
-
-
-all: $(OBJS)
-$(OBJS):
- -if not exist $(OBJS) mkdir $(OBJS)
-
-### Targets: ###
-
-all: $(OBJS)\ifacecheck.exe
-
-clean:
- -if exist $(OBJS)\*.o del $(OBJS)\*.o
- -if exist $(OBJS)\*.d del $(OBJS)\*.d
- -if exist $(OBJS)\ifacecheck.exe del $(OBJS)\ifacecheck.exe
-
-$(OBJS)\ifacecheck.exe: $(IFACECHECK_OBJECTS)
- $(CXX) -o $@ $(IFACECHECK_OBJECTS) $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) $(____CAIRO_LIBDIR_FILENAMES_p) $(LDFLAGS) $(__WXLIB_XML_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_PNG_IF_MONO_p) -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(EXTRALIBS_FOR_BASE) $(__CAIRO_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32 -lwininet
-
-$(OBJS)\ifacecheck_ifacecheck.o: ./ifacecheck.cpp
- $(CXX) -c -o $@ $(IFACECHECK_CXXFLAGS) $(CPPDEPS) $<
-
-$(OBJS)\ifacecheck_xmlparser.o: ./xmlparser.cpp
- $(CXX) -c -o $@ $(IFACECHECK_CXXFLAGS) $(CPPDEPS) $<
-
-.PHONY: all clean
-
-
-SHELL := $(COMSPEC)
-
-# Dependencies tracking:
--include $(OBJS)/*.d
+# =========================================================================
+# This makefile was generated by
+# Bakefile 0.2.9 (http://www.bakefile.org)
+# Do not modify, all changes will be overwritten!
+# =========================================================================
+
+include ../../../build/msw/config.gcc
+
+# -------------------------------------------------------------------------
+# Do not modify the rest of this file!
+# -------------------------------------------------------------------------
+
+### Variables: ###
+
+CPPDEPS = -MT$@ -MF$@.d -MD -MP
+WX_RELEASE_NODOT = 31
+COMPILER_PREFIX = gcc
+OBJS = \
+ $(COMPILER_PREFIX)$(COMPILER_VERSION)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)
+LIBDIRNAME = \
+ .\..\..\..\lib\$(COMPILER_PREFIX)$(COMPILER_VERSION)_$(LIBTYPE_SUFFIX)$(CFG)
+SETUPHDIR = \
+ $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)
+IFACECHECK_CXXFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG_2) $(__THREADSFLAG) \
+ $(GCCFLAGS) -DHAVE_W32API_H -D__WXMSW__ $(__WXUNIV_DEFINE_p) \
+ $(__DEBUG_DEFINE_p) $(__NDEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) \
+ $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) \
+ -I$(SETUPHDIR) -I.\..\..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES_p) -W \
+ -Wall -I. $(__DLLFLAG_p) -DwxUSE_GUI=0 $(__RTTIFLAG_5) $(__EXCEPTIONSFLAG_6) \
+ -Wno-ctor-dtor-privacy $(CPPFLAGS) $(CXXFLAGS)
+IFACECHECK_OBJECTS = \
+ $(OBJS)\ifacecheck_ifacecheck.o \
+ $(OBJS)\ifacecheck_xmlparser.o
+
+### Conditionally set variables: ###
+
+ifeq ($(GCC_VERSION),2.95)
+GCCFLAGS = -fvtable-thunks
+endif
+ifeq ($(USE_GUI),0)
+PORTNAME = base
+endif
+ifeq ($(USE_GUI),1)
+PORTNAME = msw$(TOOLKIT_VERSION)
+endif
+ifeq ($(OFFICIAL_BUILD),1)
+COMPILER_VERSION = ERROR-COMPILER-VERSION-MUST-BE-SET-FOR-OFFICIAL-BUILD
+endif
+ifeq ($(BUILD),debug)
+WXDEBUGFLAG = d
+endif
+ifeq ($(UNICODE),1)
+WXUNICODEFLAG = u
+endif
+ifeq ($(WXUNIV),1)
+WXUNIVNAME = univ
+endif
+ifeq ($(SHARED),1)
+WXDLLFLAG = dll
+endif
+ifeq ($(SHARED),0)
+LIBTYPE_SUFFIX = lib
+endif
+ifeq ($(SHARED),1)
+LIBTYPE_SUFFIX = dll
+endif
+ifeq ($(MONOLITHIC),0)
+EXTRALIBS_FOR_BASE =
+endif
+ifeq ($(MONOLITHIC),1)
+EXTRALIBS_FOR_BASE =
+endif
+ifeq ($(BUILD),debug)
+__OPTIMIZEFLAG_2 = -O0
+endif
+ifeq ($(BUILD),release)
+__OPTIMIZEFLAG_2 = -O2
+endif
+ifeq ($(USE_RTTI),0)
+__RTTIFLAG_5 = -fno-rtti
+endif
+ifeq ($(USE_RTTI),1)
+__RTTIFLAG_5 =
+endif
+ifeq ($(USE_EXCEPTIONS),0)
+__EXCEPTIONSFLAG_6 = -fno-exceptions
+endif
+ifeq ($(USE_EXCEPTIONS),1)
+__EXCEPTIONSFLAG_6 =
+endif
+ifeq ($(WXUNIV),1)
+__WXUNIV_DEFINE_p = -D__WXUNIVERSAL__
+endif
+ifeq ($(DEBUG_FLAG),0)
+__DEBUG_DEFINE_p = -DwxDEBUG_LEVEL=0
+endif
+ifeq ($(BUILD),release)
+__NDEBUG_DEFINE_p = -DNDEBUG
+endif
+ifeq ($(USE_EXCEPTIONS),0)
+__EXCEPTIONS_DEFINE_p = -DwxNO_EXCEPTIONS
+endif
+ifeq ($(USE_RTTI),0)
+__RTTI_DEFINE_p = -DwxNO_RTTI
+endif
+ifeq ($(USE_THREADS),0)
+__THREAD_DEFINE_p = -DwxNO_THREADS
+endif
+ifeq ($(UNICODE),0)
+__UNICODE_DEFINE_p = -DwxUSE_UNICODE=0
+endif
+ifeq ($(UNICODE),1)
+__UNICODE_DEFINE_p = -D_UNICODE
+endif
+ifeq ($(USE_CAIRO),1)
+____CAIRO_INCLUDEDIR_FILENAMES_p = -I$(CAIRO_ROOT)\include\cairo
+endif
+ifeq ($(SHARED),1)
+__DLLFLAG_p = -DWXUSINGDLL
+endif
+ifeq ($(MONOLITHIC),0)
+__WXLIB_XML_p = \
+ -lwxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xml
+endif
+ifeq ($(MONOLITHIC),0)
+__WXLIB_BASE_p = \
+ -lwxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)
+endif
+ifeq ($(MONOLITHIC),1)
+__WXLIB_MONO_p = \
+ -lwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)
+endif
+ifeq ($(MONOLITHIC),1)
+__LIB_PNG_IF_MONO_p = $(__LIB_PNG_p)
+endif
+ifeq ($(USE_GUI),1)
+__LIB_PNG_p = -lwxpng$(WXDEBUGFLAG)
+endif
+ifeq ($(USE_CAIRO),1)
+__CAIRO_LIB_p = -lcairo
+endif
+ifeq ($(USE_CAIRO),1)
+____CAIRO_LIBDIR_FILENAMES_p = -L$(CAIRO_ROOT)\lib
+endif
+ifeq ($(BUILD),debug)
+ifeq ($(DEBUG_INFO),default)
+__DEBUGINFO = -g
+endif
+endif
+ifeq ($(BUILD),release)
+ifeq ($(DEBUG_INFO),default)
+__DEBUGINFO =
+endif
+endif
+ifeq ($(DEBUG_INFO),0)
+__DEBUGINFO =
+endif
+ifeq ($(DEBUG_INFO),1)
+__DEBUGINFO = -g
+endif
+ifeq ($(USE_THREADS),0)
+__THREADSFLAG =
+endif
+ifeq ($(USE_THREADS),1)
+__THREADSFLAG = -mthreads
+endif
+
+
+all: $(OBJS)
+$(OBJS):
+ -if not exist $(OBJS) mkdir $(OBJS)
+
+### Targets: ###
+
+all: $(OBJS)\ifacecheck.exe
+
+clean:
+ -if exist $(OBJS)\*.o del $(OBJS)\*.o
+ -if exist $(OBJS)\*.d del $(OBJS)\*.d
+ -if exist $(OBJS)\ifacecheck.exe del $(OBJS)\ifacecheck.exe
+
+$(OBJS)\ifacecheck.exe: $(IFACECHECK_OBJECTS)
+ $(CXX) -o $@ $(IFACECHECK_OBJECTS) $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) $(____CAIRO_LIBDIR_FILENAMES_p) $(LDFLAGS) $(__WXLIB_XML_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_PNG_IF_MONO_p) -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(EXTRALIBS_FOR_BASE) $(__CAIRO_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32 -lwininet
+
+$(OBJS)\ifacecheck_ifacecheck.o: ./ifacecheck.cpp
+ $(CXX) -c -o $@ $(IFACECHECK_CXXFLAGS) $(CPPDEPS) $<
+
+$(OBJS)\ifacecheck_xmlparser.o: ./xmlparser.cpp
+ $(CXX) -c -o $@ $(IFACECHECK_CXXFLAGS) $(CPPDEPS) $<
+
+.PHONY: all clean
+
+
+SHELL := $(COMSPEC)
+
+# Dependencies tracking:
+-include $(OBJS)/*.d
diff --git a/utils/ifacecheck/src/makefile.vc b/utils/ifacecheck/src/makefile.vc
index e8f7d65c77..f53f7093b1 100644
--- a/utils/ifacecheck/src/makefile.vc
+++ b/utils/ifacecheck/src/makefile.vc
@@ -1,304 +1,304 @@
-# =========================================================================
-# This makefile was generated by
-# Bakefile 0.2.9 (http://www.bakefile.org)
-# Do not modify, all changes will be overwritten!
-# =========================================================================
-
-!include <../../../build/msw/config.vc>
-
-# -------------------------------------------------------------------------
-# Do not modify the rest of this file!
-# -------------------------------------------------------------------------
-
-### Variables: ###
-
-WX_RELEASE_NODOT = 31
-COMPILER_PREFIX = vc
-OBJS = \
- $(COMPILER_PREFIX)$(COMPILER_VERSION)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)$(ARCH_SUFFIX)
-LIBDIRNAME = \
- .\..\..\..\lib\$(COMPILER_PREFIX)$(COMPILER_VERSION)$(ARCH_SUFFIX)_$(LIBTYPE_SUFFIX)$(CFG)
-SETUPHDIR = \
- $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)
-IFACECHECK_CXXFLAGS = /M$(__RUNTIME_LIBS_10)$(__DEBUGRUNTIME_4) /DWIN32 \
- $(__DEBUGINFO_0) /Fd$(OBJS)\ifacecheck.pdb $(____DEBUGRUNTIME_3_p) \
- $(__OPTIMIZEFLAG_6) /D_CRT_SECURE_NO_DEPRECATE=1 \
- /D_CRT_NON_CONFORMING_SWPRINTFS=1 /D_SCL_SECURE_NO_WARNINGS=1 \
- $(__NO_VC_CRTDBG_p) /D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \
- $(__NDEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \
- $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) /I$(SETUPHDIR) \
- /I.\..\..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES_p) /W4 /I. \
- $(__DLLFLAG_p) /D_CONSOLE /DwxUSE_GUI=0 $(__RTTIFLAG_11) \
- $(__EXCEPTIONSFLAG_12) $(CPPFLAGS) $(CXXFLAGS)
-IFACECHECK_OBJECTS = \
- $(OBJS)\ifacecheck_ifacecheck.obj \
- $(OBJS)\ifacecheck_xmlparser.obj
-
-### Conditionally set variables: ###
-
-!if "$(TARGET_CPU)" == "AMD64"
-ARCH_SUFFIX = _x64
-!endif
-!if "$(TARGET_CPU)" == "IA64"
-ARCH_SUFFIX = _ia64
-!endif
-!if "$(TARGET_CPU)" == "X64"
-ARCH_SUFFIX = _x64
-!endif
-!if "$(TARGET_CPU)" == "amd64"
-ARCH_SUFFIX = _x64
-!endif
-!if "$(TARGET_CPU)" == "ia64"
-ARCH_SUFFIX = _ia64
-!endif
-!if "$(TARGET_CPU)" == "x64"
-ARCH_SUFFIX = _x64
-!endif
-!if "$(USE_GUI)" == "0"
-PORTNAME = base
-!endif
-!if "$(USE_GUI)" == "1"
-PORTNAME = msw$(TOOLKIT_VERSION)
-!endif
-!if "$(OFFICIAL_BUILD)" == "1"
-COMPILER_VERSION = ERROR-COMPILER-VERSION-MUST-BE-SET-FOR-OFFICIAL-BUILD
-!endif
-!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default"
-WXDEBUGFLAG = d
-!endif
-!if "$(DEBUG_RUNTIME_LIBS)" == "1"
-WXDEBUGFLAG = d
-!endif
-!if "$(UNICODE)" == "1"
-WXUNICODEFLAG = u
-!endif
-!if "$(WXUNIV)" == "1"
-WXUNIVNAME = univ
-!endif
-!if "$(SHARED)" == "1"
-WXDLLFLAG = dll
-!endif
-!if "$(SHARED)" == "0"
-LIBTYPE_SUFFIX = lib
-!endif
-!if "$(SHARED)" == "1"
-LIBTYPE_SUFFIX = dll
-!endif
-!if "$(TARGET_CPU)" == "AMD64"
-LINK_TARGET_CPU = /MACHINE:X64
-!endif
-!if "$(TARGET_CPU)" == "IA64"
-LINK_TARGET_CPU = /MACHINE:IA64
-!endif
-!if "$(TARGET_CPU)" == "X64"
-LINK_TARGET_CPU = /MACHINE:X64
-!endif
-!if "$(TARGET_CPU)" == "amd64"
-LINK_TARGET_CPU = /MACHINE:X64
-!endif
-!if "$(TARGET_CPU)" == "ia64"
-LINK_TARGET_CPU = /MACHINE:IA64
-!endif
-!if "$(TARGET_CPU)" == "x64"
-LINK_TARGET_CPU = /MACHINE:X64
-!endif
-!if "$(MONOLITHIC)" == "0"
-EXTRALIBS_FOR_BASE =
-!endif
-!if "$(MONOLITHIC)" == "1"
-EXTRALIBS_FOR_BASE =
-!endif
-!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default"
-__DEBUGINFO_0 = /Zi
-!endif
-!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default"
-__DEBUGINFO_0 =
-!endif
-!if "$(DEBUG_INFO)" == "0"
-__DEBUGINFO_0 =
-!endif
-!if "$(DEBUG_INFO)" == "1"
-__DEBUGINFO_0 = /Zi
-!endif
-!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default"
-__DEBUGINFO_1 = /DEBUG
-!endif
-!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default"
-__DEBUGINFO_1 =
-!endif
-!if "$(DEBUG_INFO)" == "0"
-__DEBUGINFO_1 =
-!endif
-!if "$(DEBUG_INFO)" == "1"
-__DEBUGINFO_1 = /DEBUG
-!endif
-!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default"
-__DEBUGINFO_2 = $(__DEBUGRUNTIME_5)
-!endif
-!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default"
-__DEBUGINFO_2 =
-!endif
-!if "$(DEBUG_INFO)" == "0"
-__DEBUGINFO_2 =
-!endif
-!if "$(DEBUG_INFO)" == "1"
-__DEBUGINFO_2 = $(__DEBUGRUNTIME_5)
-!endif
-!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default"
-____DEBUGRUNTIME_3_p = /D_DEBUG
-!endif
-!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default"
-____DEBUGRUNTIME_3_p =
-!endif
-!if "$(DEBUG_RUNTIME_LIBS)" == "0"
-____DEBUGRUNTIME_3_p =
-!endif
-!if "$(DEBUG_RUNTIME_LIBS)" == "1"
-____DEBUGRUNTIME_3_p = /D_DEBUG
-!endif
-!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default"
-__DEBUGRUNTIME_4 = d
-!endif
-!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default"
-__DEBUGRUNTIME_4 =
-!endif
-!if "$(DEBUG_RUNTIME_LIBS)" == "0"
-__DEBUGRUNTIME_4 =
-!endif
-!if "$(DEBUG_RUNTIME_LIBS)" == "1"
-__DEBUGRUNTIME_4 = d
-!endif
-!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default"
-__DEBUGRUNTIME_5 =
-!endif
-!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default"
-__DEBUGRUNTIME_5 = /opt:ref /opt:icf
-!endif
-!if "$(DEBUG_RUNTIME_LIBS)" == "0"
-__DEBUGRUNTIME_5 = /opt:ref /opt:icf
-!endif
-!if "$(DEBUG_RUNTIME_LIBS)" == "1"
-__DEBUGRUNTIME_5 =
-!endif
-!if "$(BUILD)" == "debug"
-__OPTIMIZEFLAG_6 = /Od
-!endif
-!if "$(BUILD)" == "release"
-__OPTIMIZEFLAG_6 = /O2
-!endif
-!if "$(USE_THREADS)" == "0"
-__THREADSFLAG_9 = L
-!endif
-!if "$(USE_THREADS)" == "1"
-__THREADSFLAG_9 = T
-!endif
-!if "$(RUNTIME_LIBS)" == "dynamic"
-__RUNTIME_LIBS_10 = D
-!endif
-!if "$(RUNTIME_LIBS)" == "static"
-__RUNTIME_LIBS_10 = $(__THREADSFLAG_9)
-!endif
-!if "$(USE_RTTI)" == "0"
-__RTTIFLAG_11 =
-!endif
-!if "$(USE_RTTI)" == "1"
-__RTTIFLAG_11 = /GR
-!endif
-!if "$(USE_EXCEPTIONS)" == "0"
-__EXCEPTIONSFLAG_12 =
-!endif
-!if "$(USE_EXCEPTIONS)" == "1"
-__EXCEPTIONSFLAG_12 = /EHsc
-!endif
-!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "0"
-__NO_VC_CRTDBG_p = /D__NO_VC_CRTDBG__
-!endif
-!if "$(BUILD)" == "release" && "$(DEBUG_FLAG)" == "1"
-__NO_VC_CRTDBG_p = /D__NO_VC_CRTDBG__
-!endif
-!if "$(WXUNIV)" == "1"
-__WXUNIV_DEFINE_p = /D__WXUNIVERSAL__
-!endif
-!if "$(DEBUG_FLAG)" == "0"
-__DEBUG_DEFINE_p = /DwxDEBUG_LEVEL=0
-!endif
-!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default"
-__NDEBUG_DEFINE_p = /DNDEBUG
-!endif
-!if "$(DEBUG_RUNTIME_LIBS)" == "0"
-__NDEBUG_DEFINE_p = /DNDEBUG
-!endif
-!if "$(USE_EXCEPTIONS)" == "0"
-__EXCEPTIONS_DEFINE_p = /DwxNO_EXCEPTIONS
-!endif
-!if "$(USE_RTTI)" == "0"
-__RTTI_DEFINE_p = /DwxNO_RTTI
-!endif
-!if "$(USE_THREADS)" == "0"
-__THREAD_DEFINE_p = /DwxNO_THREADS
-!endif
-!if "$(UNICODE)" == "0"
-__UNICODE_DEFINE_p = /DwxUSE_UNICODE=0
-!endif
-!if "$(UNICODE)" == "1"
-__UNICODE_DEFINE_p = /D_UNICODE
-!endif
-!if "$(USE_CAIRO)" == "1"
-____CAIRO_INCLUDEDIR_FILENAMES_p = /I$(CAIRO_ROOT)\include\cairo
-!endif
-!if "$(SHARED)" == "1"
-__DLLFLAG_p = /DWXUSINGDLL
-!endif
-!if "$(MONOLITHIC)" == "0"
-__WXLIB_XML_p = \
- wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xml.lib
-!endif
-!if "$(MONOLITHIC)" == "0"
-__WXLIB_BASE_p = \
- wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib
-!endif
-!if "$(MONOLITHIC)" == "1"
-__WXLIB_MONO_p = \
- wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib
-!endif
-!if "$(MONOLITHIC)" == "1"
-__LIB_PNG_IF_MONO_p = $(__LIB_PNG_p)
-!endif
-!if "$(USE_GUI)" == "1"
-__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib
-!endif
-!if "$(USE_CAIRO)" == "1"
-__CAIRO_LIB_p = cairo.lib
-!endif
-!if "$(USE_CAIRO)" == "1"
-____CAIRO_LIBDIR_FILENAMES_p = /LIBPATH:$(CAIRO_ROOT)\lib
-!endif
-
-
-all: $(OBJS)
-$(OBJS):
- -if not exist $(OBJS) mkdir $(OBJS)
-
-### Targets: ###
-
-all: $(OBJS)\ifacecheck.exe
-
-clean:
- -if exist $(OBJS)\*.obj del $(OBJS)\*.obj
- -if exist $(OBJS)\*.res del $(OBJS)\*.res
- -if exist $(OBJS)\*.pch del $(OBJS)\*.pch
- -if exist $(OBJS)\ifacecheck.exe del $(OBJS)\ifacecheck.exe
- -if exist $(OBJS)\ifacecheck.ilk del $(OBJS)\ifacecheck.ilk
- -if exist $(OBJS)\ifacecheck.pdb del $(OBJS)\ifacecheck.pdb
-
-$(OBJS)\ifacecheck.exe: $(IFACECHECK_OBJECTS)
- link /NOLOGO /OUT:$@ $(__DEBUGINFO_1) /pdb:"$(OBJS)\ifacecheck.pdb" $(__DEBUGINFO_2) $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:CONSOLE $(____CAIRO_LIBDIR_FILENAMES_p) $(LDFLAGS) @<<
- $(IFACECHECK_OBJECTS) $(__WXLIB_XML_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_PNG_IF_MONO_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__CAIRO_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib
-<<
-
-$(OBJS)\ifacecheck_ifacecheck.obj: .\ifacecheck.cpp
- $(CXX) /c /nologo /TP /Fo$@ $(IFACECHECK_CXXFLAGS) .\ifacecheck.cpp
-
-$(OBJS)\ifacecheck_xmlparser.obj: .\xmlparser.cpp
- $(CXX) /c /nologo /TP /Fo$@ $(IFACECHECK_CXXFLAGS) .\xmlparser.cpp
-
+# =========================================================================
+# This makefile was generated by
+# Bakefile 0.2.9 (http://www.bakefile.org)
+# Do not modify, all changes will be overwritten!
+# =========================================================================
+
+!include <../../../build/msw/config.vc>
+
+# -------------------------------------------------------------------------
+# Do not modify the rest of this file!
+# -------------------------------------------------------------------------
+
+### Variables: ###
+
+WX_RELEASE_NODOT = 31
+COMPILER_PREFIX = vc
+OBJS = \
+ $(COMPILER_PREFIX)$(COMPILER_VERSION)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)$(ARCH_SUFFIX)
+LIBDIRNAME = \
+ .\..\..\..\lib\$(COMPILER_PREFIX)$(COMPILER_VERSION)$(ARCH_SUFFIX)_$(LIBTYPE_SUFFIX)$(CFG)
+SETUPHDIR = \
+ $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)
+IFACECHECK_CXXFLAGS = /M$(__RUNTIME_LIBS_10)$(__DEBUGRUNTIME_4) /DWIN32 \
+ $(__DEBUGINFO_0) /Fd$(OBJS)\ifacecheck.pdb $(____DEBUGRUNTIME_3_p) \
+ $(__OPTIMIZEFLAG_6) /D_CRT_SECURE_NO_DEPRECATE=1 \
+ /D_CRT_NON_CONFORMING_SWPRINTFS=1 /D_SCL_SECURE_NO_WARNINGS=1 \
+ $(__NO_VC_CRTDBG_p) /D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \
+ $(__NDEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \
+ $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) /I$(SETUPHDIR) \
+ /I.\..\..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES_p) /W4 /I. \
+ $(__DLLFLAG_p) /D_CONSOLE /DwxUSE_GUI=0 $(__RTTIFLAG_11) \
+ $(__EXCEPTIONSFLAG_12) $(CPPFLAGS) $(CXXFLAGS)
+IFACECHECK_OBJECTS = \
+ $(OBJS)\ifacecheck_ifacecheck.obj \
+ $(OBJS)\ifacecheck_xmlparser.obj
+
+### Conditionally set variables: ###
+
+!if "$(TARGET_CPU)" == "AMD64"
+ARCH_SUFFIX = _x64
+!endif
+!if "$(TARGET_CPU)" == "IA64"
+ARCH_SUFFIX = _ia64
+!endif
+!if "$(TARGET_CPU)" == "X64"
+ARCH_SUFFIX = _x64
+!endif
+!if "$(TARGET_CPU)" == "amd64"
+ARCH_SUFFIX = _x64
+!endif
+!if "$(TARGET_CPU)" == "ia64"
+ARCH_SUFFIX = _ia64
+!endif
+!if "$(TARGET_CPU)" == "x64"
+ARCH_SUFFIX = _x64
+!endif
+!if "$(USE_GUI)" == "0"
+PORTNAME = base
+!endif
+!if "$(USE_GUI)" == "1"
+PORTNAME = msw$(TOOLKIT_VERSION)
+!endif
+!if "$(OFFICIAL_BUILD)" == "1"
+COMPILER_VERSION = ERROR-COMPILER-VERSION-MUST-BE-SET-FOR-OFFICIAL-BUILD
+!endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default"
+WXDEBUGFLAG = d
+!endif
+!if "$(DEBUG_RUNTIME_LIBS)" == "1"
+WXDEBUGFLAG = d
+!endif
+!if "$(UNICODE)" == "1"
+WXUNICODEFLAG = u
+!endif
+!if "$(WXUNIV)" == "1"
+WXUNIVNAME = univ
+!endif
+!if "$(SHARED)" == "1"
+WXDLLFLAG = dll
+!endif
+!if "$(SHARED)" == "0"
+LIBTYPE_SUFFIX = lib
+!endif
+!if "$(SHARED)" == "1"
+LIBTYPE_SUFFIX = dll
+!endif
+!if "$(TARGET_CPU)" == "AMD64"
+LINK_TARGET_CPU = /MACHINE:X64
+!endif
+!if "$(TARGET_CPU)" == "IA64"
+LINK_TARGET_CPU = /MACHINE:IA64
+!endif
+!if "$(TARGET_CPU)" == "X64"
+LINK_TARGET_CPU = /MACHINE:X64
+!endif
+!if "$(TARGET_CPU)" == "amd64"
+LINK_TARGET_CPU = /MACHINE:X64
+!endif
+!if "$(TARGET_CPU)" == "ia64"
+LINK_TARGET_CPU = /MACHINE:IA64
+!endif
+!if "$(TARGET_CPU)" == "x64"
+LINK_TARGET_CPU = /MACHINE:X64
+!endif
+!if "$(MONOLITHIC)" == "0"
+EXTRALIBS_FOR_BASE =
+!endif
+!if "$(MONOLITHIC)" == "1"
+EXTRALIBS_FOR_BASE =
+!endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default"
+__DEBUGINFO_0 = /Zi
+!endif
+!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default"
+__DEBUGINFO_0 =
+!endif
+!if "$(DEBUG_INFO)" == "0"
+__DEBUGINFO_0 =
+!endif
+!if "$(DEBUG_INFO)" == "1"
+__DEBUGINFO_0 = /Zi
+!endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default"
+__DEBUGINFO_1 = /DEBUG
+!endif
+!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default"
+__DEBUGINFO_1 =
+!endif
+!if "$(DEBUG_INFO)" == "0"
+__DEBUGINFO_1 =
+!endif
+!if "$(DEBUG_INFO)" == "1"
+__DEBUGINFO_1 = /DEBUG
+!endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default"
+__DEBUGINFO_2 = $(__DEBUGRUNTIME_5)
+!endif
+!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default"
+__DEBUGINFO_2 =
+!endif
+!if "$(DEBUG_INFO)" == "0"
+__DEBUGINFO_2 =
+!endif
+!if "$(DEBUG_INFO)" == "1"
+__DEBUGINFO_2 = $(__DEBUGRUNTIME_5)
+!endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default"
+____DEBUGRUNTIME_3_p = /D_DEBUG
+!endif
+!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default"
+____DEBUGRUNTIME_3_p =
+!endif
+!if "$(DEBUG_RUNTIME_LIBS)" == "0"
+____DEBUGRUNTIME_3_p =
+!endif
+!if "$(DEBUG_RUNTIME_LIBS)" == "1"
+____DEBUGRUNTIME_3_p = /D_DEBUG
+!endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default"
+__DEBUGRUNTIME_4 = d
+!endif
+!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default"
+__DEBUGRUNTIME_4 =
+!endif
+!if "$(DEBUG_RUNTIME_LIBS)" == "0"
+__DEBUGRUNTIME_4 =
+!endif
+!if "$(DEBUG_RUNTIME_LIBS)" == "1"
+__DEBUGRUNTIME_4 = d
+!endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default"
+__DEBUGRUNTIME_5 =
+!endif
+!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default"
+__DEBUGRUNTIME_5 = /opt:ref /opt:icf
+!endif
+!if "$(DEBUG_RUNTIME_LIBS)" == "0"
+__DEBUGRUNTIME_5 = /opt:ref /opt:icf
+!endif
+!if "$(DEBUG_RUNTIME_LIBS)" == "1"
+__DEBUGRUNTIME_5 =
+!endif
+!if "$(BUILD)" == "debug"
+__OPTIMIZEFLAG_6 = /Od
+!endif
+!if "$(BUILD)" == "release"
+__OPTIMIZEFLAG_6 = /O2
+!endif
+!if "$(USE_THREADS)" == "0"
+__THREADSFLAG_9 = L
+!endif
+!if "$(USE_THREADS)" == "1"
+__THREADSFLAG_9 = T
+!endif
+!if "$(RUNTIME_LIBS)" == "dynamic"
+__RUNTIME_LIBS_10 = D
+!endif
+!if "$(RUNTIME_LIBS)" == "static"
+__RUNTIME_LIBS_10 = $(__THREADSFLAG_9)
+!endif
+!if "$(USE_RTTI)" == "0"
+__RTTIFLAG_11 =
+!endif
+!if "$(USE_RTTI)" == "1"
+__RTTIFLAG_11 = /GR
+!endif
+!if "$(USE_EXCEPTIONS)" == "0"
+__EXCEPTIONSFLAG_12 =
+!endif
+!if "$(USE_EXCEPTIONS)" == "1"
+__EXCEPTIONSFLAG_12 = /EHsc
+!endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "0"
+__NO_VC_CRTDBG_p = /D__NO_VC_CRTDBG__
+!endif
+!if "$(BUILD)" == "release" && "$(DEBUG_FLAG)" == "1"
+__NO_VC_CRTDBG_p = /D__NO_VC_CRTDBG__
+!endif
+!if "$(WXUNIV)" == "1"
+__WXUNIV_DEFINE_p = /D__WXUNIVERSAL__
+!endif
+!if "$(DEBUG_FLAG)" == "0"
+__DEBUG_DEFINE_p = /DwxDEBUG_LEVEL=0
+!endif
+!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default"
+__NDEBUG_DEFINE_p = /DNDEBUG
+!endif
+!if "$(DEBUG_RUNTIME_LIBS)" == "0"
+__NDEBUG_DEFINE_p = /DNDEBUG
+!endif
+!if "$(USE_EXCEPTIONS)" == "0"
+__EXCEPTIONS_DEFINE_p = /DwxNO_EXCEPTIONS
+!endif
+!if "$(USE_RTTI)" == "0"
+__RTTI_DEFINE_p = /DwxNO_RTTI
+!endif
+!if "$(USE_THREADS)" == "0"
+__THREAD_DEFINE_p = /DwxNO_THREADS
+!endif
+!if "$(UNICODE)" == "0"
+__UNICODE_DEFINE_p = /DwxUSE_UNICODE=0
+!endif
+!if "$(UNICODE)" == "1"
+__UNICODE_DEFINE_p = /D_UNICODE
+!endif
+!if "$(USE_CAIRO)" == "1"
+____CAIRO_INCLUDEDIR_FILENAMES_p = /I$(CAIRO_ROOT)\include\cairo
+!endif
+!if "$(SHARED)" == "1"
+__DLLFLAG_p = /DWXUSINGDLL
+!endif
+!if "$(MONOLITHIC)" == "0"
+__WXLIB_XML_p = \
+ wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xml.lib
+!endif
+!if "$(MONOLITHIC)" == "0"
+__WXLIB_BASE_p = \
+ wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib
+!endif
+!if "$(MONOLITHIC)" == "1"
+__WXLIB_MONO_p = \
+ wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib
+!endif
+!if "$(MONOLITHIC)" == "1"
+__LIB_PNG_IF_MONO_p = $(__LIB_PNG_p)
+!endif
+!if "$(USE_GUI)" == "1"
+__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib
+!endif
+!if "$(USE_CAIRO)" == "1"
+__CAIRO_LIB_p = cairo.lib
+!endif
+!if "$(USE_CAIRO)" == "1"
+____CAIRO_LIBDIR_FILENAMES_p = /LIBPATH:$(CAIRO_ROOT)\lib
+!endif
+
+
+all: $(OBJS)
+$(OBJS):
+ -if not exist $(OBJS) mkdir $(OBJS)
+
+### Targets: ###
+
+all: $(OBJS)\ifacecheck.exe
+
+clean:
+ -if exist $(OBJS)\*.obj del $(OBJS)\*.obj
+ -if exist $(OBJS)\*.res del $(OBJS)\*.res
+ -if exist $(OBJS)\*.pch del $(OBJS)\*.pch
+ -if exist $(OBJS)\ifacecheck.exe del $(OBJS)\ifacecheck.exe
+ -if exist $(OBJS)\ifacecheck.ilk del $(OBJS)\ifacecheck.ilk
+ -if exist $(OBJS)\ifacecheck.pdb del $(OBJS)\ifacecheck.pdb
+
+$(OBJS)\ifacecheck.exe: $(IFACECHECK_OBJECTS)
+ link /NOLOGO /OUT:$@ $(__DEBUGINFO_1) /pdb:"$(OBJS)\ifacecheck.pdb" $(__DEBUGINFO_2) $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:CONSOLE $(____CAIRO_LIBDIR_FILENAMES_p) $(LDFLAGS) @<<
+ $(IFACECHECK_OBJECTS) $(__WXLIB_XML_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_PNG_IF_MONO_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__CAIRO_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib
+<<
+
+$(OBJS)\ifacecheck_ifacecheck.obj: .\ifacecheck.cpp
+ $(CXX) /c /nologo /TP /Fo$@ $(IFACECHECK_CXXFLAGS) .\ifacecheck.cpp
+
+$(OBJS)\ifacecheck_xmlparser.obj: .\xmlparser.cpp
+ $(CXX) /c /nologo /TP /Fo$@ $(IFACECHECK_CXXFLAGS) .\xmlparser.cpp
+
diff --git a/utils/makefile.bcc b/utils/makefile.bcc
index 8eb61ff3d2..63fddc9d64 100644
--- a/utils/makefile.bcc
+++ b/utils/makefile.bcc
@@ -1,124 +1,124 @@
-# =========================================================================
-# This makefile was generated by
-# Bakefile 0.2.9 (http://www.bakefile.org)
-# 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)" \
- -DUSE_THREADS="$(USE_THREADS)" -DUSE_CAIRO="$(USE_CAIRO)" \
- -DOFFICIAL_BUILD="$(OFFICIAL_BUILD)" -DVENDOR="$(VENDOR)" \
- -DWX_FLAVOUR="$(WX_FLAVOUR)" -DWX_LIB_FLAVOUR="$(WX_LIB_FLAVOUR)" \
- -DCFG="$(CFG)" -DCPPUNIT_CFLAGS="$(CPPUNIT_CFLAGS)" \
- -DCPPUNIT_LIBS="$(CPPUNIT_LIBS)" -DRUNTIME_LIBS="$(RUNTIME_LIBS)"
-
-### Conditionally set variables: ###
-
-
-
-### Targets: ###
-
-all: emulator execmon helpview hhp2cached ifacecheck screenshotgen wxrc
-
-clean:
- -if exist .\*.obj del .\*.obj
- -if exist .\*.res del .\*.res
- -if exist .\*.csm del .\*.csm
- @echo cd emulator\src >emulator.bat
- @echo $(MAKE) -f makefile.bcc $(MAKEARGS) clean >>emulator.bat
- call emulator.bat
- @del emulator.bat
- @echo cd execmon >execmon.bat
- @echo $(MAKE) -f makefile.bcc $(MAKEARGS) clean >>execmon.bat
- call execmon.bat
- @del execmon.bat
- @echo cd helpview\src >helpview.bat
- @echo $(MAKE) -f makefile.bcc $(MAKEARGS) clean >>helpview.bat
- call helpview.bat
- @del helpview.bat
- @echo cd hhp2cached >hhp2cached.bat
- @echo $(MAKE) -f makefile.bcc $(MAKEARGS) clean >>hhp2cached.bat
- call hhp2cached.bat
- @del hhp2cached.bat
- @echo cd ifacecheck\src >ifacecheck.bat
- @echo $(MAKE) -f makefile.bcc $(MAKEARGS) clean >>ifacecheck.bat
- call ifacecheck.bat
- @del ifacecheck.bat
- @echo cd screenshotgen\src >screenshotgen.bat
- @echo $(MAKE) -f makefile.bcc $(MAKEARGS) clean >>screenshotgen.bat
- call screenshotgen.bat
- @del screenshotgen.bat
- @echo cd wxrc >wxrc.bat
- @echo $(MAKE) -f makefile.bcc $(MAKEARGS) clean >>wxrc.bat
- call wxrc.bat
- @del wxrc.bat
-
-emulator:
- @echo cd emulator\src >emulator.bat
- @echo $(MAKE) -f makefile.bcc $(MAKEARGS) all >>emulator.bat
- call emulator.bat
- @del emulator.bat
-
-execmon:
- @echo cd execmon >execmon.bat
- @echo $(MAKE) -f makefile.bcc $(MAKEARGS) all >>execmon.bat
- call execmon.bat
- @del execmon.bat
-
-helpview:
- @echo cd helpview\src >helpview.bat
- @echo $(MAKE) -f makefile.bcc $(MAKEARGS) all >>helpview.bat
- call helpview.bat
- @del helpview.bat
-
-hhp2cached:
- @echo cd hhp2cached >hhp2cached.bat
- @echo $(MAKE) -f makefile.bcc $(MAKEARGS) all >>hhp2cached.bat
- call hhp2cached.bat
- @del hhp2cached.bat
-
-ifacecheck:
- @echo cd ifacecheck\src >ifacecheck.bat
- @echo $(MAKE) -f makefile.bcc $(MAKEARGS) all >>ifacecheck.bat
- call ifacecheck.bat
- @del ifacecheck.bat
-
-screenshotgen:
- @echo cd screenshotgen\src >screenshotgen.bat
- @echo $(MAKE) -f makefile.bcc $(MAKEARGS) all >>screenshotgen.bat
- call screenshotgen.bat
- @del screenshotgen.bat
-
-wxrc:
- @echo cd wxrc >wxrc.bat
- @echo $(MAKE) -f makefile.bcc $(MAKEARGS) all >>wxrc.bat
- call wxrc.bat
- @del wxrc.bat
-
+# =========================================================================
+# This makefile was generated by
+# Bakefile 0.2.9 (http://www.bakefile.org)
+# 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)" \
+ -DUSE_THREADS="$(USE_THREADS)" -DUSE_CAIRO="$(USE_CAIRO)" \
+ -DOFFICIAL_BUILD="$(OFFICIAL_BUILD)" -DVENDOR="$(VENDOR)" \
+ -DWX_FLAVOUR="$(WX_FLAVOUR)" -DWX_LIB_FLAVOUR="$(WX_LIB_FLAVOUR)" \
+ -DCFG="$(CFG)" -DCPPUNIT_CFLAGS="$(CPPUNIT_CFLAGS)" \
+ -DCPPUNIT_LIBS="$(CPPUNIT_LIBS)" -DRUNTIME_LIBS="$(RUNTIME_LIBS)"
+
+### Conditionally set variables: ###
+
+
+
+### Targets: ###
+
+all: emulator execmon helpview hhp2cached ifacecheck screenshotgen wxrc
+
+clean:
+ -if exist .\*.obj del .\*.obj
+ -if exist .\*.res del .\*.res
+ -if exist .\*.csm del .\*.csm
+ @echo cd emulator\src >emulator.bat
+ @echo $(MAKE) -f makefile.bcc $(MAKEARGS) clean >>emulator.bat
+ call emulator.bat
+ @del emulator.bat
+ @echo cd execmon >execmon.bat
+ @echo $(MAKE) -f makefile.bcc $(MAKEARGS) clean >>execmon.bat
+ call execmon.bat
+ @del execmon.bat
+ @echo cd helpview\src >helpview.bat
+ @echo $(MAKE) -f makefile.bcc $(MAKEARGS) clean >>helpview.bat
+ call helpview.bat
+ @del helpview.bat
+ @echo cd hhp2cached >hhp2cached.bat
+ @echo $(MAKE) -f makefile.bcc $(MAKEARGS) clean >>hhp2cached.bat
+ call hhp2cached.bat
+ @del hhp2cached.bat
+ @echo cd ifacecheck\src >ifacecheck.bat
+ @echo $(MAKE) -f makefile.bcc $(MAKEARGS) clean >>ifacecheck.bat
+ call ifacecheck.bat
+ @del ifacecheck.bat
+ @echo cd screenshotgen\src >screenshotgen.bat
+ @echo $(MAKE) -f makefile.bcc $(MAKEARGS) clean >>screenshotgen.bat
+ call screenshotgen.bat
+ @del screenshotgen.bat
+ @echo cd wxrc >wxrc.bat
+ @echo $(MAKE) -f makefile.bcc $(MAKEARGS) clean >>wxrc.bat
+ call wxrc.bat
+ @del wxrc.bat
+
+emulator:
+ @echo cd emulator\src >emulator.bat
+ @echo $(MAKE) -f makefile.bcc $(MAKEARGS) all >>emulator.bat
+ call emulator.bat
+ @del emulator.bat
+
+execmon:
+ @echo cd execmon >execmon.bat
+ @echo $(MAKE) -f makefile.bcc $(MAKEARGS) all >>execmon.bat
+ call execmon.bat
+ @del execmon.bat
+
+helpview:
+ @echo cd helpview\src >helpview.bat
+ @echo $(MAKE) -f makefile.bcc $(MAKEARGS) all >>helpview.bat
+ call helpview.bat
+ @del helpview.bat
+
+hhp2cached:
+ @echo cd hhp2cached >hhp2cached.bat
+ @echo $(MAKE) -f makefile.bcc $(MAKEARGS) all >>hhp2cached.bat
+ call hhp2cached.bat
+ @del hhp2cached.bat
+
+ifacecheck:
+ @echo cd ifacecheck\src >ifacecheck.bat
+ @echo $(MAKE) -f makefile.bcc $(MAKEARGS) all >>ifacecheck.bat
+ call ifacecheck.bat
+ @del ifacecheck.bat
+
+screenshotgen:
+ @echo cd screenshotgen\src >screenshotgen.bat
+ @echo $(MAKE) -f makefile.bcc $(MAKEARGS) all >>screenshotgen.bat
+ call screenshotgen.bat
+ @del screenshotgen.bat
+
+wxrc:
+ @echo cd wxrc >wxrc.bat
+ @echo $(MAKE) -f makefile.bcc $(MAKEARGS) all >>wxrc.bat
+ call wxrc.bat
+ @del wxrc.bat
+
diff --git a/utils/makefile.gcc b/utils/makefile.gcc
index fc9bd2411b..ce47c21df0 100644
--- a/utils/makefile.gcc
+++ b/utils/makefile.gcc
@@ -1,82 +1,82 @@
-# =========================================================================
-# This makefile was generated by
-# Bakefile 0.2.9 (http://www.bakefile.org)
-# Do not modify, all changes will be overwritten!
-# =========================================================================
-
-include ../build/msw/config.gcc
-
-# -------------------------------------------------------------------------
-# Do not modify the rest of this file!
-# -------------------------------------------------------------------------
-
-### Variables: ###
-
-MAKEARGS = LINK_DLL_FLAGS="$(LINK_DLL_FLAGS)" \
- LINK_MODULE_FLAGS="$(LINK_MODULE_FLAGS)" CC="$(CC)" CXX="$(CXX)" \
- CFLAGS="$(CFLAGS)" CXXFLAGS="$(CXXFLAGS)" CPPFLAGS="$(CPPFLAGS)" \
- LDFLAGS="$(LDFLAGS)" CPP="$(CPP)" SHARED="$(SHARED)" \
- TOOLKIT_VERSION="$(TOOLKIT_VERSION)" WXUNIV="$(WXUNIV)" \
- UNICODE="$(UNICODE)" BUILD="$(BUILD)" DEBUG_INFO="$(DEBUG_INFO)" \
- DEBUG_FLAG="$(DEBUG_FLAG)" MONOLITHIC="$(MONOLITHIC)" USE_GUI="$(USE_GUI)" \
- USE_HTML="$(USE_HTML)" USE_WEBVIEW="$(USE_WEBVIEW)" \
- USE_MEDIA="$(USE_MEDIA)" USE_XRC="$(USE_XRC)" USE_AUI="$(USE_AUI)" \
- USE_RIBBON="$(USE_RIBBON)" USE_PROPGRID="$(USE_PROPGRID)" \
- USE_RICHTEXT="$(USE_RICHTEXT)" USE_STC="$(USE_STC)" \
- USE_OPENGL="$(USE_OPENGL)" USE_QA="$(USE_QA)" \
- USE_EXCEPTIONS="$(USE_EXCEPTIONS)" USE_RTTI="$(USE_RTTI)" \
- USE_THREADS="$(USE_THREADS)" USE_CAIRO="$(USE_CAIRO)" \
- OFFICIAL_BUILD="$(OFFICIAL_BUILD)" VENDOR="$(VENDOR)" \
- WX_FLAVOUR="$(WX_FLAVOUR)" WX_LIB_FLAVOUR="$(WX_LIB_FLAVOUR)" CFG="$(CFG)" \
- CPPUNIT_CFLAGS="$(CPPUNIT_CFLAGS)" CPPUNIT_LIBS="$(CPPUNIT_LIBS)" \
- RUNTIME_LIBS="$(RUNTIME_LIBS)" GCC_VERSION="$(GCC_VERSION)" \
- WINDRES="$(WINDRES)"
-
-### Conditionally set variables: ###
-
-
-
-### Targets: ###
-
-all: emulator execmon helpview hhp2cached ifacecheck screenshotgen wxrc
-
-clean:
- -if exist .\*.o del .\*.o
- -if exist .\*.d del .\*.d
- $(MAKE) -C emulator\src -f makefile.gcc $(MAKEARGS) clean
- $(MAKE) -C execmon -f makefile.gcc $(MAKEARGS) clean
- $(MAKE) -C helpview\src -f makefile.gcc $(MAKEARGS) clean
- $(MAKE) -C hhp2cached -f makefile.gcc $(MAKEARGS) clean
- $(MAKE) -C ifacecheck\src -f makefile.gcc $(MAKEARGS) clean
- $(MAKE) -C screenshotgen\src -f makefile.gcc $(MAKEARGS) clean
- $(MAKE) -C wxrc -f makefile.gcc $(MAKEARGS) clean
-
-emulator:
- $(MAKE) -C emulator\src -f makefile.gcc $(MAKEARGS) all
-
-execmon:
- $(MAKE) -C execmon -f makefile.gcc $(MAKEARGS) all
-
-helpview:
- $(MAKE) -C helpview\src -f makefile.gcc $(MAKEARGS) all
-
-hhp2cached:
- $(MAKE) -C hhp2cached -f makefile.gcc $(MAKEARGS) all
-
-ifacecheck:
- $(MAKE) -C ifacecheck\src -f makefile.gcc $(MAKEARGS) all
-
-screenshotgen:
- $(MAKE) -C screenshotgen\src -f makefile.gcc $(MAKEARGS) all
-
-wxrc:
- $(MAKE) -C wxrc -f makefile.gcc $(MAKEARGS) all
-
-.PHONY: all clean emulator execmon helpview hhp2cached ifacecheck screenshotgen \
- wxrc
-
-
-SHELL := $(COMSPEC)
-
-# Dependencies tracking:
--include ./*.d
+# =========================================================================
+# This makefile was generated by
+# Bakefile 0.2.9 (http://www.bakefile.org)
+# Do not modify, all changes will be overwritten!
+# =========================================================================
+
+include ../build/msw/config.gcc
+
+# -------------------------------------------------------------------------
+# Do not modify the rest of this file!
+# -------------------------------------------------------------------------
+
+### Variables: ###
+
+MAKEARGS = LINK_DLL_FLAGS="$(LINK_DLL_FLAGS)" \
+ LINK_MODULE_FLAGS="$(LINK_MODULE_FLAGS)" CC="$(CC)" CXX="$(CXX)" \
+ CFLAGS="$(CFLAGS)" CXXFLAGS="$(CXXFLAGS)" CPPFLAGS="$(CPPFLAGS)" \
+ LDFLAGS="$(LDFLAGS)" CPP="$(CPP)" SHARED="$(SHARED)" \
+ TOOLKIT_VERSION="$(TOOLKIT_VERSION)" WXUNIV="$(WXUNIV)" \
+ UNICODE="$(UNICODE)" BUILD="$(BUILD)" DEBUG_INFO="$(DEBUG_INFO)" \
+ DEBUG_FLAG="$(DEBUG_FLAG)" MONOLITHIC="$(MONOLITHIC)" USE_GUI="$(USE_GUI)" \
+ USE_HTML="$(USE_HTML)" USE_WEBVIEW="$(USE_WEBVIEW)" \
+ USE_MEDIA="$(USE_MEDIA)" USE_XRC="$(USE_XRC)" USE_AUI="$(USE_AUI)" \
+ USE_RIBBON="$(USE_RIBBON)" USE_PROPGRID="$(USE_PROPGRID)" \
+ USE_RICHTEXT="$(USE_RICHTEXT)" USE_STC="$(USE_STC)" \
+ USE_OPENGL="$(USE_OPENGL)" USE_QA="$(USE_QA)" \
+ USE_EXCEPTIONS="$(USE_EXCEPTIONS)" USE_RTTI="$(USE_RTTI)" \
+ USE_THREADS="$(USE_THREADS)" USE_CAIRO="$(USE_CAIRO)" \
+ OFFICIAL_BUILD="$(OFFICIAL_BUILD)" VENDOR="$(VENDOR)" \
+ WX_FLAVOUR="$(WX_FLAVOUR)" WX_LIB_FLAVOUR="$(WX_LIB_FLAVOUR)" CFG="$(CFG)" \
+ CPPUNIT_CFLAGS="$(CPPUNIT_CFLAGS)" CPPUNIT_LIBS="$(CPPUNIT_LIBS)" \
+ RUNTIME_LIBS="$(RUNTIME_LIBS)" GCC_VERSION="$(GCC_VERSION)" \
+ WINDRES="$(WINDRES)"
+
+### Conditionally set variables: ###
+
+
+
+### Targets: ###
+
+all: emulator execmon helpview hhp2cached ifacecheck screenshotgen wxrc
+
+clean:
+ -if exist .\*.o del .\*.o
+ -if exist .\*.d del .\*.d
+ $(MAKE) -C emulator\src -f makefile.gcc $(MAKEARGS) clean
+ $(MAKE) -C execmon -f makefile.gcc $(MAKEARGS) clean
+ $(MAKE) -C helpview\src -f makefile.gcc $(MAKEARGS) clean
+ $(MAKE) -C hhp2cached -f makefile.gcc $(MAKEARGS) clean
+ $(MAKE) -C ifacecheck\src -f makefile.gcc $(MAKEARGS) clean
+ $(MAKE) -C screenshotgen\src -f makefile.gcc $(MAKEARGS) clean
+ $(MAKE) -C wxrc -f makefile.gcc $(MAKEARGS) clean
+
+emulator:
+ $(MAKE) -C emulator\src -f makefile.gcc $(MAKEARGS) all
+
+execmon:
+ $(MAKE) -C execmon -f makefile.gcc $(MAKEARGS) all
+
+helpview:
+ $(MAKE) -C helpview\src -f makefile.gcc $(MAKEARGS) all
+
+hhp2cached:
+ $(MAKE) -C hhp2cached -f makefile.gcc $(MAKEARGS) all
+
+ifacecheck:
+ $(MAKE) -C ifacecheck\src -f makefile.gcc $(MAKEARGS) all
+
+screenshotgen:
+ $(MAKE) -C screenshotgen\src -f makefile.gcc $(MAKEARGS) all
+
+wxrc:
+ $(MAKE) -C wxrc -f makefile.gcc $(MAKEARGS) all
+
+.PHONY: all clean emulator execmon helpview hhp2cached ifacecheck screenshotgen \
+ wxrc
+
+
+SHELL := $(COMSPEC)
+
+# Dependencies tracking:
+-include ./*.d
diff --git a/utils/makefile.vc b/utils/makefile.vc
index 2ff7b3de12..9954f30da3 100644
--- a/utils/makefile.vc
+++ b/utils/makefile.vc
@@ -1,101 +1,101 @@
-# =========================================================================
-# This makefile was generated by
-# Bakefile 0.2.9 (http://www.bakefile.org)
-# Do not modify, all changes will be overwritten!
-# =========================================================================
-
-!include <../build/msw/config.vc>
-
-# -------------------------------------------------------------------------
-# Do not modify the rest of this file!
-# -------------------------------------------------------------------------
-
-### Variables: ###
-
-MAKEARGS = CC="$(CC)" CXX="$(CXX)" CFLAGS="$(CFLAGS)" CXXFLAGS="$(CXXFLAGS)" \
- CPPFLAGS="$(CPPFLAGS)" LDFLAGS="$(LDFLAGS)" CPP="$(CPP)" SHARED="$(SHARED)" \
- TOOLKIT_VERSION="$(TOOLKIT_VERSION)" WXUNIV="$(WXUNIV)" \
- UNICODE="$(UNICODE)" BUILD="$(BUILD)" TARGET_CPU="$(TARGET_CPU)" \
- DEBUG_INFO="$(DEBUG_INFO)" DEBUG_FLAG="$(DEBUG_FLAG)" \
- DEBUG_RUNTIME_LIBS="$(DEBUG_RUNTIME_LIBS)" MONOLITHIC="$(MONOLITHIC)" \
- USE_GUI="$(USE_GUI)" USE_HTML="$(USE_HTML)" USE_WEBVIEW="$(USE_WEBVIEW)" \
- USE_MEDIA="$(USE_MEDIA)" USE_XRC="$(USE_XRC)" USE_AUI="$(USE_AUI)" \
- USE_RIBBON="$(USE_RIBBON)" USE_PROPGRID="$(USE_PROPGRID)" \
- USE_RICHTEXT="$(USE_RICHTEXT)" USE_STC="$(USE_STC)" \
- USE_OPENGL="$(USE_OPENGL)" USE_QA="$(USE_QA)" \
- USE_EXCEPTIONS="$(USE_EXCEPTIONS)" USE_RTTI="$(USE_RTTI)" \
- USE_THREADS="$(USE_THREADS)" USE_CAIRO="$(USE_CAIRO)" \
- OFFICIAL_BUILD="$(OFFICIAL_BUILD)" VENDOR="$(VENDOR)" \
- WX_FLAVOUR="$(WX_FLAVOUR)" WX_LIB_FLAVOUR="$(WX_LIB_FLAVOUR)" CFG="$(CFG)" \
- CPPUNIT_CFLAGS="$(CPPUNIT_CFLAGS)" CPPUNIT_LIBS="$(CPPUNIT_LIBS)" \
- RUNTIME_LIBS="$(RUNTIME_LIBS)"
-
-### Conditionally set variables: ###
-
-
-
-### Targets: ###
-
-all: sub_emulator sub_execmon sub_helpview sub_hhp2cached sub_ifacecheck sub_screenshotgen sub_wxrc
-
-clean:
- -if exist .\*.obj del .\*.obj
- -if exist .\*.res del .\*.res
- -if exist .\*.pch del .\*.pch
- cd emulator\src
- $(MAKE) -f makefile.vc $(MAKEARGS) clean
- cd "$(MAKEDIR)"
- cd execmon
- $(MAKE) -f makefile.vc $(MAKEARGS) clean
- cd "$(MAKEDIR)"
- cd helpview\src
- $(MAKE) -f makefile.vc $(MAKEARGS) clean
- cd "$(MAKEDIR)"
- cd hhp2cached
- $(MAKE) -f makefile.vc $(MAKEARGS) clean
- cd "$(MAKEDIR)"
- cd ifacecheck\src
- $(MAKE) -f makefile.vc $(MAKEARGS) clean
- cd "$(MAKEDIR)"
- cd screenshotgen\src
- $(MAKE) -f makefile.vc $(MAKEARGS) clean
- cd "$(MAKEDIR)"
- cd wxrc
- $(MAKE) -f makefile.vc $(MAKEARGS) clean
- cd "$(MAKEDIR)"
-
-sub_emulator:
- cd emulator\src
- $(MAKE) -f makefile.vc $(MAKEARGS) all
- cd "$(MAKEDIR)"
-
-sub_execmon:
- cd execmon
- $(MAKE) -f makefile.vc $(MAKEARGS) all
- cd "$(MAKEDIR)"
-
-sub_helpview:
- cd helpview\src
- $(MAKE) -f makefile.vc $(MAKEARGS) all
- cd "$(MAKEDIR)"
-
-sub_hhp2cached:
- cd hhp2cached
- $(MAKE) -f makefile.vc $(MAKEARGS) all
- cd "$(MAKEDIR)"
-
-sub_ifacecheck:
- cd ifacecheck\src
- $(MAKE) -f makefile.vc $(MAKEARGS) all
- cd "$(MAKEDIR)"
-
-sub_screenshotgen:
- cd screenshotgen\src
- $(MAKE) -f makefile.vc $(MAKEARGS) all
- cd "$(MAKEDIR)"
-
-sub_wxrc:
- cd wxrc
- $(MAKE) -f makefile.vc $(MAKEARGS) all
- cd "$(MAKEDIR)"
-
+# =========================================================================
+# This makefile was generated by
+# Bakefile 0.2.9 (http://www.bakefile.org)
+# Do not modify, all changes will be overwritten!
+# =========================================================================
+
+!include <../build/msw/config.vc>
+
+# -------------------------------------------------------------------------
+# Do not modify the rest of this file!
+# -------------------------------------------------------------------------
+
+### Variables: ###
+
+MAKEARGS = CC="$(CC)" CXX="$(CXX)" CFLAGS="$(CFLAGS)" CXXFLAGS="$(CXXFLAGS)" \
+ CPPFLAGS="$(CPPFLAGS)" LDFLAGS="$(LDFLAGS)" CPP="$(CPP)" SHARED="$(SHARED)" \
+ TOOLKIT_VERSION="$(TOOLKIT_VERSION)" WXUNIV="$(WXUNIV)" \
+ UNICODE="$(UNICODE)" BUILD="$(BUILD)" TARGET_CPU="$(TARGET_CPU)" \
+ DEBUG_INFO="$(DEBUG_INFO)" DEBUG_FLAG="$(DEBUG_FLAG)" \
+ DEBUG_RUNTIME_LIBS="$(DEBUG_RUNTIME_LIBS)" MONOLITHIC="$(MONOLITHIC)" \
+ USE_GUI="$(USE_GUI)" USE_HTML="$(USE_HTML)" USE_WEBVIEW="$(USE_WEBVIEW)" \
+ USE_MEDIA="$(USE_MEDIA)" USE_XRC="$(USE_XRC)" USE_AUI="$(USE_AUI)" \
+ USE_RIBBON="$(USE_RIBBON)" USE_PROPGRID="$(USE_PROPGRID)" \
+ USE_RICHTEXT="$(USE_RICHTEXT)" USE_STC="$(USE_STC)" \
+ USE_OPENGL="$(USE_OPENGL)" USE_QA="$(USE_QA)" \
+ USE_EXCEPTIONS="$(USE_EXCEPTIONS)" USE_RTTI="$(USE_RTTI)" \
+ USE_THREADS="$(USE_THREADS)" USE_CAIRO="$(USE_CAIRO)" \
+ OFFICIAL_BUILD="$(OFFICIAL_BUILD)" VENDOR="$(VENDOR)" \
+ WX_FLAVOUR="$(WX_FLAVOUR)" WX_LIB_FLAVOUR="$(WX_LIB_FLAVOUR)" CFG="$(CFG)" \
+ CPPUNIT_CFLAGS="$(CPPUNIT_CFLAGS)" CPPUNIT_LIBS="$(CPPUNIT_LIBS)" \
+ RUNTIME_LIBS="$(RUNTIME_LIBS)"
+
+### Conditionally set variables: ###
+
+
+
+### Targets: ###
+
+all: sub_emulator sub_execmon sub_helpview sub_hhp2cached sub_ifacecheck sub_screenshotgen sub_wxrc
+
+clean:
+ -if exist .\*.obj del .\*.obj
+ -if exist .\*.res del .\*.res
+ -if exist .\*.pch del .\*.pch
+ cd emulator\src
+ $(MAKE) -f makefile.vc $(MAKEARGS) clean
+ cd "$(MAKEDIR)"
+ cd execmon
+ $(MAKE) -f makefile.vc $(MAKEARGS) clean
+ cd "$(MAKEDIR)"
+ cd helpview\src
+ $(MAKE) -f makefile.vc $(MAKEARGS) clean
+ cd "$(MAKEDIR)"
+ cd hhp2cached
+ $(MAKE) -f makefile.vc $(MAKEARGS) clean
+ cd "$(MAKEDIR)"
+ cd ifacecheck\src
+ $(MAKE) -f makefile.vc $(MAKEARGS) clean
+ cd "$(MAKEDIR)"
+ cd screenshotgen\src
+ $(MAKE) -f makefile.vc $(MAKEARGS) clean
+ cd "$(MAKEDIR)"
+ cd wxrc
+ $(MAKE) -f makefile.vc $(MAKEARGS) clean
+ cd "$(MAKEDIR)"
+
+sub_emulator:
+ cd emulator\src
+ $(MAKE) -f makefile.vc $(MAKEARGS) all
+ cd "$(MAKEDIR)"
+
+sub_execmon:
+ cd execmon
+ $(MAKE) -f makefile.vc $(MAKEARGS) all
+ cd "$(MAKEDIR)"
+
+sub_helpview:
+ cd helpview\src
+ $(MAKE) -f makefile.vc $(MAKEARGS) all
+ cd "$(MAKEDIR)"
+
+sub_hhp2cached:
+ cd hhp2cached
+ $(MAKE) -f makefile.vc $(MAKEARGS) all
+ cd "$(MAKEDIR)"
+
+sub_ifacecheck:
+ cd ifacecheck\src
+ $(MAKE) -f makefile.vc $(MAKEARGS) all
+ cd "$(MAKEDIR)"
+
+sub_screenshotgen:
+ cd screenshotgen\src
+ $(MAKE) -f makefile.vc $(MAKEARGS) all
+ cd "$(MAKEDIR)"
+
+sub_wxrc:
+ cd wxrc
+ $(MAKE) -f makefile.vc $(MAKEARGS) all
+ cd "$(MAKEDIR)"
+
diff --git a/utils/screenshotgen/src/makefile.bcc b/utils/screenshotgen/src/makefile.bcc
index a58909cec1..d987c4a759 100644
--- a/utils/screenshotgen/src/makefile.bcc
+++ b/utils/screenshotgen/src/makefile.bcc
@@ -1,284 +1,284 @@
-# =========================================================================
-# This makefile was generated by
-# Bakefile 0.2.9 (http://www.bakefile.org)
-# 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: ###
-
-WX_RELEASE_NODOT = 31
-COMPILER_PREFIX = bcc
-OBJS = \
- $(COMPILER_PREFIX)$(COMPILER_VERSION)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)
-LIBDIRNAME = \
- .\..\..\..\lib\$(COMPILER_PREFIX)$(COMPILER_VERSION)_$(LIBTYPE_SUFFIX)$(CFG)
-SETUPHDIR = \
- $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)
-SCREENSHOTGEN_CXXFLAGS = $(__RUNTIME_LIBS_7) -I$(BCCDIR)\include \
- $(__DEBUGINFO) $(__OPTIMIZEFLAG_2) $(__THREADSFLAG_6) -D__WXMSW__ \
- $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__NDEBUG_DEFINE_p) \
- $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \
- $(__UNICODE_DEFINE_p) -I$(SETUPHDIR) -I.\..\..\..\include \
- $(____CAIRO_INCLUDEDIR_FILENAMES_p) -I. $(__DLLFLAG_p) -I.\..\..\..\samples \
- -DNOPCH $(CPPFLAGS) $(CXXFLAGS)
-SCREENSHOTGEN_OBJECTS = \
- $(OBJS)\screenshotgen_screenshot_app.obj \
- $(OBJS)\screenshotgen_screenshot_main.obj \
- $(OBJS)\screenshotgen_guiframe.obj \
- $(OBJS)\screenshotgen_customcombo.obj \
- $(OBJS)\screenshotgen_autocapture.obj
-
-### Conditionally set variables: ###
-
-!if "$(USE_GUI)" == "0"
-PORTNAME = base
-!endif
-!if "$(USE_GUI)" == "1"
-PORTNAME = msw$(TOOLKIT_VERSION)
-!endif
-!if "$(OFFICIAL_BUILD)" == "1"
-COMPILER_VERSION = ERROR-COMPILER-VERSION-MUST-BE-SET-FOR-OFFICIAL-BUILD
-!endif
-!if "$(BUILD)" == "debug"
-WXDEBUGFLAG = d
-!endif
-!if "$(UNICODE)" == "1"
-WXUNICODEFLAG = u
-!endif
-!if "$(WXUNIV)" == "1"
-WXUNIVNAME = univ
-!endif
-!if "$(SHARED)" == "1"
-WXDLLFLAG = dll
-!endif
-!if "$(SHARED)" == "0"
-LIBTYPE_SUFFIX = lib
-!endif
-!if "$(SHARED)" == "1"
-LIBTYPE_SUFFIX = dll
-!endif
-!if "$(MONOLITHIC)" == "0"
-EXTRALIBS_FOR_BASE =
-!endif
-!if "$(MONOLITHIC)" == "1"
-EXTRALIBS_FOR_BASE =
-!endif
-!if "$(BUILD)" == "debug"
-__OPTIMIZEFLAG_2 = -Od
-!endif
-!if "$(BUILD)" == "release"
-__OPTIMIZEFLAG_2 = -O2
-!endif
-!if "$(USE_THREADS)" == "0"
-__THREADSFLAG_5 =
-!endif
-!if "$(USE_THREADS)" == "1"
-__THREADSFLAG_5 = mt
-!endif
-!if "$(USE_THREADS)" == "0"
-__THREADSFLAG_6 =
-!endif
-!if "$(USE_THREADS)" == "1"
-__THREADSFLAG_6 = -tWM
-!endif
-!if "$(RUNTIME_LIBS)" == "dynamic"
-__RUNTIME_LIBS_7 = -tWR
-!endif
-!if "$(RUNTIME_LIBS)" == "static"
-__RUNTIME_LIBS_7 =
-!endif
-!if "$(RUNTIME_LIBS)" == "dynamic"
-__RUNTIME_LIBS_8 = i
-!endif
-!if "$(RUNTIME_LIBS)" == "static"
-__RUNTIME_LIBS_8 =
-!endif
-!if "$(WXUNIV)" == "1"
-__WXUNIV_DEFINE_p = -D__WXUNIVERSAL__
-!endif
-!if "$(WXUNIV)" == "1"
-__WXUNIV_DEFINE_p_1 = -d__WXUNIVERSAL__
-!endif
-!if "$(DEBUG_FLAG)" == "0"
-__DEBUG_DEFINE_p = -DwxDEBUG_LEVEL=0
-!endif
-!if "$(DEBUG_FLAG)" == "0"
-__DEBUG_DEFINE_p_1 = -dwxDEBUG_LEVEL=0
-!endif
-!if "$(BUILD)" == "release"
-__NDEBUG_DEFINE_p = -DNDEBUG
-!endif
-!if "$(BUILD)" == "release"
-__NDEBUG_DEFINE_p_1 = -dNDEBUG
-!endif
-!if "$(USE_EXCEPTIONS)" == "0"
-__EXCEPTIONS_DEFINE_p = -DwxNO_EXCEPTIONS
-!endif
-!if "$(USE_EXCEPTIONS)" == "0"
-__EXCEPTIONS_DEFINE_p_1 = -dwxNO_EXCEPTIONS
-!endif
-!if "$(USE_RTTI)" == "0"
-__RTTI_DEFINE_p = -DwxNO_RTTI
-!endif
-!if "$(USE_RTTI)" == "0"
-__RTTI_DEFINE_p_1 = -dwxNO_RTTI
-!endif
-!if "$(USE_THREADS)" == "0"
-__THREAD_DEFINE_p = -DwxNO_THREADS
-!endif
-!if "$(USE_THREADS)" == "0"
-__THREAD_DEFINE_p_1 = -dwxNO_THREADS
-!endif
-!if "$(UNICODE)" == "0"
-__UNICODE_DEFINE_p = -DwxUSE_UNICODE=0
-!endif
-!if "$(UNICODE)" == "1"
-__UNICODE_DEFINE_p = -D_UNICODE
-!endif
-!if "$(UNICODE)" == "0"
-__UNICODE_DEFINE_p_1 = -dwxUSE_UNICODE=0
-!endif
-!if "$(UNICODE)" == "1"
-__UNICODE_DEFINE_p_1 = -d_UNICODE
-!endif
-!if "$(USE_CAIRO)" == "1"
-____CAIRO_INCLUDEDIR_FILENAMES_p = -I$(CAIRO_ROOT)\include\cairo
-!endif
-!if "$(USE_CAIRO)" == "1"
-____CAIRO_INCLUDEDIR_FILENAMES_1_p = -i$(CAIRO_ROOT)\include\cairo
-!endif
-!if "$(SHARED)" == "1"
-__DLLFLAG_p = -DWXUSINGDLL
-!endif
-!if "$(SHARED)" == "1"
-__DLLFLAG_p_1 = -dWXUSINGDLL
-!endif
-!if "$(MONOLITHIC)" == "0"
-__WXLIB_AUI_p = \
- wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_aui.lib
-!endif
-!if "$(MONOLITHIC)" == "0"
-__WXLIB_RICHTEXT_p = \
- wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_richtext.lib
-!endif
-!if "$(MONOLITHIC)" == "0"
-__WXLIB_HTML_p = \
- wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_html.lib
-!endif
-!if "$(MONOLITHIC)" == "0"
-__WXLIB_ADV_p = \
- wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_adv.lib
-!endif
-!if "$(MONOLITHIC)" == "0"
-__WXLIB_XML_p = \
- wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xml.lib
-!endif
-!if "$(MONOLITHIC)" == "0"
-__WXLIB_CORE_p = \
- wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib
-!endif
-!if "$(MONOLITHIC)" == "0"
-__WXLIB_BASE_p = \
- wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib
-!endif
-!if "$(MONOLITHIC)" == "1"
-__WXLIB_MONO_p = \
- wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib
-!endif
-!if "$(MONOLITHIC)" == "1" && "$(USE_STC)" == "1"
-__LIB_SCINTILLA_IF_MONO_p = wxscintilla$(WXDEBUGFLAG).lib
-!endif
-!if "$(USE_GUI)" == "1"
-__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib
-!endif
-!if "$(USE_GUI)" == "1"
-__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib
-!endif
-!if "$(USE_GUI)" == "1"
-__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib
-!endif
-!if "$(USE_CAIRO)" == "1"
-__CAIRO_LIB_p = cairo.lib
-!endif
-!if "$(USE_CAIRO)" == "1"
-____CAIRO_LIBDIR_FILENAMES_p = -L$(CAIRO_ROOT)\lib
-!endif
-!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default"
-__DEBUGINFO = -v
-!endif
-!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default"
-__DEBUGINFO = -v-
-!endif
-!if "$(DEBUG_INFO)" == "0"
-__DEBUGINFO = -v-
-!endif
-!if "$(DEBUG_INFO)" == "1"
-__DEBUGINFO = -v
-!endif
-
-
-all: $(OBJS)
-$(OBJS):
- -if not exist $(OBJS) mkdir $(OBJS)
-
-### Targets: ###
-
-all: $(OBJS)\screenshotgen.exe bitmaps xml
-
-clean:
- -if exist $(OBJS)\*.obj del $(OBJS)\*.obj
- -if exist $(OBJS)\*.res del $(OBJS)\*.res
- -if exist $(OBJS)\*.csm del $(OBJS)\*.csm
- -if exist $(OBJS)\screenshotgen.exe del $(OBJS)\screenshotgen.exe
- -if exist $(OBJS)\screenshotgen.tds del $(OBJS)\screenshotgen.tds
- -if exist $(OBJS)\screenshotgen.ilc del $(OBJS)\screenshotgen.ilc
- -if exist $(OBJS)\screenshotgen.ild del $(OBJS)\screenshotgen.ild
- -if exist $(OBJS)\screenshotgen.ilf del $(OBJS)\screenshotgen.ilf
- -if exist $(OBJS)\screenshotgen.ils del $(OBJS)\screenshotgen.ils
-
-$(OBJS)\screenshotgen.exe: $(SCREENSHOTGEN_OBJECTS) $(OBJS)\screenshotgen_screenshotgen.res
- ilink32 -Tpe -q -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUGINFO) -L$(LIBDIRNAME) -aa $(____CAIRO_LIBDIR_FILENAMES_p) $(LDFLAGS) @&&|
- c0w32.obj $(SCREENSHOTGEN_OBJECTS),$@,, $(__WXLIB_AUI_p) $(__WXLIB_RICHTEXT_p) $(__WXLIB_HTML_p) $(__WXLIB_ADV_p) $(__WXLIB_XML_p) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_SCINTILLA_IF_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__CAIRO_LIB_p) ole2w32.lib oleacc.lib import32.lib cw32$(__THREADSFLAG_5)$(__RUNTIME_LIBS_8).lib,, $(OBJS)\screenshotgen_screenshotgen.res
-|
-
-bitmaps:
- if not exist $(OBJS)\bitmaps mkdir $(OBJS)\bitmaps
- for %f in (wxwin32x32.png bell.png sound.png dropbuth.png dropbutn.png dropbutp.png throbber.gif) do if not exist $(OBJS)\bitmaps\%f copy .\bitmaps\%f $(OBJS)\bitmaps
-
-xml:
- if not exist $(OBJS) mkdir $(OBJS)
- for %f in (richtext.xml) do if not exist $(OBJS)\%f copy .\%f $(OBJS)
-
-$(OBJS)\screenshotgen_screenshot_app.obj: .\screenshot_app.cpp
- $(CXX) -q -c -P -o$@ $(SCREENSHOTGEN_CXXFLAGS) .\screenshot_app.cpp
-
-$(OBJS)\screenshotgen_screenshot_main.obj: .\screenshot_main.cpp
- $(CXX) -q -c -P -o$@ $(SCREENSHOTGEN_CXXFLAGS) .\screenshot_main.cpp
-
-$(OBJS)\screenshotgen_guiframe.obj: .\guiframe.cpp
- $(CXX) -q -c -P -o$@ $(SCREENSHOTGEN_CXXFLAGS) .\guiframe.cpp
-
-$(OBJS)\screenshotgen_customcombo.obj: .\customcombo.cpp
- $(CXX) -q -c -P -o$@ $(SCREENSHOTGEN_CXXFLAGS) .\customcombo.cpp
-
-$(OBJS)\screenshotgen_autocapture.obj: .\autocapture.cpp
- $(CXX) -q -c -P -o$@ $(SCREENSHOTGEN_CXXFLAGS) .\autocapture.cpp
-
-$(OBJS)\screenshotgen_screenshotgen.res: .\screenshotgen.rc
- brcc32 -32 -r -fo$@ -i$(BCCDIR)\include -d__WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__NDEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) -i$(SETUPHDIR) -i.\..\..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES_1_p) -i. $(__DLLFLAG_p_1) -i.\..\..\..\samples -i$(BCCDIR)\include\windows\sdk -dNOPCH .\screenshotgen.rc
-
+# =========================================================================
+# This makefile was generated by
+# Bakefile 0.2.9 (http://www.bakefile.org)
+# 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: ###
+
+WX_RELEASE_NODOT = 31
+COMPILER_PREFIX = bcc
+OBJS = \
+ $(COMPILER_PREFIX)$(COMPILER_VERSION)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)
+LIBDIRNAME = \
+ .\..\..\..\lib\$(COMPILER_PREFIX)$(COMPILER_VERSION)_$(LIBTYPE_SUFFIX)$(CFG)
+SETUPHDIR = \
+ $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)
+SCREENSHOTGEN_CXXFLAGS = $(__RUNTIME_LIBS_7) -I$(BCCDIR)\include \
+ $(__DEBUGINFO) $(__OPTIMIZEFLAG_2) $(__THREADSFLAG_6) -D__WXMSW__ \
+ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__NDEBUG_DEFINE_p) \
+ $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \
+ $(__UNICODE_DEFINE_p) -I$(SETUPHDIR) -I.\..\..\..\include \
+ $(____CAIRO_INCLUDEDIR_FILENAMES_p) -I. $(__DLLFLAG_p) -I.\..\..\..\samples \
+ -DNOPCH $(CPPFLAGS) $(CXXFLAGS)
+SCREENSHOTGEN_OBJECTS = \
+ $(OBJS)\screenshotgen_screenshot_app.obj \
+ $(OBJS)\screenshotgen_screenshot_main.obj \
+ $(OBJS)\screenshotgen_guiframe.obj \
+ $(OBJS)\screenshotgen_customcombo.obj \
+ $(OBJS)\screenshotgen_autocapture.obj
+
+### Conditionally set variables: ###
+
+!if "$(USE_GUI)" == "0"
+PORTNAME = base
+!endif
+!if "$(USE_GUI)" == "1"
+PORTNAME = msw$(TOOLKIT_VERSION)
+!endif
+!if "$(OFFICIAL_BUILD)" == "1"
+COMPILER_VERSION = ERROR-COMPILER-VERSION-MUST-BE-SET-FOR-OFFICIAL-BUILD
+!endif
+!if "$(BUILD)" == "debug"
+WXDEBUGFLAG = d
+!endif
+!if "$(UNICODE)" == "1"
+WXUNICODEFLAG = u
+!endif
+!if "$(WXUNIV)" == "1"
+WXUNIVNAME = univ
+!endif
+!if "$(SHARED)" == "1"
+WXDLLFLAG = dll
+!endif
+!if "$(SHARED)" == "0"
+LIBTYPE_SUFFIX = lib
+!endif
+!if "$(SHARED)" == "1"
+LIBTYPE_SUFFIX = dll
+!endif
+!if "$(MONOLITHIC)" == "0"
+EXTRALIBS_FOR_BASE =
+!endif
+!if "$(MONOLITHIC)" == "1"
+EXTRALIBS_FOR_BASE =
+!endif
+!if "$(BUILD)" == "debug"
+__OPTIMIZEFLAG_2 = -Od
+!endif
+!if "$(BUILD)" == "release"
+__OPTIMIZEFLAG_2 = -O2
+!endif
+!if "$(USE_THREADS)" == "0"
+__THREADSFLAG_5 =
+!endif
+!if "$(USE_THREADS)" == "1"
+__THREADSFLAG_5 = mt
+!endif
+!if "$(USE_THREADS)" == "0"
+__THREADSFLAG_6 =
+!endif
+!if "$(USE_THREADS)" == "1"
+__THREADSFLAG_6 = -tWM
+!endif
+!if "$(RUNTIME_LIBS)" == "dynamic"
+__RUNTIME_LIBS_7 = -tWR
+!endif
+!if "$(RUNTIME_LIBS)" == "static"
+__RUNTIME_LIBS_7 =
+!endif
+!if "$(RUNTIME_LIBS)" == "dynamic"
+__RUNTIME_LIBS_8 = i
+!endif
+!if "$(RUNTIME_LIBS)" == "static"
+__RUNTIME_LIBS_8 =
+!endif
+!if "$(WXUNIV)" == "1"
+__WXUNIV_DEFINE_p = -D__WXUNIVERSAL__
+!endif
+!if "$(WXUNIV)" == "1"
+__WXUNIV_DEFINE_p_1 = -d__WXUNIVERSAL__
+!endif
+!if "$(DEBUG_FLAG)" == "0"
+__DEBUG_DEFINE_p = -DwxDEBUG_LEVEL=0
+!endif
+!if "$(DEBUG_FLAG)" == "0"
+__DEBUG_DEFINE_p_1 = -dwxDEBUG_LEVEL=0
+!endif
+!if "$(BUILD)" == "release"
+__NDEBUG_DEFINE_p = -DNDEBUG
+!endif
+!if "$(BUILD)" == "release"
+__NDEBUG_DEFINE_p_1 = -dNDEBUG
+!endif
+!if "$(USE_EXCEPTIONS)" == "0"
+__EXCEPTIONS_DEFINE_p = -DwxNO_EXCEPTIONS
+!endif
+!if "$(USE_EXCEPTIONS)" == "0"
+__EXCEPTIONS_DEFINE_p_1 = -dwxNO_EXCEPTIONS
+!endif
+!if "$(USE_RTTI)" == "0"
+__RTTI_DEFINE_p = -DwxNO_RTTI
+!endif
+!if "$(USE_RTTI)" == "0"
+__RTTI_DEFINE_p_1 = -dwxNO_RTTI
+!endif
+!if "$(USE_THREADS)" == "0"
+__THREAD_DEFINE_p = -DwxNO_THREADS
+!endif
+!if "$(USE_THREADS)" == "0"
+__THREAD_DEFINE_p_1 = -dwxNO_THREADS
+!endif
+!if "$(UNICODE)" == "0"
+__UNICODE_DEFINE_p = -DwxUSE_UNICODE=0
+!endif
+!if "$(UNICODE)" == "1"
+__UNICODE_DEFINE_p = -D_UNICODE
+!endif
+!if "$(UNICODE)" == "0"
+__UNICODE_DEFINE_p_1 = -dwxUSE_UNICODE=0
+!endif
+!if "$(UNICODE)" == "1"
+__UNICODE_DEFINE_p_1 = -d_UNICODE
+!endif
+!if "$(USE_CAIRO)" == "1"
+____CAIRO_INCLUDEDIR_FILENAMES_p = -I$(CAIRO_ROOT)\include\cairo
+!endif
+!if "$(USE_CAIRO)" == "1"
+____CAIRO_INCLUDEDIR_FILENAMES_1_p = -i$(CAIRO_ROOT)\include\cairo
+!endif
+!if "$(SHARED)" == "1"
+__DLLFLAG_p = -DWXUSINGDLL
+!endif
+!if "$(SHARED)" == "1"
+__DLLFLAG_p_1 = -dWXUSINGDLL
+!endif
+!if "$(MONOLITHIC)" == "0"
+__WXLIB_AUI_p = \
+ wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_aui.lib
+!endif
+!if "$(MONOLITHIC)" == "0"
+__WXLIB_RICHTEXT_p = \
+ wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_richtext.lib
+!endif
+!if "$(MONOLITHIC)" == "0"
+__WXLIB_HTML_p = \
+ wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_html.lib
+!endif
+!if "$(MONOLITHIC)" == "0"
+__WXLIB_ADV_p = \
+ wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_adv.lib
+!endif
+!if "$(MONOLITHIC)" == "0"
+__WXLIB_XML_p = \
+ wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xml.lib
+!endif
+!if "$(MONOLITHIC)" == "0"
+__WXLIB_CORE_p = \
+ wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib
+!endif
+!if "$(MONOLITHIC)" == "0"
+__WXLIB_BASE_p = \
+ wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib
+!endif
+!if "$(MONOLITHIC)" == "1"
+__WXLIB_MONO_p = \
+ wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib
+!endif
+!if "$(MONOLITHIC)" == "1" && "$(USE_STC)" == "1"
+__LIB_SCINTILLA_IF_MONO_p = wxscintilla$(WXDEBUGFLAG).lib
+!endif
+!if "$(USE_GUI)" == "1"
+__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib
+!endif
+!if "$(USE_GUI)" == "1"
+__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib
+!endif
+!if "$(USE_GUI)" == "1"
+__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib
+!endif
+!if "$(USE_CAIRO)" == "1"
+__CAIRO_LIB_p = cairo.lib
+!endif
+!if "$(USE_CAIRO)" == "1"
+____CAIRO_LIBDIR_FILENAMES_p = -L$(CAIRO_ROOT)\lib
+!endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default"
+__DEBUGINFO = -v
+!endif
+!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default"
+__DEBUGINFO = -v-
+!endif
+!if "$(DEBUG_INFO)" == "0"
+__DEBUGINFO = -v-
+!endif
+!if "$(DEBUG_INFO)" == "1"
+__DEBUGINFO = -v
+!endif
+
+
+all: $(OBJS)
+$(OBJS):
+ -if not exist $(OBJS) mkdir $(OBJS)
+
+### Targets: ###
+
+all: $(OBJS)\screenshotgen.exe bitmaps xml
+
+clean:
+ -if exist $(OBJS)\*.obj del $(OBJS)\*.obj
+ -if exist $(OBJS)\*.res del $(OBJS)\*.res
+ -if exist $(OBJS)\*.csm del $(OBJS)\*.csm
+ -if exist $(OBJS)\screenshotgen.exe del $(OBJS)\screenshotgen.exe
+ -if exist $(OBJS)\screenshotgen.tds del $(OBJS)\screenshotgen.tds
+ -if exist $(OBJS)\screenshotgen.ilc del $(OBJS)\screenshotgen.ilc
+ -if exist $(OBJS)\screenshotgen.ild del $(OBJS)\screenshotgen.ild
+ -if exist $(OBJS)\screenshotgen.ilf del $(OBJS)\screenshotgen.ilf
+ -if exist $(OBJS)\screenshotgen.ils del $(OBJS)\screenshotgen.ils
+
+$(OBJS)\screenshotgen.exe: $(SCREENSHOTGEN_OBJECTS) $(OBJS)\screenshotgen_screenshotgen.res
+ ilink32 -Tpe -q -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUGINFO) -L$(LIBDIRNAME) -aa $(____CAIRO_LIBDIR_FILENAMES_p) $(LDFLAGS) @&&|
+ c0w32.obj $(SCREENSHOTGEN_OBJECTS),$@,, $(__WXLIB_AUI_p) $(__WXLIB_RICHTEXT_p) $(__WXLIB_HTML_p) $(__WXLIB_ADV_p) $(__WXLIB_XML_p) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_SCINTILLA_IF_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__CAIRO_LIB_p) ole2w32.lib oleacc.lib import32.lib cw32$(__THREADSFLAG_5)$(__RUNTIME_LIBS_8).lib,, $(OBJS)\screenshotgen_screenshotgen.res
+|
+
+bitmaps:
+ if not exist $(OBJS)\bitmaps mkdir $(OBJS)\bitmaps
+ for %f in (wxwin32x32.png bell.png sound.png dropbuth.png dropbutn.png dropbutp.png throbber.gif) do if not exist $(OBJS)\bitmaps\%f copy .\bitmaps\%f $(OBJS)\bitmaps
+
+xml:
+ if not exist $(OBJS) mkdir $(OBJS)
+ for %f in (richtext.xml) do if not exist $(OBJS)\%f copy .\%f $(OBJS)
+
+$(OBJS)\screenshotgen_screenshot_app.obj: .\screenshot_app.cpp
+ $(CXX) -q -c -P -o$@ $(SCREENSHOTGEN_CXXFLAGS) .\screenshot_app.cpp
+
+$(OBJS)\screenshotgen_screenshot_main.obj: .\screenshot_main.cpp
+ $(CXX) -q -c -P -o$@ $(SCREENSHOTGEN_CXXFLAGS) .\screenshot_main.cpp
+
+$(OBJS)\screenshotgen_guiframe.obj: .\guiframe.cpp
+ $(CXX) -q -c -P -o$@ $(SCREENSHOTGEN_CXXFLAGS) .\guiframe.cpp
+
+$(OBJS)\screenshotgen_customcombo.obj: .\customcombo.cpp
+ $(CXX) -q -c -P -o$@ $(SCREENSHOTGEN_CXXFLAGS) .\customcombo.cpp
+
+$(OBJS)\screenshotgen_autocapture.obj: .\autocapture.cpp
+ $(CXX) -q -c -P -o$@ $(SCREENSHOTGEN_CXXFLAGS) .\autocapture.cpp
+
+$(OBJS)\screenshotgen_screenshotgen.res: .\screenshotgen.rc
+ brcc32 -32 -r -fo$@ -i$(BCCDIR)\include -d__WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__NDEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) -i$(SETUPHDIR) -i.\..\..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES_1_p) -i. $(__DLLFLAG_p_1) -i.\..\..\..\samples -i$(BCCDIR)\include\windows\sdk -dNOPCH .\screenshotgen.rc
+
diff --git a/utils/screenshotgen/src/makefile.gcc b/utils/screenshotgen/src/makefile.gcc
index f65a700508..867d4ffb04 100644
--- a/utils/screenshotgen/src/makefile.gcc
+++ b/utils/screenshotgen/src/makefile.gcc
@@ -1,279 +1,279 @@
-# =========================================================================
-# This makefile was generated by
-# Bakefile 0.2.9 (http://www.bakefile.org)
-# Do not modify, all changes will be overwritten!
-# =========================================================================
-
-include ../../../build/msw/config.gcc
-
-# -------------------------------------------------------------------------
-# Do not modify the rest of this file!
-# -------------------------------------------------------------------------
-
-### Variables: ###
-
-CPPDEPS = -MT$@ -MF$@.d -MD -MP
-WX_RELEASE_NODOT = 31
-COMPILER_PREFIX = gcc
-OBJS = \
- $(COMPILER_PREFIX)$(COMPILER_VERSION)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)
-LIBDIRNAME = \
- .\..\..\..\lib\$(COMPILER_PREFIX)$(COMPILER_VERSION)_$(LIBTYPE_SUFFIX)$(CFG)
-SETUPHDIR = \
- $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)
-SCREENSHOTGEN_CXXFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG_2) $(__THREADSFLAG) \
- $(GCCFLAGS) -DHAVE_W32API_H -D__WXMSW__ $(__WXUNIV_DEFINE_p) \
- $(__DEBUG_DEFINE_p) $(__NDEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) \
- $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) \
- -I$(SETUPHDIR) -I.\..\..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES_p) -W \
- -Wall -I. $(__DLLFLAG_p) -I.\..\..\..\samples -DNOPCH $(__RTTIFLAG_5) \
- $(__EXCEPTIONSFLAG_6) -Wno-ctor-dtor-privacy $(CPPFLAGS) $(CXXFLAGS)
-SCREENSHOTGEN_OBJECTS = \
- $(OBJS)\screenshotgen_screenshot_app.o \
- $(OBJS)\screenshotgen_screenshot_main.o \
- $(OBJS)\screenshotgen_guiframe.o \
- $(OBJS)\screenshotgen_customcombo.o \
- $(OBJS)\screenshotgen_autocapture.o \
- $(OBJS)\screenshotgen_screenshotgen_rc.o
-
-### Conditionally set variables: ###
-
-ifeq ($(GCC_VERSION),2.95)
-GCCFLAGS = -fvtable-thunks
-endif
-ifeq ($(USE_GUI),0)
-PORTNAME = base
-endif
-ifeq ($(USE_GUI),1)
-PORTNAME = msw$(TOOLKIT_VERSION)
-endif
-ifeq ($(OFFICIAL_BUILD),1)
-COMPILER_VERSION = ERROR-COMPILER-VERSION-MUST-BE-SET-FOR-OFFICIAL-BUILD
-endif
-ifeq ($(BUILD),debug)
-WXDEBUGFLAG = d
-endif
-ifeq ($(UNICODE),1)
-WXUNICODEFLAG = u
-endif
-ifeq ($(WXUNIV),1)
-WXUNIVNAME = univ
-endif
-ifeq ($(SHARED),1)
-WXDLLFLAG = dll
-endif
-ifeq ($(SHARED),0)
-LIBTYPE_SUFFIX = lib
-endif
-ifeq ($(SHARED),1)
-LIBTYPE_SUFFIX = dll
-endif
-ifeq ($(MONOLITHIC),0)
-EXTRALIBS_FOR_BASE =
-endif
-ifeq ($(MONOLITHIC),1)
-EXTRALIBS_FOR_BASE =
-endif
-ifeq ($(BUILD),debug)
-__OPTIMIZEFLAG_2 = -O0
-endif
-ifeq ($(BUILD),release)
-__OPTIMIZEFLAG_2 = -O2
-endif
-ifeq ($(USE_RTTI),0)
-__RTTIFLAG_5 = -fno-rtti
-endif
-ifeq ($(USE_RTTI),1)
-__RTTIFLAG_5 =
-endif
-ifeq ($(USE_EXCEPTIONS),0)
-__EXCEPTIONSFLAG_6 = -fno-exceptions
-endif
-ifeq ($(USE_EXCEPTIONS),1)
-__EXCEPTIONSFLAG_6 =
-endif
-ifeq ($(WXUNIV),1)
-__WXUNIV_DEFINE_p = -D__WXUNIVERSAL__
-endif
-ifeq ($(WXUNIV),1)
-__WXUNIV_DEFINE_p_1 = --define __WXUNIVERSAL__
-endif
-ifeq ($(DEBUG_FLAG),0)
-__DEBUG_DEFINE_p = -DwxDEBUG_LEVEL=0
-endif
-ifeq ($(DEBUG_FLAG),0)
-__DEBUG_DEFINE_p_1 = --define wxDEBUG_LEVEL=0
-endif
-ifeq ($(BUILD),release)
-__NDEBUG_DEFINE_p = -DNDEBUG
-endif
-ifeq ($(BUILD),release)
-__NDEBUG_DEFINE_p_1 = --define NDEBUG
-endif
-ifeq ($(USE_EXCEPTIONS),0)
-__EXCEPTIONS_DEFINE_p = -DwxNO_EXCEPTIONS
-endif
-ifeq ($(USE_EXCEPTIONS),0)
-__EXCEPTIONS_DEFINE_p_1 = --define wxNO_EXCEPTIONS
-endif
-ifeq ($(USE_RTTI),0)
-__RTTI_DEFINE_p = -DwxNO_RTTI
-endif
-ifeq ($(USE_RTTI),0)
-__RTTI_DEFINE_p_1 = --define wxNO_RTTI
-endif
-ifeq ($(USE_THREADS),0)
-__THREAD_DEFINE_p = -DwxNO_THREADS
-endif
-ifeq ($(USE_THREADS),0)
-__THREAD_DEFINE_p_1 = --define wxNO_THREADS
-endif
-ifeq ($(UNICODE),0)
-__UNICODE_DEFINE_p = -DwxUSE_UNICODE=0
-endif
-ifeq ($(UNICODE),1)
-__UNICODE_DEFINE_p = -D_UNICODE
-endif
-ifeq ($(UNICODE),0)
-__UNICODE_DEFINE_p_1 = --define wxUSE_UNICODE=0
-endif
-ifeq ($(UNICODE),1)
-__UNICODE_DEFINE_p_1 = --define _UNICODE
-endif
-ifeq ($(USE_CAIRO),1)
-____CAIRO_INCLUDEDIR_FILENAMES_p = -I$(CAIRO_ROOT)\include\cairo
-endif
-ifeq ($(USE_CAIRO),1)
-__CAIRO_INCLUDEDIR_p = --include-dir $(CAIRO_ROOT)/include/cairo
-endif
-ifeq ($(SHARED),1)
-__DLLFLAG_p = -DWXUSINGDLL
-endif
-ifeq ($(SHARED),1)
-__DLLFLAG_p_1 = --define WXUSINGDLL
-endif
-ifeq ($(MONOLITHIC),0)
-__WXLIB_AUI_p = \
- -lwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_aui
-endif
-ifeq ($(MONOLITHIC),0)
-__WXLIB_RICHTEXT_p = \
- -lwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_richtext
-endif
-ifeq ($(MONOLITHIC),0)
-__WXLIB_HTML_p = \
- -lwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_html
-endif
-ifeq ($(MONOLITHIC),0)
-__WXLIB_ADV_p = \
- -lwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_adv
-endif
-ifeq ($(MONOLITHIC),0)
-__WXLIB_XML_p = \
- -lwxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xml
-endif
-ifeq ($(MONOLITHIC),0)
-__WXLIB_CORE_p = \
- -lwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core
-endif
-ifeq ($(MONOLITHIC),0)
-__WXLIB_BASE_p = \
- -lwxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)
-endif
-ifeq ($(MONOLITHIC),1)
-__WXLIB_MONO_p = \
- -lwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)
-endif
-ifeq ($(MONOLITHIC),1)
-ifeq ($(USE_STC),1)
-__LIB_SCINTILLA_IF_MONO_p = -lwxscintilla$(WXDEBUGFLAG)
-endif
-endif
-ifeq ($(USE_GUI),1)
-__LIB_TIFF_p = -lwxtiff$(WXDEBUGFLAG)
-endif
-ifeq ($(USE_GUI),1)
-__LIB_JPEG_p = -lwxjpeg$(WXDEBUGFLAG)
-endif
-ifeq ($(USE_GUI),1)
-__LIB_PNG_p = -lwxpng$(WXDEBUGFLAG)
-endif
-ifeq ($(USE_CAIRO),1)
-__CAIRO_LIB_p = -lcairo
-endif
-ifeq ($(USE_CAIRO),1)
-____CAIRO_LIBDIR_FILENAMES_p = -L$(CAIRO_ROOT)\lib
-endif
-ifeq ($(BUILD),debug)
-ifeq ($(DEBUG_INFO),default)
-__DEBUGINFO = -g
-endif
-endif
-ifeq ($(BUILD),release)
-ifeq ($(DEBUG_INFO),default)
-__DEBUGINFO =
-endif
-endif
-ifeq ($(DEBUG_INFO),0)
-__DEBUGINFO =
-endif
-ifeq ($(DEBUG_INFO),1)
-__DEBUGINFO = -g
-endif
-ifeq ($(USE_THREADS),0)
-__THREADSFLAG =
-endif
-ifeq ($(USE_THREADS),1)
-__THREADSFLAG = -mthreads
-endif
-
-
-all: $(OBJS)
-$(OBJS):
- -if not exist $(OBJS) mkdir $(OBJS)
-
-### Targets: ###
-
-all: $(OBJS)\screenshotgen.exe bitmaps xml
-
-clean:
- -if exist $(OBJS)\*.o del $(OBJS)\*.o
- -if exist $(OBJS)\*.d del $(OBJS)\*.d
- -if exist $(OBJS)\screenshotgen.exe del $(OBJS)\screenshotgen.exe
-
-$(OBJS)\screenshotgen.exe: $(SCREENSHOTGEN_OBJECTS) $(OBJS)\screenshotgen_screenshotgen_rc.o
- $(CXX) -o $@ $(SCREENSHOTGEN_OBJECTS) $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) -Wl,--subsystem,windows -mwindows $(____CAIRO_LIBDIR_FILENAMES_p) $(LDFLAGS) $(__WXLIB_AUI_p) $(__WXLIB_RICHTEXT_p) $(__WXLIB_HTML_p) $(__WXLIB_ADV_p) $(__WXLIB_XML_p) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_SCINTILLA_IF_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(EXTRALIBS_FOR_BASE) $(__CAIRO_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32 -lwininet
-
-bitmaps:
- if not exist $(OBJS)\bitmaps mkdir $(OBJS)\bitmaps
- for %%f in (wxwin32x32.png bell.png sound.png dropbuth.png dropbutn.png dropbutp.png throbber.gif) do if not exist $(OBJS)\bitmaps\%%f copy .\bitmaps\%%f $(OBJS)\bitmaps
-
-xml:
- if not exist $(OBJS) mkdir $(OBJS)
- for %%f in (richtext.xml) do if not exist $(OBJS)\%%f copy .\%%f $(OBJS)
-
-$(OBJS)\screenshotgen_screenshot_app.o: ./screenshot_app.cpp
- $(CXX) -c -o $@ $(SCREENSHOTGEN_CXXFLAGS) $(CPPDEPS) $<
-
-$(OBJS)\screenshotgen_screenshot_main.o: ./screenshot_main.cpp
- $(CXX) -c -o $@ $(SCREENSHOTGEN_CXXFLAGS) $(CPPDEPS) $<
-
-$(OBJS)\screenshotgen_guiframe.o: ./guiframe.cpp
- $(CXX) -c -o $@ $(SCREENSHOTGEN_CXXFLAGS) $(CPPDEPS) $<
-
-$(OBJS)\screenshotgen_customcombo.o: ./customcombo.cpp
- $(CXX) -c -o $@ $(SCREENSHOTGEN_CXXFLAGS) $(CPPDEPS) $<
-
-$(OBJS)\screenshotgen_autocapture.o: ./autocapture.cpp
- $(CXX) -c -o $@ $(SCREENSHOTGEN_CXXFLAGS) $(CPPDEPS) $<
-
-$(OBJS)\screenshotgen_screenshotgen_rc.o: ./screenshotgen.rc
- $(WINDRES) -i$< -o$@ --define __WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__NDEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) --include-dir $(SETUPHDIR) --include-dir ./../../../include $(__CAIRO_INCLUDEDIR_p) --include-dir . $(__DLLFLAG_p_1) --include-dir ./../../../samples --define NOPCH
-
-.PHONY: all clean bitmaps xml
-
-
-SHELL := $(COMSPEC)
-
-# Dependencies tracking:
--include $(OBJS)/*.d
+# =========================================================================
+# This makefile was generated by
+# Bakefile 0.2.9 (http://www.bakefile.org)
+# Do not modify, all changes will be overwritten!
+# =========================================================================
+
+include ../../../build/msw/config.gcc
+
+# -------------------------------------------------------------------------
+# Do not modify the rest of this file!
+# -------------------------------------------------------------------------
+
+### Variables: ###
+
+CPPDEPS = -MT$@ -MF$@.d -MD -MP
+WX_RELEASE_NODOT = 31
+COMPILER_PREFIX = gcc
+OBJS = \
+ $(COMPILER_PREFIX)$(COMPILER_VERSION)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)
+LIBDIRNAME = \
+ .\..\..\..\lib\$(COMPILER_PREFIX)$(COMPILER_VERSION)_$(LIBTYPE_SUFFIX)$(CFG)
+SETUPHDIR = \
+ $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)
+SCREENSHOTGEN_CXXFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG_2) $(__THREADSFLAG) \
+ $(GCCFLAGS) -DHAVE_W32API_H -D__WXMSW__ $(__WXUNIV_DEFINE_p) \
+ $(__DEBUG_DEFINE_p) $(__NDEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) \
+ $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) \
+ -I$(SETUPHDIR) -I.\..\..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES_p) -W \
+ -Wall -I. $(__DLLFLAG_p) -I.\..\..\..\samples -DNOPCH $(__RTTIFLAG_5) \
+ $(__EXCEPTIONSFLAG_6) -Wno-ctor-dtor-privacy $(CPPFLAGS) $(CXXFLAGS)
+SCREENSHOTGEN_OBJECTS = \
+ $(OBJS)\screenshotgen_screenshot_app.o \
+ $(OBJS)\screenshotgen_screenshot_main.o \
+ $(OBJS)\screenshotgen_guiframe.o \
+ $(OBJS)\screenshotgen_customcombo.o \
+ $(OBJS)\screenshotgen_autocapture.o \
+ $(OBJS)\screenshotgen_screenshotgen_rc.o
+
+### Conditionally set variables: ###
+
+ifeq ($(GCC_VERSION),2.95)
+GCCFLAGS = -fvtable-thunks
+endif
+ifeq ($(USE_GUI),0)
+PORTNAME = base
+endif
+ifeq ($(USE_GUI),1)
+PORTNAME = msw$(TOOLKIT_VERSION)
+endif
+ifeq ($(OFFICIAL_BUILD),1)
+COMPILER_VERSION = ERROR-COMPILER-VERSION-MUST-BE-SET-FOR-OFFICIAL-BUILD
+endif
+ifeq ($(BUILD),debug)
+WXDEBUGFLAG = d
+endif
+ifeq ($(UNICODE),1)
+WXUNICODEFLAG = u
+endif
+ifeq ($(WXUNIV),1)
+WXUNIVNAME = univ
+endif
+ifeq ($(SHARED),1)
+WXDLLFLAG = dll
+endif
+ifeq ($(SHARED),0)
+LIBTYPE_SUFFIX = lib
+endif
+ifeq ($(SHARED),1)
+LIBTYPE_SUFFIX = dll
+endif
+ifeq ($(MONOLITHIC),0)
+EXTRALIBS_FOR_BASE =
+endif
+ifeq ($(MONOLITHIC),1)
+EXTRALIBS_FOR_BASE =
+endif
+ifeq ($(BUILD),debug)
+__OPTIMIZEFLAG_2 = -O0
+endif
+ifeq ($(BUILD),release)
+__OPTIMIZEFLAG_2 = -O2
+endif
+ifeq ($(USE_RTTI),0)
+__RTTIFLAG_5 = -fno-rtti
+endif
+ifeq ($(USE_RTTI),1)
+__RTTIFLAG_5 =
+endif
+ifeq ($(USE_EXCEPTIONS),0)
+__EXCEPTIONSFLAG_6 = -fno-exceptions
+endif
+ifeq ($(USE_EXCEPTIONS),1)
+__EXCEPTIONSFLAG_6 =
+endif
+ifeq ($(WXUNIV),1)
+__WXUNIV_DEFINE_p = -D__WXUNIVERSAL__
+endif
+ifeq ($(WXUNIV),1)
+__WXUNIV_DEFINE_p_1 = --define __WXUNIVERSAL__
+endif
+ifeq ($(DEBUG_FLAG),0)
+__DEBUG_DEFINE_p = -DwxDEBUG_LEVEL=0
+endif
+ifeq ($(DEBUG_FLAG),0)
+__DEBUG_DEFINE_p_1 = --define wxDEBUG_LEVEL=0
+endif
+ifeq ($(BUILD),release)
+__NDEBUG_DEFINE_p = -DNDEBUG
+endif
+ifeq ($(BUILD),release)
+__NDEBUG_DEFINE_p_1 = --define NDEBUG
+endif
+ifeq ($(USE_EXCEPTIONS),0)
+__EXCEPTIONS_DEFINE_p = -DwxNO_EXCEPTIONS
+endif
+ifeq ($(USE_EXCEPTIONS),0)
+__EXCEPTIONS_DEFINE_p_1 = --define wxNO_EXCEPTIONS
+endif
+ifeq ($(USE_RTTI),0)
+__RTTI_DEFINE_p = -DwxNO_RTTI
+endif
+ifeq ($(USE_RTTI),0)
+__RTTI_DEFINE_p_1 = --define wxNO_RTTI
+endif
+ifeq ($(USE_THREADS),0)
+__THREAD_DEFINE_p = -DwxNO_THREADS
+endif
+ifeq ($(USE_THREADS),0)
+__THREAD_DEFINE_p_1 = --define wxNO_THREADS
+endif
+ifeq ($(UNICODE),0)
+__UNICODE_DEFINE_p = -DwxUSE_UNICODE=0
+endif
+ifeq ($(UNICODE),1)
+__UNICODE_DEFINE_p = -D_UNICODE
+endif
+ifeq ($(UNICODE),0)
+__UNICODE_DEFINE_p_1 = --define wxUSE_UNICODE=0
+endif
+ifeq ($(UNICODE),1)
+__UNICODE_DEFINE_p_1 = --define _UNICODE
+endif
+ifeq ($(USE_CAIRO),1)
+____CAIRO_INCLUDEDIR_FILENAMES_p = -I$(CAIRO_ROOT)\include\cairo
+endif
+ifeq ($(USE_CAIRO),1)
+__CAIRO_INCLUDEDIR_p = --include-dir $(CAIRO_ROOT)/include/cairo
+endif
+ifeq ($(SHARED),1)
+__DLLFLAG_p = -DWXUSINGDLL
+endif
+ifeq ($(SHARED),1)
+__DLLFLAG_p_1 = --define WXUSINGDLL
+endif
+ifeq ($(MONOLITHIC),0)
+__WXLIB_AUI_p = \
+ -lwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_aui
+endif
+ifeq ($(MONOLITHIC),0)
+__WXLIB_RICHTEXT_p = \
+ -lwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_richtext
+endif
+ifeq ($(MONOLITHIC),0)
+__WXLIB_HTML_p = \
+ -lwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_html
+endif
+ifeq ($(MONOLITHIC),0)
+__WXLIB_ADV_p = \
+ -lwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_adv
+endif
+ifeq ($(MONOLITHIC),0)
+__WXLIB_XML_p = \
+ -lwxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xml
+endif
+ifeq ($(MONOLITHIC),0)
+__WXLIB_CORE_p = \
+ -lwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core
+endif
+ifeq ($(MONOLITHIC),0)
+__WXLIB_BASE_p = \
+ -lwxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)
+endif
+ifeq ($(MONOLITHIC),1)
+__WXLIB_MONO_p = \
+ -lwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)
+endif
+ifeq ($(MONOLITHIC),1)
+ifeq ($(USE_STC),1)
+__LIB_SCINTILLA_IF_MONO_p = -lwxscintilla$(WXDEBUGFLAG)
+endif
+endif
+ifeq ($(USE_GUI),1)
+__LIB_TIFF_p = -lwxtiff$(WXDEBUGFLAG)
+endif
+ifeq ($(USE_GUI),1)
+__LIB_JPEG_p = -lwxjpeg$(WXDEBUGFLAG)
+endif
+ifeq ($(USE_GUI),1)
+__LIB_PNG_p = -lwxpng$(WXDEBUGFLAG)
+endif
+ifeq ($(USE_CAIRO),1)
+__CAIRO_LIB_p = -lcairo
+endif
+ifeq ($(USE_CAIRO),1)
+____CAIRO_LIBDIR_FILENAMES_p = -L$(CAIRO_ROOT)\lib
+endif
+ifeq ($(BUILD),debug)
+ifeq ($(DEBUG_INFO),default)
+__DEBUGINFO = -g
+endif
+endif
+ifeq ($(BUILD),release)
+ifeq ($(DEBUG_INFO),default)
+__DEBUGINFO =
+endif
+endif
+ifeq ($(DEBUG_INFO),0)
+__DEBUGINFO =
+endif
+ifeq ($(DEBUG_INFO),1)
+__DEBUGINFO = -g
+endif
+ifeq ($(USE_THREADS),0)
+__THREADSFLAG =
+endif
+ifeq ($(USE_THREADS),1)
+__THREADSFLAG = -mthreads
+endif
+
+
+all: $(OBJS)
+$(OBJS):
+ -if not exist $(OBJS) mkdir $(OBJS)
+
+### Targets: ###
+
+all: $(OBJS)\screenshotgen.exe bitmaps xml
+
+clean:
+ -if exist $(OBJS)\*.o del $(OBJS)\*.o
+ -if exist $(OBJS)\*.d del $(OBJS)\*.d
+ -if exist $(OBJS)\screenshotgen.exe del $(OBJS)\screenshotgen.exe
+
+$(OBJS)\screenshotgen.exe: $(SCREENSHOTGEN_OBJECTS) $(OBJS)\screenshotgen_screenshotgen_rc.o
+ $(CXX) -o $@ $(SCREENSHOTGEN_OBJECTS) $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) -Wl,--subsystem,windows -mwindows $(____CAIRO_LIBDIR_FILENAMES_p) $(LDFLAGS) $(__WXLIB_AUI_p) $(__WXLIB_RICHTEXT_p) $(__WXLIB_HTML_p) $(__WXLIB_ADV_p) $(__WXLIB_XML_p) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_SCINTILLA_IF_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(EXTRALIBS_FOR_BASE) $(__CAIRO_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32 -lwininet
+
+bitmaps:
+ if not exist $(OBJS)\bitmaps mkdir $(OBJS)\bitmaps
+ for %%f in (wxwin32x32.png bell.png sound.png dropbuth.png dropbutn.png dropbutp.png throbber.gif) do if not exist $(OBJS)\bitmaps\%%f copy .\bitmaps\%%f $(OBJS)\bitmaps
+
+xml:
+ if not exist $(OBJS) mkdir $(OBJS)
+ for %%f in (richtext.xml) do if not exist $(OBJS)\%%f copy .\%%f $(OBJS)
+
+$(OBJS)\screenshotgen_screenshot_app.o: ./screenshot_app.cpp
+ $(CXX) -c -o $@ $(SCREENSHOTGEN_CXXFLAGS) $(CPPDEPS) $<
+
+$(OBJS)\screenshotgen_screenshot_main.o: ./screenshot_main.cpp
+ $(CXX) -c -o $@ $(SCREENSHOTGEN_CXXFLAGS) $(CPPDEPS) $<
+
+$(OBJS)\screenshotgen_guiframe.o: ./guiframe.cpp
+ $(CXX) -c -o $@ $(SCREENSHOTGEN_CXXFLAGS) $(CPPDEPS) $<
+
+$(OBJS)\screenshotgen_customcombo.o: ./customcombo.cpp
+ $(CXX) -c -o $@ $(SCREENSHOTGEN_CXXFLAGS) $(CPPDEPS) $<
+
+$(OBJS)\screenshotgen_autocapture.o: ./autocapture.cpp
+ $(CXX) -c -o $@ $(SCREENSHOTGEN_CXXFLAGS) $(CPPDEPS) $<
+
+$(OBJS)\screenshotgen_screenshotgen_rc.o: ./screenshotgen.rc
+ $(WINDRES) -i$< -o$@ --define __WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__NDEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) --include-dir $(SETUPHDIR) --include-dir ./../../../include $(__CAIRO_INCLUDEDIR_p) --include-dir . $(__DLLFLAG_p_1) --include-dir ./../../../samples --define NOPCH
+
+.PHONY: all clean bitmaps xml
+
+
+SHELL := $(COMSPEC)
+
+# Dependencies tracking:
+-include $(OBJS)/*.d
diff --git a/utils/screenshotgen/src/makefile.vc b/utils/screenshotgen/src/makefile.vc
index 0f0989bc30..71327c686d 100644
--- a/utils/screenshotgen/src/makefile.vc
+++ b/utils/screenshotgen/src/makefile.vc
@@ -1,406 +1,406 @@
-# =========================================================================
-# This makefile was generated by
-# Bakefile 0.2.9 (http://www.bakefile.org)
-# Do not modify, all changes will be overwritten!
-# =========================================================================
-
-!include <../../../build/msw/config.vc>
-
-# -------------------------------------------------------------------------
-# Do not modify the rest of this file!
-# -------------------------------------------------------------------------
-
-### Variables: ###
-
-WX_RELEASE_NODOT = 31
-COMPILER_PREFIX = vc
-OBJS = \
- $(COMPILER_PREFIX)$(COMPILER_VERSION)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)$(ARCH_SUFFIX)
-LIBDIRNAME = \
- .\..\..\..\lib\$(COMPILER_PREFIX)$(COMPILER_VERSION)$(ARCH_SUFFIX)_$(LIBTYPE_SUFFIX)$(CFG)
-SETUPHDIR = \
- $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)
-SCREENSHOTGEN_CXXFLAGS = /M$(__RUNTIME_LIBS_10)$(__DEBUGRUNTIME_4) /DWIN32 \
- $(__DEBUGINFO_0) /Fd$(OBJS)\screenshotgen.pdb $(____DEBUGRUNTIME_3_p) \
- $(__OPTIMIZEFLAG_6) /D_CRT_SECURE_NO_DEPRECATE=1 \
- /D_CRT_NON_CONFORMING_SWPRINTFS=1 /D_SCL_SECURE_NO_WARNINGS=1 \
- $(__NO_VC_CRTDBG_p) /D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \
- $(__NDEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \
- $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) /I$(SETUPHDIR) \
- /I.\..\..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES_p) /W4 /I. \
- $(__DLLFLAG_p) /D_WINDOWS /I.\..\..\..\samples /DNOPCH $(__RTTIFLAG_11) \
- $(__EXCEPTIONSFLAG_12) $(CPPFLAGS) $(CXXFLAGS)
-SCREENSHOTGEN_OBJECTS = \
- $(OBJS)\screenshotgen_screenshot_app.obj \
- $(OBJS)\screenshotgen_screenshot_main.obj \
- $(OBJS)\screenshotgen_guiframe.obj \
- $(OBJS)\screenshotgen_customcombo.obj \
- $(OBJS)\screenshotgen_autocapture.obj
-SCREENSHOTGEN_RESOURCES = \
- $(OBJS)\screenshotgen_screenshotgen.res
-
-### Conditionally set variables: ###
-
-!if "$(TARGET_CPU)" == "AMD64"
-ARCH_SUFFIX = _x64
-!endif
-!if "$(TARGET_CPU)" == "IA64"
-ARCH_SUFFIX = _ia64
-!endif
-!if "$(TARGET_CPU)" == "X64"
-ARCH_SUFFIX = _x64
-!endif
-!if "$(TARGET_CPU)" == "amd64"
-ARCH_SUFFIX = _x64
-!endif
-!if "$(TARGET_CPU)" == "ia64"
-ARCH_SUFFIX = _ia64
-!endif
-!if "$(TARGET_CPU)" == "x64"
-ARCH_SUFFIX = _x64
-!endif
-!if "$(USE_GUI)" == "0"
-PORTNAME = base
-!endif
-!if "$(USE_GUI)" == "1"
-PORTNAME = msw$(TOOLKIT_VERSION)
-!endif
-!if "$(OFFICIAL_BUILD)" == "1"
-COMPILER_VERSION = ERROR-COMPILER-VERSION-MUST-BE-SET-FOR-OFFICIAL-BUILD
-!endif
-!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default"
-WXDEBUGFLAG = d
-!endif
-!if "$(DEBUG_RUNTIME_LIBS)" == "1"
-WXDEBUGFLAG = d
-!endif
-!if "$(UNICODE)" == "1"
-WXUNICODEFLAG = u
-!endif
-!if "$(WXUNIV)" == "1"
-WXUNIVNAME = univ
-!endif
-!if "$(SHARED)" == "1"
-WXDLLFLAG = dll
-!endif
-!if "$(SHARED)" == "0"
-LIBTYPE_SUFFIX = lib
-!endif
-!if "$(SHARED)" == "1"
-LIBTYPE_SUFFIX = dll
-!endif
-!if "$(TARGET_CPU)" == "AMD64"
-LINK_TARGET_CPU = /MACHINE:X64
-!endif
-!if "$(TARGET_CPU)" == "IA64"
-LINK_TARGET_CPU = /MACHINE:IA64
-!endif
-!if "$(TARGET_CPU)" == "X64"
-LINK_TARGET_CPU = /MACHINE:X64
-!endif
-!if "$(TARGET_CPU)" == "amd64"
-LINK_TARGET_CPU = /MACHINE:X64
-!endif
-!if "$(TARGET_CPU)" == "ia64"
-LINK_TARGET_CPU = /MACHINE:IA64
-!endif
-!if "$(TARGET_CPU)" == "x64"
-LINK_TARGET_CPU = /MACHINE:X64
-!endif
-!if "$(MONOLITHIC)" == "0"
-EXTRALIBS_FOR_BASE =
-!endif
-!if "$(MONOLITHIC)" == "1"
-EXTRALIBS_FOR_BASE =
-!endif
-!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default"
-__DEBUGINFO_0 = /Zi
-!endif
-!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default"
-__DEBUGINFO_0 =
-!endif
-!if "$(DEBUG_INFO)" == "0"
-__DEBUGINFO_0 =
-!endif
-!if "$(DEBUG_INFO)" == "1"
-__DEBUGINFO_0 = /Zi
-!endif
-!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default"
-__DEBUGINFO_1 = /DEBUG
-!endif
-!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default"
-__DEBUGINFO_1 =
-!endif
-!if "$(DEBUG_INFO)" == "0"
-__DEBUGINFO_1 =
-!endif
-!if "$(DEBUG_INFO)" == "1"
-__DEBUGINFO_1 = /DEBUG
-!endif
-!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default"
-__DEBUGINFO_2 = $(__DEBUGRUNTIME_5)
-!endif
-!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default"
-__DEBUGINFO_2 =
-!endif
-!if "$(DEBUG_INFO)" == "0"
-__DEBUGINFO_2 =
-!endif
-!if "$(DEBUG_INFO)" == "1"
-__DEBUGINFO_2 = $(__DEBUGRUNTIME_5)
-!endif
-!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default"
-____DEBUGRUNTIME_3_p = /D_DEBUG
-!endif
-!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default"
-____DEBUGRUNTIME_3_p =
-!endif
-!if "$(DEBUG_RUNTIME_LIBS)" == "0"
-____DEBUGRUNTIME_3_p =
-!endif
-!if "$(DEBUG_RUNTIME_LIBS)" == "1"
-____DEBUGRUNTIME_3_p = /D_DEBUG
-!endif
-!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default"
-____DEBUGRUNTIME_3_p_1 = /d _DEBUG
-!endif
-!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default"
-____DEBUGRUNTIME_3_p_1 =
-!endif
-!if "$(DEBUG_RUNTIME_LIBS)" == "0"
-____DEBUGRUNTIME_3_p_1 =
-!endif
-!if "$(DEBUG_RUNTIME_LIBS)" == "1"
-____DEBUGRUNTIME_3_p_1 = /d _DEBUG
-!endif
-!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default"
-__DEBUGRUNTIME_4 = d
-!endif
-!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default"
-__DEBUGRUNTIME_4 =
-!endif
-!if "$(DEBUG_RUNTIME_LIBS)" == "0"
-__DEBUGRUNTIME_4 =
-!endif
-!if "$(DEBUG_RUNTIME_LIBS)" == "1"
-__DEBUGRUNTIME_4 = d
-!endif
-!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default"
-__DEBUGRUNTIME_5 =
-!endif
-!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default"
-__DEBUGRUNTIME_5 = /opt:ref /opt:icf
-!endif
-!if "$(DEBUG_RUNTIME_LIBS)" == "0"
-__DEBUGRUNTIME_5 = /opt:ref /opt:icf
-!endif
-!if "$(DEBUG_RUNTIME_LIBS)" == "1"
-__DEBUGRUNTIME_5 =
-!endif
-!if "$(BUILD)" == "debug"
-__OPTIMIZEFLAG_6 = /Od
-!endif
-!if "$(BUILD)" == "release"
-__OPTIMIZEFLAG_6 = /O2
-!endif
-!if "$(USE_THREADS)" == "0"
-__THREADSFLAG_9 = L
-!endif
-!if "$(USE_THREADS)" == "1"
-__THREADSFLAG_9 = T
-!endif
-!if "$(RUNTIME_LIBS)" == "dynamic"
-__RUNTIME_LIBS_10 = D
-!endif
-!if "$(RUNTIME_LIBS)" == "static"
-__RUNTIME_LIBS_10 = $(__THREADSFLAG_9)
-!endif
-!if "$(USE_RTTI)" == "0"
-__RTTIFLAG_11 =
-!endif
-!if "$(USE_RTTI)" == "1"
-__RTTIFLAG_11 = /GR
-!endif
-!if "$(USE_EXCEPTIONS)" == "0"
-__EXCEPTIONSFLAG_12 =
-!endif
-!if "$(USE_EXCEPTIONS)" == "1"
-__EXCEPTIONSFLAG_12 = /EHsc
-!endif
-!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "0"
-__NO_VC_CRTDBG_p = /D__NO_VC_CRTDBG__
-!endif
-!if "$(BUILD)" == "release" && "$(DEBUG_FLAG)" == "1"
-__NO_VC_CRTDBG_p = /D__NO_VC_CRTDBG__
-!endif
-!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "0"
-__NO_VC_CRTDBG_p_1 = /d __NO_VC_CRTDBG__
-!endif
-!if "$(BUILD)" == "release" && "$(DEBUG_FLAG)" == "1"
-__NO_VC_CRTDBG_p_1 = /d __NO_VC_CRTDBG__
-!endif
-!if "$(WXUNIV)" == "1"
-__WXUNIV_DEFINE_p = /D__WXUNIVERSAL__
-!endif
-!if "$(WXUNIV)" == "1"
-__WXUNIV_DEFINE_p_1 = /d __WXUNIVERSAL__
-!endif
-!if "$(DEBUG_FLAG)" == "0"
-__DEBUG_DEFINE_p = /DwxDEBUG_LEVEL=0
-!endif
-!if "$(DEBUG_FLAG)" == "0"
-__DEBUG_DEFINE_p_1 = /d wxDEBUG_LEVEL=0
-!endif
-!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default"
-__NDEBUG_DEFINE_p = /DNDEBUG
-!endif
-!if "$(DEBUG_RUNTIME_LIBS)" == "0"
-__NDEBUG_DEFINE_p = /DNDEBUG
-!endif
-!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default"
-__NDEBUG_DEFINE_p_1 = /d NDEBUG
-!endif
-!if "$(DEBUG_RUNTIME_LIBS)" == "0"
-__NDEBUG_DEFINE_p_1 = /d NDEBUG
-!endif
-!if "$(USE_EXCEPTIONS)" == "0"
-__EXCEPTIONS_DEFINE_p = /DwxNO_EXCEPTIONS
-!endif
-!if "$(USE_EXCEPTIONS)" == "0"
-__EXCEPTIONS_DEFINE_p_1 = /d wxNO_EXCEPTIONS
-!endif
-!if "$(USE_RTTI)" == "0"
-__RTTI_DEFINE_p = /DwxNO_RTTI
-!endif
-!if "$(USE_RTTI)" == "0"
-__RTTI_DEFINE_p_1 = /d wxNO_RTTI
-!endif
-!if "$(USE_THREADS)" == "0"
-__THREAD_DEFINE_p = /DwxNO_THREADS
-!endif
-!if "$(USE_THREADS)" == "0"
-__THREAD_DEFINE_p_1 = /d wxNO_THREADS
-!endif
-!if "$(UNICODE)" == "0"
-__UNICODE_DEFINE_p = /DwxUSE_UNICODE=0
-!endif
-!if "$(UNICODE)" == "1"
-__UNICODE_DEFINE_p = /D_UNICODE
-!endif
-!if "$(UNICODE)" == "0"
-__UNICODE_DEFINE_p_1 = /d wxUSE_UNICODE=0
-!endif
-!if "$(UNICODE)" == "1"
-__UNICODE_DEFINE_p_1 = /d _UNICODE
-!endif
-!if "$(USE_CAIRO)" == "1"
-____CAIRO_INCLUDEDIR_FILENAMES_p = /I$(CAIRO_ROOT)\include\cairo
-!endif
-!if "$(USE_CAIRO)" == "1"
-____CAIRO_INCLUDEDIR_FILENAMES_1_p = /i $(CAIRO_ROOT)\include\cairo
-!endif
-!if "$(SHARED)" == "1"
-__DLLFLAG_p = /DWXUSINGDLL
-!endif
-!if "$(SHARED)" == "1"
-__DLLFLAG_p_1 = /d WXUSINGDLL
-!endif
-!if "$(MONOLITHIC)" == "0"
-__WXLIB_AUI_p = \
- wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_aui.lib
-!endif
-!if "$(MONOLITHIC)" == "0"
-__WXLIB_RICHTEXT_p = \
- wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_richtext.lib
-!endif
-!if "$(MONOLITHIC)" == "0"
-__WXLIB_HTML_p = \
- wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_html.lib
-!endif
-!if "$(MONOLITHIC)" == "0"
-__WXLIB_ADV_p = \
- wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_adv.lib
-!endif
-!if "$(MONOLITHIC)" == "0"
-__WXLIB_XML_p = \
- wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xml.lib
-!endif
-!if "$(MONOLITHIC)" == "0"
-__WXLIB_CORE_p = \
- wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib
-!endif
-!if "$(MONOLITHIC)" == "0"
-__WXLIB_BASE_p = \
- wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib
-!endif
-!if "$(MONOLITHIC)" == "1"
-__WXLIB_MONO_p = \
- wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib
-!endif
-!if "$(MONOLITHIC)" == "1" && "$(USE_STC)" == "1"
-__LIB_SCINTILLA_IF_MONO_p = wxscintilla$(WXDEBUGFLAG).lib
-!endif
-!if "$(USE_GUI)" == "1"
-__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib
-!endif
-!if "$(USE_GUI)" == "1"
-__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib
-!endif
-!if "$(USE_GUI)" == "1"
-__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib
-!endif
-!if "$(USE_CAIRO)" == "1"
-__CAIRO_LIB_p = cairo.lib
-!endif
-!if "$(USE_CAIRO)" == "1"
-____CAIRO_LIBDIR_FILENAMES_p = /LIBPATH:$(CAIRO_ROOT)\lib
-!endif
-
-
-all: $(OBJS)
-$(OBJS):
- -if not exist $(OBJS) mkdir $(OBJS)
-
-### Targets: ###
-
-all: $(OBJS)\screenshotgen.exe bitmaps xml
-
-clean:
- -if exist $(OBJS)\*.obj del $(OBJS)\*.obj
- -if exist $(OBJS)\*.res del $(OBJS)\*.res
- -if exist $(OBJS)\*.pch del $(OBJS)\*.pch
- -if exist $(OBJS)\screenshotgen.exe del $(OBJS)\screenshotgen.exe
- -if exist $(OBJS)\screenshotgen.ilk del $(OBJS)\screenshotgen.ilk
- -if exist $(OBJS)\screenshotgen.pdb del $(OBJS)\screenshotgen.pdb
-
-$(OBJS)\screenshotgen.exe: $(SCREENSHOTGEN_OBJECTS) $(OBJS)\screenshotgen_screenshotgen.res
- link /NOLOGO /OUT:$@ $(__DEBUGINFO_1) /pdb:"$(OBJS)\screenshotgen.pdb" $(__DEBUGINFO_2) $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:WINDOWS $(____CAIRO_LIBDIR_FILENAMES_p) $(LDFLAGS) @<<
- $(SCREENSHOTGEN_OBJECTS) $(SCREENSHOTGEN_RESOURCES) $(__WXLIB_AUI_p) $(__WXLIB_RICHTEXT_p) $(__WXLIB_HTML_p) $(__WXLIB_ADV_p) $(__WXLIB_XML_p) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_SCINTILLA_IF_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__CAIRO_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib
-<<
-
-bitmaps:
- if not exist $(OBJS)\bitmaps mkdir $(OBJS)\bitmaps
- for %f in (wxwin32x32.png bell.png sound.png dropbuth.png dropbutn.png dropbutp.png throbber.gif) do if not exist $(OBJS)\bitmaps\%f copy .\bitmaps\%f $(OBJS)\bitmaps
-
-xml:
- if not exist $(OBJS) mkdir $(OBJS)
- for %f in (richtext.xml) do if not exist $(OBJS)\%f copy .\%f $(OBJS)
-
-$(OBJS)\screenshotgen_screenshot_app.obj: .\screenshot_app.cpp
- $(CXX) /c /nologo /TP /Fo$@ $(SCREENSHOTGEN_CXXFLAGS) .\screenshot_app.cpp
-
-$(OBJS)\screenshotgen_screenshot_main.obj: .\screenshot_main.cpp
- $(CXX) /c /nologo /TP /Fo$@ $(SCREENSHOTGEN_CXXFLAGS) .\screenshot_main.cpp
-
-$(OBJS)\screenshotgen_guiframe.obj: .\guiframe.cpp
- $(CXX) /c /nologo /TP /Fo$@ $(SCREENSHOTGEN_CXXFLAGS) .\guiframe.cpp
-
-$(OBJS)\screenshotgen_customcombo.obj: .\customcombo.cpp
- $(CXX) /c /nologo /TP /Fo$@ $(SCREENSHOTGEN_CXXFLAGS) .\customcombo.cpp
-
-$(OBJS)\screenshotgen_autocapture.obj: .\autocapture.cpp
- $(CXX) /c /nologo /TP /Fo$@ $(SCREENSHOTGEN_CXXFLAGS) .\autocapture.cpp
-
-$(OBJS)\screenshotgen_screenshotgen.res: .\screenshotgen.rc
- rc /fo$@ /d WIN32 $(____DEBUGRUNTIME_3_p_1) /d _CRT_SECURE_NO_DEPRECATE=1 /d _CRT_NON_CONFORMING_SWPRINTFS=1 /d _SCL_SECURE_NO_WARNINGS=1 $(__NO_VC_CRTDBG_p_1) /d __WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__NDEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) /i $(SETUPHDIR) /i .\..\..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES_1_p) /i . $(__DLLFLAG_p_1) /d _WINDOWS /i .\..\..\..\samples /d NOPCH .\screenshotgen.rc
-
+# =========================================================================
+# This makefile was generated by
+# Bakefile 0.2.9 (http://www.bakefile.org)
+# Do not modify, all changes will be overwritten!
+# =========================================================================
+
+!include <../../../build/msw/config.vc>
+
+# -------------------------------------------------------------------------
+# Do not modify the rest of this file!
+# -------------------------------------------------------------------------
+
+### Variables: ###
+
+WX_RELEASE_NODOT = 31
+COMPILER_PREFIX = vc
+OBJS = \
+ $(COMPILER_PREFIX)$(COMPILER_VERSION)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)$(ARCH_SUFFIX)
+LIBDIRNAME = \
+ .\..\..\..\lib\$(COMPILER_PREFIX)$(COMPILER_VERSION)$(ARCH_SUFFIX)_$(LIBTYPE_SUFFIX)$(CFG)
+SETUPHDIR = \
+ $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)
+SCREENSHOTGEN_CXXFLAGS = /M$(__RUNTIME_LIBS_10)$(__DEBUGRUNTIME_4) /DWIN32 \
+ $(__DEBUGINFO_0) /Fd$(OBJS)\screenshotgen.pdb $(____DEBUGRUNTIME_3_p) \
+ $(__OPTIMIZEFLAG_6) /D_CRT_SECURE_NO_DEPRECATE=1 \
+ /D_CRT_NON_CONFORMING_SWPRINTFS=1 /D_SCL_SECURE_NO_WARNINGS=1 \
+ $(__NO_VC_CRTDBG_p) /D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \
+ $(__NDEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \
+ $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) /I$(SETUPHDIR) \
+ /I.\..\..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES_p) /W4 /I. \
+ $(__DLLFLAG_p) /D_WINDOWS /I.\..\..\..\samples /DNOPCH $(__RTTIFLAG_11) \
+ $(__EXCEPTIONSFLAG_12) $(CPPFLAGS) $(CXXFLAGS)
+SCREENSHOTGEN_OBJECTS = \
+ $(OBJS)\screenshotgen_screenshot_app.obj \
+ $(OBJS)\screenshotgen_screenshot_main.obj \
+ $(OBJS)\screenshotgen_guiframe.obj \
+ $(OBJS)\screenshotgen_customcombo.obj \
+ $(OBJS)\screenshotgen_autocapture.obj
+SCREENSHOTGEN_RESOURCES = \
+ $(OBJS)\screenshotgen_screenshotgen.res
+
+### Conditionally set variables: ###
+
+!if "$(TARGET_CPU)" == "AMD64"
+ARCH_SUFFIX = _x64
+!endif
+!if "$(TARGET_CPU)" == "IA64"
+ARCH_SUFFIX = _ia64
+!endif
+!if "$(TARGET_CPU)" == "X64"
+ARCH_SUFFIX = _x64
+!endif
+!if "$(TARGET_CPU)" == "amd64"
+ARCH_SUFFIX = _x64
+!endif
+!if "$(TARGET_CPU)" == "ia64"
+ARCH_SUFFIX = _ia64
+!endif
+!if "$(TARGET_CPU)" == "x64"
+ARCH_SUFFIX = _x64
+!endif
+!if "$(USE_GUI)" == "0"
+PORTNAME = base
+!endif
+!if "$(USE_GUI)" == "1"
+PORTNAME = msw$(TOOLKIT_VERSION)
+!endif
+!if "$(OFFICIAL_BUILD)" == "1"
+COMPILER_VERSION = ERROR-COMPILER-VERSION-MUST-BE-SET-FOR-OFFICIAL-BUILD
+!endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default"
+WXDEBUGFLAG = d
+!endif
+!if "$(DEBUG_RUNTIME_LIBS)" == "1"
+WXDEBUGFLAG = d
+!endif
+!if "$(UNICODE)" == "1"
+WXUNICODEFLAG = u
+!endif
+!if "$(WXUNIV)" == "1"
+WXUNIVNAME = univ
+!endif
+!if "$(SHARED)" == "1"
+WXDLLFLAG = dll
+!endif
+!if "$(SHARED)" == "0"
+LIBTYPE_SUFFIX = lib
+!endif
+!if "$(SHARED)" == "1"
+LIBTYPE_SUFFIX = dll
+!endif
+!if "$(TARGET_CPU)" == "AMD64"
+LINK_TARGET_CPU = /MACHINE:X64
+!endif
+!if "$(TARGET_CPU)" == "IA64"
+LINK_TARGET_CPU = /MACHINE:IA64
+!endif
+!if "$(TARGET_CPU)" == "X64"
+LINK_TARGET_CPU = /MACHINE:X64
+!endif
+!if "$(TARGET_CPU)" == "amd64"
+LINK_TARGET_CPU = /MACHINE:X64
+!endif
+!if "$(TARGET_CPU)" == "ia64"
+LINK_TARGET_CPU = /MACHINE:IA64
+!endif
+!if "$(TARGET_CPU)" == "x64"
+LINK_TARGET_CPU = /MACHINE:X64
+!endif
+!if "$(MONOLITHIC)" == "0"
+EXTRALIBS_FOR_BASE =
+!endif
+!if "$(MONOLITHIC)" == "1"
+EXTRALIBS_FOR_BASE =
+!endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default"
+__DEBUGINFO_0 = /Zi
+!endif
+!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default"
+__DEBUGINFO_0 =
+!endif
+!if "$(DEBUG_INFO)" == "0"
+__DEBUGINFO_0 =
+!endif
+!if "$(DEBUG_INFO)" == "1"
+__DEBUGINFO_0 = /Zi
+!endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default"
+__DEBUGINFO_1 = /DEBUG
+!endif
+!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default"
+__DEBUGINFO_1 =
+!endif
+!if "$(DEBUG_INFO)" == "0"
+__DEBUGINFO_1 =
+!endif
+!if "$(DEBUG_INFO)" == "1"
+__DEBUGINFO_1 = /DEBUG
+!endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default"
+__DEBUGINFO_2 = $(__DEBUGRUNTIME_5)
+!endif
+!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default"
+__DEBUGINFO_2 =
+!endif
+!if "$(DEBUG_INFO)" == "0"
+__DEBUGINFO_2 =
+!endif
+!if "$(DEBUG_INFO)" == "1"
+__DEBUGINFO_2 = $(__DEBUGRUNTIME_5)
+!endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default"
+____DEBUGRUNTIME_3_p = /D_DEBUG
+!endif
+!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default"
+____DEBUGRUNTIME_3_p =
+!endif
+!if "$(DEBUG_RUNTIME_LIBS)" == "0"
+____DEBUGRUNTIME_3_p =
+!endif
+!if "$(DEBUG_RUNTIME_LIBS)" == "1"
+____DEBUGRUNTIME_3_p = /D_DEBUG
+!endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default"
+____DEBUGRUNTIME_3_p_1 = /d _DEBUG
+!endif
+!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default"
+____DEBUGRUNTIME_3_p_1 =
+!endif
+!if "$(DEBUG_RUNTIME_LIBS)" == "0"
+____DEBUGRUNTIME_3_p_1 =
+!endif
+!if "$(DEBUG_RUNTIME_LIBS)" == "1"
+____DEBUGRUNTIME_3_p_1 = /d _DEBUG
+!endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default"
+__DEBUGRUNTIME_4 = d
+!endif
+!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default"
+__DEBUGRUNTIME_4 =
+!endif
+!if "$(DEBUG_RUNTIME_LIBS)" == "0"
+__DEBUGRUNTIME_4 =
+!endif
+!if "$(DEBUG_RUNTIME_LIBS)" == "1"
+__DEBUGRUNTIME_4 = d
+!endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default"
+__DEBUGRUNTIME_5 =
+!endif
+!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default"
+__DEBUGRUNTIME_5 = /opt:ref /opt:icf
+!endif
+!if "$(DEBUG_RUNTIME_LIBS)" == "0"
+__DEBUGRUNTIME_5 = /opt:ref /opt:icf
+!endif
+!if "$(DEBUG_RUNTIME_LIBS)" == "1"
+__DEBUGRUNTIME_5 =
+!endif
+!if "$(BUILD)" == "debug"
+__OPTIMIZEFLAG_6 = /Od
+!endif
+!if "$(BUILD)" == "release"
+__OPTIMIZEFLAG_6 = /O2
+!endif
+!if "$(USE_THREADS)" == "0"
+__THREADSFLAG_9 = L
+!endif
+!if "$(USE_THREADS)" == "1"
+__THREADSFLAG_9 = T
+!endif
+!if "$(RUNTIME_LIBS)" == "dynamic"
+__RUNTIME_LIBS_10 = D
+!endif
+!if "$(RUNTIME_LIBS)" == "static"
+__RUNTIME_LIBS_10 = $(__THREADSFLAG_9)
+!endif
+!if "$(USE_RTTI)" == "0"
+__RTTIFLAG_11 =
+!endif
+!if "$(USE_RTTI)" == "1"
+__RTTIFLAG_11 = /GR
+!endif
+!if "$(USE_EXCEPTIONS)" == "0"
+__EXCEPTIONSFLAG_12 =
+!endif
+!if "$(USE_EXCEPTIONS)" == "1"
+__EXCEPTIONSFLAG_12 = /EHsc
+!endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "0"
+__NO_VC_CRTDBG_p = /D__NO_VC_CRTDBG__
+!endif
+!if "$(BUILD)" == "release" && "$(DEBUG_FLAG)" == "1"
+__NO_VC_CRTDBG_p = /D__NO_VC_CRTDBG__
+!endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "0"
+__NO_VC_CRTDBG_p_1 = /d __NO_VC_CRTDBG__
+!endif
+!if "$(BUILD)" == "release" && "$(DEBUG_FLAG)" == "1"
+__NO_VC_CRTDBG_p_1 = /d __NO_VC_CRTDBG__
+!endif
+!if "$(WXUNIV)" == "1"
+__WXUNIV_DEFINE_p = /D__WXUNIVERSAL__
+!endif
+!if "$(WXUNIV)" == "1"
+__WXUNIV_DEFINE_p_1 = /d __WXUNIVERSAL__
+!endif
+!if "$(DEBUG_FLAG)" == "0"
+__DEBUG_DEFINE_p = /DwxDEBUG_LEVEL=0
+!endif
+!if "$(DEBUG_FLAG)" == "0"
+__DEBUG_DEFINE_p_1 = /d wxDEBUG_LEVEL=0
+!endif
+!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default"
+__NDEBUG_DEFINE_p = /DNDEBUG
+!endif
+!if "$(DEBUG_RUNTIME_LIBS)" == "0"
+__NDEBUG_DEFINE_p = /DNDEBUG
+!endif
+!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default"
+__NDEBUG_DEFINE_p_1 = /d NDEBUG
+!endif
+!if "$(DEBUG_RUNTIME_LIBS)" == "0"
+__NDEBUG_DEFINE_p_1 = /d NDEBUG
+!endif
+!if "$(USE_EXCEPTIONS)" == "0"
+__EXCEPTIONS_DEFINE_p = /DwxNO_EXCEPTIONS
+!endif
+!if "$(USE_EXCEPTIONS)" == "0"
+__EXCEPTIONS_DEFINE_p_1 = /d wxNO_EXCEPTIONS
+!endif
+!if "$(USE_RTTI)" == "0"
+__RTTI_DEFINE_p = /DwxNO_RTTI
+!endif
+!if "$(USE_RTTI)" == "0"
+__RTTI_DEFINE_p_1 = /d wxNO_RTTI
+!endif
+!if "$(USE_THREADS)" == "0"
+__THREAD_DEFINE_p = /DwxNO_THREADS
+!endif
+!if "$(USE_THREADS)" == "0"
+__THREAD_DEFINE_p_1 = /d wxNO_THREADS
+!endif
+!if "$(UNICODE)" == "0"
+__UNICODE_DEFINE_p = /DwxUSE_UNICODE=0
+!endif
+!if "$(UNICODE)" == "1"
+__UNICODE_DEFINE_p = /D_UNICODE
+!endif
+!if "$(UNICODE)" == "0"
+__UNICODE_DEFINE_p_1 = /d wxUSE_UNICODE=0
+!endif
+!if "$(UNICODE)" == "1"
+__UNICODE_DEFINE_p_1 = /d _UNICODE
+!endif
+!if "$(USE_CAIRO)" == "1"
+____CAIRO_INCLUDEDIR_FILENAMES_p = /I$(CAIRO_ROOT)\include\cairo
+!endif
+!if "$(USE_CAIRO)" == "1"
+____CAIRO_INCLUDEDIR_FILENAMES_1_p = /i $(CAIRO_ROOT)\include\cairo
+!endif
+!if "$(SHARED)" == "1"
+__DLLFLAG_p = /DWXUSINGDLL
+!endif
+!if "$(SHARED)" == "1"
+__DLLFLAG_p_1 = /d WXUSINGDLL
+!endif
+!if "$(MONOLITHIC)" == "0"
+__WXLIB_AUI_p = \
+ wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_aui.lib
+!endif
+!if "$(MONOLITHIC)" == "0"
+__WXLIB_RICHTEXT_p = \
+ wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_richtext.lib
+!endif
+!if "$(MONOLITHIC)" == "0"
+__WXLIB_HTML_p = \
+ wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_html.lib
+!endif
+!if "$(MONOLITHIC)" == "0"
+__WXLIB_ADV_p = \
+ wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_adv.lib
+!endif
+!if "$(MONOLITHIC)" == "0"
+__WXLIB_XML_p = \
+ wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xml.lib
+!endif
+!if "$(MONOLITHIC)" == "0"
+__WXLIB_CORE_p = \
+ wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib
+!endif
+!if "$(MONOLITHIC)" == "0"
+__WXLIB_BASE_p = \
+ wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib
+!endif
+!if "$(MONOLITHIC)" == "1"
+__WXLIB_MONO_p = \
+ wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib
+!endif
+!if "$(MONOLITHIC)" == "1" && "$(USE_STC)" == "1"
+__LIB_SCINTILLA_IF_MONO_p = wxscintilla$(WXDEBUGFLAG).lib
+!endif
+!if "$(USE_GUI)" == "1"
+__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib
+!endif
+!if "$(USE_GUI)" == "1"
+__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib
+!endif
+!if "$(USE_GUI)" == "1"
+__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib
+!endif
+!if "$(USE_CAIRO)" == "1"
+__CAIRO_LIB_p = cairo.lib
+!endif
+!if "$(USE_CAIRO)" == "1"
+____CAIRO_LIBDIR_FILENAMES_p = /LIBPATH:$(CAIRO_ROOT)\lib
+!endif
+
+
+all: $(OBJS)
+$(OBJS):
+ -if not exist $(OBJS) mkdir $(OBJS)
+
+### Targets: ###
+
+all: $(OBJS)\screenshotgen.exe bitmaps xml
+
+clean:
+ -if exist $(OBJS)\*.obj del $(OBJS)\*.obj
+ -if exist $(OBJS)\*.res del $(OBJS)\*.res
+ -if exist $(OBJS)\*.pch del $(OBJS)\*.pch
+ -if exist $(OBJS)\screenshotgen.exe del $(OBJS)\screenshotgen.exe
+ -if exist $(OBJS)\screenshotgen.ilk del $(OBJS)\screenshotgen.ilk
+ -if exist $(OBJS)\screenshotgen.pdb del $(OBJS)\screenshotgen.pdb
+
+$(OBJS)\screenshotgen.exe: $(SCREENSHOTGEN_OBJECTS) $(OBJS)\screenshotgen_screenshotgen.res
+ link /NOLOGO /OUT:$@ $(__DEBUGINFO_1) /pdb:"$(OBJS)\screenshotgen.pdb" $(__DEBUGINFO_2) $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:WINDOWS $(____CAIRO_LIBDIR_FILENAMES_p) $(LDFLAGS) @<<
+ $(SCREENSHOTGEN_OBJECTS) $(SCREENSHOTGEN_RESOURCES) $(__WXLIB_AUI_p) $(__WXLIB_RICHTEXT_p) $(__WXLIB_HTML_p) $(__WXLIB_ADV_p) $(__WXLIB_XML_p) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_SCINTILLA_IF_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__CAIRO_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib
+<<
+
+bitmaps:
+ if not exist $(OBJS)\bitmaps mkdir $(OBJS)\bitmaps
+ for %f in (wxwin32x32.png bell.png sound.png dropbuth.png dropbutn.png dropbutp.png throbber.gif) do if not exist $(OBJS)\bitmaps\%f copy .\bitmaps\%f $(OBJS)\bitmaps
+
+xml:
+ if not exist $(OBJS) mkdir $(OBJS)
+ for %f in (richtext.xml) do if not exist $(OBJS)\%f copy .\%f $(OBJS)
+
+$(OBJS)\screenshotgen_screenshot_app.obj: .\screenshot_app.cpp
+ $(CXX) /c /nologo /TP /Fo$@ $(SCREENSHOTGEN_CXXFLAGS) .\screenshot_app.cpp
+
+$(OBJS)\screenshotgen_screenshot_main.obj: .\screenshot_main.cpp
+ $(CXX) /c /nologo /TP /Fo$@ $(SCREENSHOTGEN_CXXFLAGS) .\screenshot_main.cpp
+
+$(OBJS)\screenshotgen_guiframe.obj: .\guiframe.cpp
+ $(CXX) /c /nologo /TP /Fo$@ $(SCREENSHOTGEN_CXXFLAGS) .\guiframe.cpp
+
+$(OBJS)\screenshotgen_customcombo.obj: .\customcombo.cpp
+ $(CXX) /c /nologo /TP /Fo$@ $(SCREENSHOTGEN_CXXFLAGS) .\customcombo.cpp
+
+$(OBJS)\screenshotgen_autocapture.obj: .\autocapture.cpp
+ $(CXX) /c /nologo /TP /Fo$@ $(SCREENSHOTGEN_CXXFLAGS) .\autocapture.cpp
+
+$(OBJS)\screenshotgen_screenshotgen.res: .\screenshotgen.rc
+ rc /fo$@ /d WIN32 $(____DEBUGRUNTIME_3_p_1) /d _CRT_SECURE_NO_DEPRECATE=1 /d _CRT_NON_CONFORMING_SWPRINTFS=1 /d _SCL_SECURE_NO_WARNINGS=1 $(__NO_VC_CRTDBG_p_1) /d __WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__NDEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) /i $(SETUPHDIR) /i .\..\..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES_1_p) /i . $(__DLLFLAG_p_1) /d _WINDOWS /i .\..\..\..\samples /d NOPCH .\screenshotgen.rc
+
diff --git a/utils/screenshotgen/src/screenshotgen_vc7.sln b/utils/screenshotgen/src/screenshotgen_vc7.sln
index 8b61541e90..23192e80f1 100644
--- a/utils/screenshotgen/src/screenshotgen_vc7.sln
+++ b/utils/screenshotgen/src/screenshotgen_vc7.sln
@@ -1,25 +1,25 @@
-Microsoft Visual Studio Solution File, Format Version 8.00
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "screenshotgen", "screenshotgen_vc7.vcproj", "{65A1C4C8-E1D5-5972-8550-0F5631031FBB}"
-EndProject
-Global
- GlobalSection(SolutionConfigurationPlatforms) = preSolution
- Debug|Win32 = Debug|Win32
- Release|Win32 = Release|Win32
- DLL Debug|Win32 = DLL Debug|Win32
- DLL Release|Win32 = DLL Release|Win32
- EndGlobalSection
- GlobalSection(ProjectConfigurationPlatforms) = postSolution
- {65A1C4C8-E1D5-5972-8550-0F5631031FBB}.Debug|Win32.ActiveCfg = Debug|Win32
- {65A1C4C8-E1D5-5972-8550-0F5631031FBB}.Debug|Win32.Build.0 = Debug|Win32
- {65A1C4C8-E1D5-5972-8550-0F5631031FBB}.Release|Win32.ActiveCfg = Release|Win32
- {65A1C4C8-E1D5-5972-8550-0F5631031FBB}.Release|Win32.Build.0 = Release|Win32
- {65A1C4C8-E1D5-5972-8550-0F5631031FBB}.DLL Debug|Win32.ActiveCfg = DLL Debug|Win32
- {65A1C4C8-E1D5-5972-8550-0F5631031FBB}.DLL Debug|Win32.Build.0 = DLL Debug|Win32
- {65A1C4C8-E1D5-5972-8550-0F5631031FBB}.DLL Release|Win32.ActiveCfg = DLL Release|Win32
- {65A1C4C8-E1D5-5972-8550-0F5631031FBB}.DLL Release|Win32.Build.0 = DLL Release|Win32
- EndGlobalSection
- GlobalSection(SolutionProperties) = preSolution
- HideSolutionNode = FALSE
- EndGlobalSection
-EndGlobal
-
+Microsoft Visual Studio Solution File, Format Version 8.00
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "screenshotgen", "screenshotgen_vc7.vcproj", "{65A1C4C8-E1D5-5972-8550-0F5631031FBB}"
+EndProject
+Global
+ GlobalSection(SolutionConfigurationPlatforms) = preSolution
+ Debug|Win32 = Debug|Win32
+ Release|Win32 = Release|Win32
+ DLL Debug|Win32 = DLL Debug|Win32
+ DLL Release|Win32 = DLL Release|Win32
+ EndGlobalSection
+ GlobalSection(ProjectConfigurationPlatforms) = postSolution
+ {65A1C4C8-E1D5-5972-8550-0F5631031FBB}.Debug|Win32.ActiveCfg = Debug|Win32
+ {65A1C4C8-E1D5-5972-8550-0F5631031FBB}.Debug|Win32.Build.0 = Debug|Win32
+ {65A1C4C8-E1D5-5972-8550-0F5631031FBB}.Release|Win32.ActiveCfg = Release|Win32
+ {65A1C4C8-E1D5-5972-8550-0F5631031FBB}.Release|Win32.Build.0 = Release|Win32
+ {65A1C4C8-E1D5-5972-8550-0F5631031FBB}.DLL Debug|Win32.ActiveCfg = DLL Debug|Win32
+ {65A1C4C8-E1D5-5972-8550-0F5631031FBB}.DLL Debug|Win32.Build.0 = DLL Debug|Win32
+ {65A1C4C8-E1D5-5972-8550-0F5631031FBB}.DLL Release|Win32.ActiveCfg = DLL Release|Win32
+ {65A1C4C8-E1D5-5972-8550-0F5631031FBB}.DLL Release|Win32.Build.0 = DLL Release|Win32
+ EndGlobalSection
+ GlobalSection(SolutionProperties) = preSolution
+ HideSolutionNode = FALSE
+ EndGlobalSection
+EndGlobal
+
diff --git a/utils/screenshotgen/src/screenshotgen_vc7.vcproj b/utils/screenshotgen/src/screenshotgen_vc7.vcproj
index f8ad45a5f3..3bacb330b8 100644
--- a/utils/screenshotgen/src/screenshotgen_vc7.vcproj
+++ b/utils/screenshotgen/src/screenshotgen_vc7.vcproj
@@ -1,335 +1,335 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/utils/screenshotgen/src/screenshotgen_vc8.sln b/utils/screenshotgen/src/screenshotgen_vc8.sln
index 0eb5c9a28d..cffabc4ab7 100644
--- a/utils/screenshotgen/src/screenshotgen_vc8.sln
+++ b/utils/screenshotgen/src/screenshotgen_vc8.sln
@@ -1,38 +1,38 @@
-Microsoft Visual Studio Solution File, Format Version 9.00
-# Visual Studio 2005
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "screenshotgen", "screenshotgen_vc8.vcproj", "{D36F115C-330D-5EAE-B66F-885D6BE20540}"
-EndProject
-Global
- GlobalSection(SolutionConfigurationPlatforms) = preSolution
- Debug|Win32 = Debug|Win32
- Debug|x64 = Debug|x64
- Release|Win32 = Release|Win32
- Release|x64 = Release|x64
- DLL Debug|Win32 = DLL Debug|Win32
- DLL Debug|x64 = DLL Debug|x64
- DLL Release|Win32 = DLL Release|Win32
- DLL Release|x64 = DLL Release|x64
- EndGlobalSection
- GlobalSection(ProjectConfigurationPlatforms) = postSolution
- {D36F115C-330D-5EAE-B66F-885D6BE20540}.Debug|Win32.ActiveCfg = Debug|Win32
- {D36F115C-330D-5EAE-B66F-885D6BE20540}.Debug|Win32.Build.0 = Debug|Win32
- {D36F115C-330D-5EAE-B66F-885D6BE20540}.Debug|x64.ActiveCfg = Debug|x64
- {D36F115C-330D-5EAE-B66F-885D6BE20540}.Debug|x64.Build.0 = Debug|x64
- {D36F115C-330D-5EAE-B66F-885D6BE20540}.Release|Win32.ActiveCfg = Release|Win32
- {D36F115C-330D-5EAE-B66F-885D6BE20540}.Release|Win32.Build.0 = Release|Win32
- {D36F115C-330D-5EAE-B66F-885D6BE20540}.Release|x64.ActiveCfg = Release|x64
- {D36F115C-330D-5EAE-B66F-885D6BE20540}.Release|x64.Build.0 = Release|x64
- {D36F115C-330D-5EAE-B66F-885D6BE20540}.DLL Debug|Win32.ActiveCfg = DLL Debug|Win32
- {D36F115C-330D-5EAE-B66F-885D6BE20540}.DLL Debug|Win32.Build.0 = DLL Debug|Win32
- {D36F115C-330D-5EAE-B66F-885D6BE20540}.DLL Debug|x64.ActiveCfg = DLL Debug|x64
- {D36F115C-330D-5EAE-B66F-885D6BE20540}.DLL Debug|x64.Build.0 = DLL Debug|x64
- {D36F115C-330D-5EAE-B66F-885D6BE20540}.DLL Release|Win32.ActiveCfg = DLL Release|Win32
- {D36F115C-330D-5EAE-B66F-885D6BE20540}.DLL Release|Win32.Build.0 = DLL Release|Win32
- {D36F115C-330D-5EAE-B66F-885D6BE20540}.DLL Release|x64.ActiveCfg = DLL Release|x64
- {D36F115C-330D-5EAE-B66F-885D6BE20540}.DLL Release|x64.Build.0 = DLL Release|x64
- EndGlobalSection
- GlobalSection(SolutionProperties) = preSolution
- HideSolutionNode = FALSE
- EndGlobalSection
-EndGlobal
-
+Microsoft Visual Studio Solution File, Format Version 9.00
+# Visual Studio 2005
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "screenshotgen", "screenshotgen_vc8.vcproj", "{D36F115C-330D-5EAE-B66F-885D6BE20540}"
+EndProject
+Global
+ GlobalSection(SolutionConfigurationPlatforms) = preSolution
+ Debug|Win32 = Debug|Win32
+ Debug|x64 = Debug|x64
+ Release|Win32 = Release|Win32
+ Release|x64 = Release|x64
+ DLL Debug|Win32 = DLL Debug|Win32
+ DLL Debug|x64 = DLL Debug|x64
+ DLL Release|Win32 = DLL Release|Win32
+ DLL Release|x64 = DLL Release|x64
+ EndGlobalSection
+ GlobalSection(ProjectConfigurationPlatforms) = postSolution
+ {D36F115C-330D-5EAE-B66F-885D6BE20540}.Debug|Win32.ActiveCfg = Debug|Win32
+ {D36F115C-330D-5EAE-B66F-885D6BE20540}.Debug|Win32.Build.0 = Debug|Win32
+ {D36F115C-330D-5EAE-B66F-885D6BE20540}.Debug|x64.ActiveCfg = Debug|x64
+ {D36F115C-330D-5EAE-B66F-885D6BE20540}.Debug|x64.Build.0 = Debug|x64
+ {D36F115C-330D-5EAE-B66F-885D6BE20540}.Release|Win32.ActiveCfg = Release|Win32
+ {D36F115C-330D-5EAE-B66F-885D6BE20540}.Release|Win32.Build.0 = Release|Win32
+ {D36F115C-330D-5EAE-B66F-885D6BE20540}.Release|x64.ActiveCfg = Release|x64
+ {D36F115C-330D-5EAE-B66F-885D6BE20540}.Release|x64.Build.0 = Release|x64
+ {D36F115C-330D-5EAE-B66F-885D6BE20540}.DLL Debug|Win32.ActiveCfg = DLL Debug|Win32
+ {D36F115C-330D-5EAE-B66F-885D6BE20540}.DLL Debug|Win32.Build.0 = DLL Debug|Win32
+ {D36F115C-330D-5EAE-B66F-885D6BE20540}.DLL Debug|x64.ActiveCfg = DLL Debug|x64
+ {D36F115C-330D-5EAE-B66F-885D6BE20540}.DLL Debug|x64.Build.0 = DLL Debug|x64
+ {D36F115C-330D-5EAE-B66F-885D6BE20540}.DLL Release|Win32.ActiveCfg = DLL Release|Win32
+ {D36F115C-330D-5EAE-B66F-885D6BE20540}.DLL Release|Win32.Build.0 = DLL Release|Win32
+ {D36F115C-330D-5EAE-B66F-885D6BE20540}.DLL Release|x64.ActiveCfg = DLL Release|x64
+ {D36F115C-330D-5EAE-B66F-885D6BE20540}.DLL Release|x64.Build.0 = DLL Release|x64
+ EndGlobalSection
+ GlobalSection(SolutionProperties) = preSolution
+ HideSolutionNode = FALSE
+ EndGlobalSection
+EndGlobal
+
diff --git a/utils/screenshotgen/src/screenshotgen_vc8.vcproj b/utils/screenshotgen/src/screenshotgen_vc8.vcproj
index 6426ebbbf9..0d2e4c6017 100644
--- a/utils/screenshotgen/src/screenshotgen_vc8.vcproj
+++ b/utils/screenshotgen/src/screenshotgen_vc8.vcproj
@@ -1,871 +1,871 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/utils/screenshotgen/src/screenshotgen_vc9.sln b/utils/screenshotgen/src/screenshotgen_vc9.sln
index 3f9c22f5e5..7ccd9d4584 100644
--- a/utils/screenshotgen/src/screenshotgen_vc9.sln
+++ b/utils/screenshotgen/src/screenshotgen_vc9.sln
@@ -1,38 +1,38 @@
-Microsoft Visual Studio Solution File, Format Version 10.00
-# Visual Studio 2008
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "screenshotgen", "screenshotgen_vc9.vcproj", "{820F5E3E-095B-580D-AE31-7E492C647B90}"
-EndProject
-Global
- GlobalSection(SolutionConfigurationPlatforms) = preSolution
- Debug|Win32 = Debug|Win32
- Debug|x64 = Debug|x64
- Release|Win32 = Release|Win32
- Release|x64 = Release|x64
- DLL Debug|Win32 = DLL Debug|Win32
- DLL Debug|x64 = DLL Debug|x64
- DLL Release|Win32 = DLL Release|Win32
- DLL Release|x64 = DLL Release|x64
- EndGlobalSection
- GlobalSection(ProjectConfigurationPlatforms) = postSolution
- {820F5E3E-095B-580D-AE31-7E492C647B90}.Debug|Win32.ActiveCfg = Debug|Win32
- {820F5E3E-095B-580D-AE31-7E492C647B90}.Debug|Win32.Build.0 = Debug|Win32
- {820F5E3E-095B-580D-AE31-7E492C647B90}.Debug|x64.ActiveCfg = Debug|x64
- {820F5E3E-095B-580D-AE31-7E492C647B90}.Debug|x64.Build.0 = Debug|x64
- {820F5E3E-095B-580D-AE31-7E492C647B90}.Release|Win32.ActiveCfg = Release|Win32
- {820F5E3E-095B-580D-AE31-7E492C647B90}.Release|Win32.Build.0 = Release|Win32
- {820F5E3E-095B-580D-AE31-7E492C647B90}.Release|x64.ActiveCfg = Release|x64
- {820F5E3E-095B-580D-AE31-7E492C647B90}.Release|x64.Build.0 = Release|x64
- {820F5E3E-095B-580D-AE31-7E492C647B90}.DLL Debug|Win32.ActiveCfg = DLL Debug|Win32
- {820F5E3E-095B-580D-AE31-7E492C647B90}.DLL Debug|Win32.Build.0 = DLL Debug|Win32
- {820F5E3E-095B-580D-AE31-7E492C647B90}.DLL Debug|x64.ActiveCfg = DLL Debug|x64
- {820F5E3E-095B-580D-AE31-7E492C647B90}.DLL Debug|x64.Build.0 = DLL Debug|x64
- {820F5E3E-095B-580D-AE31-7E492C647B90}.DLL Release|Win32.ActiveCfg = DLL Release|Win32
- {820F5E3E-095B-580D-AE31-7E492C647B90}.DLL Release|Win32.Build.0 = DLL Release|Win32
- {820F5E3E-095B-580D-AE31-7E492C647B90}.DLL Release|x64.ActiveCfg = DLL Release|x64
- {820F5E3E-095B-580D-AE31-7E492C647B90}.DLL Release|x64.Build.0 = DLL Release|x64
- EndGlobalSection
- GlobalSection(SolutionProperties) = preSolution
- HideSolutionNode = FALSE
- EndGlobalSection
-EndGlobal
-
+Microsoft Visual Studio Solution File, Format Version 10.00
+# Visual Studio 2008
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "screenshotgen", "screenshotgen_vc9.vcproj", "{820F5E3E-095B-580D-AE31-7E492C647B90}"
+EndProject
+Global
+ GlobalSection(SolutionConfigurationPlatforms) = preSolution
+ Debug|Win32 = Debug|Win32
+ Debug|x64 = Debug|x64
+ Release|Win32 = Release|Win32
+ Release|x64 = Release|x64
+ DLL Debug|Win32 = DLL Debug|Win32
+ DLL Debug|x64 = DLL Debug|x64
+ DLL Release|Win32 = DLL Release|Win32
+ DLL Release|x64 = DLL Release|x64
+ EndGlobalSection
+ GlobalSection(ProjectConfigurationPlatforms) = postSolution
+ {820F5E3E-095B-580D-AE31-7E492C647B90}.Debug|Win32.ActiveCfg = Debug|Win32
+ {820F5E3E-095B-580D-AE31-7E492C647B90}.Debug|Win32.Build.0 = Debug|Win32
+ {820F5E3E-095B-580D-AE31-7E492C647B90}.Debug|x64.ActiveCfg = Debug|x64
+ {820F5E3E-095B-580D-AE31-7E492C647B90}.Debug|x64.Build.0 = Debug|x64
+ {820F5E3E-095B-580D-AE31-7E492C647B90}.Release|Win32.ActiveCfg = Release|Win32
+ {820F5E3E-095B-580D-AE31-7E492C647B90}.Release|Win32.Build.0 = Release|Win32
+ {820F5E3E-095B-580D-AE31-7E492C647B90}.Release|x64.ActiveCfg = Release|x64
+ {820F5E3E-095B-580D-AE31-7E492C647B90}.Release|x64.Build.0 = Release|x64
+ {820F5E3E-095B-580D-AE31-7E492C647B90}.DLL Debug|Win32.ActiveCfg = DLL Debug|Win32
+ {820F5E3E-095B-580D-AE31-7E492C647B90}.DLL Debug|Win32.Build.0 = DLL Debug|Win32
+ {820F5E3E-095B-580D-AE31-7E492C647B90}.DLL Debug|x64.ActiveCfg = DLL Debug|x64
+ {820F5E3E-095B-580D-AE31-7E492C647B90}.DLL Debug|x64.Build.0 = DLL Debug|x64
+ {820F5E3E-095B-580D-AE31-7E492C647B90}.DLL Release|Win32.ActiveCfg = DLL Release|Win32
+ {820F5E3E-095B-580D-AE31-7E492C647B90}.DLL Release|Win32.Build.0 = DLL Release|Win32
+ {820F5E3E-095B-580D-AE31-7E492C647B90}.DLL Release|x64.ActiveCfg = DLL Release|x64
+ {820F5E3E-095B-580D-AE31-7E492C647B90}.DLL Release|x64.Build.0 = DLL Release|x64
+ EndGlobalSection
+ GlobalSection(SolutionProperties) = preSolution
+ HideSolutionNode = FALSE
+ EndGlobalSection
+EndGlobal
+
diff --git a/utils/screenshotgen/src/screenshotgen_vc9.vcproj b/utils/screenshotgen/src/screenshotgen_vc9.vcproj
index 3762e5954e..9056ce3730 100644
--- a/utils/screenshotgen/src/screenshotgen_vc9.vcproj
+++ b/utils/screenshotgen/src/screenshotgen_vc9.vcproj
@@ -1,843 +1,843 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/utils/wxrc/makefile.bcc b/utils/wxrc/makefile.bcc
index a339efa811..80de2ecd1b 100644
--- a/utils/wxrc/makefile.bcc
+++ b/utils/wxrc/makefile.bcc
@@ -1,205 +1,205 @@
-# =========================================================================
-# This makefile was generated by
-# Bakefile 0.2.9 (http://www.bakefile.org)
-# 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: ###
-
-WX_RELEASE_NODOT = 31
-COMPILER_PREFIX = bcc
-OBJS = \
- $(COMPILER_PREFIX)$(COMPILER_VERSION)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)
-LIBDIRNAME = \
- .\..\..\lib\$(COMPILER_PREFIX)$(COMPILER_VERSION)_$(LIBTYPE_SUFFIX)$(CFG)
-SETUPHDIR = \
- $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)
-WXRC_CXXFLAGS = $(__RUNTIME_LIBS_7) -I$(BCCDIR)\include $(__DEBUGINFO) \
- $(__OPTIMIZEFLAG_2) $(__THREADSFLAG_6) -D__WXMSW__ $(__WXUNIV_DEFINE_p) \
- $(__DEBUG_DEFINE_p) $(__NDEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) \
- $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) \
- -I$(SETUPHDIR) -I.\..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES_p) -I. \
- $(__DLLFLAG_p) -DwxUSE_GUI=0 $(CPPFLAGS) $(CXXFLAGS)
-WXRC_OBJECTS = \
- $(OBJS)\wxrc_wxrc.obj
-
-### Conditionally set variables: ###
-
-!if "$(USE_GUI)" == "0"
-PORTNAME = base
-!endif
-!if "$(USE_GUI)" == "1"
-PORTNAME = msw$(TOOLKIT_VERSION)
-!endif
-!if "$(OFFICIAL_BUILD)" == "1"
-COMPILER_VERSION = ERROR-COMPILER-VERSION-MUST-BE-SET-FOR-OFFICIAL-BUILD
-!endif
-!if "$(BUILD)" == "debug"
-WXDEBUGFLAG = d
-!endif
-!if "$(UNICODE)" == "1"
-WXUNICODEFLAG = u
-!endif
-!if "$(WXUNIV)" == "1"
-WXUNIVNAME = univ
-!endif
-!if "$(SHARED)" == "1"
-WXDLLFLAG = dll
-!endif
-!if "$(SHARED)" == "0"
-LIBTYPE_SUFFIX = lib
-!endif
-!if "$(SHARED)" == "1"
-LIBTYPE_SUFFIX = dll
-!endif
-!if "$(MONOLITHIC)" == "0"
-EXTRALIBS_FOR_BASE =
-!endif
-!if "$(MONOLITHIC)" == "1"
-EXTRALIBS_FOR_BASE =
-!endif
-!if "$(USE_XRC)" == "1"
-__wxrc___depname = $(OBJS)\wxrc.exe
-!endif
-!if "$(BUILD)" == "debug"
-__OPTIMIZEFLAG_2 = -Od
-!endif
-!if "$(BUILD)" == "release"
-__OPTIMIZEFLAG_2 = -O2
-!endif
-!if "$(USE_THREADS)" == "0"
-__THREADSFLAG_5 =
-!endif
-!if "$(USE_THREADS)" == "1"
-__THREADSFLAG_5 = mt
-!endif
-!if "$(USE_THREADS)" == "0"
-__THREADSFLAG_6 =
-!endif
-!if "$(USE_THREADS)" == "1"
-__THREADSFLAG_6 = -tWM
-!endif
-!if "$(RUNTIME_LIBS)" == "dynamic"
-__RUNTIME_LIBS_7 = -tWR
-!endif
-!if "$(RUNTIME_LIBS)" == "static"
-__RUNTIME_LIBS_7 =
-!endif
-!if "$(RUNTIME_LIBS)" == "dynamic"
-__RUNTIME_LIBS_8 = i
-!endif
-!if "$(RUNTIME_LIBS)" == "static"
-__RUNTIME_LIBS_8 =
-!endif
-!if "$(WXUNIV)" == "1"
-__WXUNIV_DEFINE_p = -D__WXUNIVERSAL__
-!endif
-!if "$(DEBUG_FLAG)" == "0"
-__DEBUG_DEFINE_p = -DwxDEBUG_LEVEL=0
-!endif
-!if "$(BUILD)" == "release"
-__NDEBUG_DEFINE_p = -DNDEBUG
-!endif
-!if "$(USE_EXCEPTIONS)" == "0"
-__EXCEPTIONS_DEFINE_p = -DwxNO_EXCEPTIONS
-!endif
-!if "$(USE_RTTI)" == "0"
-__RTTI_DEFINE_p = -DwxNO_RTTI
-!endif
-!if "$(USE_THREADS)" == "0"
-__THREAD_DEFINE_p = -DwxNO_THREADS
-!endif
-!if "$(UNICODE)" == "0"
-__UNICODE_DEFINE_p = -DwxUSE_UNICODE=0
-!endif
-!if "$(UNICODE)" == "1"
-__UNICODE_DEFINE_p = -D_UNICODE
-!endif
-!if "$(USE_CAIRO)" == "1"
-____CAIRO_INCLUDEDIR_FILENAMES_p = -I$(CAIRO_ROOT)\include\cairo
-!endif
-!if "$(SHARED)" == "1"
-__DLLFLAG_p = -DWXUSINGDLL
-!endif
-!if "$(MONOLITHIC)" == "0"
-__WXLIB_XML_p = \
- wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xml.lib
-!endif
-!if "$(MONOLITHIC)" == "0"
-__WXLIB_BASE_p = \
- wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib
-!endif
-!if "$(MONOLITHIC)" == "1"
-__WXLIB_MONO_p = \
- wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib
-!endif
-!if "$(MONOLITHIC)" == "1"
-__LIB_PNG_IF_MONO_p = $(__LIB_PNG_p)
-!endif
-!if "$(USE_GUI)" == "1"
-__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib
-!endif
-!if "$(USE_CAIRO)" == "1"
-__CAIRO_LIB_p = cairo.lib
-!endif
-!if "$(USE_CAIRO)" == "1"
-____CAIRO_LIBDIR_FILENAMES_p = -L$(CAIRO_ROOT)\lib
-!endif
-!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default"
-__DEBUGINFO = -v
-!endif
-!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default"
-__DEBUGINFO = -v-
-!endif
-!if "$(DEBUG_INFO)" == "0"
-__DEBUGINFO = -v-
-!endif
-!if "$(DEBUG_INFO)" == "1"
-__DEBUGINFO = -v
-!endif
-
-
-all: $(OBJS)
-$(OBJS):
- -if not exist $(OBJS) mkdir $(OBJS)
-
-### Targets: ###
-
-all: $(__wxrc___depname)
-
-clean:
- -if exist $(OBJS)\*.obj del $(OBJS)\*.obj
- -if exist $(OBJS)\*.res del $(OBJS)\*.res
- -if exist $(OBJS)\*.csm del $(OBJS)\*.csm
- -if exist $(OBJS)\wxrc.exe del $(OBJS)\wxrc.exe
- -if exist $(OBJS)\wxrc.tds del $(OBJS)\wxrc.tds
- -if exist $(OBJS)\wxrc.ilc del $(OBJS)\wxrc.ilc
- -if exist $(OBJS)\wxrc.ild del $(OBJS)\wxrc.ild
- -if exist $(OBJS)\wxrc.ilf del $(OBJS)\wxrc.ilf
- -if exist $(OBJS)\wxrc.ils del $(OBJS)\wxrc.ils
-
-!if "$(USE_XRC)" == "1"
-$(OBJS)\wxrc.exe: $(WXRC_OBJECTS)
- ilink32 -Tpe -q -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUGINFO) -L$(LIBDIRNAME) -ap $(____CAIRO_LIBDIR_FILENAMES_p) $(LDFLAGS) @&&|
- c0x32.obj $(WXRC_OBJECTS),$@,, $(__WXLIB_XML_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_PNG_IF_MONO_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__CAIRO_LIB_p) ole2w32.lib oleacc.lib import32.lib cw32$(__THREADSFLAG_5)$(__RUNTIME_LIBS_8).lib,,
-|
-!endif
-
-$(OBJS)\wxrc_wxrc.obj: .\wxrc.cpp
- $(CXX) -q -c -P -o$@ $(WXRC_CXXFLAGS) .\wxrc.cpp
-
+# =========================================================================
+# This makefile was generated by
+# Bakefile 0.2.9 (http://www.bakefile.org)
+# 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: ###
+
+WX_RELEASE_NODOT = 31
+COMPILER_PREFIX = bcc
+OBJS = \
+ $(COMPILER_PREFIX)$(COMPILER_VERSION)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)
+LIBDIRNAME = \
+ .\..\..\lib\$(COMPILER_PREFIX)$(COMPILER_VERSION)_$(LIBTYPE_SUFFIX)$(CFG)
+SETUPHDIR = \
+ $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)
+WXRC_CXXFLAGS = $(__RUNTIME_LIBS_7) -I$(BCCDIR)\include $(__DEBUGINFO) \
+ $(__OPTIMIZEFLAG_2) $(__THREADSFLAG_6) -D__WXMSW__ $(__WXUNIV_DEFINE_p) \
+ $(__DEBUG_DEFINE_p) $(__NDEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) \
+ $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) \
+ -I$(SETUPHDIR) -I.\..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES_p) -I. \
+ $(__DLLFLAG_p) -DwxUSE_GUI=0 $(CPPFLAGS) $(CXXFLAGS)
+WXRC_OBJECTS = \
+ $(OBJS)\wxrc_wxrc.obj
+
+### Conditionally set variables: ###
+
+!if "$(USE_GUI)" == "0"
+PORTNAME = base
+!endif
+!if "$(USE_GUI)" == "1"
+PORTNAME = msw$(TOOLKIT_VERSION)
+!endif
+!if "$(OFFICIAL_BUILD)" == "1"
+COMPILER_VERSION = ERROR-COMPILER-VERSION-MUST-BE-SET-FOR-OFFICIAL-BUILD
+!endif
+!if "$(BUILD)" == "debug"
+WXDEBUGFLAG = d
+!endif
+!if "$(UNICODE)" == "1"
+WXUNICODEFLAG = u
+!endif
+!if "$(WXUNIV)" == "1"
+WXUNIVNAME = univ
+!endif
+!if "$(SHARED)" == "1"
+WXDLLFLAG = dll
+!endif
+!if "$(SHARED)" == "0"
+LIBTYPE_SUFFIX = lib
+!endif
+!if "$(SHARED)" == "1"
+LIBTYPE_SUFFIX = dll
+!endif
+!if "$(MONOLITHIC)" == "0"
+EXTRALIBS_FOR_BASE =
+!endif
+!if "$(MONOLITHIC)" == "1"
+EXTRALIBS_FOR_BASE =
+!endif
+!if "$(USE_XRC)" == "1"
+__wxrc___depname = $(OBJS)\wxrc.exe
+!endif
+!if "$(BUILD)" == "debug"
+__OPTIMIZEFLAG_2 = -Od
+!endif
+!if "$(BUILD)" == "release"
+__OPTIMIZEFLAG_2 = -O2
+!endif
+!if "$(USE_THREADS)" == "0"
+__THREADSFLAG_5 =
+!endif
+!if "$(USE_THREADS)" == "1"
+__THREADSFLAG_5 = mt
+!endif
+!if "$(USE_THREADS)" == "0"
+__THREADSFLAG_6 =
+!endif
+!if "$(USE_THREADS)" == "1"
+__THREADSFLAG_6 = -tWM
+!endif
+!if "$(RUNTIME_LIBS)" == "dynamic"
+__RUNTIME_LIBS_7 = -tWR
+!endif
+!if "$(RUNTIME_LIBS)" == "static"
+__RUNTIME_LIBS_7 =
+!endif
+!if "$(RUNTIME_LIBS)" == "dynamic"
+__RUNTIME_LIBS_8 = i
+!endif
+!if "$(RUNTIME_LIBS)" == "static"
+__RUNTIME_LIBS_8 =
+!endif
+!if "$(WXUNIV)" == "1"
+__WXUNIV_DEFINE_p = -D__WXUNIVERSAL__
+!endif
+!if "$(DEBUG_FLAG)" == "0"
+__DEBUG_DEFINE_p = -DwxDEBUG_LEVEL=0
+!endif
+!if "$(BUILD)" == "release"
+__NDEBUG_DEFINE_p = -DNDEBUG
+!endif
+!if "$(USE_EXCEPTIONS)" == "0"
+__EXCEPTIONS_DEFINE_p = -DwxNO_EXCEPTIONS
+!endif
+!if "$(USE_RTTI)" == "0"
+__RTTI_DEFINE_p = -DwxNO_RTTI
+!endif
+!if "$(USE_THREADS)" == "0"
+__THREAD_DEFINE_p = -DwxNO_THREADS
+!endif
+!if "$(UNICODE)" == "0"
+__UNICODE_DEFINE_p = -DwxUSE_UNICODE=0
+!endif
+!if "$(UNICODE)" == "1"
+__UNICODE_DEFINE_p = -D_UNICODE
+!endif
+!if "$(USE_CAIRO)" == "1"
+____CAIRO_INCLUDEDIR_FILENAMES_p = -I$(CAIRO_ROOT)\include\cairo
+!endif
+!if "$(SHARED)" == "1"
+__DLLFLAG_p = -DWXUSINGDLL
+!endif
+!if "$(MONOLITHIC)" == "0"
+__WXLIB_XML_p = \
+ wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xml.lib
+!endif
+!if "$(MONOLITHIC)" == "0"
+__WXLIB_BASE_p = \
+ wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib
+!endif
+!if "$(MONOLITHIC)" == "1"
+__WXLIB_MONO_p = \
+ wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib
+!endif
+!if "$(MONOLITHIC)" == "1"
+__LIB_PNG_IF_MONO_p = $(__LIB_PNG_p)
+!endif
+!if "$(USE_GUI)" == "1"
+__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib
+!endif
+!if "$(USE_CAIRO)" == "1"
+__CAIRO_LIB_p = cairo.lib
+!endif
+!if "$(USE_CAIRO)" == "1"
+____CAIRO_LIBDIR_FILENAMES_p = -L$(CAIRO_ROOT)\lib
+!endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default"
+__DEBUGINFO = -v
+!endif
+!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default"
+__DEBUGINFO = -v-
+!endif
+!if "$(DEBUG_INFO)" == "0"
+__DEBUGINFO = -v-
+!endif
+!if "$(DEBUG_INFO)" == "1"
+__DEBUGINFO = -v
+!endif
+
+
+all: $(OBJS)
+$(OBJS):
+ -if not exist $(OBJS) mkdir $(OBJS)
+
+### Targets: ###
+
+all: $(__wxrc___depname)
+
+clean:
+ -if exist $(OBJS)\*.obj del $(OBJS)\*.obj
+ -if exist $(OBJS)\*.res del $(OBJS)\*.res
+ -if exist $(OBJS)\*.csm del $(OBJS)\*.csm
+ -if exist $(OBJS)\wxrc.exe del $(OBJS)\wxrc.exe
+ -if exist $(OBJS)\wxrc.tds del $(OBJS)\wxrc.tds
+ -if exist $(OBJS)\wxrc.ilc del $(OBJS)\wxrc.ilc
+ -if exist $(OBJS)\wxrc.ild del $(OBJS)\wxrc.ild
+ -if exist $(OBJS)\wxrc.ilf del $(OBJS)\wxrc.ilf
+ -if exist $(OBJS)\wxrc.ils del $(OBJS)\wxrc.ils
+
+!if "$(USE_XRC)" == "1"
+$(OBJS)\wxrc.exe: $(WXRC_OBJECTS)
+ ilink32 -Tpe -q -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUGINFO) -L$(LIBDIRNAME) -ap $(____CAIRO_LIBDIR_FILENAMES_p) $(LDFLAGS) @&&|
+ c0x32.obj $(WXRC_OBJECTS),$@,, $(__WXLIB_XML_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_PNG_IF_MONO_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__CAIRO_LIB_p) ole2w32.lib oleacc.lib import32.lib cw32$(__THREADSFLAG_5)$(__RUNTIME_LIBS_8).lib,,
+|
+!endif
+
+$(OBJS)\wxrc_wxrc.obj: .\wxrc.cpp
+ $(CXX) -q -c -P -o$@ $(WXRC_CXXFLAGS) .\wxrc.cpp
+
diff --git a/utils/wxrc/makefile.gcc b/utils/wxrc/makefile.gcc
index b2e54bee4d..d5af8cc810 100644
--- a/utils/wxrc/makefile.gcc
+++ b/utils/wxrc/makefile.gcc
@@ -1,198 +1,198 @@
-# =========================================================================
-# This makefile was generated by
-# Bakefile 0.2.9 (http://www.bakefile.org)
-# Do not modify, all changes will be overwritten!
-# =========================================================================
-
-include ../../build/msw/config.gcc
-
-# -------------------------------------------------------------------------
-# Do not modify the rest of this file!
-# -------------------------------------------------------------------------
-
-### Variables: ###
-
-CPPDEPS = -MT$@ -MF$@.d -MD -MP
-WX_RELEASE_NODOT = 31
-COMPILER_PREFIX = gcc
-OBJS = \
- $(COMPILER_PREFIX)$(COMPILER_VERSION)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)
-LIBDIRNAME = \
- .\..\..\lib\$(COMPILER_PREFIX)$(COMPILER_VERSION)_$(LIBTYPE_SUFFIX)$(CFG)
-SETUPHDIR = \
- $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)
-WXRC_CXXFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG_2) $(__THREADSFLAG) $(GCCFLAGS) \
- -DHAVE_W32API_H -D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \
- $(__NDEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \
- $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) -I$(SETUPHDIR) -I.\..\..\include \
- $(____CAIRO_INCLUDEDIR_FILENAMES_p) -W -Wall -I. $(__DLLFLAG_p) -DwxUSE_GUI=0 \
- $(__RTTIFLAG_5) $(__EXCEPTIONSFLAG_6) -Wno-ctor-dtor-privacy $(CPPFLAGS) \
- $(CXXFLAGS)
-WXRC_OBJECTS = \
- $(OBJS)\wxrc_wxrc.o
-
-### Conditionally set variables: ###
-
-ifeq ($(GCC_VERSION),2.95)
-GCCFLAGS = -fvtable-thunks
-endif
-ifeq ($(USE_GUI),0)
-PORTNAME = base
-endif
-ifeq ($(USE_GUI),1)
-PORTNAME = msw$(TOOLKIT_VERSION)
-endif
-ifeq ($(OFFICIAL_BUILD),1)
-COMPILER_VERSION = ERROR-COMPILER-VERSION-MUST-BE-SET-FOR-OFFICIAL-BUILD
-endif
-ifeq ($(BUILD),debug)
-WXDEBUGFLAG = d
-endif
-ifeq ($(UNICODE),1)
-WXUNICODEFLAG = u
-endif
-ifeq ($(WXUNIV),1)
-WXUNIVNAME = univ
-endif
-ifeq ($(SHARED),1)
-WXDLLFLAG = dll
-endif
-ifeq ($(SHARED),0)
-LIBTYPE_SUFFIX = lib
-endif
-ifeq ($(SHARED),1)
-LIBTYPE_SUFFIX = dll
-endif
-ifeq ($(MONOLITHIC),0)
-EXTRALIBS_FOR_BASE =
-endif
-ifeq ($(MONOLITHIC),1)
-EXTRALIBS_FOR_BASE =
-endif
-ifeq ($(USE_XRC),1)
-__wxrc___depname = $(OBJS)\wxrc.exe
-endif
-ifeq ($(BUILD),debug)
-__OPTIMIZEFLAG_2 = -O0
-endif
-ifeq ($(BUILD),release)
-__OPTIMIZEFLAG_2 = -O2
-endif
-ifeq ($(USE_RTTI),0)
-__RTTIFLAG_5 = -fno-rtti
-endif
-ifeq ($(USE_RTTI),1)
-__RTTIFLAG_5 =
-endif
-ifeq ($(USE_EXCEPTIONS),0)
-__EXCEPTIONSFLAG_6 = -fno-exceptions
-endif
-ifeq ($(USE_EXCEPTIONS),1)
-__EXCEPTIONSFLAG_6 =
-endif
-ifeq ($(WXUNIV),1)
-__WXUNIV_DEFINE_p = -D__WXUNIVERSAL__
-endif
-ifeq ($(DEBUG_FLAG),0)
-__DEBUG_DEFINE_p = -DwxDEBUG_LEVEL=0
-endif
-ifeq ($(BUILD),release)
-__NDEBUG_DEFINE_p = -DNDEBUG
-endif
-ifeq ($(USE_EXCEPTIONS),0)
-__EXCEPTIONS_DEFINE_p = -DwxNO_EXCEPTIONS
-endif
-ifeq ($(USE_RTTI),0)
-__RTTI_DEFINE_p = -DwxNO_RTTI
-endif
-ifeq ($(USE_THREADS),0)
-__THREAD_DEFINE_p = -DwxNO_THREADS
-endif
-ifeq ($(UNICODE),0)
-__UNICODE_DEFINE_p = -DwxUSE_UNICODE=0
-endif
-ifeq ($(UNICODE),1)
-__UNICODE_DEFINE_p = -D_UNICODE
-endif
-ifeq ($(USE_CAIRO),1)
-____CAIRO_INCLUDEDIR_FILENAMES_p = -I$(CAIRO_ROOT)\include\cairo
-endif
-ifeq ($(SHARED),1)
-__DLLFLAG_p = -DWXUSINGDLL
-endif
-ifeq ($(MONOLITHIC),0)
-__WXLIB_XML_p = \
- -lwxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xml
-endif
-ifeq ($(MONOLITHIC),0)
-__WXLIB_BASE_p = \
- -lwxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)
-endif
-ifeq ($(MONOLITHIC),1)
-__WXLIB_MONO_p = \
- -lwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)
-endif
-ifeq ($(MONOLITHIC),1)
-__LIB_PNG_IF_MONO_p = $(__LIB_PNG_p)
-endif
-ifeq ($(USE_GUI),1)
-__LIB_PNG_p = -lwxpng$(WXDEBUGFLAG)
-endif
-ifeq ($(USE_CAIRO),1)
-__CAIRO_LIB_p = -lcairo
-endif
-ifeq ($(USE_CAIRO),1)
-____CAIRO_LIBDIR_FILENAMES_p = -L$(CAIRO_ROOT)\lib
-endif
-ifeq ($(BUILD),debug)
-ifeq ($(DEBUG_INFO),default)
-__DEBUGINFO = -g
-endif
-endif
-ifeq ($(BUILD),release)
-ifeq ($(DEBUG_INFO),default)
-__DEBUGINFO =
-endif
-endif
-ifeq ($(DEBUG_INFO),0)
-__DEBUGINFO =
-endif
-ifeq ($(DEBUG_INFO),1)
-__DEBUGINFO = -g
-endif
-ifeq ($(USE_THREADS),0)
-__THREADSFLAG =
-endif
-ifeq ($(USE_THREADS),1)
-__THREADSFLAG = -mthreads
-endif
-
-
-all: $(OBJS)
-$(OBJS):
- -if not exist $(OBJS) mkdir $(OBJS)
-
-### Targets: ###
-
-all: $(__wxrc___depname)
-
-clean:
- -if exist $(OBJS)\*.o del $(OBJS)\*.o
- -if exist $(OBJS)\*.d del $(OBJS)\*.d
- -if exist $(OBJS)\wxrc.exe del $(OBJS)\wxrc.exe
-
-ifeq ($(USE_XRC),1)
-$(OBJS)\wxrc.exe: $(WXRC_OBJECTS)
- $(CXX) -o $@ $(WXRC_OBJECTS) $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) $(____CAIRO_LIBDIR_FILENAMES_p) $(LDFLAGS) $(__WXLIB_XML_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_PNG_IF_MONO_p) -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(EXTRALIBS_FOR_BASE) $(__CAIRO_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32 -lwininet
-endif
-
-$(OBJS)\wxrc_wxrc.o: ./wxrc.cpp
- $(CXX) -c -o $@ $(WXRC_CXXFLAGS) $(CPPDEPS) $<
-
-.PHONY: all clean
-
-
-SHELL := $(COMSPEC)
-
-# Dependencies tracking:
--include $(OBJS)/*.d
+# =========================================================================
+# This makefile was generated by
+# Bakefile 0.2.9 (http://www.bakefile.org)
+# Do not modify, all changes will be overwritten!
+# =========================================================================
+
+include ../../build/msw/config.gcc
+
+# -------------------------------------------------------------------------
+# Do not modify the rest of this file!
+# -------------------------------------------------------------------------
+
+### Variables: ###
+
+CPPDEPS = -MT$@ -MF$@.d -MD -MP
+WX_RELEASE_NODOT = 31
+COMPILER_PREFIX = gcc
+OBJS = \
+ $(COMPILER_PREFIX)$(COMPILER_VERSION)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)
+LIBDIRNAME = \
+ .\..\..\lib\$(COMPILER_PREFIX)$(COMPILER_VERSION)_$(LIBTYPE_SUFFIX)$(CFG)
+SETUPHDIR = \
+ $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)
+WXRC_CXXFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG_2) $(__THREADSFLAG) $(GCCFLAGS) \
+ -DHAVE_W32API_H -D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \
+ $(__NDEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \
+ $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) -I$(SETUPHDIR) -I.\..\..\include \
+ $(____CAIRO_INCLUDEDIR_FILENAMES_p) -W -Wall -I. $(__DLLFLAG_p) -DwxUSE_GUI=0 \
+ $(__RTTIFLAG_5) $(__EXCEPTIONSFLAG_6) -Wno-ctor-dtor-privacy $(CPPFLAGS) \
+ $(CXXFLAGS)
+WXRC_OBJECTS = \
+ $(OBJS)\wxrc_wxrc.o
+
+### Conditionally set variables: ###
+
+ifeq ($(GCC_VERSION),2.95)
+GCCFLAGS = -fvtable-thunks
+endif
+ifeq ($(USE_GUI),0)
+PORTNAME = base
+endif
+ifeq ($(USE_GUI),1)
+PORTNAME = msw$(TOOLKIT_VERSION)
+endif
+ifeq ($(OFFICIAL_BUILD),1)
+COMPILER_VERSION = ERROR-COMPILER-VERSION-MUST-BE-SET-FOR-OFFICIAL-BUILD
+endif
+ifeq ($(BUILD),debug)
+WXDEBUGFLAG = d
+endif
+ifeq ($(UNICODE),1)
+WXUNICODEFLAG = u
+endif
+ifeq ($(WXUNIV),1)
+WXUNIVNAME = univ
+endif
+ifeq ($(SHARED),1)
+WXDLLFLAG = dll
+endif
+ifeq ($(SHARED),0)
+LIBTYPE_SUFFIX = lib
+endif
+ifeq ($(SHARED),1)
+LIBTYPE_SUFFIX = dll
+endif
+ifeq ($(MONOLITHIC),0)
+EXTRALIBS_FOR_BASE =
+endif
+ifeq ($(MONOLITHIC),1)
+EXTRALIBS_FOR_BASE =
+endif
+ifeq ($(USE_XRC),1)
+__wxrc___depname = $(OBJS)\wxrc.exe
+endif
+ifeq ($(BUILD),debug)
+__OPTIMIZEFLAG_2 = -O0
+endif
+ifeq ($(BUILD),release)
+__OPTIMIZEFLAG_2 = -O2
+endif
+ifeq ($(USE_RTTI),0)
+__RTTIFLAG_5 = -fno-rtti
+endif
+ifeq ($(USE_RTTI),1)
+__RTTIFLAG_5 =
+endif
+ifeq ($(USE_EXCEPTIONS),0)
+__EXCEPTIONSFLAG_6 = -fno-exceptions
+endif
+ifeq ($(USE_EXCEPTIONS),1)
+__EXCEPTIONSFLAG_6 =
+endif
+ifeq ($(WXUNIV),1)
+__WXUNIV_DEFINE_p = -D__WXUNIVERSAL__
+endif
+ifeq ($(DEBUG_FLAG),0)
+__DEBUG_DEFINE_p = -DwxDEBUG_LEVEL=0
+endif
+ifeq ($(BUILD),release)
+__NDEBUG_DEFINE_p = -DNDEBUG
+endif
+ifeq ($(USE_EXCEPTIONS),0)
+__EXCEPTIONS_DEFINE_p = -DwxNO_EXCEPTIONS
+endif
+ifeq ($(USE_RTTI),0)
+__RTTI_DEFINE_p = -DwxNO_RTTI
+endif
+ifeq ($(USE_THREADS),0)
+__THREAD_DEFINE_p = -DwxNO_THREADS
+endif
+ifeq ($(UNICODE),0)
+__UNICODE_DEFINE_p = -DwxUSE_UNICODE=0
+endif
+ifeq ($(UNICODE),1)
+__UNICODE_DEFINE_p = -D_UNICODE
+endif
+ifeq ($(USE_CAIRO),1)
+____CAIRO_INCLUDEDIR_FILENAMES_p = -I$(CAIRO_ROOT)\include\cairo
+endif
+ifeq ($(SHARED),1)
+__DLLFLAG_p = -DWXUSINGDLL
+endif
+ifeq ($(MONOLITHIC),0)
+__WXLIB_XML_p = \
+ -lwxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xml
+endif
+ifeq ($(MONOLITHIC),0)
+__WXLIB_BASE_p = \
+ -lwxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)
+endif
+ifeq ($(MONOLITHIC),1)
+__WXLIB_MONO_p = \
+ -lwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)
+endif
+ifeq ($(MONOLITHIC),1)
+__LIB_PNG_IF_MONO_p = $(__LIB_PNG_p)
+endif
+ifeq ($(USE_GUI),1)
+__LIB_PNG_p = -lwxpng$(WXDEBUGFLAG)
+endif
+ifeq ($(USE_CAIRO),1)
+__CAIRO_LIB_p = -lcairo
+endif
+ifeq ($(USE_CAIRO),1)
+____CAIRO_LIBDIR_FILENAMES_p = -L$(CAIRO_ROOT)\lib
+endif
+ifeq ($(BUILD),debug)
+ifeq ($(DEBUG_INFO),default)
+__DEBUGINFO = -g
+endif
+endif
+ifeq ($(BUILD),release)
+ifeq ($(DEBUG_INFO),default)
+__DEBUGINFO =
+endif
+endif
+ifeq ($(DEBUG_INFO),0)
+__DEBUGINFO =
+endif
+ifeq ($(DEBUG_INFO),1)
+__DEBUGINFO = -g
+endif
+ifeq ($(USE_THREADS),0)
+__THREADSFLAG =
+endif
+ifeq ($(USE_THREADS),1)
+__THREADSFLAG = -mthreads
+endif
+
+
+all: $(OBJS)
+$(OBJS):
+ -if not exist $(OBJS) mkdir $(OBJS)
+
+### Targets: ###
+
+all: $(__wxrc___depname)
+
+clean:
+ -if exist $(OBJS)\*.o del $(OBJS)\*.o
+ -if exist $(OBJS)\*.d del $(OBJS)\*.d
+ -if exist $(OBJS)\wxrc.exe del $(OBJS)\wxrc.exe
+
+ifeq ($(USE_XRC),1)
+$(OBJS)\wxrc.exe: $(WXRC_OBJECTS)
+ $(CXX) -o $@ $(WXRC_OBJECTS) $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) $(____CAIRO_LIBDIR_FILENAMES_p) $(LDFLAGS) $(__WXLIB_XML_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_PNG_IF_MONO_p) -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(EXTRALIBS_FOR_BASE) $(__CAIRO_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32 -lwininet
+endif
+
+$(OBJS)\wxrc_wxrc.o: ./wxrc.cpp
+ $(CXX) -c -o $@ $(WXRC_CXXFLAGS) $(CPPDEPS) $<
+
+.PHONY: all clean
+
+
+SHELL := $(COMSPEC)
+
+# Dependencies tracking:
+-include $(OBJS)/*.d
diff --git a/utils/wxrc/makefile.vc b/utils/wxrc/makefile.vc
index 10fc4b4237..88df7dc545 100644
--- a/utils/wxrc/makefile.vc
+++ b/utils/wxrc/makefile.vc
@@ -1,305 +1,305 @@
-# =========================================================================
-# This makefile was generated by
-# Bakefile 0.2.9 (http://www.bakefile.org)
-# Do not modify, all changes will be overwritten!
-# =========================================================================
-
-!include <../../build/msw/config.vc>
-
-# -------------------------------------------------------------------------
-# Do not modify the rest of this file!
-# -------------------------------------------------------------------------
-
-### Variables: ###
-
-WX_RELEASE_NODOT = 31
-COMPILER_PREFIX = vc
-OBJS = \
- $(COMPILER_PREFIX)$(COMPILER_VERSION)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)$(ARCH_SUFFIX)
-LIBDIRNAME = \
- .\..\..\lib\$(COMPILER_PREFIX)$(COMPILER_VERSION)$(ARCH_SUFFIX)_$(LIBTYPE_SUFFIX)$(CFG)
-SETUPHDIR = \
- $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)
-WXRC_CXXFLAGS = /M$(__RUNTIME_LIBS_10)$(__DEBUGRUNTIME_4) /DWIN32 \
- $(__DEBUGINFO_0) /Fd$(OBJS)\wxrc.pdb $(____DEBUGRUNTIME_3_p) \
- $(__OPTIMIZEFLAG_6) /D_CRT_SECURE_NO_DEPRECATE=1 \
- /D_CRT_NON_CONFORMING_SWPRINTFS=1 /D_SCL_SECURE_NO_WARNINGS=1 \
- $(__NO_VC_CRTDBG_p) /D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \
- $(__NDEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \
- $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) /I$(SETUPHDIR) /I.\..\..\include \
- $(____CAIRO_INCLUDEDIR_FILENAMES_p) /W4 /I. $(__DLLFLAG_p) /D_CONSOLE \
- /DwxUSE_GUI=0 $(__RTTIFLAG_11) $(__EXCEPTIONSFLAG_12) $(CPPFLAGS) \
- $(CXXFLAGS)
-WXRC_OBJECTS = \
- $(OBJS)\wxrc_wxrc.obj
-
-### Conditionally set variables: ###
-
-!if "$(TARGET_CPU)" == "AMD64"
-ARCH_SUFFIX = _x64
-!endif
-!if "$(TARGET_CPU)" == "IA64"
-ARCH_SUFFIX = _ia64
-!endif
-!if "$(TARGET_CPU)" == "X64"
-ARCH_SUFFIX = _x64
-!endif
-!if "$(TARGET_CPU)" == "amd64"
-ARCH_SUFFIX = _x64
-!endif
-!if "$(TARGET_CPU)" == "ia64"
-ARCH_SUFFIX = _ia64
-!endif
-!if "$(TARGET_CPU)" == "x64"
-ARCH_SUFFIX = _x64
-!endif
-!if "$(USE_GUI)" == "0"
-PORTNAME = base
-!endif
-!if "$(USE_GUI)" == "1"
-PORTNAME = msw$(TOOLKIT_VERSION)
-!endif
-!if "$(OFFICIAL_BUILD)" == "1"
-COMPILER_VERSION = ERROR-COMPILER-VERSION-MUST-BE-SET-FOR-OFFICIAL-BUILD
-!endif
-!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default"
-WXDEBUGFLAG = d
-!endif
-!if "$(DEBUG_RUNTIME_LIBS)" == "1"
-WXDEBUGFLAG = d
-!endif
-!if "$(UNICODE)" == "1"
-WXUNICODEFLAG = u
-!endif
-!if "$(WXUNIV)" == "1"
-WXUNIVNAME = univ
-!endif
-!if "$(SHARED)" == "1"
-WXDLLFLAG = dll
-!endif
-!if "$(SHARED)" == "0"
-LIBTYPE_SUFFIX = lib
-!endif
-!if "$(SHARED)" == "1"
-LIBTYPE_SUFFIX = dll
-!endif
-!if "$(TARGET_CPU)" == "AMD64"
-LINK_TARGET_CPU = /MACHINE:X64
-!endif
-!if "$(TARGET_CPU)" == "IA64"
-LINK_TARGET_CPU = /MACHINE:IA64
-!endif
-!if "$(TARGET_CPU)" == "X64"
-LINK_TARGET_CPU = /MACHINE:X64
-!endif
-!if "$(TARGET_CPU)" == "amd64"
-LINK_TARGET_CPU = /MACHINE:X64
-!endif
-!if "$(TARGET_CPU)" == "ia64"
-LINK_TARGET_CPU = /MACHINE:IA64
-!endif
-!if "$(TARGET_CPU)" == "x64"
-LINK_TARGET_CPU = /MACHINE:X64
-!endif
-!if "$(MONOLITHIC)" == "0"
-EXTRALIBS_FOR_BASE =
-!endif
-!if "$(MONOLITHIC)" == "1"
-EXTRALIBS_FOR_BASE =
-!endif
-!if "$(USE_XRC)" == "1"
-__wxrc___depname = $(OBJS)\wxrc.exe
-!endif
-!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default"
-__DEBUGINFO_0 = /Zi
-!endif
-!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default"
-__DEBUGINFO_0 =
-!endif
-!if "$(DEBUG_INFO)" == "0"
-__DEBUGINFO_0 =
-!endif
-!if "$(DEBUG_INFO)" == "1"
-__DEBUGINFO_0 = /Zi
-!endif
-!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default"
-__DEBUGINFO_1 = /DEBUG
-!endif
-!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default"
-__DEBUGINFO_1 =
-!endif
-!if "$(DEBUG_INFO)" == "0"
-__DEBUGINFO_1 =
-!endif
-!if "$(DEBUG_INFO)" == "1"
-__DEBUGINFO_1 = /DEBUG
-!endif
-!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default"
-__DEBUGINFO_2 = $(__DEBUGRUNTIME_5)
-!endif
-!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default"
-__DEBUGINFO_2 =
-!endif
-!if "$(DEBUG_INFO)" == "0"
-__DEBUGINFO_2 =
-!endif
-!if "$(DEBUG_INFO)" == "1"
-__DEBUGINFO_2 = $(__DEBUGRUNTIME_5)
-!endif
-!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default"
-____DEBUGRUNTIME_3_p = /D_DEBUG
-!endif
-!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default"
-____DEBUGRUNTIME_3_p =
-!endif
-!if "$(DEBUG_RUNTIME_LIBS)" == "0"
-____DEBUGRUNTIME_3_p =
-!endif
-!if "$(DEBUG_RUNTIME_LIBS)" == "1"
-____DEBUGRUNTIME_3_p = /D_DEBUG
-!endif
-!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default"
-__DEBUGRUNTIME_4 = d
-!endif
-!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default"
-__DEBUGRUNTIME_4 =
-!endif
-!if "$(DEBUG_RUNTIME_LIBS)" == "0"
-__DEBUGRUNTIME_4 =
-!endif
-!if "$(DEBUG_RUNTIME_LIBS)" == "1"
-__DEBUGRUNTIME_4 = d
-!endif
-!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default"
-__DEBUGRUNTIME_5 =
-!endif
-!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default"
-__DEBUGRUNTIME_5 = /opt:ref /opt:icf
-!endif
-!if "$(DEBUG_RUNTIME_LIBS)" == "0"
-__DEBUGRUNTIME_5 = /opt:ref /opt:icf
-!endif
-!if "$(DEBUG_RUNTIME_LIBS)" == "1"
-__DEBUGRUNTIME_5 =
-!endif
-!if "$(BUILD)" == "debug"
-__OPTIMIZEFLAG_6 = /Od
-!endif
-!if "$(BUILD)" == "release"
-__OPTIMIZEFLAG_6 = /O2
-!endif
-!if "$(USE_THREADS)" == "0"
-__THREADSFLAG_9 = L
-!endif
-!if "$(USE_THREADS)" == "1"
-__THREADSFLAG_9 = T
-!endif
-!if "$(RUNTIME_LIBS)" == "dynamic"
-__RUNTIME_LIBS_10 = D
-!endif
-!if "$(RUNTIME_LIBS)" == "static"
-__RUNTIME_LIBS_10 = $(__THREADSFLAG_9)
-!endif
-!if "$(USE_RTTI)" == "0"
-__RTTIFLAG_11 =
-!endif
-!if "$(USE_RTTI)" == "1"
-__RTTIFLAG_11 = /GR
-!endif
-!if "$(USE_EXCEPTIONS)" == "0"
-__EXCEPTIONSFLAG_12 =
-!endif
-!if "$(USE_EXCEPTIONS)" == "1"
-__EXCEPTIONSFLAG_12 = /EHsc
-!endif
-!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "0"
-__NO_VC_CRTDBG_p = /D__NO_VC_CRTDBG__
-!endif
-!if "$(BUILD)" == "release" && "$(DEBUG_FLAG)" == "1"
-__NO_VC_CRTDBG_p = /D__NO_VC_CRTDBG__
-!endif
-!if "$(WXUNIV)" == "1"
-__WXUNIV_DEFINE_p = /D__WXUNIVERSAL__
-!endif
-!if "$(DEBUG_FLAG)" == "0"
-__DEBUG_DEFINE_p = /DwxDEBUG_LEVEL=0
-!endif
-!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default"
-__NDEBUG_DEFINE_p = /DNDEBUG
-!endif
-!if "$(DEBUG_RUNTIME_LIBS)" == "0"
-__NDEBUG_DEFINE_p = /DNDEBUG
-!endif
-!if "$(USE_EXCEPTIONS)" == "0"
-__EXCEPTIONS_DEFINE_p = /DwxNO_EXCEPTIONS
-!endif
-!if "$(USE_RTTI)" == "0"
-__RTTI_DEFINE_p = /DwxNO_RTTI
-!endif
-!if "$(USE_THREADS)" == "0"
-__THREAD_DEFINE_p = /DwxNO_THREADS
-!endif
-!if "$(UNICODE)" == "0"
-__UNICODE_DEFINE_p = /DwxUSE_UNICODE=0
-!endif
-!if "$(UNICODE)" == "1"
-__UNICODE_DEFINE_p = /D_UNICODE
-!endif
-!if "$(USE_CAIRO)" == "1"
-____CAIRO_INCLUDEDIR_FILENAMES_p = /I$(CAIRO_ROOT)\include\cairo
-!endif
-!if "$(SHARED)" == "1"
-__DLLFLAG_p = /DWXUSINGDLL
-!endif
-!if "$(MONOLITHIC)" == "0"
-__WXLIB_XML_p = \
- wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xml.lib
-!endif
-!if "$(MONOLITHIC)" == "0"
-__WXLIB_BASE_p = \
- wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib
-!endif
-!if "$(MONOLITHIC)" == "1"
-__WXLIB_MONO_p = \
- wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib
-!endif
-!if "$(MONOLITHIC)" == "1"
-__LIB_PNG_IF_MONO_p = $(__LIB_PNG_p)
-!endif
-!if "$(USE_GUI)" == "1"
-__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib
-!endif
-!if "$(USE_CAIRO)" == "1"
-__CAIRO_LIB_p = cairo.lib
-!endif
-!if "$(USE_CAIRO)" == "1"
-____CAIRO_LIBDIR_FILENAMES_p = /LIBPATH:$(CAIRO_ROOT)\lib
-!endif
-
-
-all: $(OBJS)
-$(OBJS):
- -if not exist $(OBJS) mkdir $(OBJS)
-
-### Targets: ###
-
-all: $(__wxrc___depname)
-
-clean:
- -if exist $(OBJS)\*.obj del $(OBJS)\*.obj
- -if exist $(OBJS)\*.res del $(OBJS)\*.res
- -if exist $(OBJS)\*.pch del $(OBJS)\*.pch
- -if exist $(OBJS)\wxrc.exe del $(OBJS)\wxrc.exe
- -if exist $(OBJS)\wxrc.ilk del $(OBJS)\wxrc.ilk
- -if exist $(OBJS)\wxrc.pdb del $(OBJS)\wxrc.pdb
-
-!if "$(USE_XRC)" == "1"
-$(OBJS)\wxrc.exe: $(WXRC_OBJECTS)
- link /NOLOGO /OUT:$@ $(__DEBUGINFO_1) /pdb:"$(OBJS)\wxrc.pdb" $(__DEBUGINFO_2) $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:CONSOLE $(____CAIRO_LIBDIR_FILENAMES_p) $(LDFLAGS) @<<
- $(WXRC_OBJECTS) $(__WXLIB_XML_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_PNG_IF_MONO_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__CAIRO_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib
-<<
-!endif
-
-$(OBJS)\wxrc_wxrc.obj: .\wxrc.cpp
- $(CXX) /c /nologo /TP /Fo$@ $(WXRC_CXXFLAGS) .\wxrc.cpp
-
+# =========================================================================
+# This makefile was generated by
+# Bakefile 0.2.9 (http://www.bakefile.org)
+# Do not modify, all changes will be overwritten!
+# =========================================================================
+
+!include <../../build/msw/config.vc>
+
+# -------------------------------------------------------------------------
+# Do not modify the rest of this file!
+# -------------------------------------------------------------------------
+
+### Variables: ###
+
+WX_RELEASE_NODOT = 31
+COMPILER_PREFIX = vc
+OBJS = \
+ $(COMPILER_PREFIX)$(COMPILER_VERSION)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)$(ARCH_SUFFIX)
+LIBDIRNAME = \
+ .\..\..\lib\$(COMPILER_PREFIX)$(COMPILER_VERSION)$(ARCH_SUFFIX)_$(LIBTYPE_SUFFIX)$(CFG)
+SETUPHDIR = \
+ $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)
+WXRC_CXXFLAGS = /M$(__RUNTIME_LIBS_10)$(__DEBUGRUNTIME_4) /DWIN32 \
+ $(__DEBUGINFO_0) /Fd$(OBJS)\wxrc.pdb $(____DEBUGRUNTIME_3_p) \
+ $(__OPTIMIZEFLAG_6) /D_CRT_SECURE_NO_DEPRECATE=1 \
+ /D_CRT_NON_CONFORMING_SWPRINTFS=1 /D_SCL_SECURE_NO_WARNINGS=1 \
+ $(__NO_VC_CRTDBG_p) /D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \
+ $(__NDEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \
+ $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) /I$(SETUPHDIR) /I.\..\..\include \
+ $(____CAIRO_INCLUDEDIR_FILENAMES_p) /W4 /I. $(__DLLFLAG_p) /D_CONSOLE \
+ /DwxUSE_GUI=0 $(__RTTIFLAG_11) $(__EXCEPTIONSFLAG_12) $(CPPFLAGS) \
+ $(CXXFLAGS)
+WXRC_OBJECTS = \
+ $(OBJS)\wxrc_wxrc.obj
+
+### Conditionally set variables: ###
+
+!if "$(TARGET_CPU)" == "AMD64"
+ARCH_SUFFIX = _x64
+!endif
+!if "$(TARGET_CPU)" == "IA64"
+ARCH_SUFFIX = _ia64
+!endif
+!if "$(TARGET_CPU)" == "X64"
+ARCH_SUFFIX = _x64
+!endif
+!if "$(TARGET_CPU)" == "amd64"
+ARCH_SUFFIX = _x64
+!endif
+!if "$(TARGET_CPU)" == "ia64"
+ARCH_SUFFIX = _ia64
+!endif
+!if "$(TARGET_CPU)" == "x64"
+ARCH_SUFFIX = _x64
+!endif
+!if "$(USE_GUI)" == "0"
+PORTNAME = base
+!endif
+!if "$(USE_GUI)" == "1"
+PORTNAME = msw$(TOOLKIT_VERSION)
+!endif
+!if "$(OFFICIAL_BUILD)" == "1"
+COMPILER_VERSION = ERROR-COMPILER-VERSION-MUST-BE-SET-FOR-OFFICIAL-BUILD
+!endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default"
+WXDEBUGFLAG = d
+!endif
+!if "$(DEBUG_RUNTIME_LIBS)" == "1"
+WXDEBUGFLAG = d
+!endif
+!if "$(UNICODE)" == "1"
+WXUNICODEFLAG = u
+!endif
+!if "$(WXUNIV)" == "1"
+WXUNIVNAME = univ
+!endif
+!if "$(SHARED)" == "1"
+WXDLLFLAG = dll
+!endif
+!if "$(SHARED)" == "0"
+LIBTYPE_SUFFIX = lib
+!endif
+!if "$(SHARED)" == "1"
+LIBTYPE_SUFFIX = dll
+!endif
+!if "$(TARGET_CPU)" == "AMD64"
+LINK_TARGET_CPU = /MACHINE:X64
+!endif
+!if "$(TARGET_CPU)" == "IA64"
+LINK_TARGET_CPU = /MACHINE:IA64
+!endif
+!if "$(TARGET_CPU)" == "X64"
+LINK_TARGET_CPU = /MACHINE:X64
+!endif
+!if "$(TARGET_CPU)" == "amd64"
+LINK_TARGET_CPU = /MACHINE:X64
+!endif
+!if "$(TARGET_CPU)" == "ia64"
+LINK_TARGET_CPU = /MACHINE:IA64
+!endif
+!if "$(TARGET_CPU)" == "x64"
+LINK_TARGET_CPU = /MACHINE:X64
+!endif
+!if "$(MONOLITHIC)" == "0"
+EXTRALIBS_FOR_BASE =
+!endif
+!if "$(MONOLITHIC)" == "1"
+EXTRALIBS_FOR_BASE =
+!endif
+!if "$(USE_XRC)" == "1"
+__wxrc___depname = $(OBJS)\wxrc.exe
+!endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default"
+__DEBUGINFO_0 = /Zi
+!endif
+!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default"
+__DEBUGINFO_0 =
+!endif
+!if "$(DEBUG_INFO)" == "0"
+__DEBUGINFO_0 =
+!endif
+!if "$(DEBUG_INFO)" == "1"
+__DEBUGINFO_0 = /Zi
+!endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default"
+__DEBUGINFO_1 = /DEBUG
+!endif
+!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default"
+__DEBUGINFO_1 =
+!endif
+!if "$(DEBUG_INFO)" == "0"
+__DEBUGINFO_1 =
+!endif
+!if "$(DEBUG_INFO)" == "1"
+__DEBUGINFO_1 = /DEBUG
+!endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default"
+__DEBUGINFO_2 = $(__DEBUGRUNTIME_5)
+!endif
+!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default"
+__DEBUGINFO_2 =
+!endif
+!if "$(DEBUG_INFO)" == "0"
+__DEBUGINFO_2 =
+!endif
+!if "$(DEBUG_INFO)" == "1"
+__DEBUGINFO_2 = $(__DEBUGRUNTIME_5)
+!endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default"
+____DEBUGRUNTIME_3_p = /D_DEBUG
+!endif
+!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default"
+____DEBUGRUNTIME_3_p =
+!endif
+!if "$(DEBUG_RUNTIME_LIBS)" == "0"
+____DEBUGRUNTIME_3_p =
+!endif
+!if "$(DEBUG_RUNTIME_LIBS)" == "1"
+____DEBUGRUNTIME_3_p = /D_DEBUG
+!endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default"
+__DEBUGRUNTIME_4 = d
+!endif
+!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default"
+__DEBUGRUNTIME_4 =
+!endif
+!if "$(DEBUG_RUNTIME_LIBS)" == "0"
+__DEBUGRUNTIME_4 =
+!endif
+!if "$(DEBUG_RUNTIME_LIBS)" == "1"
+__DEBUGRUNTIME_4 = d
+!endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default"
+__DEBUGRUNTIME_5 =
+!endif
+!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default"
+__DEBUGRUNTIME_5 = /opt:ref /opt:icf
+!endif
+!if "$(DEBUG_RUNTIME_LIBS)" == "0"
+__DEBUGRUNTIME_5 = /opt:ref /opt:icf
+!endif
+!if "$(DEBUG_RUNTIME_LIBS)" == "1"
+__DEBUGRUNTIME_5 =
+!endif
+!if "$(BUILD)" == "debug"
+__OPTIMIZEFLAG_6 = /Od
+!endif
+!if "$(BUILD)" == "release"
+__OPTIMIZEFLAG_6 = /O2
+!endif
+!if "$(USE_THREADS)" == "0"
+__THREADSFLAG_9 = L
+!endif
+!if "$(USE_THREADS)" == "1"
+__THREADSFLAG_9 = T
+!endif
+!if "$(RUNTIME_LIBS)" == "dynamic"
+__RUNTIME_LIBS_10 = D
+!endif
+!if "$(RUNTIME_LIBS)" == "static"
+__RUNTIME_LIBS_10 = $(__THREADSFLAG_9)
+!endif
+!if "$(USE_RTTI)" == "0"
+__RTTIFLAG_11 =
+!endif
+!if "$(USE_RTTI)" == "1"
+__RTTIFLAG_11 = /GR
+!endif
+!if "$(USE_EXCEPTIONS)" == "0"
+__EXCEPTIONSFLAG_12 =
+!endif
+!if "$(USE_EXCEPTIONS)" == "1"
+__EXCEPTIONSFLAG_12 = /EHsc
+!endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "0"
+__NO_VC_CRTDBG_p = /D__NO_VC_CRTDBG__
+!endif
+!if "$(BUILD)" == "release" && "$(DEBUG_FLAG)" == "1"
+__NO_VC_CRTDBG_p = /D__NO_VC_CRTDBG__
+!endif
+!if "$(WXUNIV)" == "1"
+__WXUNIV_DEFINE_p = /D__WXUNIVERSAL__
+!endif
+!if "$(DEBUG_FLAG)" == "0"
+__DEBUG_DEFINE_p = /DwxDEBUG_LEVEL=0
+!endif
+!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default"
+__NDEBUG_DEFINE_p = /DNDEBUG
+!endif
+!if "$(DEBUG_RUNTIME_LIBS)" == "0"
+__NDEBUG_DEFINE_p = /DNDEBUG
+!endif
+!if "$(USE_EXCEPTIONS)" == "0"
+__EXCEPTIONS_DEFINE_p = /DwxNO_EXCEPTIONS
+!endif
+!if "$(USE_RTTI)" == "0"
+__RTTI_DEFINE_p = /DwxNO_RTTI
+!endif
+!if "$(USE_THREADS)" == "0"
+__THREAD_DEFINE_p = /DwxNO_THREADS
+!endif
+!if "$(UNICODE)" == "0"
+__UNICODE_DEFINE_p = /DwxUSE_UNICODE=0
+!endif
+!if "$(UNICODE)" == "1"
+__UNICODE_DEFINE_p = /D_UNICODE
+!endif
+!if "$(USE_CAIRO)" == "1"
+____CAIRO_INCLUDEDIR_FILENAMES_p = /I$(CAIRO_ROOT)\include\cairo
+!endif
+!if "$(SHARED)" == "1"
+__DLLFLAG_p = /DWXUSINGDLL
+!endif
+!if "$(MONOLITHIC)" == "0"
+__WXLIB_XML_p = \
+ wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xml.lib
+!endif
+!if "$(MONOLITHIC)" == "0"
+__WXLIB_BASE_p = \
+ wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib
+!endif
+!if "$(MONOLITHIC)" == "1"
+__WXLIB_MONO_p = \
+ wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib
+!endif
+!if "$(MONOLITHIC)" == "1"
+__LIB_PNG_IF_MONO_p = $(__LIB_PNG_p)
+!endif
+!if "$(USE_GUI)" == "1"
+__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib
+!endif
+!if "$(USE_CAIRO)" == "1"
+__CAIRO_LIB_p = cairo.lib
+!endif
+!if "$(USE_CAIRO)" == "1"
+____CAIRO_LIBDIR_FILENAMES_p = /LIBPATH:$(CAIRO_ROOT)\lib
+!endif
+
+
+all: $(OBJS)
+$(OBJS):
+ -if not exist $(OBJS) mkdir $(OBJS)
+
+### Targets: ###
+
+all: $(__wxrc___depname)
+
+clean:
+ -if exist $(OBJS)\*.obj del $(OBJS)\*.obj
+ -if exist $(OBJS)\*.res del $(OBJS)\*.res
+ -if exist $(OBJS)\*.pch del $(OBJS)\*.pch
+ -if exist $(OBJS)\wxrc.exe del $(OBJS)\wxrc.exe
+ -if exist $(OBJS)\wxrc.ilk del $(OBJS)\wxrc.ilk
+ -if exist $(OBJS)\wxrc.pdb del $(OBJS)\wxrc.pdb
+
+!if "$(USE_XRC)" == "1"
+$(OBJS)\wxrc.exe: $(WXRC_OBJECTS)
+ link /NOLOGO /OUT:$@ $(__DEBUGINFO_1) /pdb:"$(OBJS)\wxrc.pdb" $(__DEBUGINFO_2) $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:CONSOLE $(____CAIRO_LIBDIR_FILENAMES_p) $(LDFLAGS) @<<
+ $(WXRC_OBJECTS) $(__WXLIB_XML_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_PNG_IF_MONO_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__CAIRO_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib
+<<
+!endif
+
+$(OBJS)\wxrc_wxrc.obj: .\wxrc.cpp
+ $(CXX) /c /nologo /TP /Fo$@ $(WXRC_CXXFLAGS) .\wxrc.cpp
+
diff --git a/utils/wxrc/wxrc_vc7.vcproj b/utils/wxrc/wxrc_vc7.vcproj
index 9a09d2d1ac..4764946342 100644
--- a/utils/wxrc/wxrc_vc7.vcproj
+++ b/utils/wxrc/wxrc_vc7.vcproj
@@ -1,295 +1,295 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/utils/wxrc/wxrc_vc8.vcproj b/utils/wxrc/wxrc_vc8.vcproj
index 49f33cb275..6331ee17d2 100644
--- a/utils/wxrc/wxrc_vc8.vcproj
+++ b/utils/wxrc/wxrc_vc8.vcproj
@@ -1,819 +1,819 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/utils/wxrc/wxrc_vc9.vcproj b/utils/wxrc/wxrc_vc9.vcproj
index 0c034c1ca3..8e905daaa3 100644
--- a/utils/wxrc/wxrc_vc9.vcproj
+++ b/utils/wxrc/wxrc_vc9.vcproj
@@ -1,791 +1,791 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+