Merge branch 'master' into next

This commit is contained in:
Alam Ed Arias 2016-03-14 13:25:37 -04:00
commit 6301deb2a5

View file

@ -262,9 +262,7 @@ else
OBJS+=$(OBJDIR)/hw3sound.o OBJS+=$(OBJDIR)/hw3sound.o
endif endif
ifndef NOVERSION
OPTS += -DCOMPVERSION OPTS += -DCOMPVERSION
endif
ifndef NONX86 ifndef NONX86
ifndef GCC29 ifndef GCC29
@ -551,15 +549,11 @@ cleandep:
$(REMOVE) comptime.h $(REMOVE) comptime.h
pre-build: pre-build:
ifdef NOVERSION
-@touch comptime.c
else
ifdef WINDOWSHELL ifdef WINDOWSHELL
-..\comptime.bat . -..\comptime.bat .
else else
-@../comptime.sh . -@../comptime.sh .
endif endif
endif
clean: clean:
$(REMOVE) *~ *.flc $(REMOVE) *~ *.flc