From 4e36ae8632de8bbba75d2104af031637cb95e345 Mon Sep 17 00:00:00 2001
From: igor725 <gvaldovigor@gmail.com>
Date: Mon, 11 Mar 2019 14:17:02 +0300
Subject: [PATCH] getsha.bat is no longer needed

---
 .gitignore       | 2 +-
 src/Makefile     | 4 ++--
 src/Makefile.win | 4 ++--
 src/getsha.bat   | 3 ---
 4 files changed, 5 insertions(+), 8 deletions(-)
 delete mode 100644 src/getsha.bat

diff --git a/.gitignore b/.gitignore
index 83825285a..250e3b695 100644
--- a/.gitignore
+++ b/.gitignore
@@ -31,7 +31,7 @@ bld/
 [sS]rc/options.txt
 [sS]rc/ClassiCube*
 [sS]rc/screenshots
-
+[sS]rc/fontscache.txt
 #GCC object files
 *.o
 
diff --git a/src/Makefile b/src/Makefile
index 03e373cc5..0722d6d80 100644
--- a/src/Makefile
+++ b/src/Makefile
@@ -1,9 +1,9 @@
 CC=gcc
-LIBS=-lGL -lcurl -lopenal -lpthread -lX11 -lm -ldl
+LIBS=-lX11 -lpthread -lGL -lm -lcurl -lopenal -ldl
 CFLAGS=-g -w -no-pie -rdynamic -pipe
 SOURCES=$(wildcard *.c)
 OBJECTS=$(patsubst %.c, %.o, $(SOURCES))
-COMMITSHA=$(shell git rev-parse HEAD | cut -c '1-7')
+COMMITSHA=$(shell git rev-parse --short HEAD)
 
 EXECUTABLE=ClassiCube
 
diff --git a/src/Makefile.win b/src/Makefile.win
index 7e29266bd..91c059d1f 100644
--- a/src/Makefile.win
+++ b/src/Makefile.win
@@ -1,9 +1,9 @@
 CC=gcc
-LIBS=-mwindows -lws2_32 -lwininet -lwinmm -limagehlp -ld3d9 -lcrypt32
+LIBS=-mwindows -lws2_32 -lwininet -lwinmm -limagehlp -lcrypt32 -ld3d9
 CFLAGS=-g -w -pipe
 SOURCES=$(wildcard *.c)
 OBJECTS=$(patsubst %.c, %.o, $(SOURCES))
-COMMITSHA=$(shell getsha)
+COMMITSHA=$(shell git rev-parse --short HEAD)
 
 EXECUTABLE=ClassiCube
 
diff --git a/src/getsha.bat b/src/getsha.bat
deleted file mode 100644
index 26e5291ac..000000000
--- a/src/getsha.bat
+++ /dev/null
@@ -1,3 +0,0 @@
-@echo off
-for /f %%i in ('git rev-parse HEAD')do set SHA=%%i
-<nul set/p=%SHA:~1,7%