Makefile: Add source code file extensions to all objects, and strip them back off with $(basename ).

git-svn-id: https://svn.eduke32.com/eduke32@6099 1a8010ca-5511-0410-912e-c29ae57300e0
This commit is contained in:
hendricks266 2017-03-23 20:46:47 +00:00
parent bc5fa3975a
commit 15713808e8

View file

@ -38,104 +38,104 @@ ENGINE_CFLAGS=-I$(ENGINE_SRC)
ENGINE_OBJ=$(obj)/$(ENGINE) ENGINE_OBJ=$(obj)/$(ENGINE)
ENGINE_OBJS = \ ENGINE_OBJS = \
rev \ rev.cpp \
baselayer \ baselayer.cpp \
cache1d \ cache1d.cpp \
common \ common.cpp \
compat \ compat.cpp \
crc32 \ crc32.cpp \
defs \ defs.cpp \
engine \ engine.cpp \
tiles \ tiles.cpp \
clip \ clip.cpp \
2d \ 2d.cpp \
hash \ hash.cpp \
palette \ palette.cpp \
polymost \ polymost.cpp \
texcache \ texcache.cpp \
dxtfilter \ dxtfilter.cpp \
hightile \ hightile.cpp \
textfont \ textfont.cpp \
smalltextfont \ smalltextfont.cpp \
kplib \ kplib.cpp \
lz4 \ lz4.c \
osd \ osd.cpp \
pragmas \ pragmas.cpp \
scriptfile \ scriptfile.cpp \
mmulti_null \ mmulti_null.cpp \
mutex \ mutex.cpp \
xxhash \ xxhash.c \
md4 \ md4.cpp \
colmatch \ colmatch.cpp \
screenshot \ screenshot.cpp \
mhk \ mhk.cpp \
ENGINE_EDITOR_OBJS = \ ENGINE_EDITOR_OBJS = \
build \ build.cpp \
config \ config.cpp \
defs \ defs.cpp \
ifeq (0,$(NOASM)) ifeq (0,$(NOASM))
ENGINE_OBJS+= a ENGINE_OBJS+= a.nasm
else else
ENGINE_OBJS+= a-c ENGINE_OBJS+= a-c.cpp
ifneq (0,$(USE_ASM64)) ifneq (0,$(USE_ASM64))
ENGINE_OBJS+= a64 ENGINE_OBJS+= a64.yasm
endif endif
endif endif
ifeq (1,$(USE_OPENGL)) ifeq (1,$(USE_OPENGL))
ENGINE_OBJS+= glbuild voxmodel mdsprite ENGINE_OBJS+= glbuild.cpp voxmodel.cpp mdsprite.cpp
ifeq (1,$(POLYMER)) ifeq (1,$(POLYMER))
ENGINE_OBJS+= polymer ENGINE_OBJS+= polymer.cpp
endif endif
endif endif
ifneq (0,$(LUNATIC)) ifneq (0,$(LUNATIC))
ENGINE_OBJS+= lunatic ENGINE_OBJS+= lunatic.cpp
endif endif
ifeq ($(PLATFORM),DARWIN) ifeq ($(PLATFORM),DARWIN)
ENGINE_OBJS += osxbits ENGINE_OBJS += osxbits.mm
ifeq ($(STARTUP_WINDOW),1) ifeq ($(STARTUP_WINDOW),1)
ENGINE_EDITOR_OBJS += startosx.editor ENGINE_EDITOR_OBJS += startosx.editor.mm
endif endif
ifeq ($(SDL_TARGET),1) ifeq ($(SDL_TARGET),1)
ifneq ($(SDL_FRAMEWORK),0) ifneq ($(SDL_FRAMEWORK),0)
ENGINE_OBJS+=SDLMain ENGINE_OBJS+=SDLMain.mm
endif endif
endif endif
endif endif
ifeq ($(PLATFORM),WINDOWS) ifeq ($(PLATFORM),WINDOWS)
ENGINE_OBJS+= winbits ENGINE_OBJS+= winbits.cpp
ifeq ($(STARTUP_WINDOW),1) ifeq ($(STARTUP_WINDOW),1)
ENGINE_EDITOR_OBJS+= startwin.editor ENGINE_EDITOR_OBJS+= startwin.editor.cpp
endif endif
endif endif
ifeq ($(PLATFORM),WII) ifeq ($(PLATFORM),WII)
ENGINE_OBJS+= wiibits ENGINE_OBJS+= wiibits.cpp
LINKERFLAGS+= -Wl,-wrap,c_default_exceptionhandler LINKERFLAGS+= -Wl,-wrap,c_default_exceptionhandler
endif endif
ifeq ($(RENDERTYPE),SDL) ifeq ($(RENDERTYPE),SDL)
ENGINE_OBJS+= sdlayer ENGINE_OBJS+= sdlayer.cpp
ifeq (1,$(HAVE_GTK2)) ifeq (1,$(HAVE_GTK2))
ENGINE_OBJS+= gtkbits ENGINE_OBJS+= gtkbits.cpp
ifeq ($(LINKED_GTK),0) ifeq ($(LINKED_GTK),0)
ENGINE_OBJS+= dynamicgtk ENGINE_OBJS+= dynamicgtk.cpp
endif endif
ifeq ($(STARTUP_WINDOW),1) ifeq ($(STARTUP_WINDOW),1)
ENGINE_EDITOR_OBJS+= startgtk.editor ENGINE_EDITOR_OBJS+= startgtk.editor.cpp
endif endif
endif endif
endif endif
ifeq ($(RENDERTYPE),WIN) ifeq ($(RENDERTYPE),WIN)
ENGINE_OBJS+= winlayer rawinput ENGINE_OBJS+= winlayer.cpp rawinput.cpp
endif endif
ifneq ($(USE_LIBVPX),0) ifneq ($(USE_LIBVPX),0)
ENGINE_OBJS+= animvpx ENGINE_OBJS+= animvpx.cpp
endif endif
ENGINE_OBJS_EXP:=$(addprefix $(ENGINE_OBJ)/,$(addsuffix .$o,$(ENGINE_OBJS))) ENGINE_OBJS_EXP:=$(addprefix $(ENGINE_OBJ)/,$(addsuffix .$o,$(basename $(ENGINE_OBJS))))
ENGINE_EDITOR_OBJS_EXP:=$(addprefix $(ENGINE_OBJ)/,$(addsuffix .$o,$(ENGINE_EDITOR_OBJS))) ENGINE_EDITOR_OBJS_EXP:=$(addprefix $(ENGINE_OBJ)/,$(addsuffix .$o,$(basename $(ENGINE_EDITOR_OBJS))))
# MACT # MACT
@ -148,14 +148,14 @@ MACT_INC=$(MACT_ROOT)/include
MACT_OBJ=$(obj)/$(MACT) MACT_OBJ=$(obj)/$(MACT)
MACT_OBJS = \ MACT_OBJS = \
file_lib \ file_lib.cpp \
control \ control.cpp \
keyboard \ keyboard.cpp \
joystick \ joystick.cpp \
scriplib \ scriplib.cpp \
animlib \ animlib.cpp \
MACT_OBJS_EXP:=$(addprefix $(MACT_OBJ)/,$(addsuffix .$o,$(MACT_OBJS))) MACT_OBJS_EXP:=$(addprefix $(MACT_OBJ)/,$(addsuffix .$o,$(basename $(MACT_OBJS))))
# AudioLib # AudioLib
@ -163,18 +163,18 @@ MACT_OBJS_EXP:=$(addprefix $(MACT_OBJ)/,$(addsuffix .$o,$(MACT_OBJS)))
AUDIOLIB=audiolib AUDIOLIB=audiolib
AUDIOLIB_OBJS = \ AUDIOLIB_OBJS = \
drivers \ drivers.cpp \
fx_man \ fx_man.cpp \
multivoc \ multivoc.cpp \
mix \ mix.cpp \
mixst \ mixst.cpp \
pitch \ pitch.cpp \
formats \ formats.cpp \
vorbis \ vorbis.cpp \
flac \ flac.cpp \
xa \ xa.cpp \
xmp \ xmp.cpp \
driver_nosound \ driver_nosound.cpp \
AUDIOLIB_ROOT=$(source)/$(AUDIOLIB) AUDIOLIB_ROOT=$(source)/$(AUDIOLIB)
AUDIOLIB_SRC=$(AUDIOLIB_ROOT)/src AUDIOLIB_SRC=$(AUDIOLIB_ROOT)/src
@ -183,7 +183,7 @@ AUDIOLIB_OBJ=$(obj)/$(AUDIOLIB)
ifeq ($(PLATFORM),WINDOWS) ifeq ($(PLATFORM),WINDOWS)
ifeq ($(MIXERTYPE),WIN) ifeq ($(MIXERTYPE),WIN)
AUDIOLIB_OBJS+= driver_directsound AUDIOLIB_OBJS+= driver_directsound.cpp
endif endif
endif endif
@ -195,10 +195,10 @@ ifeq ($(MIXERTYPE),SDL)
endif endif
endif endif
endif endif
AUDIOLIB_OBJS+= driver_sdl AUDIOLIB_OBJS+= driver_sdl.cpp
endif endif
AUDIOLIB_OBJS_EXP:=$(addprefix $(AUDIOLIB_OBJ)/,$(addsuffix .$o,$(AUDIOLIB_OBJS))) AUDIOLIB_OBJS_EXP:=$(addprefix $(AUDIOLIB_OBJ)/,$(addsuffix .$o,$(basename $(AUDIOLIB_OBJS))))
# ENet # ENet
@ -206,13 +206,13 @@ AUDIOLIB_OBJS_EXP:=$(addprefix $(AUDIOLIB_OBJ)/,$(addsuffix .$o,$(AUDIOLIB_OBJS)
ENET=enet ENET=enet
ENET_OBJS = \ ENET_OBJS = \
callbacks \ callbacks.c \
host \ host.c \
list \ list.c \
packet \ packet.c \
peer \ peer.c \
protocol \ protocol.c \
compress \ compress.c \
ENET_ROOT=$(source)/$(ENET) ENET_ROOT=$(source)/$(ENET)
ENET_SRC=$(ENET_ROOT)/src ENET_SRC=$(ENET_ROOT)/src
@ -222,13 +222,13 @@ ENET_OBJ=$(obj)/$(ENET)
ENET_CFLAGS= ENET_CFLAGS=
ifeq ($(PLATFORM),WINDOWS) ifeq ($(PLATFORM),WINDOWS)
ENET_OBJS += win32 ENET_OBJS += win32.c
else else
ENET_OBJS += unix ENET_OBJS += unix.c
ENET_CFLAGS += -DHAS_SOCKLEN_T ENET_CFLAGS += -DHAS_SOCKLEN_T
endif endif
ENET_OBJS_EXP:=$(addprefix $(ENET_OBJ)/,$(addsuffix .$o,$(ENET_OBJS))) ENET_OBJS_EXP:=$(addprefix $(ENET_OBJ)/,$(addsuffix .$o,$(basename $(ENET_OBJS))))
ifeq ($(NETCODE),0) ifeq ($(NETCODE),0)
ENET_TARGET= ENET_TARGET=
@ -242,15 +242,15 @@ endif
TOOLS=tools TOOLS=tools
TOOLS_OBJS = \ TOOLS_OBJS = \
compat_tools \ compat_tools.cpp \
ENGINE_TOOLS_OBJS = \ ENGINE_TOOLS_OBJS = \
compat \ compat.cpp \
pragmas \ pragmas.cpp \
kplib \ kplib.cpp \
cache1d \ cache1d.cpp \
crc32 \ crc32.cpp \
colmatch \ colmatch.cpp \
TOOLS_ROOT=$(source)/$(TOOLS) TOOLS_ROOT=$(source)/$(TOOLS)
TOOLS_SRC=$(TOOLS_ROOT)/src TOOLS_SRC=$(TOOLS_ROOT)/src
@ -284,10 +284,10 @@ ifeq ($(RENDERTYPE),SDL)
endif endif
ifeq ($(PLATFORM),DARWIN) ifeq ($(PLATFORM),DARWIN)
TOOLS_OBJS += osxbits TOOLS_OBJS += osxbits.mm
endif endif
TOOLS_OBJS_EXP:=$(addprefix $(TOOLS_OBJ)/,$(addsuffix .$o,$(TOOLS_OBJS))) $(addprefix $(ENGINE_OBJ)/,$(addsuffix .$o,$(ENGINE_TOOLS_OBJS))) TOOLS_OBJS_EXP:=$(addprefix $(TOOLS_OBJ)/,$(addsuffix .$o,$(basename $(TOOLS_OBJS)))) $(addprefix $(ENGINE_OBJ)/,$(addsuffix .$o,$(basename $(ENGINE_TOOLS_OBJS))))
# KenBuild (Test Game) # KenBuild (Test Game)
@ -309,37 +309,37 @@ KENBUILD_GAME_PROPER ?= EKenBuild
KENBUILD_EDITOR_PROPER ?= EKenBuild Editor KENBUILD_EDITOR_PROPER ?= EKenBuild Editor
KENBUILD_GAME_OBJS = \ KENBUILD_GAME_OBJS = \
game \ game.cpp \
sound_stub \ sound_stub.cpp \
common \ common.cpp \
config \ config.cpp \
KENBUILD_EDITOR_OBJS = \ KENBUILD_EDITOR_OBJS = \
bstub \ bstub.cpp \
common \ common.cpp \
ifeq ($(RENDERTYPE),SDL) ifeq ($(RENDERTYPE),SDL)
ifeq (1,$(HAVE_GTK2)) ifeq (1,$(HAVE_GTK2))
KENBUILD_GAME_OBJS+= game_banner startgtk.game KENBUILD_GAME_OBJS+= game_banner.c startgtk.game.cpp
KENBUILD_EDITOR_OBJS+= build_banner KENBUILD_EDITOR_OBJS+= build_banner.c
endif endif
KENBUILD_GAME_OBJS+= game_icon KENBUILD_GAME_OBJS+= game_icon.c
KENBUILD_EDITOR_OBJS+= build_icon KENBUILD_EDITOR_OBJS+= build_icon.c
endif endif
ifeq ($(PLATFORM),WINDOWS) ifeq ($(PLATFORM),WINDOWS)
KENBUILD_GAME_OBJS+= gameres startwin.game KENBUILD_GAME_OBJS+= gameres.rc startwin.game.cpp
KENBUILD_EDITOR_OBJS+= buildres KENBUILD_EDITOR_OBJS+= buildres.rc
endif endif
ifeq ($(PLATFORM),DARWIN) ifeq ($(PLATFORM),DARWIN)
ifeq ($(STARTUP_WINDOW),1) ifeq ($(STARTUP_WINDOW),1)
KENBUILD_GAME_OBJS += StartupWinController.game KENBUILD_GAME_OBJS += StartupWinController.game.mm
endif endif
endif endif
KENBUILD_GAME_OBJS_EXP:=$(addprefix $(KENBUILD_OBJ)/,$(addsuffix .$o,$(KENBUILD_GAME_OBJS))) KENBUILD_GAME_OBJS_EXP:=$(addprefix $(KENBUILD_OBJ)/,$(addsuffix .$o,$(basename $(KENBUILD_GAME_OBJS))))
KENBUILD_EDITOR_OBJS_EXP:=$(addprefix $(KENBUILD_OBJ)/,$(addsuffix .$o,$(KENBUILD_EDITOR_OBJS))) KENBUILD_EDITOR_OBJS_EXP:=$(addprefix $(KENBUILD_OBJ)/,$(addsuffix .$o,$(basename $(KENBUILD_EDITOR_OBJS))))
# Duke Nukem 3D # Duke Nukem 3D
@ -364,48 +364,48 @@ DUKE3D_GAME_PROPER ?= EDuke32
DUKE3D_EDITOR_PROPER ?= Mapster32 DUKE3D_EDITOR_PROPER ?= Mapster32
COMMON_EDITOR_OBJS = \ COMMON_EDITOR_OBJS = \
m32common \ m32common.cpp \
m32def \ m32def.cpp \
m32exec \ m32exec.cpp \
m32vars \ m32vars.cpp \
DUKE3D_GAME_OBJS = \ DUKE3D_GAME_OBJS = \
game \ game.cpp \
global \ global.cpp \
actors \ actors.cpp \
gamedef \ gamedef.cpp \
gameexec \ gameexec.cpp \
gamevars \ gamevars.cpp \
player \ player.cpp \
premap \ premap.cpp \
sector \ sector.cpp \
anim \ anim.cpp \
animsounds \ animsounds.cpp \
common \ common.cpp \
config \ config.cpp \
demo \ demo.cpp \
input \ input.cpp \
menus \ menus.cpp \
namesdyn \ namesdyn.cpp \
net \ net.cpp \
savegame \ savegame.cpp \
rts \ rts.cpp \
osdfuncs \ osdfuncs.cpp \
osdcmds \ osdcmds.cpp \
grpscan \ grpscan.cpp \
sounds \ sounds.cpp \
soundsdyn \ soundsdyn.cpp \
cheats \ cheats.cpp \
sbar \ sbar.cpp \
screentext \ screentext.cpp \
screens \ screens.cpp \
cmdline \ cmdline.cpp \
DUKE3D_EDITOR_OBJS = \ DUKE3D_EDITOR_OBJS = \
astub \ astub.cpp \
common \ common.cpp \
grpscan \ grpscan.cpp \
sounds_mapster32 \ sounds_mapster32.cpp \
DUKE3D_GAME_MISCDEPS= DUKE3D_GAME_MISCDEPS=
DUKE3D_EDITOR_MISCDEPS= DUKE3D_EDITOR_MISCDEPS=
@ -415,36 +415,36 @@ LUNATIC_LUA_PREFIX = luaJIT_BC_
ifneq (0,$(LUNATIC)) ifneq (0,$(LUNATIC))
# Lunatic object base names. These are not used in targets directly. # Lunatic object base names. These are not used in targets directly.
LUNATIC_LUA_OBJS = \ LUNATIC_LUA_OBJS = \
defs_common \ defs_common.lua \
engine_maptext \ engine_maptext.lua \
engine \ engine.lua \
bcarray \ bcarray.lua \
bcheck \ bcheck.lua \
bitar \ bitar.lua \
xmath \ xmath.lua \
v \ v.lua \
dump \ dump.lua \
dis_x86 \ dis_x86.lua \
dis_x64 \ dis_x64.lua \
LUNATIC_GAME_LUA_OBJS = \ LUNATIC_GAME_LUA_OBJS = \
_defs_game \ _defs_game.lua \
con_lang \ con_lang.lua \
lunacon \ lunacon.lua \
randgen \ randgen.lua \
stat \ stat.lua \
control \ control.lua \
savegame \ savegame.lua \
fs \ fs.lua \
LUNATIC_EDITOR_LUA_OBJS = \ LUNATIC_EDITOR_LUA_OBJS = \
_defs_editor \ _defs_editor.lua \
LUNATIC_GAME_OBJS = \ LUNATIC_GAME_OBJS = \
lunatic_game \ lunatic_game.cpp \
LUNATIC_EDITOR_OBJS = \ LUNATIC_EDITOR_OBJS = \
lunatic_editor \ lunatic_editor.cpp \
# TODO: remove debugging modules from release build # TODO: remove debugging modules from release build
@ -513,7 +513,7 @@ ifeq ($(PLATFORM),DARWIN)
endif endif
ifeq ($(STARTUP_WINDOW),1) ifeq ($(STARTUP_WINDOW),1)
DUKE3D_GAME_OBJS += GrpFile.game GameListSource.game startosx.game DUKE3D_GAME_OBJS += GrpFile.game.mm GameListSource.game.mm startosx.game.mm
endif endif
endif endif
@ -522,14 +522,14 @@ ifeq ($(PLATFORM),WINDOWS)
LIBS += -lxmp-lite LIBS += -lxmp-lite
endif endif
LIBS += -lFLAC -lvorbisfile -lvorbis -logg LIBS += -lFLAC -lvorbisfile -lvorbis -logg
DUKE3D_GAME_OBJS+= gameres winbits DUKE3D_GAME_OBJS+= gameres.rc winbits.cpp
DUKE3D_EDITOR_OBJS+= buildres DUKE3D_EDITOR_OBJS+= buildres.rc
ifeq ($(STARTUP_WINDOW),1) ifeq ($(STARTUP_WINDOW),1)
DUKE3D_GAME_OBJS+= startwin.game DUKE3D_GAME_OBJS+= startwin.game.cpp
endif endif
ifeq ($(MIXERTYPE),WIN) ifeq ($(MIXERTYPE),WIN)
LIBS+= -ldsound LIBS+= -ldsound
MIDI_OBJS=music midi mpu401 MIDI_OBJS=music.cpp midi.cpp mpu401.cpp
endif endif
endif endif
@ -539,29 +539,29 @@ endif
ifeq ($(RENDERTYPE),SDL) ifeq ($(RENDERTYPE),SDL)
ifeq (11,$(HAVE_GTK2)$(STARTUP_WINDOW)) ifeq (11,$(HAVE_GTK2)$(STARTUP_WINDOW))
DUKE3D_GAME_OBJS+= game_banner startgtk.game DUKE3D_GAME_OBJS+= game_banner.c startgtk.game.cpp
DUKE3D_EDITOR_OBJS+= build_banner DUKE3D_EDITOR_OBJS+= build_banner.c
endif endif
DUKE3D_GAME_OBJS+= game_icon DUKE3D_GAME_OBJS+= game_icon.c
DUKE3D_EDITOR_OBJS+= build_icon DUKE3D_EDITOR_OBJS+= build_icon.c
endif endif
ifeq ($(MIXERTYPE),SDL) ifeq ($(MIXERTYPE),SDL)
MIDI_OBJS=sdlmusic MIDI_OBJS=sdlmusic.cpp
endif endif
## Construct file names of object files ## Construct file names of object files
COMMON_EDITOR_OBJS_EXP:=$(addprefix $(DUKE3D_OBJ)/,$(addsuffix .$o,$(COMMON_EDITOR_OBJS))) $(ENGINE_EDITOR_OBJS_EXP) COMMON_EDITOR_OBJS_EXP:=$(addprefix $(DUKE3D_OBJ)/,$(addsuffix .$o,$(basename $(COMMON_EDITOR_OBJS)))) $(ENGINE_EDITOR_OBJS_EXP)
MIDI_OBJS_EXP:=$(addprefix $(DUKE3D_OBJ)/,$(addsuffix .$o,$(MIDI_OBJS))) MIDI_OBJS_EXP:=$(addprefix $(DUKE3D_OBJ)/,$(addsuffix .$o,$(basename $(MIDI_OBJS))))
DUKE3D_GAME_OBJS_EXP:=$(addprefix $(DUKE3D_OBJ)/,$(addsuffix .$o,$(DUKE3D_GAME_OBJS))) $(MIDI_OBJS_EXP) $(AUDIOLIB_OBJS_EXP) $(MACT_OBJS_EXP) $(ENET_TARGET) DUKE3D_GAME_OBJS_EXP:=$(addprefix $(DUKE3D_OBJ)/,$(addsuffix .$o,$(basename $(DUKE3D_GAME_OBJS)))) $(MIDI_OBJS_EXP) $(AUDIOLIB_OBJS_EXP) $(MACT_OBJS_EXP) $(ENET_TARGET)
DUKE3D_EDITOR_OBJS_EXP:=$(addprefix $(DUKE3D_OBJ)/,$(addsuffix .$o,$(DUKE3D_EDITOR_OBJS))) $(AUDIOLIB_OBJS_EXP) DUKE3D_EDITOR_OBJS_EXP:=$(addprefix $(DUKE3D_OBJ)/,$(addsuffix .$o,$(basename $(DUKE3D_EDITOR_OBJS)))) $(AUDIOLIB_OBJS_EXP)
ifneq (0,$(LUNATIC)) ifneq (0,$(LUNATIC))
DUKE3D_GAME_OBJS_EXP+= $(addprefix $(DUKE3D_OBJ)/,$(addsuffix .$o,$(LUNATIC_GAME_OBJS) $(addprefix $(LUNATIC_LUA_PREFIX),$(LUNATIC_LUA_OBJS) $(LUNATIC_GAME_LUA_OBJS)))) DUKE3D_GAME_OBJS_EXP+= $(addprefix $(DUKE3D_OBJ)/,$(addsuffix .$o,$(basename $(LUNATIC_GAME_OBJS) $(addprefix $(LUNATIC_LUA_PREFIX),$(LUNATIC_LUA_OBJS) $(LUNATIC_GAME_LUA_OBJS)))))
DUKE3D_EDITOR_OBJS_EXP+= $(addprefix $(DUKE3D_OBJ)/,$(addsuffix .$o,$(LUNATIC_EDITOR_OBJS) $(addprefix $(LUNATIC_LUA_PREFIX),$(LUNATIC_LUA_OBJS) $(LUNATIC_EDITOR_LUA_OBJS)))) DUKE3D_EDITOR_OBJS_EXP+= $(addprefix $(DUKE3D_OBJ)/,$(addsuffix .$o,$(basename $(LUNATIC_EDITOR_OBJS) $(addprefix $(LUNATIC_LUA_PREFIX),$(LUNATIC_LUA_OBJS) $(LUNATIC_EDITOR_LUA_OBJS)))))
endif endif
# Shadow Warrior # Shadow Warrior
@ -583,103 +583,103 @@ SW_GAME_PROPER ?= VoidSW
SW_EDITOR_PROPER ?= VoidSW Editor SW_EDITOR_PROPER ?= VoidSW Editor
SW_GAME_OBJS = \ SW_GAME_OBJS = \
actor \ actor.cpp \
ai \ ai.cpp \
anim \ anim.cpp \
border \ border.cpp \
break \ break.cpp \
bunny \ bunny.cpp \
cache \ cache.cpp \
cheats \ cheats.cpp \
colormap \ colormap.cpp \
common \ common.cpp \
config \ config.cpp \
console \ console.cpp \
coolg \ coolg.cpp \
coolie \ coolie.cpp \
copysect \ copysect.cpp \
demo \ demo.cpp \
draw \ draw.cpp \
eel \ eel.cpp \
game \ game.cpp \
girlninj \ girlninj.cpp \
goro \ goro.cpp \
grpscan \ grpscan.cpp \
hornet \ hornet.cpp \
interp \ interp.cpp \
interpsh \ interpsh.cpp \
inv \ inv.cpp \
jplayer \ jplayer.cpp \
jsector \ jsector.cpp \
jweapon \ jweapon.cpp \
lava \ lava.cpp \
light \ light.cpp \
mclip \ mclip.cpp \
mdastr \ mdastr.cpp \
menus \ menus.cpp \
miscactr \ miscactr.cpp \
morph \ morph.cpp \
net \ net.cpp \
ninja \ ninja.cpp \
panel \ panel.cpp \
player \ player.cpp \
predict \ predict.cpp \
quake \ quake.cpp \
ripper \ ripper.cpp \
ripper2 \ ripper2.cpp \
rooms \ rooms.cpp \
rotator \ rotator.cpp \
rts \ rts.cpp \
save \ save.cpp \
scrip2 \ scrip2.cpp \
sector \ sector.cpp \
serp \ serp.cpp \
setup \ setup.cpp \
skel \ skel.cpp \
skull \ skull.cpp \
slidor \ slidor.cpp \
sounds \ sounds.cpp \
spike \ spike.cpp \
sprite \ sprite.cpp \
sumo \ sumo.cpp \
swconfig \ swconfig.cpp \
sync \ sync.cpp \
text \ text.cpp \
track \ track.cpp \
vator \ vator.cpp \
vis \ vis.cpp \
wallmove \ wallmove.cpp \
warp \ warp.cpp \
weapon \ weapon.cpp \
zilla \ zilla.cpp \
zombie \ zombie.cpp \
saveable \ saveable.cpp \
SW_EDITOR_OBJS = \ SW_EDITOR_OBJS = \
jnstub \ jnstub.cpp \
brooms \ brooms.cpp \
bldscript \ bldscript.cpp \
jbhlp \ jbhlp.cpp \
colormap \ colormap.cpp \
grpscan \ grpscan.cpp \
common \ common.cpp \
ifeq ($(RENDERTYPE),SDL) ifeq ($(RENDERTYPE),SDL)
ifeq (1,$(HAVE_GTK2)) ifeq (1,$(HAVE_GTK2))
SW_GAME_OBJS+= game_banner startgtk.game SW_GAME_OBJS+= game_banner.c startgtk.game.cpp
SW_EDITOR_OBJS+= build_banner SW_EDITOR_OBJS+= build_banner.c
endif endif
SW_GAME_OBJS+= game_icon SW_GAME_OBJS+= game_icon.c
SW_EDITOR_OBJS+= game_icon SW_EDITOR_OBJS+= game_icon.c
endif endif
ifeq ($(PLATFORM),WINDOWS) ifeq ($(PLATFORM),WINDOWS)
SW_GAME_OBJS+= gameres startwin.game SW_GAME_OBJS+= gameres.rc startwin.game.cpp
SW_EDITOR_OBJS+= buildres SW_EDITOR_OBJS+= buildres.rc
endif endif
SW_GAME_OBJS_EXP:=$(addprefix $(SW_OBJ)/,$(addsuffix .$o,$(SW_GAME_OBJS))) $(MIDI_OBJS_EXP) $(AUDIOLIB_OBJS_EXP) $(MACT_OBJS_EXP) SW_GAME_OBJS_EXP:=$(addprefix $(SW_OBJ)/,$(addsuffix .$o,$(basename $(SW_GAME_OBJS)))) $(MIDI_OBJS_EXP) $(AUDIOLIB_OBJS_EXP) $(MACT_OBJS_EXP)
SW_EDITOR_OBJS_EXP:=$(addprefix $(SW_OBJ)/,$(addsuffix .$o,$(SW_EDITOR_OBJS))) $(AUDIOLIB_OBJS_EXP) SW_EDITOR_OBJS_EXP:=$(addprefix $(SW_OBJ)/,$(addsuffix .$o,$(basename $(SW_EDITOR_OBJS)))) $(AUDIOLIB_OBJS_EXP)
### component definitions end ### component definitions end