Merge pull request #571 from igor725/master

getsha.bat is no longer needed
ClassiCube · Mar 11, 2019 · 47f9d72 · 47f9d72
2 parents e188746 + 4e36ae8
commit 47f9d72
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 8 deletions.
diff --git 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
@@ -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
@@ -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