Skip to content
Permalink
Browse files

Merge pull request #571 from igor725/master

getsha.bat is no longer needed
  • Loading branch information...
UnknownShadow200 committed Mar 11, 2019
2 parents e188746 + 4e36ae8 commit 47f9d72f6acd86010d343828a65f6e133c5330d4
Showing with 5 additions and 8 deletions.
  1. +1 −1 .gitignore
  2. +2 −2 src/Makefile
  3. +2 −2 src/Makefile.win
  4. +0 −3 src/getsha.bat
@@ -31,7 +31,7 @@ bld/
[sS]rc/options.txt
[sS]rc/ClassiCube*
[sS]rc/screenshots

[sS]rc/fontscache.txt
#GCC object files
*.o

@@ -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

@@ -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

This file was deleted.

Oops, something went wrong.

0 comments on commit 47f9d72

Please sign in to comment.
You can’t perform that action at this time.