From d28ca17675010f82c648537cc4fac85bf194fe35 Mon Sep 17 00:00:00 2001
From: name1e5s <836401406@qq.com>
Date: Wed, 6 Jun 2018 23:37:23 +0800
Subject: [PATCH 1/2] Make this project buildable on the latest MINGW64

---
 src/MakefileWin64 | 8 ++++----
 src/ege_head.h    | 2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/MakefileWin64 b/src/MakefileWin64
index 39af3f35..dc68e406 100644
--- a/src/MakefileWin64
+++ b/src/MakefileWin64
@@ -53,13 +53,13 @@ SRC_C=\
 OBJ=$(SRC_CXX:.cpp=.o) $(SRC_C:.c=.o)
 
 all:	$(OBJ)
-	copy /Y /B .\lib\libgdiplus64.a .\libgraphics64.a
+	cp .\lib\libgdiplus64.a .\libgraphics64.a
 	$(LIB) libgraphics64.a $(OBJ)
 
 clean:
-	del /F /Q *.o
-	del /F /Q "lpng\*.o"
-	del /F /Q libgraphics64.a
+	rm -rf *.o
+	rm -rf lpng/*.o
+	rm -rf libgraphics64.a
 
 %.o: %.cpp
 	$(CXX) -c $(CXXFLAGS) $*.cpp -o $@
diff --git a/src/ege_head.h b/src/ege_head.h
index 13719846..33637417 100644
--- a/src/ege_head.h
+++ b/src/ege_head.h
@@ -44,7 +44,7 @@
 #else
 #	if __GNUC__ == 3
 #		include "gdiplus3/gdiplus.h"
-#	elif __GNUC__ == 4
+#	elif __GNUC__ >= 4
 #		include "gdiplus4/gdiplus.h"
 #	endif
 #endif

From cd2b62877b284f424e61a71b371aa822bfc7bc9e Mon Sep 17 00:00:00 2001
From: name1e5s <836401406@qq.com>
Date: Wed, 6 Jun 2018 23:43:54 +0800
Subject: [PATCH 2/2] Remove useless batch files

---
 src/make-mingw3.4.bat | 12 ------------
 src/make-mingw4.5.bat | 12 ------------
 src/make-mingw4.6.bat | 12 ------------
 src/make-mingw4.7.bat | 12 ------------
 src/make-mingw4.8.bat | 11 -----------
 src/make-vc10.bat     | 13 -------------
 src/make-vc12.bat     | 13 -------------
 src/make-vc13.bat     | 13 -------------
 src/make-vc6.bat      |  9 ---------
 src/make-vc9.bat      | 13 -------------
 10 files changed, 120 deletions(-)
 delete mode 100644 src/make-mingw3.4.bat
 delete mode 100644 src/make-mingw4.5.bat
 delete mode 100644 src/make-mingw4.6.bat
 delete mode 100644 src/make-mingw4.7.bat
 delete mode 100644 src/make-mingw4.8.bat
 delete mode 100644 src/make-vc10.bat
 delete mode 100644 src/make-vc12.bat
 delete mode 100644 src/make-vc13.bat
 delete mode 100644 src/make-vc6.bat
 delete mode 100644 src/make-vc9.bat

diff --git a/src/make-mingw3.4.bat b/src/make-mingw3.4.bat
deleted file mode 100644
index 07f95492..00000000
--- a/src/make-mingw3.4.bat
+++ /dev/null
@@ -1,12 +0,0 @@
-call setenv
-set path=%MINGW35PATH%\bin;%MINGW35PATH%\mingw32\bin
-
-mingw32-make.exe -f MakefileWin clean
-mingw32-make.exe -f MakefileWin all
-if not %ErrorLevel% == 0 (
-    pause
-) else (
-    mkdir ..\lib\mingw3.4\lib
-    move /y libgraphics.a ..\lib\mingw3.4\lib\
-)
-
diff --git a/src/make-mingw4.5.bat b/src/make-mingw4.5.bat
deleted file mode 100644
index 321e33b0..00000000
--- a/src/make-mingw4.5.bat
+++ /dev/null
@@ -1,12 +0,0 @@
-call setenv
-set path=%MINGW45PATH%\bin;%MINGW45PATH%\mingw32\bin
-
-mingw32-make.exe -f MakefileWin clean
-mingw32-make.exe -f MakefileWin all
-if not %ErrorLevel% == 0 (
-    pause
-) else (
-    mkdir ..\lib\mingw4.5\lib
-    move /y libgraphics.a ..\lib\mingw4.5\lib\
-)
-
diff --git a/src/make-mingw4.6.bat b/src/make-mingw4.6.bat
deleted file mode 100644
index ee2930ed..00000000
--- a/src/make-mingw4.6.bat
+++ /dev/null
@@ -1,12 +0,0 @@
-call setenv
-set path=%MINGW46PATH%\bin;%MINGW46PATH%\mingw32\bin
-
-mingw32-make.exe -f MakefileWin clean
-mingw32-make.exe -f MakefileWin all
-if not %ErrorLevel% == 0 (
-    pause
-) else (
-    mkdir ..\lib\mingw4.6\lib
-    move /y libgraphics.a ..\lib\mingw4.6\lib\
-)
-
diff --git a/src/make-mingw4.7.bat b/src/make-mingw4.7.bat
deleted file mode 100644
index b85b2fb4..00000000
--- a/src/make-mingw4.7.bat
+++ /dev/null
@@ -1,12 +0,0 @@
-call setenv
-set path=%MINGW47PATH%\bin;%MINGW47PATH%\mingw32\bin
-
-mingw32-make.exe -f MakefileWin clean
-mingw32-make.exe -f MakefileWin all
-if not %ErrorLevel% == 0 (
-    pause
-) else (
-    mkdir ..\lib\mingw4.7\lib
-    move /y libgraphics.a ..\lib\mingw4.7\lib\
-)
-
diff --git a/src/make-mingw4.8.bat b/src/make-mingw4.8.bat
deleted file mode 100644
index ab7b3c60..00000000
--- a/src/make-mingw4.8.bat
+++ /dev/null
@@ -1,11 +0,0 @@
-call setenv
-set path=%MINGW48PATH%\bin;%MINGW48PATH%\mingw32\bin
-
-mingw32-make.exe -f MakefileWin clean
-mingw32-make.exe -f MakefileWin all
-if not %ErrorLevel% == 0 (
-    pause
-) else (
-    mkdir ..\lib\mingw4.8.1\lib
-    move /y libgraphics.a ..\lib\mingw4.8.1\lib\
-)
diff --git a/src/make-vc10.bat b/src/make-vc10.bat
deleted file mode 100644
index 6b0435ea..00000000
--- a/src/make-vc10.bat
+++ /dev/null
@@ -1,13 +0,0 @@
-@echo off
-call setenv
-"%VC10PATH%\..\Common7\IDE\devenv.com" "graphics10/graphics10.vcxproj" /Rebuild "Release|x64"
-if not %ErrorLevel% == 0 (
-        pause
-        goto end
-)
-"%VC10PATH%\..\Common7\IDE\devenv.com" "graphics10/graphics10.vcxproj" /Build "Release|Win32"
-if not %ErrorLevel% == 0 (
-        pause
-        goto end
-)
-:end
diff --git a/src/make-vc12.bat b/src/make-vc12.bat
deleted file mode 100644
index b10052a7..00000000
--- a/src/make-vc12.bat
+++ /dev/null
@@ -1,13 +0,0 @@
-@echo off
-call setenv
-"%VC12PATH%\..\Common7\IDE\devenv.com" "graphics12/graphics12.vcxproj" /Rebuild "Release|x64"
-if not %ErrorLevel% == 0 (
-        pause
-        goto end
-)
-"%VC12PATH%\..\Common7\IDE\devenv.com" "graphics12/graphics12.vcxproj" /Build "Release|Win32"
-if not %ErrorLevel% == 0 (
-        pause
-        goto end
-)
-:end
diff --git a/src/make-vc13.bat b/src/make-vc13.bat
deleted file mode 100644
index 4411cee2..00000000
--- a/src/make-vc13.bat
+++ /dev/null
@@ -1,13 +0,0 @@
-@echo off
-call setenv
-"%VC13PATH%\..\Common7\IDE\devenv.com" "graphics13/graphics13.vcxproj" /Rebuild "Release|x64"
-if not %ErrorLevel% == 0 (
-        pause
-        goto end
-)
-"%VC13PATH%\..\Common7\IDE\devenv.com" "graphics13/graphics13.vcxproj" /Build "Release|Win32"
-if not %ErrorLevel% == 0 (
-        pause
-        goto end
-)
-:end
diff --git a/src/make-vc6.bat b/src/make-vc6.bat
deleted file mode 100644
index 56a098fb..00000000
--- a/src/make-vc6.bat
+++ /dev/null
@@ -1,9 +0,0 @@
-@echo off
-call setenv
-"%VC6PATH%\..\Common\MSDev98\Bin\MSDEV.COM" "graphics/graphics.dsw" /make "graphics - Win32 Release" /CLEAN
-"%VC6PATH%\..\Common\MSDev98\Bin\MSDEV.COM" "graphics/graphics.dsw" /make "graphics - Win32 Release"
-if not %ErrorLevel% == 0 (
-        pause
-        goto end
-)
-:end
diff --git a/src/make-vc9.bat b/src/make-vc9.bat
deleted file mode 100644
index 5e0276c9..00000000
--- a/src/make-vc9.bat
+++ /dev/null
@@ -1,13 +0,0 @@
-@echo off
-call setenv
-"%VC9PATH%\..\Common7\IDE\devenv.com" "graphics08/graphics08.vcproj" /Rebuild "Release|x64"
-if not %ErrorLevel% == 0 (
-        pause
-        goto end
-)
-"%VC9PATH%\..\Common7\IDE\devenv.com" "graphics08/graphics08.vcproj" /Rebuild "Release|Win32"
-if not %ErrorLevel% == 0 (
-        pause
-        goto end
-)
-:end