Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

getsha.bat is no longer needed #571

Merged
merged 1 commit into from Mar 11, 2019
Merged

getsha.bat is no longer needed #571

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 1 addition & 1 deletion .gitignore
View file
Open in desktop
Expand Up @@ -31,7 +31,7 @@ bld/
[sS]rc/options.txt
[sS]rc/ClassiCube*
[sS]rc/screenshots

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

Expand Down
4 changes: 2 additions & 2 deletions src/Makefile
View file
Open in desktop
@@ -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

Expand Down
4 changes: 2 additions & 2 deletions src/Makefile.win
View file
Open in desktop
@@ -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

Expand Down
3 changes: 0 additions & 3 deletions src/getsha.bat
View file
Open in desktop

This file was deleted.