From 750e663ecaab70f326bceab7db6ec2d449ae7fa3 Mon Sep 17 00:00:00 2001 From: Edouard Dupin Date: Mon, 16 Jul 2012 17:59:56 +0200 Subject: [PATCH] update to the new compilation system for Linux --- Makefile | 2 ++ jni/Linux.mk | 4 ++-- jni/appl/init.cpp | 1 - 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/Makefile b/Makefile index 98b0126..2d3ee9a 100644 --- a/Makefile +++ b/Makefile @@ -8,6 +8,8 @@ PROJECT_VENDOR=heeroyui # Binary name ... (no dot, no MAJ no Numerical char) PROJECT_NAME=edn +USER_PACKAGES=$(shell pwd)/jni/ + # include basic makefile for EWOL include $(shell pwd)/../ewol/Build/Makefile.mk diff --git a/jni/Linux.mk b/jni/Linux.mk index 0877bed..6bc1615 100644 --- a/jni/Linux.mk +++ b/jni/Linux.mk @@ -14,9 +14,9 @@ LOCAL_VERSION_TAG_SHORT=$(shell cd $(LOCAL_PATH) ; git describe --tags --abbrev= $(info $(LOCAL_MODULE) version TAG : $(LOCAL_VERSION_TAG)) # name of the dependency -LOCAL_STATIC_LIBRARIES := etk ewol tinyxml libzip libpng libfreetype parsersvg agg +LOCAL_STATIC_LIBRARIES := ewol -LOCAL_C_INCLUDES := -I$(LOCAL_PATH) $(addprefix -I$(LOCAL_PATH)/, $(sort $(dir $(FILE_LIST)))) +LOCAL_C_INCLUDES := $(LOCAL_PATH) $(addprefix $(LOCAL_PATH)/, $(sort $(dir $(FILE_LIST)))) LOCAL_SRC_FILES := $(FILE_LIST) diff --git a/jni/appl/init.cpp b/jni/appl/init.cpp index cc840b1..0fd7155 100644 --- a/jni/appl/init.cpp +++ b/jni/appl/init.cpp @@ -66,7 +66,6 @@ void APP_Init(void) ewol::ChangeSize(800, 600); etk::InitDefaultFolder(PROJECT_NAME); - etk::tool::frand(0,1); ewol::SetFontFolder("Font"); #ifdef __PLATFORM__Android