Skip to content
Snippets Groups Projects
Commit 6301deb2 authored by Alam Ed Arias's avatar Alam Ed Arias
Browse files

Merge branch 'master' into next

parents 32325499 2f21c24d
Branches
Tags
No related merge requests found
...@@ -262,9 +262,7 @@ else ...@@ -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: ...@@ -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
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment