From 4166e540db12a8238f1896632f05afb2f4d45390 Mon Sep 17 00:00:00 2001
From: Marek Karcz <makarcz@users.noreply.github.com>
Date: Sat, 24 Dec 2022 12:50:11 -0500
Subject: [PATCH] Corrected batch script and makefile

Corrected batch script and makefile for MINGW/GCC 8.1.0
---
 makefile.mingw | 4 ++--
 mingw-w64.bat  | 3 ++-
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/makefile.mingw b/makefile.mingw
index a4403c5..26476b5 100644
--- a/makefile.mingw
+++ b/makefile.mingw
@@ -18,8 +18,8 @@ LINKOBJ  = main.o VMachine.o MKCpu.o Memory.o Display.o GraphDisp.o MemMapDev.o
 LINKOBJ2 = bin2hex.o
 LIBS     = -L"$(MINGWDIR)\mingw64\x86_64-w64-mingw32/lib" -L"$(MINGWDIR)\mingw64\x86_64-w64-mingw32/lib" -static-libgcc -static-libstdc++ -Wl,-Bstatic -lstdc++ -lpthread -Wl,-Bdynamic -lmingw32
 SDLLIBS  = -L"$(SDLBASE)\x86_64-w64-mingw32/lib" -lSDL2main -lSDL2
-INCS     = -I"$(MINGWDIR)\mingw64/include" -I"$(MINGWDIR)\mingw64\x86_64-w64-mingw32/include" -I"$(MINGWDIR)\mingw64\lib\gcc\x86_64-w64-mingw32\5.3.0/include"
-CXXINCS  = -I"$(MINGWDIR)\mingw64/include" -I"$(MINGWDIR)\mingw64\x86_64-w64-mingw32/include" -I"$(MINGWDIR)\mingw64\lib\gcc\x86_64-w64-mingw32\5.3.0/include"
+INCS     = -I"$(MINGWDIR)\mingw64/include" -I"$(MINGWDIR)\mingw64\x86_64-w64-mingw32/include" -I"$(MINGWDIR)\mingw64\lib\gcc\x86_64-w64-mingw32\$(GCCVER)/include"
+CXXINCS  = -I"$(MINGWDIR)\mingw64/include" -I"$(MINGWDIR)\mingw64\x86_64-w64-mingw32/include" -I"$(MINGWDIR)\mingw64\lib\gcc\x86_64-w64-mingw32\$(GCCVER)/include"
 BIN       = vm65.exe
 BIN2      = bin2hex.exe
 CXXFLAGS  = $(CXXINCS) -std=c++11 -Wall -Wextra -pedantic -g3
diff --git a/mingw-w64.bat b/mingw-w64.bat
index dd11706..b554ac6 100644
--- a/mingw-w64.bat
+++ b/mingw-w64.bat
@@ -1,5 +1,6 @@
 echo off
-set MINGWDIR=C:\mingw-w64\x86_64-8.1.0
+set GCCVER=8.1.0
+set MINGWDIR=C:\mingw-w64\x86_64-%GCCVER%
 set SDLDIR=D:\src\SDL
 set PATH=%MINGWDIR%\mingw64\bin;%SDLDIR%\lib\x64;%PATH%
 rem echo %PATH%