diff --git a/.gitignore b/.gitignore index 3aeb5b3..64f0f78 100644 --- a/.gitignore +++ b/.gitignore @@ -26,7 +26,7 @@ *.pyc *bin/Lephisto *bin/mksprite -*bin/data +*bin/ldata *bin/test.xml *pack *core diff --git a/bin/Makefile b/bin/Makefile index fe382ae..9af6cee 100644 --- a/bin/Makefile +++ b/bin/Makefile @@ -83,7 +83,7 @@ DATA_XML := $(wildcard ../dat/*.xml ../dat/*.ttf) DATA_SND := $(wildcard ../snd/music/*.ogg \ ../snd/sounds/*.wav) ../snd/music.lua DATA_MISN := $(wildcard ../dat/missions/*.lua) -DATA := data +DATA := ldata DATAFILES := $(DATA_AI) $(DATA_GFX) $(DATA_XML) $(DATA_SND) $(DATA_MISN) # TARGETS. @@ -93,17 +93,17 @@ DATAFILES := $(DATA_AI) $(DATA_GFX) $(DATA_XML) $(DATA_SND) $(DATA_MISN) @$(CC) -c $(CFLAGS) -o $@ $< @echo -e "\tCC $@" -all: utils data lua lephisto +all: utils ldata lua lephisto help: @echo "Possible targets are:": @echo " lua - Makes Lua." @echo " lephisto - Makes the Lephisto binary." @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 " 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." lephisto: $(OBJS) @@ -122,9 +122,9 @@ mksprite: ../utils/mkspr/main.c $(VERSIONFILE): @echo -n "$(VMAJOR).$(VMINOR).$(VREV)" > $(VERSIONFILE) -data: pack $(DATAFILES) +ldata: pack $(DATAFILES) @echo -n "$(VMAJOR).$(VMINOR).$(VREV)" > $(VERSIONFILE) - @echo -e "\tCreating data..\n" + @echo -e "\tCreating ldata..\n" @./pack $(DATA) $(DATAFILES) $(VERSIONFILE) utils: pack mksprite @@ -133,7 +133,7 @@ docs: @(cd docs/doxygen; doxygen) clean: - @echo -e "\tRemoving data" + @echo -e "\tRemoving ldata" @$(RM) $(DATA) @$(RM) $(OBJS) @echo -e "\tRemoving object files" @@ -145,5 +145,5 @@ purge: clean @echo -e "\tCleaning Lua" @make -C ../lib/lua clean @echo -e "\tRemoving binaries." - @$(RM) Lephisto mksprite data pack gmon.out VERSION + @$(RM) Lephisto mksprite ldata pack gmon.out VERSION diff --git a/src/lephisto.h b/src/lephisto.h index e9d5f15..661643b 100644 --- a/src/lephisto.h +++ b/src/lephisto.h @@ -19,7 +19,7 @@ #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. */ #define DATA data /**< Standard data file to use. */ #define DATA_NAME_LEN 32 /**< Max length of data name. */