mirror of
https://github.com/RGBCube/serenity
synced 2025-05-31 06:48:12 +00:00
0be4a3b635
Doing this means we no longer need to maintain our own Doom fork and we get the newest features of the upstream repository, such as sound effects and music.
43 lines
2 KiB
Diff
43 lines
2 KiB
Diff
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
From: Tim Ledbetter <timledbetter@gmail.com>
|
|
Date: Sat, 5 Aug 2023 09:57:15 +0100
|
|
Subject: [PATCH] Update the makefile for serenity
|
|
|
|
---
|
|
doomgeneric/Makefile.sdl | 11 +++++++----
|
|
1 file changed, 7 insertions(+), 4 deletions(-)
|
|
|
|
diff --git a/doomgeneric/Makefile.sdl b/doomgeneric/Makefile.sdl
|
|
index 38402da57ac889901b7080341a842a2acbdfe90b..742354b198afdfb9be22d1c4569ce57c86a11c46 100644
|
|
--- a/doomgeneric/Makefile.sdl
|
|
+++ b/doomgeneric/Makefile.sdl
|
|
@@ -12,18 +12,18 @@ else
|
|
endif
|
|
|
|
|
|
-SDL_CFLAGS = `sdl2-config --cflags`
|
|
-SDL_LIBS = `sdl2-config --cflags --libs` -lSDL2_mixer
|
|
+SDL_CFLAGS = -I$(SERENITY_INSTALL_ROOT)/usr/local/include/SDL2 -D_REENTRANT
|
|
+SDL_LIBS = -L$(SERENITY_INSTALL_ROOT)/usr/local/lib -lSDL2 -lSDL2_mixer
|
|
|
|
|
|
-CC=clang # gcc or g++
|
|
+CC?=x86_64-pc-serenity-gcc
|
|
CFLAGS+=-DFEATURE_SOUND $(SDL_CFLAGS)
|
|
LDFLAGS+=
|
|
LIBS+=-lm -lc $(SDL_LIBS)
|
|
|
|
# subdirectory for objects
|
|
OBJDIR=build
|
|
-OUTPUT=doomgeneric
|
|
+OUTPUT=doom
|
|
|
|
SRC_DOOM = dummy.o am_map.o doomdef.o doomstat.o dstrings.o d_event.o d_items.o d_iwad.o d_loop.o d_main.o d_mode.o d_net.o f_finale.o f_wipe.o g_game.o hu_lib.o hu_stuff.o info.o i_cdmus.o i_endoom.o i_joystick.o i_scale.o i_sound.o i_system.o i_timer.o memio.o m_argv.o m_bbox.o m_cheat.o m_config.o m_controls.o m_fixed.o m_menu.o m_misc.o m_random.o p_ceilng.o p_doors.o p_enemy.o p_floor.o p_inter.o p_lights.o p_map.o p_maputl.o p_mobj.o p_plats.o p_pspr.o p_saveg.o p_setup.o p_sight.o p_spec.o p_switch.o p_telept.o p_tick.o p_user.o r_bsp.o r_data.o r_draw.o r_main.o r_plane.o r_segs.o r_sky.o r_things.o sha1.o sounds.o statdump.o st_lib.o st_stuff.o s_sound.o tables.o v_video.o wi_stuff.o w_checksum.o w_file.o w_main.o w_wad.o z_zone.o w_file_stdc.o i_input.o i_video.o doomgeneric.o doomgeneric_sdl.o mus2mid.o i_sdlmusic.o i_sdlsound.o
|
|
OBJS += $(addprefix $(OBJDIR)/, $(SRC_DOOM))
|
|
@@ -53,3 +53,6 @@ $(OBJDIR)/%.o: %.c
|
|
print:
|
|
@echo OBJS: $(OBJS)
|
|
|
|
+install:
|
|
+ mkdir -p $(DESTDIR)/usr/local/bin
|
|
+ cp $(OUTPUT) $(DESTDIR)/usr/local/bin
|