GNU makefile

# Conflicts:
#	GNUmakefile

GNUmakefile

@@ -725,6 +725,270 @@ ifeq ($(MIXERTYPE),SDL)
 endif
 
 
+#### Blood
+
+blood := blood
+
+blood_game_ldflags :=
+
+blood_game_stripflags :=
+
+blood_root := $(source)/$(blood)
+blood_src := $(blood_root)/src
+blood_rsrc := $(blood_root)/rsrc
+blood_obj := $(obj)/$(blood)
+
+blood_cflags := -I$(blood_src)
+
+blood_game_deps := blood_common_midi audiolib mact libsmackerdec
+
+ifneq (0,$(NETCODE))
+    blood_game_deps += enet
+endif
+
+blood_game := nblood
+
+ifneq (,$(APPBASENAME))
+    blood_game := $(APPBASENAME)
+endif
+
+blood_game_proper := NBlood
+
+blood_game_objs := \
+	blood.cpp \
+	actor.cpp \
+	ai.cpp \
+	aibat.cpp \
+	aibeast.cpp \
+	aiboneel.cpp \
+	aiburn.cpp \
+	aicaleb.cpp \
+	aicerber.cpp \
+	aicult.cpp \
+	aigarg.cpp \
+	aighost.cpp \
+	aigilbst.cpp \
+	aihand.cpp \
+	aihound.cpp \
+	aiinnoc.cpp \
+	aipod.cpp \
+	airat.cpp \
+	aispid.cpp \
+	aitchern.cpp \
+	aiunicult.cpp \
+	aizomba.cpp \
+	aizombf.cpp \
+	asound.cpp \
+	callback.cpp \
+	choke.cpp \
+	common.cpp \
+	config.cpp \
+	controls.cpp \
+	credits.cpp \
+	db.cpp \
+	demo.cpp \
+	dude.cpp \
+	endgame.cpp \
+	eventq.cpp \
+	fire.cpp \
+	fx.cpp \
+	gamemenu.cpp \
+	gameutil.cpp \
+	getopt.cpp \
+	gib.cpp \
+	globals.cpp \
+	inifile.cpp \
+	iob.cpp \
+	levels.cpp \
+	loadsave.cpp \
+	map2d.cpp \
+	menu.cpp \
+	messages.cpp \
+	mirrors.cpp \
+	misc.cpp \
+	network.cpp \
+	osdcmd.cpp \
+	player.cpp \
+	pqueue.cpp \
+	qav.cpp \
+	qheap.cpp \
+	replace.cpp \
+	resource.cpp \
+	screen.cpp \
+	sectorfx.cpp \
+	seq.cpp \
+	sfx.cpp \
+	sound.cpp \
+	tile.cpp \
+	trig.cpp \
+	triggers.cpp \
+	view.cpp \
+	warp.cpp \
+	weapon.cpp \
+
+blood_game_rsrc_objs :=
+blood_game_gen_objs :=
+
+blood_game_miscdeps :=
+blood_game_orderonlydeps :=
+
+ifeq ($(PLATFORM),DARWIN)
+    ifeq ($(STARTUP_WINDOW),1)
+        blood_game_objs += startosx.game.mm
+    endif
+endif
+
+ifeq ($(PLATFORM),WINDOWS)
+    blood_game_objs += winbits.cpp
+    blood_game_rsrc_objs += gameres.rc
+    ifeq ($(STARTUP_WINDOW),1)
+        blood_game_objs += startwin.game.cpp
+    endif
+    ifeq ($(MIXERTYPE),WIN)
+        blood_common_midi_objs := music.cpp midi.cpp mpu401.cpp al_midi.cpp gmtimbre.cpp opl3.cpp
+    endif
+endif
+
+ifeq (11,$(HAVE_GTK2)$(STARTUP_WINDOW))
+    blood_game_objs += startgtk.game.cpp
+    blood_game_gen_objs += game_banner.c
+endif
+ifeq ($(RENDERTYPE),SDL)
+    blood_game_rsrc_objs += game_icon.c
+endif
+ifeq ($(MIXERTYPE),SDL)
+    blood_common_midi_objs := sdlmusic.cpp oplmidi.cpp al_midi.cpp gmtimbre.cpp opl3.cpp
+endif
+
+#### Redneck Rampage
+
+rr := rr
+
+rr_game_ldflags :=
+rr_editor_ldflags :=
+
+rr_game_stripflags :=
+rr_editor_stripflags :=
+
+rr_root := $(source)/$(rr)
+rr_src := $(rr_root)/src
+rr_rsrc := $(rr_root)/rsrc
+rr_obj := $(obj)/$(rr)
+
+rr_cflags := -I$(rr_src)
+
+common_editor_deps := rr_common_editor engine_editor
+
+rr_game_deps := rr_common_midi audiolib mact
+rr_editor_deps := audiolib
+
+ifneq (0,$(NETCODE))
+    rr_game_deps += enet
+endif
+
+ifneq (0,$(LUNATIC))
+    rr_game_deps += lunatic lunatic_game lpeg
+    rr_editor_deps += lunatic lunatic_editor lpeg
+endif
+
+rr_game := rednukem
+rr_editor := rrmapster32
+
+ifneq (,$(APPBASENAME))
+    rr_game := $(APPBASENAME)
+endif
+
+rr_game_proper := Rednukem
+rr_editor_proper := RRMapster32
+
+rr_common_editor_objs := \
+    m32common.cpp \
+    m32def.cpp \
+    m32exec.cpp \
+    m32vars.cpp \
+
+rr_game_objs := \
+    game.cpp \
+    global.cpp \
+    actors.cpp \
+    gamedef.cpp \
+    gameexec.cpp \
+    gamevars.cpp \
+    player.cpp \
+    premap.cpp \
+    sector.cpp \
+    anim.cpp \
+    common.cpp \
+    config.cpp \
+    demo.cpp \
+    input.cpp \
+    menus.cpp \
+    namesdyn.cpp \
+    net.cpp \
+    savegame.cpp \
+    rts.cpp \
+    osdfuncs.cpp \
+    osdcmds.cpp \
+    grpscan.cpp \
+    sounds.cpp \
+    soundsdyn.cpp \
+    cheats.cpp \
+    sbar.cpp \
+    screentext.cpp \
+    screens.cpp \
+    cmdline.cpp \
+
+rr_editor_objs := \
+    astub.cpp \
+    common.cpp \
+    grpscan.cpp \
+    sounds_mapster32.cpp \
+
+rr_game_rsrc_objs :=
+rr_editor_rsrc_objs :=
+rr_game_gen_objs :=
+rr_editor_gen_objs :=
+
+rr_game_miscdeps :=
+rr_editor_miscdeps :=
+rr_game_orderonlydeps :=
+rr_editor_orderonlydeps :=
+
+ifeq ($(PLATFORM),DARWIN)
+    ifeq ($(STARTUP_WINDOW),1)
+        rr_game_objs += GrpFile.game.mm GameListSource.game.mm startosx.game.mm
+    endif
+endif
+
+ifeq ($(PLATFORM),WINDOWS)
+    rr_game_objs += winbits.cpp
+    rr_game_rsrc_objs += gameres.rc
+    rr_editor_rsrc_objs += buildres.rc
+    ifeq ($(STARTUP_WINDOW),1)
+        rr_game_objs += startwin.game.cpp
+    endif
+    ifeq ($(MIXERTYPE),WIN)
+        rr_common_midi_objs := music.cpp midi.cpp mpu401.cpp
+    endif
+endif
+
+ifeq ($(PLATFORM),WII)
+    LIBS += -lvorbisidec
+endif
+
+ifeq (11,$(HAVE_GTK2)$(STARTUP_WINDOW))
+    rr_game_objs += startgtk.game.cpp
+    rr_game_gen_objs += game_banner.c
+    rr_editor_gen_objs += build_banner.c
+endif
+ifeq ($(RENDERTYPE),SDL)
+    rr_game_rsrc_objs += game_icon.c
+    rr_editor_rsrc_objs += build_icon.c
+endif
+ifeq ($(MIXERTYPE),SDL)
+    rr_common_midi_objs := sdlmusic.cpp
+endif
+
 #### Shadow Warrior
 
 sw := sw
@@ -861,6 +1125,7 @@ endif
 games := \
     kenbuild \
     duke3d \
+    rr \
     sw \
 
 libraries := \
@@ -952,6 +1217,14 @@ endef
 $(foreach i,$(games),$(foreach j,$(roles),$(eval $(call BUILDRULE,$i,$j))))
 
 
+include $(lpeg_root)/Dependencies.mak
+include $(engine_root)/Dependencies.mak
+include $(duke3d_root)/Dependencies.mak
+include $(blood_root)/Dependencies.mak
+include $(rr_root)/Dependencies.mak
+include $(sw_root)/Dependencies.mak
+
+
 #### Rules
 
 $(ebacktrace_dll): platform/Windows/src/backtrace.c

source/rr/src/game.h

@@ -295,7 +295,6 @@ extern int32_t g_cameraClock;
 extern int32_t g_cameraDistance;
 extern int32_t g_crosshairSum;
 extern int32_t g_doQuickSave;
-extern int32_t g_fakeMultiMode;
 extern int32_t g_levelTextTime;
 extern int32_t g_quitDeadline;
 extern int32_t g_restorePalette;

source/rr/src/gamedef.h

@@ -105,7 +105,6 @@ enum QuickStructureAccess_t
 
 extern int32_t g_structVarIDs;
 
-extern char CheatStrings[][MAXCHEATLEN];
 extern char g_scriptFileName[BMAX_PATH];
 
 extern const uint32_t CheatFunctionFlags[];