MultiCraftProject/MultiCraft
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Remove ogg and item_drop improve

Browse Source
This commit is contained in:
Maksim Gamarnik 2016-04-01 00:26:03 +03:00
parent 6e72fc2fb9
commit a96eae9804
3 changed files with 60 additions and 60 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

71
build/android/Makefile
View File

@ -64,17 +64,16 @@ ASSETS_TIMESTAMP = deps/assets_timestamp
OPENAL_FOLDER = $(ROOT)/deps/openal-soft OPENAL_FOLDER = $(ROOT)/deps/openal-soft
OPENAL_DIR = $(ROOT)/deps/openal-soft/android OPENAL_DIR = $(ROOT)/deps/openal-soft/android
OPENAL_LIB = $(OPENAL_DIR)libs/$(TARGET_ABI)/libopenal.so OPENAL_LIB = $(OPENAL_DIR)/libs/$(TARGET_ABI)/libopenal.so
OPENAL_TIMESTAMP = $(OPENAL_DIR)/timestamp OPENAL_TIMESTAMP = $(OPENAL_DIR)/timestamp
OPENAL_TIMESTAMP_INT = $(ROOT)/deps/openal_timestamp OPENAL_TIMESTAMP_INT = $(ROOT)/deps/openal_timestamp
OPENAL_URL_GIT = https://github.com/MoNTE48/openal-soft OPENAL_URL_GIT = https://github.com/MoNTE48/openal-soft
OGG_DIR = $(ROOT)/deps/libvorbis-libogg-android VORBIS_DIR = $(ROOT)/deps/libvorbis-android
OGG_LIB = $(OGG_DIR)/libs/$(TARGET_ABI)/libogg.so VORBIS_LIB = $(VORBIS_DIR)/libs/$(TARGET_ABI)/libvorbis.so
VORBIS_LIB = $(OGG_DIR)/libs/$(TARGET_ABI)/libogg.so VORBIS_TIMESTAMP = $(VORBIS_DIR)/timestamp
OGG_TIMESTAMP = $(OGG_DIR)/timestamp VORBIS_TIMESTAMP_INT = $(ROOT)/deps/vorbis_timestamp
OGG_TIMESTAMP_INT = $(ROOT)/deps/ogg_timestamp VORBIS_URL_GIT = https://github.com/MoNTE48/libvorbis-android
OGG_URL_GIT = https://github.com/MoNTE48/libvorbis-libogg-android
IRRLICHT_COMMIT = 58fa0cf3419c2733159fc3c6253634bedada3bfe IRRLICHT_COMMIT = 58fa0cf3419c2733159fc3c6253634bedada3bfe
#IRRLICHT_COMMIT = 54b8cba398c3b845d0d1158822916c2f78be194b #IRRLICHT_COMMIT = 54b8cba398c3b845d0d1158822916c2f78be194b
@ -119,8 +118,8 @@ ICONV_TIMESTAMP = $(ICONV_DIR)/timestamp
ICONV_TIMESTAMP_INT = $(ROOT)/deps/iconv_timestamp ICONV_TIMESTAMP_INT = $(ROOT)/deps/iconv_timestamp
ICONV_URL_HTTP = http://ftp.gnu.org/pub/gnu/libiconv/libiconv-$(ICONV_VERSION).tar.gz ICONV_URL_HTTP = http://ftp.gnu.org/pub/gnu/libiconv/libiconv-$(ICONV_VERSION).tar.gz
SQLITE3_VERSION= 3110100 SQLITE3_VERSION= 3120000
SQLITE3_DIR = $(ROOT)/deps/sqlite-amalgamation-$(SQLITE3_VERSION) SQLITE3_DIR = $(ROOT)/deps/sqlite
SQLITE3_URL = http://www.sqlite.org/2016/sqlite-amalgamation-$(SQLITE3_VERSION).zip SQLITE3_URL = http://www.sqlite.org/2016/sqlite-amalgamation-$(SQLITE3_VERSION).zip
LUAJIT_GIT_BRANCH = v2.1 LUAJIT_GIT_BRANCH = v2.1
@ -155,7 +154,7 @@ VERSION_PATCH := $(shell cat $(ROOT)/../../CMakeLists.txt | \
install_debug install envpaths all \ install_debug install envpaths all \
manifest clean_manifest\ manifest clean_manifest\
$(ASSETS_TIMESTAMP) $(LUAJIT_TIMESTAMP) \ $(ASSETS_TIMESTAMP) $(LUAJIT_TIMESTAMP) \
$(OPENAL_TIMESTAMP) $(OGG_TIMESTAMP) \ $(OPENAL_TIMESTAMP) $(VORBIS_TIMESTAMP) \
$(IRRLICHT_TIMESTAMP) $(CURL_TIMESTAMP) \ $(IRRLICHT_TIMESTAMP) $(CURL_TIMESTAMP) \
$(OPENSSL_TIMESTAMP) $(VORBIS_TIMESTAMP) \ $(OPENSSL_TIMESTAMP) $(VORBIS_TIMESTAMP) \
$(ROOT)/jni/src/android_version.h \ $(ROOT)/jni/src/android_version.h \
@ -240,48 +239,48 @@ $(OPENAL_LIB): $(OPENAL_TIMESTAMP)
clean_openal : clean_openal :
$(RM) -rf ${OPENAL_FOLDER} $(RM) -rf ${OPENAL_FOLDER}
$(OGG_TIMESTAMP) : ogg_download $(VORBIS_TIMESTAMP) : vorbis_download
@LAST_MODIF=$$(find ${OGG_DIR} -type f -printf '%T@ %p\n' | sort -n | tail -1 | cut -f2- -d" "); \ @LAST_MODIF=$$(find ${VORBIS_DIR} -type f -printf '%T@ %p\n' | sort -n | tail -1 | cut -f2- -d" "); \
if [ $$(basename $$LAST_MODIF) != "timestamp" ] ; then \ if [ $$(basename $$LAST_MODIF) != "timestamp" ] ; then \
touch ${OGG_TIMESTAMP}; \ touch ${VORBIS_TIMESTAMP}; \
fi fi
ogg_download : vorbis_download :
@if [ ! -d ${OGG_DIR} ] ; then \ @if [ ! -d ${VORBIS_DIR} ] ; then \
echo "ogg sources missing, downloading..."; \ echo "vorbis sources missing, downloading..."; \
mkdir -p ${ROOT}/deps; \ mkdir -p ${ROOT}/deps; \
cd ${ROOT}/deps ; \ cd ${ROOT}/deps ; \
git clone ${OGG_URL_GIT}|| exit 1; \ git clone ${VORBIS_URL_GIT}|| exit 1; \
fi fi
ogg : $(OGG_LIB) vorbis : $(VORBIS_LIB)
$(OGG_LIB): $(OGG_TIMESTAMP) $(VORBIS_LIB): $(VORBIS_TIMESTAMP)
+ @REFRESH=0; \ + @REFRESH=0; \
if [ ! -e ${OGG_TIMESTAMP_INT} ] ; then \ if [ ! -e ${VORBIS_TIMESTAMP_INT} ] ; then \
echo "${OGG_TIMESTAMP_INT} doesn't exist"; \ echo "${VORBIS_TIMESTAMP_INT} doesn't exist"; \
REFRESH=1; \ REFRESH=1; \
fi; \ fi; \
if [ ${OGG_TIMESTAMP} -nt ${OGG_TIMESTAMP_INT} ] ; then \ if [ ${VORBIS_TIMESTAMP} -nt ${VORBIS_TIMESTAMP_INT} ] ; then \
REFRESH=1; \ REFRESH=1; \
fi; \ fi; \
if [ $$REFRESH -ne 0 ] ; then \ if [ $$REFRESH -ne 0 ] ; then \
export PATH=$$PATH:${ANDROID_NDK}; \ export PATH=$$PATH:${ANDROID_NDK}; \
echo "changed timestamp for ogg detected building..."; \ echo "changed timestamp for vorbis detected building..."; \
cd ${OGG_DIR}; \ cd ${VORBIS_DIR}; \
ndk-build NDEBUG=${NDEBUG} \ ndk-build NDEBUG=${NDEBUG} \
APP_ABI=${TARGET_ABI} APP_PLATFORM=${APP_PLATFORM} \ APP_ABI=${TARGET_ABI} APP_PLATFORM=${APP_PLATFORM} \
TARGET_CFLAGS+="${TARGET_CFLAGS_ADDON}" \ TARGET_CFLAGS+="${TARGET_CFLAGS_ADDON}" \
TARGET_LDFLAGS+="${TARGET_LDFLAGS_ADDON}" \ TARGET_LDFLAGS+="${TARGET_LDFLAGS_ADDON}" \
TARGET_CXXFLAGS+="${TARGET_CXXFLAGS_ADDON}" || exit 1; \ TARGET_CXXFLAGS+="${TARGET_CXXFLAGS_ADDON}" || exit 1; \
touch ${OGG_TIMESTAMP}; \ touch ${VORBIS_TIMESTAMP}; \
touch ${OGG_TIMESTAMP_INT}; \ touch ${VORBIS_TIMESTAMP_INT}; \
else \ else \
echo "nothing to be done for libogg/libvorbis"; \ echo "nothing to be done for libvorbis/libvorbis"; \
fi fi
clean_ogg : clean_vorbis :
$(RM) -rf ${OGG_DIR} $(RM) -rf ${VORBIS_DIR}
$(OPENSSL_TIMESTAMP) : openssl_download $(OPENSSL_TIMESTAMP) : openssl_download
@LAST_MODIF=$$(find ${OPENSSL_DIR} -type f -printf '%T@ %p\n' | sort -n | tail -1 | cut -f2- -d" "); \ @LAST_MODIF=$$(find ${OPENSSL_DIR} -type f -printf '%T@ %p\n' | sort -n | tail -1 | cut -f2- -d" "); \
@ -626,19 +625,19 @@ $(GMP_LIB): $(GMP_TIMESTAMP)
clean_gmp: clean_gmp:
$(RM) -R deps/gmp $(RM) -R deps/gmp
sqlite3_download: sqlite3_download: deps/${SQLITE3_FOLDER}/sqlite3.c
@if [ ! -d ${SQLITE3_DIR} ] ; then \
echo "SQLITE sources missing, downloading..."; \ deps/${SQLITE3_FOLDER}/sqlite3.c :
mkdir -p ${ROOT}/deps; \ mkdir -p ${ROOT}/deps; \
cd ${ROOT}/deps; \ cd ${ROOT}/deps; \
rm -R sqlite; \
wget ${SQLITE3_URL}; \ wget ${SQLITE3_URL}; \
unzip sqlite-amalgamation-$(SQLITE3_VERSION).zip; \ unzip sqlite-amalgamation-$(SQLITE3_VERSION).zip || exit 1; \
rm sqlite-amalgamation-$(SQLITE3_VERSION).zip; \ rm sqlite-amalgamation-$(SQLITE3_VERSION).zip; \
ln -s ${SQLITE3_DIR} sqlite; \ mv sqlite-amalgamation-$(SQLITE3_VERSION) sqlite; \
fi fi
clean_sqlite3: clean_sqlite3:
cd deps && $(RM) -rf ${SQLITE3_DIR} && \
$(RM) -R sqlite $(RM) -R sqlite
$(ASSETS_TIMESTAMP) : $(IRRLICHT_LIB) $(ASSETS_TIMESTAMP) : $(IRRLICHT_LIB)
@ -756,7 +755,7 @@ clean_assets :
apk: $(PATHCFGFILE) assets $(ICONV_LIB) $(IRRLICHT_LIB) $(CURL_LIB) $(GMP_LIB) \ apk: $(PATHCFGFILE) assets $(ICONV_LIB) $(IRRLICHT_LIB) $(CURL_LIB) $(GMP_LIB) \
$(LUAJIT_LIB) \ $(LUAJIT_LIB) \
$(OPENAL_LIB) $(OGG_LIB) prep_srcdir $(ROOT)/jni/src/android_version.h \ $(OPENAL_LIB) $(VORBIS_LIB) prep_srcdir $(ROOT)/jni/src/android_version.h \
$(ROOT)/jni/src/android_version_githash.h sqlite3_download $(ROOT)/jni/src/android_version_githash.h sqlite3_download
@export NDEBUG=$$NDEBUG; $(MAKE) manifest; \ @export NDEBUG=$$NDEBUG; $(MAKE) manifest; \
export PATH=$$PATH:${SDKFOLDER}/platform-tools:${ANDROID_NDK}; \ export PATH=$$PATH:${SDKFOLDER}/platform-tools:${ANDROID_NDK}; \

11
build/android/jni/Android.mk
View File

@ -27,14 +27,9 @@ LOCAL_MODULE := openal
LOCAL_SRC_FILES := deps/openal-soft/android/obj/local/$(APP_ABI)/libopenal.a LOCAL_SRC_FILES := deps/openal-soft/android/obj/local/$(APP_ABI)/libopenal.a
include $(PREBUILT_STATIC_LIBRARY) include $(PREBUILT_STATIC_LIBRARY)
include $(CLEAR_VARS)
LOCAL_MODULE := ogg
LOCAL_SRC_FILES := deps/libvorbis-libogg-android/obj/local/$(APP_ABI)/libogg.a
include $(PREBUILT_STATIC_LIBRARY)
include $(CLEAR_VARS) include $(CLEAR_VARS)
LOCAL_MODULE := vorbis LOCAL_MODULE := vorbis
LOCAL_SRC_FILES := deps/libvorbis-libogg-android/libs/$(TARGET_LIBDIR)/libvorbis.so LOCAL_SRC_FILES := deps/libvorbis-android/libs/$(TARGET_LIBDIR)/libvorbis.so
include $(PREBUILT_SHARED_LIBRARY) include $(PREBUILT_SHARED_LIBRARY)
include $(CLEAR_VARS) include $(CLEAR_VARS)
@ -103,7 +98,7 @@ LOCAL_C_INCLUDES := \
deps/freetype/include \ deps/freetype/include \
deps/curl/include \ deps/curl/include \
deps/openal-soft/include \ deps/openal-soft/include \
deps/libvorbis-libogg-android/jni/include \ deps/libvorbis-android/jni/include \
deps/gmp/usr/include \ deps/gmp/usr/include \
deps/sqlite/ \ deps/sqlite/ \
deps/luajit/src deps/luajit/src
@ -323,7 +318,7 @@ LOCAL_SRC_FILES += \
LOCAL_SRC_FILES += jni/src/json/jsoncpp.cpp LOCAL_SRC_FILES += jni/src/json/jsoncpp.cpp
LOCAL_SHARED_LIBRARIES := gmp vorbis LOCAL_SHARED_LIBRARIES := gmp vorbis
LOCAL_STATIC_LIBRARIES := Irrlicht freetype curl ssl crypto iconv LuaJIT openal ogg android_native_app_glue $(PROFILER_LIBS) LOCAL_STATIC_LIBRARIES := Irrlicht freetype curl ssl crypto iconv LuaJIT openal android_native_app_glue $(PROFILER_LIBS)
LOCAL_LDLIBS := -lEGL -llog -lGLESv1_CM -lGLESv2 -lz -landroid -lOpenSLES LOCAL_LDLIBS := -lEGL -llog -lGLESv1_CM -lGLESv2 -lz -landroid -lOpenSLES

8
builtin/game/item_entity.lua
View File

@ -72,6 +72,7 @@ core.register_entity(":__builtin:item", {
infotext = description, infotext = description,
} }
self.object:set_properties(prop) self.object:set_properties(prop)
self.collect = true
end, end,
get_staticdata = function(self) get_staticdata = function(self)
@ -79,7 +80,8 @@ core.register_entity(":__builtin:item", {
itemstring = self.itemstring, itemstring = self.itemstring,
always_collect = self.always_collect, always_collect = self.always_collect,
age = self.age, age = self.age,
dropped_by = self.dropped_by dropped_by = self.dropped_by,
--collect = self.collect
}) })
end, end,
@ -93,6 +95,10 @@ core.register_entity(":__builtin:item", {
self.age = data.age + dtime_s self.age = data.age + dtime_s
else else
self.age = dtime_s self.age = dtime_s
--end
--remember collection data
--if data.collect then
--self.collect = data.collect
end end
self.dropped_by = data.dropped_by self.dropped_by = data.dropped_by
end end