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
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
STJr
SRB2
Commits
3003c252
Commit
3003c252
authored
4 years ago
by
James R.
Browse files
Options
Downloads
Patches
Plain Diff
Makfile: don't print some messages twice
parent
b31c4db8
No related branches found
Branches containing commit
No related tags found
Tags containing commit
1 merge request
!1407
Dependency files
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
src/Makefile
+7
-3
7 additions, 3 deletions
src/Makefile
src/Makefile.cfg
+6
-4
6 additions, 4 deletions
src/Makefile.cfg
with
13 additions
and
7 deletions
src/Makefile
+
7
−
3
View file @
3003c252
...
...
@@ -2,7 +2,7 @@
# GNU Make makefile for SRB2
#############################################################################
# Copyright (C) 1998-2000 by DooM Legacy Team.
# Copyright (C) 2003-202
0
by Sonic Team Junior.
# Copyright (C) 2003-202
1
by Sonic Team Junior.
#
# This program is free software distributed under the
# terms of the GNU General Public License, version 2.
...
...
@@ -79,6 +79,10 @@
#
#############################################################################
ifndef
MAKE_RESTARTS
print
=
$(
info
$(
1
))
endif
ALL_SYSTEMS
=
\
PANDORA
\
LINUX64
\
...
...
@@ -98,7 +102,7 @@ ALL_SYSTEMS=\
ifeq
(,$(filter $(ALL_SYSTEMS),$(.VARIABLES)))
ifeq
($(OS),Windows_NT)
# all windows are Windows_NT...
$(
info
Detected
a
Windows
system,
compiling
for
32-bit
MinGW
SDL2...)
$(
call
print,
Detected a Windows system, compiling
for
32-bit MinGW SDL2...
)
# go for a 32-bit sdl mingw exe by default
MINGW
=
1
...
...
@@ -123,7 +127,7 @@ else # if you on the *nix
new_system
:=
$(
new_system
)
64
endif
$(
info
Detected
$(system)
($(new_system))...)
$(
call
print,
Detected
$(
system
)
(
$(
new_system
))
...
)
$(new_system)
=
1
endif
...
...
This diff is collapsed.
Click to expand it.
src/Makefile.cfg
+
6
−
4
View file @
3003c252
...
...
@@ -60,12 +60,14 @@ ifeq (,$(filter GCC%,$(.VARIABLES)))
# If this version is not in the list, default to the latest supported
ifeq
(,$(filter $(v),$(SUPPORTED_GCC_VERSIONS)))
$(info\
Your
compiler
version,
GCC
$(version),
is
not
supported
by
the
Makefile.\
The
Makefile
will
assume
GCC
$(LATEST_GCC_VERSION).)
define
line =
Your
compiler
version,
GCC
$(version),
is
not
supported
by
the
Makefile.
The
Makefile
will
assume
GCC
$(LATEST_GCC_VERSION).))
endef
$(
call
print,
$(
line
))
GCC
$(
subst
.,,
$(
LATEST_GCC_VERSION
))
=1
else
$(
info
Detected
GCC
$(version)
(GCC$(v)))
$(
call
print,
Detected GCC
$(
version
)
(
GCC
$(
v
)))
GCC$(v)
=
1
endif
endif
...
...
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