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
ec8b63d6
Commit
ec8b63d6
authored
3 years ago
by
James R.
Browse files
Options
Downloads
Patches
Plain Diff
Makefile: remove last of unused flags
parent
f9813844
No related branches found
Branches containing commit
No related tags found
Tags containing commit
1 merge request
!1497
Makefile rewrite + source code file list parity with CMake
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
src/Makefile.d/nix.mk
+1
-1
1 addition, 1 deletion
src/Makefile.d/nix.mk
src/Makefile.d/platform.mk
+2
-2
2 additions, 2 deletions
src/Makefile.d/platform.mk
src/Makefile.d/sdl.mk
+2
-21
2 additions, 21 deletions
src/Makefile.d/sdl.mk
with
5 additions
and
24 deletions
src/Makefile.d/nix.mk
+
1
−
1
View file @
ec8b63d6
...
...
@@ -30,7 +30,7 @@ opts+=-I/usr/X11R6/include -DLINUX -DFREEBSD
libs
+=
-L
/usr/X11R6/lib
-lipx
-lkvm
endif
# FIXME
# FIXME
: UNTESTED
#ifdef SOLARIS
#NOIPX=1
#NOASM=1
...
...
This diff is collapsed.
Click to expand it.
src/Makefile.d/platform.mk
+
2
−
2
View file @
ec8b63d6
...
...
@@ -33,10 +33,10 @@ endif
else
ifdef
FREEBSD
UNIX
=
1
platform
=
freebsd
else
ifdef
SOLARIS
# FIXME
else
ifdef
SOLARIS
# FIXME
: UNTESTED
UNIX
=
1
platform
=
solaris
else
ifdef
CYGWIN32
# FIXME
else
ifdef
CYGWIN32
# FIXME
: UNTESTED
nasm_format
=
win32
platform
=
cygwin
else
ifdef
MINGW
...
...
This diff is collapsed.
Click to expand it.
src/Makefile.d/sdl.mk
+
2
−
21
View file @
ec8b63d6
...
...
@@ -13,12 +13,12 @@ makedir:=$(makedir)/SDL
sources
+=
$(
call List,sdl/Sourcefile
)
opts
+=
-DDIRECTFULLSCREEN
-DHAVE_SDL
# FIXME
# FIXME
: UNTESTED
#ifdef PANDORA
#include sdl/SRB2Pandora/Makefile.cfg
#endif #ifdef PANDORA
# FIXME
# FIXME
: UNTESTED
#ifdef CYGWIN32
#include sdl/MakeCYG.cfg
#endif #ifdef CYGWIN32
...
...
@@ -63,25 +63,6 @@ USEASM=1
endif
endif
# FIXME
#ifdef SDL_TTF
# OPTS+=-DHAVE_TTF
# SDL_LDFLAGS+=-lSDL2_ttf -lfreetype -lz
# OBJS+=$(OBJDIR)/i_ttf.o
#endif
# FIXME
#ifdef SDL_IMAGE
# OPTS+=-DHAVE_IMAGE
# SDL_LDFLAGS+=-lSDL2_image
#endif
# FIXME
#ifdef SDL_NET
# OPTS+=-DHAVE_SDLNET
# SDL_LDFLAGS+=-lSDL2_net
#endif
ifdef
MINGW
ifndef
NOSDLMAIN
SDLMAIN
=
1
...
...
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