zdoom/raze-gles
0
0
Fork 0
mirror of https://github.com/ZDoom/raze-gles.git synced 2024-12-26 03:30:46 +00:00
Code Issues Projects Releases Packages Wiki Activity

Makefile: Clean up Lunatic objects.

Browse source 
git-svn-id: https://svn.eduke32.com/eduke32@6098 1a8010ca-5511-0410-912e-c29ae57300e0
This commit is contained in:
hendricks266 2017-03-23 20:46:44 +00:00
parent f0869a6d0e
commit bc5fa3975a
1 changed files with 39 additions and 31 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

66
GNUmakefile
View file

@ -410,39 +410,44 @@ DUKE3D_EDITOR_OBJS = \
DUKE3D_GAME_MISCDEPS= DUKE3D_GAME_MISCDEPS=
DUKE3D_EDITOR_MISCDEPS= DUKE3D_EDITOR_MISCDEPS=
## Lunatic devel
LUNATIC_LUA_PREFIX = luaJIT_BC_
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_OBJS = \ LUNATIC_LUA_OBJS = \
luaJIT_BC_defs_common \ defs_common \
luaJIT_BC_engine_maptext \ engine_maptext \
luaJIT_BC_engine \ engine \
luaJIT_BC_bcarray \ bcarray \
luaJIT_BC_bcheck \ bcheck \
luaJIT_BC_bitar \ bitar \
luaJIT_BC_xmath \ xmath \
luaJIT_BC_v \ v \
luaJIT_BC_dump \ dump \
luaJIT_BC_dis_x86 \ dis_x86 \
luaJIT_BC_dis_x64 \ dis_x64 \
LUNATIC_GAME_LUA_OBJS = \
_defs_game \
con_lang \
lunacon \
randgen \
stat \
control \
savegame \
fs \
LUNATIC_EDITOR_LUA_OBJS = \
_defs_editor \
LUNATIC_GAME_OBJS = \ LUNATIC_GAME_OBJS = \
luaJIT_BC__defs_game \ lunatic_game \
luaJIT_BC_con_lang \
luaJIT_BC_lunacon \ LUNATIC_EDITOR_OBJS = \
luaJIT_BC_randgen \ lunatic_editor \
luaJIT_BC_stat \
luaJIT_BC_control \
luaJIT_BC_savegame \
luaJIT_BC_fs \
## Lunatic devel
ifneq (0,$(LUNATIC))
# TODO: remove debugging modules from release build # TODO: remove debugging modules from release build
DUKE3D_EDITOR_OBJS+= lunatic_editor $(LUNATIC_OBJS)
DUKE3D_GAME_OBJS+= lunatic_game $(LUNATIC_OBJS)
DUKE3D_EDITOR_OBJS+= luaJIT_BC__defs_editor
ifneq ($(PLATFORM),WINDOWS) ifneq ($(PLATFORM),WINDOWS)
# On non-Windows, we expect to have liblpeg.a (or a symlink to it) in source/. # On non-Windows, we expect to have liblpeg.a (or a symlink to it) in source/.
# On Windows, it will reside in platform/Windows/lib/32/ or lib/64/. # On Windows, it will reside in platform/Windows/lib/32/ or lib/64/.
@ -453,7 +458,6 @@ ifneq (0,$(LUNATIC))
endif endif
endif endif
LIBS+= -llpeg LIBS+= -llpeg
DUKE3D_GAME_OBJS+= $(LUNATIC_GAME_OBJS)
# now, take care of having the necessary symbols (sector, wall, etc.) in the # now, take care of having the necessary symbols (sector, wall, etc.) in the
# executable no matter what the debugging level # executable no matter what the debugging level
@ -555,6 +559,10 @@ MIDI_OBJS_EXP:=$(addprefix $(DUKE3D_OBJ)/,$(addsuffix .$o,$(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,$(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,$(DUKE3D_EDITOR_OBJS))) $(AUDIOLIB_OBJS_EXP)
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_EDITOR_OBJS_EXP+= $(addprefix $(DUKE3D_OBJ)/,$(addsuffix .$o,$(LUNATIC_EDITOR_OBJS) $(addprefix $(LUNATIC_LUA_PREFIX),$(LUNATIC_LUA_OBJS) $(LUNATIC_EDITOR_LUA_OBJS))))
endif
# Shadow Warrior # Shadow Warrior
@ -791,7 +799,7 @@ getdxdidf$(EXESUFFIX): $(TOOLS_OBJ)/getdxdidf.$o
#### Lunatic #### Lunatic
# Create object files directly with luajit # Create object files directly with luajit
$(DUKE3D_OBJ)/luaJIT_BC_%.$o: $(DUKE3D_SRC)/lunatic/%.lua | $(DUKE3D_OBJ) $(DUKE3D_OBJ)/$(LUNATIC_LUA_PREFIX)%.$o: $(DUKE3D_SRC)/lunatic/%.lua | $(DUKE3D_OBJ)
$(COMPILE_STATUS) $(COMPILE_STATUS)
$(RECIPE_IF) $(LUAJIT) -bg $(LUAJIT_BCOPTS) $< $@ $(RECIPE_RESULT_COMPILE) $(RECIPE_IF) $(LUAJIT) -bg $(LUAJIT_BCOPTS) $< $@ $(RECIPE_RESULT_COMPILE)