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
Deploy
Releases
Package registry
Model registry
Operate
Terraform modules
Analyze
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Jaden
SRB2
Commits
b2a84a93
Commit
b2a84a93
authored
4 years ago
by
James R.
Browse files
Options
Downloads
Plain Diff
Merge remote-tracking branch 'origin/master' into no-dd-make
parents
79bbb3fe
e17b4d02
Branches
Branches containing commit
Tags
Tags containing commit
No related merge requests found
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
src/Makefile
+29
-0
29 additions, 0 deletions
src/Makefile
with
29 additions
and
0 deletions
src/Makefile
+
29
−
0
View file @
b2a84a93
...
@@ -535,6 +535,15 @@ OBJS:=$(i_main_o) \
...
@@ -535,6 +535,15 @@ OBJS:=$(i_main_o) \
$(
i_sound_o
)
\
$(
i_sound_o
)
\
$(
OBJS
)
$(
OBJS
)
ifndef
ECHO
ifndef
NOECHOFILENAMES
define
echoName =
@echo
--
$<
...
endef
endif
endif
# List of languages to compile.
# List of languages to compile.
# For reference, this is the command I use to build a srb2.pot file from the source code.
# For reference, this is the command I use to build a srb2.pot file from the source code.
# (The listed source files are the ones containing translated strings).
# (The listed source files are the ones containing translated strings).
...
@@ -638,6 +647,7 @@ $(OBJDIR)/r_opengl.o: hardware/r_opengl/r_opengl.c hardware/r_opengl/r_opengl.h
...
@@ -638,6 +647,7 @@ $(OBJDIR)/r_opengl.o: hardware/r_opengl/r_opengl.c hardware/r_opengl/r_opengl.h
hardware/hw_md2load.h hardware/hw_md3load.h hardware/hw_model.h hardware/u_list.h
\
hardware/hw_md2load.h hardware/hw_md3load.h hardware/hw_model.h hardware/u_list.h
\
am_map.h d_event.h d_player.h p_pspr.h m_fixed.h tables.h info.h d_think.h
\
am_map.h d_event.h d_player.h p_pspr.h m_fixed.h tables.h info.h d_think.h
\
p_mobj.h doomdata.h d_ticcmd.h r_defs.h hardware/hw_dll.h
p_mobj.h doomdata.h d_ticcmd.h r_defs.h hardware/hw_dll.h
$(
echoName
)
$(
CC
)
$(
CFLAGS
)
$(
WFLAGS
)
-c
$<
-o
$@
$(
CC
)
$(
CFLAGS
)
$(
WFLAGS
)
-c
$<
-o
$@
else
else
$(OBJDIR)/r_opengl.o
:
hardware/r_opengl/r_opengl.c hardware/r_opengl/r_opengl.h
\
$(OBJDIR)/r_opengl.o
:
hardware/r_opengl/r_opengl.c hardware/r_opengl/r_opengl.h
\
...
@@ -647,6 +657,7 @@ $(OBJDIR)/r_opengl.o: hardware/r_opengl/r_opengl.c hardware/r_opengl/r_opengl.h
...
@@ -647,6 +657,7 @@ $(OBJDIR)/r_opengl.o: hardware/r_opengl/r_opengl.c hardware/r_opengl/r_opengl.h
hardware/hw_md2load.h hardware/hw_md3load.h hardware/hw_model.h hardware/u_list.h
\
hardware/hw_md2load.h hardware/hw_md3load.h hardware/hw_model.h hardware/u_list.h
\
am_map.h d_event.h d_player.h p_pspr.h m_fixed.h tables.h info.h d_think.h
\
am_map.h d_event.h d_player.h p_pspr.h m_fixed.h tables.h info.h d_think.h
\
p_mobj.h doomdata.h d_ticcmd.h r_defs.h hardware/hw_dll.h
p_mobj.h doomdata.h d_ticcmd.h r_defs.h hardware/hw_dll.h
$(
echoName
)
$(
CC
)
$(
CFLAGS
)
$(
WFLAGS
)
-I
/usr/X11R6/include
-c
$<
-o
$@
$(
CC
)
$(
CFLAGS
)
$(
WFLAGS
)
-I
/usr/X11R6/include
-c
$<
-o
$@
endif
endif
endif
endif
...
@@ -673,43 +684,55 @@ endif
...
@@ -673,43 +684,55 @@ endif
ifdef
VALGRIND
ifdef
VALGRIND
$(OBJDIR)/z_zone.o
:
z_zone.c
$(OBJDIR)/z_zone.o
:
z_zone.c
$(
echoName
)
$(
CC
)
$(
CFLAGS
)
$(
WFLAGS
)
-DHAVE_VALGRIND
$(
VALGRIND_CFLAGS
)
-c
$<
-o
$@
$(
CC
)
$(
CFLAGS
)
$(
WFLAGS
)
-DHAVE_VALGRIND
$(
VALGRIND_CFLAGS
)
-c
$<
-o
$@
endif
endif
$(OBJDIR)/comptime.o
:
comptime.c pre-build
$(OBJDIR)/comptime.o
:
comptime.c pre-build
$(
echoName
)
$(
CC
)
$(
CFLAGS
)
$(
WFLAGS
)
-c
$<
-o
$@
$(
CC
)
$(
CFLAGS
)
$(
WFLAGS
)
-c
$<
-o
$@
$(BIN)/%.mo
:
locale/%.po
$(BIN)/%.mo
:
locale/%.po
-$(
MKDIR
)
$(
BIN
)
-$(
MKDIR
)
$(
BIN
)
$(
echoName
)
$(
MSGFMT
)
-f
-o
$@
$<
$(
MSGFMT
)
-f
-o
$@
$<
$(OBJDIR)/%.o
:
%.c
$(OBJDIR)/%.o
:
%.c
$(
echoName
)
$(
CC
)
$(
CFLAGS
)
$(
WFLAGS
)
-c
$<
-o
$@
$(
CC
)
$(
CFLAGS
)
$(
WFLAGS
)
-c
$<
-o
$@
$(OBJDIR)/%.o
:
$(INTERFACE)/%.c
$(OBJDIR)/%.o
:
$(INTERFACE)/%.c
$(
echoName
)
$(
CC
)
$(
CFLAGS
)
$(
WFLAGS
)
-c
$<
-o
$@
$(
CC
)
$(
CFLAGS
)
$(
WFLAGS
)
-c
$<
-o
$@
ifdef
MACOSX
ifdef
MACOSX
$(OBJDIR)/%.o
:
sdl/macosx/%.c
$(OBJDIR)/%.o
:
sdl/macosx/%.c
$(
echoName
)
$(
CC
)
$(
CFLAGS
)
$(
WFLAGS
)
-c
$<
-o
$@
$(
CC
)
$(
CFLAGS
)
$(
WFLAGS
)
-c
$<
-o
$@
endif
endif
$(OBJDIR)/%.o
:
hardware/%.c
$(OBJDIR)/%.o
:
hardware/%.c
$(
echoName
)
$(
CC
)
$(
CFLAGS
)
$(
WFLAGS
)
-c
$<
-o
$@
$(
CC
)
$(
CFLAGS
)
$(
WFLAGS
)
-c
$<
-o
$@
$(OBJDIR)/%.o
:
blua/%.c
$(OBJDIR)/%.o
:
blua/%.c
$(
echoName
)
$(
CC
)
$(
CFLAGS
)
$(
LUA_CFLAGS
)
$(
WFLAGS
)
-c
$<
-o
$@
$(
CC
)
$(
CFLAGS
)
$(
LUA_CFLAGS
)
$(
WFLAGS
)
-c
$<
-o
$@
$(OBJDIR)/%.o
:
%.nas
$(OBJDIR)/%.o
:
%.nas
$(
echoName
)
$(
NASM
)
$(
NASMOPTS
)
-o
$@
-f
$(
NASMFORMAT
)
$<
$(
NASM
)
$(
NASMOPTS
)
-o
$@
-f
$(
NASMFORMAT
)
$<
$(OBJDIR)/vid_copy.o
:
vid_copy.s asm_defs.inc
$(OBJDIR)/vid_copy.o
:
vid_copy.s asm_defs.inc
$(
echoName
)
$(
CC
)
$(
OPTS
)
$(
ASFLAGS
)
-x
assembler-with-cpp
-c
$<
-o
$@
$(
CC
)
$(
OPTS
)
$(
ASFLAGS
)
-x
assembler-with-cpp
-c
$<
-o
$@
$(OBJDIR)/%.o
:
%.s
$(OBJDIR)/%.o
:
%.s
$(
echoName
)
$(
CC
)
$(
OPTS
)
-x
assembler-with-cpp
-c
$<
-o
$@
$(
CC
)
$(
OPTS
)
-x
assembler-with-cpp
-c
$<
-o
$@
$(OBJDIR)/SRB2.res
:
win32/Srb2win.rc win32/afxres.h win32/resource.h
$(OBJDIR)/SRB2.res
:
win32/Srb2win.rc win32/afxres.h win32/resource.h
$(
echoName
)
$(
WINDRES
)
-i
$<
-O
rc
$(
WINDRESFLAGS
)
--include-dir
=
win32
-o
$@
-O
coff
$(
WINDRES
)
-i
$<
-O
rc
$(
WINDRESFLAGS
)
--include-dir
=
win32
-o
$@
-O
coff
...
@@ -717,31 +740,37 @@ ifdef SDL
...
@@ -717,31 +740,37 @@ ifdef SDL
ifdef
MINGW
ifdef
MINGW
$(OBJDIR)/win_dbg.o
:
win32/win_dbg.c
$(OBJDIR)/win_dbg.o
:
win32/win_dbg.c
$(
echoName
)
$(
CC
)
$(
CFLAGS
)
$(
WFLAGS
)
-c
$<
-o
$@
$(
CC
)
$(
CFLAGS
)
$(
WFLAGS
)
-c
$<
-o
$@
endif
endif
ifdef
STATICHS
ifdef
STATICHS
$(OBJDIR)/s_openal.o
:
hardware/s_openal/s_openal.c hardware/hw3dsdrv.h
\
$(OBJDIR)/s_openal.o
:
hardware/s_openal/s_openal.c hardware/hw3dsdrv.h
\
hardware/hw_dll.h
hardware/hw_dll.h
$(
echoName
)
$(
CC
)
$(
CFLAGS
)
$(
WFLAGS
)
-c
$<
-o
$@
$(
CC
)
$(
CFLAGS
)
$(
WFLAGS
)
-c
$<
-o
$@
$(OBJDIR)/s_fmod.o
:
hardware/s_fmod/s_fmod.c hardware/hw3dsdrv.h
\
$(OBJDIR)/s_fmod.o
:
hardware/s_fmod/s_fmod.c hardware/hw3dsdrv.h
\
hardware/hw_dll.h
hardware/hw_dll.h
$(
echoName
)
$(
CC
)
$(
CFLAGS
)
$(
WFLAGS
)
-c
$<
-o
$@
$(
CC
)
$(
CFLAGS
)
$(
WFLAGS
)
-c
$<
-o
$@
ifdef
MINGW
ifdef
MINGW
$(OBJDIR)/s_ds3d.o
:
hardware/s_ds3d/s_ds3d.c hardware/hw3dsdrv.h
\
$(OBJDIR)/s_ds3d.o
:
hardware/s_ds3d/s_ds3d.c hardware/hw3dsdrv.h
\
hardware/hw_dll.h
hardware/hw_dll.h
$(
echoName
)
$(
CC
)
$(
CFLAGS
)
$(
WFLAGS
)
-c
$<
-o
$@
$(
CC
)
$(
CFLAGS
)
$(
WFLAGS
)
-c
$<
-o
$@
endif
endif
else
else
$(OBJDIR)/s_fmod.o
:
hardware/s_fmod/s_fmod.c hardware/hw3dsdrv.h
\
$(OBJDIR)/s_fmod.o
:
hardware/s_fmod/s_fmod.c hardware/hw3dsdrv.h
\
hardware/hw_dll.h
hardware/hw_dll.h
$(
echoName
)
$(
CC
)
$(
ARCHOPTS
)
-Os
-o
$(
OBJDIR
)
/s_fmod.o
-DHW3SOUND
-DUNIXCOMMON
-shared
-nostartfiles
-c
hardware/s_fmod/s_fmod.c
$(
CC
)
$(
ARCHOPTS
)
-Os
-o
$(
OBJDIR
)
/s_fmod.o
-DHW3SOUND
-DUNIXCOMMON
-shared
-nostartfiles
-c
hardware/s_fmod/s_fmod.c
$(OBJDIR)/s_openal.o
:
hardware/s_openal/s_openal.c hardware/hw3dsdrv.h
\
$(OBJDIR)/s_openal.o
:
hardware/s_openal/s_openal.c hardware/hw3dsdrv.h
\
hardware/hw_dll.h
hardware/hw_dll.h
$(
echoName
)
$(
CC
)
$(
ARCHOPTS
)
-Os
-o
$(
OBJDIR
)
/s_openal.o
-DHW3SOUND
-DUNIXCOMMON
-shared
-nostartfiles
-c
hardware/s_openal/s_openal.c
$(
CC
)
$(
ARCHOPTS
)
-Os
-o
$(
OBJDIR
)
/s_openal.o
-DHW3SOUND
-DUNIXCOMMON
-shared
-nostartfiles
-c
hardware/s_openal/s_openal.c
endif
endif
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