AstralTransRocketries/ClassiCube
1
0
Fork 0
mirror of https://github.com/ClassiCube/ClassiCube.git synced 2025-09-18 03:55:19 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #571 from igor725/master

Browse Source 
getsha.bat is no longer needed
This commit is contained in:
UnknownShadow200 2019-03-11 22:23:22 +11:00 committed by GitHub
commit 47f9d72f6a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 5 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.gitignore vendored
View File

@ -31,7 +31,7 @@ bld/
[sS]rc/options.txt [sS]rc/options.txt
[sS]rc/ClassiCube* [sS]rc/ClassiCube*
[sS]rc/screenshots [sS]rc/screenshots
[sS]rc/fontscache.txt
#GCC object files #GCC object files
*.o *.o

4
src/Makefile
View File

@ -1,9 +1,9 @@
CC=gcc 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 CFLAGS=-g -w -no-pie -rdynamic -pipe
SOURCES=$(wildcard *.c) SOURCES=$(wildcard *.c)
OBJECTS=$(patsubst %.c, %.o, $(SOURCES)) OBJECTS=$(patsubst %.c, %.o, $(SOURCES))
COMMITSHA=$(shell git rev-parse HEAD | cut -c '1-7') COMMITSHA=$(shell git rev-parse --short HEAD)
EXECUTABLE=ClassiCube EXECUTABLE=ClassiCube

4
src/Makefile.win
View File

@ -1,9 +1,9 @@
CC=gcc CC=gcc
LIBS=-mwindows -lws2_32 -lwininet -lwinmm -limagehlp -ld3d9 -lcrypt32 LIBS=-mwindows -lws2_32 -lwininet -lwinmm -limagehlp -lcrypt32 -ld3d9
CFLAGS=-g -w -pipe CFLAGS=-g -w -pipe
SOURCES=$(wildcard *.c) SOURCES=$(wildcard *.c)
OBJECTS=$(patsubst %.c, %.o, $(SOURCES)) OBJECTS=$(patsubst %.c, %.o, $(SOURCES))
COMMITSHA=$(shell getsha) COMMITSHA=$(shell git rev-parse --short HEAD)
EXECUTABLE=ClassiCube EXECUTABLE=ClassiCube

3
src/getsha.bat
View File

@ -1,3 +0,0 @@
@echo off
for /f %%i in ('git rev-parse HEAD')do set SHA=%%i
<nul set/p=%SHA:~1,7%