From 09262c98d1b9ed50223967944855b769b07f8421 Mon Sep 17 00:00:00 2001
From: Steffen Olszewski <steffen.olszewski@gero-mess.de>
Date: Mon, 20 Apr 2020 21:48:38 +0200
Subject: [PATCH 1/4] Ignore GCC version and architecture tagged library output
 folders

Add patterns to ignore the directory structure of the library release version for GCC
like it is already done for MSVC.
---
 .gitignore | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/.gitignore b/.gitignore
index 8f047f3bfe..e5b0368d77 100644
--- a/.gitignore
+++ b/.gitignore
@@ -217,10 +217,12 @@
 /lib/evc_armv4_lib
 /lib/evc_emulator_lib
 /lib/expat*.lib
-/lib/gcc_dll
+/lib/gcc*_dll
+/lib/gcc*_x64_dll
 /lib/gcc_dll32
 /lib/gcc_dll64
-/lib/gcc_lib
+/lib/gcc*_lib
+/lib/gcc*_x64_lib
 /lib/gcc_lib32
 /lib/gcc_lib64
 /lib/jpeg*.lib

From a2f3bd3aadfeb5039fc169839895b51af8d3031d Mon Sep 17 00:00:00 2001
From: Vadim Zeitlin <vadim@wxwidgets.org>
Date: Tue, 21 Apr 2020 16:25:22 +0200
Subject: [PATCH 2/4] Create mailmap entry for Steffen Olszewski

Do it to map both email addresses used in Steffen's commits with the
same person.
---
 .mailmap | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.mailmap b/.mailmap
index 0799395da8..8b9f5a7020 100644
--- a/.mailmap
+++ b/.mailmap
@@ -51,6 +51,7 @@ Richard Fath							<richard.fath@t-online.de>
 Richard Powell							<rmpowell77@me.com>
 Rick S			<rivdsl@gmail.com>			<rivdsl@hotmail.com>
 Roberto Boriotti	<roberto.boriotti@canon-europe.com>
+Steffen Olszewski	<steffen.olszewski@gero-mess.de>	<sodev@trac.wxwidgets.org>
 Steve Browne		<swbrowne@gmail.com>			<sbrowne@unknown>
 			<swbrowne@gmail.com>			<amn3sia@gmail.com>
 Tim Kosse		<tim.kosse@gmx.de>			<tim.kosse@filezilla-project.org>

From 615df97097a4f1809b85288b2a5661b923800a0c Mon Sep 17 00:00:00 2001
From: Vadim Zeitlin <vadim@wxwidgets.org>
Date: Tue, 21 Apr 2020 16:26:40 +0200
Subject: [PATCH 3/4] Remove obsolete directories for eVC from .gitignore

eVC (embedded VC) compiler is not used since at least a decade.
---
 .gitignore | 2 --
 1 file changed, 2 deletions(-)

diff --git a/.gitignore b/.gitignore
index e5b0368d77..2e9b2557e2 100644
--- a/.gitignore
+++ b/.gitignore
@@ -214,8 +214,6 @@
 /lib/bcc_lib
 /lib/cdef*.res
 /lib/dmc_lib
-/lib/evc_armv4_lib
-/lib/evc_emulator_lib
 /lib/expat*.lib
 /lib/gcc*_dll
 /lib/gcc*_x64_dll

From c0e1ad6ac04ca50f4fc2457519ca63cd0cb25efd Mon Sep 17 00:00:00 2001
From: Vadim Zeitlin <vadim@wxwidgets.org>
Date: Tue, 21 Apr 2020 16:27:39 +0200
Subject: [PATCH 4/4] Remove check for eVC in bakefiles

This compiler is obsolete and doesn't exist since a long time.
---
 build/bakefiles/config.bkl | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/build/bakefiles/config.bkl b/build/bakefiles/config.bkl
index d14d5dd2d7..b08c08dada 100644
--- a/build/bakefiles/config.bkl
+++ b/build/bakefiles/config.bkl
@@ -488,7 +488,7 @@ it if SHARED=1 unless you know what you are doing.
         <set var="EXTRALIBS_GUI"/>
         <set var="EXTRALIBS_OPENGL">
             <if cond="COMPILER=='wat' and TOOLKIT=='MSW'">opengl32.lib glu32.lib</if>
-            <if cond="COMPILER in ['vc','evc']">opengl32.lib glu32.lib</if>
+            <if cond="COMPILER=='vc'">opengl32.lib glu32.lib</if>
             <if cond="COMPILER=='gcc'">-lopengl32 -lglu32</if>
         </set>
         <set var="EXTRALIBS_SDL"/>