Rtch/Lephisto
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[Change] Renamed data file from data -> ldata.

Browse Source
This commit is contained in:
Allanis 2013-12-31 19:00:55 +00:00
parent 42ec3958e1
commit 3ab5bb9313
3 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.gitignore vendored
View File

@ -26,7 +26,7 @@
*.pyc *.pyc
*bin/Lephisto *bin/Lephisto
*bin/mksprite *bin/mksprite
*bin/data *bin/ldata
*bin/test.xml *bin/test.xml
*pack *pack
*core *core

16
bin/Makefile
View File

@ -83,7 +83,7 @@ DATA_XML := $(wildcard ../dat/*.xml ../dat/*.ttf)
DATA_SND := $(wildcard ../snd/music/*.ogg \ DATA_SND := $(wildcard ../snd/music/*.ogg \
../snd/sounds/*.wav) ../snd/music.lua ../snd/sounds/*.wav) ../snd/music.lua
DATA_MISN := $(wildcard ../dat/missions/*.lua) DATA_MISN := $(wildcard ../dat/missions/*.lua)
DATA := data DATA := ldata
DATAFILES := $(DATA_AI) $(DATA_GFX) $(DATA_XML) $(DATA_SND) $(DATA_MISN) DATAFILES := $(DATA_AI) $(DATA_GFX) $(DATA_XML) $(DATA_SND) $(DATA_MISN)
# TARGETS. # TARGETS.
@ -93,17 +93,17 @@ DATAFILES := $(DATA_AI) $(DATA_GFX) $(DATA_XML) $(DATA_SND) $(DATA_MISN)
@$(CC) -c $(CFLAGS) -o $@ $< @$(CC) -c $(CFLAGS) -o $@ $<
@echo -e "\tCC $@" @echo -e "\tCC $@"
all: utils data lua lephisto all: utils ldata lua lephisto
help: help:
@echo "Possible targets are:": @echo "Possible targets are:":
@echo " lua - Makes Lua." @echo " lua - Makes Lua."
@echo " lephisto - Makes the Lephisto binary." @echo " lephisto - Makes the Lephisto binary."
@echo " mkspr - Makes the mkspr utility." @echo " mkspr - Makes the mkspr utility."
@echo " data - Creates the data file." @echo " ldata - Creates the ldata file."
@echo " utils - Makes all the utilities." @echo " utils - Makes all the utilities."
@echo " docs - Creates the doxygen documentation." @echo " docs - Creates the doxygen documentation."
@echo " clean - Removes Lephisto's main binary and data file." @echo " clean - Removes Lephisto's main binary and ldata file."
@echo " purge - Removes everything done." @echo " purge - Removes everything done."
lephisto: $(OBJS) lephisto: $(OBJS)
@ -122,9 +122,9 @@ mksprite: ../utils/mkspr/main.c
$(VERSIONFILE): $(VERSIONFILE):
@echo -n "$(VMAJOR).$(VMINOR).$(VREV)" > $(VERSIONFILE) @echo -n "$(VMAJOR).$(VMINOR).$(VREV)" > $(VERSIONFILE)
data: pack $(DATAFILES) ldata: pack $(DATAFILES)
@echo -n "$(VMAJOR).$(VMINOR).$(VREV)" > $(VERSIONFILE) @echo -n "$(VMAJOR).$(VMINOR).$(VREV)" > $(VERSIONFILE)
@echo -e "\tCreating data..\n" @echo -e "\tCreating ldata..\n"
@./pack $(DATA) $(DATAFILES) $(VERSIONFILE) @./pack $(DATA) $(DATAFILES) $(VERSIONFILE)
utils: pack mksprite utils: pack mksprite
@ -133,7 +133,7 @@ docs:
@(cd docs/doxygen; doxygen) @(cd docs/doxygen; doxygen)
clean: clean:
@echo -e "\tRemoving data" @echo -e "\tRemoving ldata"
@$(RM) $(DATA) @$(RM) $(DATA)
@$(RM) $(OBJS) @$(RM) $(OBJS)
@echo -e "\tRemoving object files" @echo -e "\tRemoving object files"
@ -145,5 +145,5 @@ purge: clean
@echo -e "\tCleaning Lua" @echo -e "\tCleaning Lua"
@make -C ../lib/lua clean @make -C ../lib/lua clean
@echo -e "\tRemoving binaries." @echo -e "\tRemoving binaries."
@$(RM) Lephisto mksprite data pack gmon.out VERSION @$(RM) Lephisto mksprite ldata pack gmon.out VERSION

2
src/lephisto.h
View File

@ -19,7 +19,7 @@
#define pow2(x) ((x)*(x)) /**< ^2 */ #define pow2(x) ((x)*(x)) /**< ^2 */
#define DATA_DEF "data" /**< Default data packfile. */ #define DATA_DEF "ldata" /**< Default data packfile. */
extern char* data; /**< Modifiable datafile. */ extern char* data; /**< Modifiable datafile. */
#define DATA data /**< Standard data file to use. */ #define DATA data /**< Standard data file to use. */
#define DATA_NAME_LEN 32 /**< Max length of data name. */ #define DATA_NAME_LEN 32 /**< Max length of data name. */