salmon-engine-core/engine
6
0 Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

catch up + fixing minor bugs

Browse Source
This commit is contained in:
vladislav.khorev committed 2013-05-28 17:55:11 +00:00
1 parent ef3e93beaf
commit a89cfc0371
10 files changed
+107 -96
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

Templates/SalmonUniversalTemplate/jni/Android.mk
+7
View File
@@ -28,6 +28,9 @@ SQUIRREL_PATH = $(LibsPathCygwin)/sqplus
LIBPNG_PATH = $(LibsPathCygwin)/libpng_1.4.1_android
LIBJPEG_PATH = $(LibsPathCygwin)/jpeg-9
ZIP_PATH = $(LibsPathCygwin)/julienr-libzip-android/jni
#====== ENGINE AND LIBS =====================
@@ -45,6 +48,7 @@ LOCAL_CFLAGS := -DTARGET_ANDROID -DNOSOUND -std=gnu++11 --std=c++11
LOCAL_STATIC_LIBRARIES := boost
LOCAL_STATIC_LIBRARIES += squirrel
LOCAL_STATIC_LIBRARIES += png_lib
LOCAL_STATIC_LIBRARIES += jpeg
LOCAL_STATIC_LIBRARIES += zip
LOCAL_SHARED_LIBRARIES := SalmonEngine
LOCAL_SHARED_LIBRARIES += gnustl_shared
@@ -62,7 +66,10 @@ LOCAL_C_INCLUDES += $(SQUIRREL_PATH)/sqplus
LOCAL_C_INCLUDES += $(SQUIRREL_PATH)/squirrel
LOCAL_C_INCLUDES += $(SQUIRREL_PATH)/sqstdlib
LOCAL_C_INCLUDES += $(LIBPNG_PATH)
LOCAL_C_INCLUDES += $(LIBJPEG_PATH)
LOCAL_C_INCLUDES += $(LIBJPEG_PATH)/vc10
LOCAL_C_INCLUDES += $(ZIP_PATH)
LOCAL_MODULE := SalmonJniTemplate
LOCAL_SRC_FILES := main_code.cpp
LOCAL_SRC_FILES += android_api.cpp