Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
SRB2
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Model registry
Help
Help
Support
GitLab documentation
Compare GitLab plans
GitLab community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
STJr
SRB2
Commits
6301deb2
Commit
6301deb2
authored
Mar 14, 2016
by
Alam Ed Arias
Browse files
Options
Downloads
Plain Diff
Merge branch 'master' into next
parents
32325499
2f21c24d
Branches
Branches containing commit
Tags
Tags containing commit
No related merge requests found
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
src/Makefile
+0
-6
0 additions, 6 deletions
src/Makefile
with
0 additions
and
6 deletions
src/Makefile
+
0
−
6
View file @
6301deb2
...
@@ -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
-
..
\c
omptime.bat .
-
..
\c
omptime.bat .
else
else
-
@../comptime.sh .
-
@../comptime.sh .
endif
endif
endif
clean
:
clean
:
$(
REMOVE
)
*
~
*
.flc
$(
REMOVE
)
*
~
*
.flc
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment