From f2bcd9052bfecc9a214b46d9cf83ba7f9b59d827 Mon Sep 17 00:00:00 2001
From: Edouard Dupin <yui.heero@gmail.com>
Date: Thu, 29 Mar 2012 17:48:48 +0200
Subject: [PATCH] Update the basic Makefile

---
 Makefile                    | 50 ++-----------------------------------
 jni/Linux.mk                |  9 +++++++
 jni/edn/Gui/MainWindows.cpp |  8 +++++-
 jni/edn/init.cpp            |  9 +++++--
 4 files changed, 25 insertions(+), 51 deletions(-)

diff --git a/Makefile b/Makefile
index dc883b0..98b0126 100644
--- a/Makefile
+++ b/Makefile
@@ -3,57 +3,11 @@
 ### Some Preject properties :                                               ###
 ###############################################################################
 
-PROJECT_PATH=$(shell pwd)
-ifeq ($(PLATFORM), Linux)
-PROJECT_NDK?=$(PROJECT_PATH)/../ewol/
-else ifeq ($(PLATFORM), Android)
-PROJECT_NDK?=$(PROJECT_PATH)/../android/ndk-r7/
-PROJECT_SDK?=$(PROJECT_PATH)/../android/sdk-r15/
-endif
-
-
-PROJECT_MODULE?=$(PROJECT_PATH)/../
-
-EWOL_FOLDER=$(PROJECT_MODULE)ewol
-
 # group name or constructor ... (no dot, no MAJ no Numerical char)
 PROJECT_VENDOR=heeroyui
 # Binary name ... (no dot, no MAJ no Numerical char)
 PROJECT_NAME=edn
 
-#dependence of the librairies : 
-#PROJECT_LIB_DEPENDENCY= ewol
-
-PROJECT_FILE_DIRECTORY=jni
-
-# get the tag of the current project : 
-PROJECT_VERSION_TAG=$(shell git describe --tags)
-#$(info Project version TAG : $(PROJECT_VERSION_TAG))
-
-PROJECT_VERSION_TAG_SHORT=$(shell git describe --tags --abbrev=0)
-#$(info Project version TAG Short: $(PROJECT_VERSION_TAG_SHORT))
-
-# enable or disable debug :
-DEBUG:=1
-
-###############################################################################
-### Compilation Define                                                      ###
-###############################################################################
-ifeq ("$(DEBUG)", "0")
-    PROJECT_CXXFLAGS = -DPROJECT_DEBUG_LEVEL=1
-    PROJECT_CXXFLAGS+= -DPROJECT_NDEBUG
-    PROJECT_CXXFLAGS+= -DPROJECT_VERSION_TAG_NAME="\"$(VERSION_TAG)-release\""
-else
-    PROJECT_CXXFLAGS = -DPROJECT_DEBUG_LEVEL=3
-    PROJECT_CXXFLAGS+= -DPROJECT_VERSION_TAG_NAME="\"$(VERSION_TAG)-debug\""
-endif
-PROJECT_CXXFLAGS+= -DPROJECT_VERSION_BUILD_TIME="\"$(VERSION_BUILD_TIME)\""
-
-PROJECT_CXXFLAGS+= -I$(EWOL_FOLDER)/Sources/
-
-PROJECT_LDFLAGS= -L$(EWOL_FOLDER)
-
-#include the specific platefom makefile
-include $(EWOL_FOLDER)/Build/Makefile.$(PLATFORM).mk
-
+# include basic makefile for EWOL 
+include $(shell pwd)/../ewol/Build/Makefile.mk
 
diff --git a/jni/Linux.mk b/jni/Linux.mk
index dfe1254..1f53e3f 100644
--- a/jni/Linux.mk
+++ b/jni/Linux.mk
@@ -5,7 +5,16 @@ include $(CLEAR_VARS)
 # load the common sources file of the platform
 include $(LOCAL_PATH)/file.mk
 
+# name of the librairy
 LOCAL_MODULE := ednn
+
+
+# get the tag of the current project : 
+LOCAL_VERSION_TAG=$(shell cd $(LOCAL_PATH) ; git describe --tags)
+LOCAL_VERSION_TAG_SHORT=$(shell cd $(LOCAL_PATH) ; git describe --tags --abbrev=0)
+$(info $(LOCAL_MODULE) version TAG : $(LOCAL_VERSION_TAG))
+
+# name of the dependency
 LOCAL_STATIC_LIBRARIES := ewol etk tinyxml libzip libpng libfreetype parsersvg agg
 
 LOCAL_C_INCLUDES := -I$(LOCAL_PATH) $(addprefix -I$(LOCAL_PATH)/, $(sort $(dir $(FILE_LIST))))
diff --git a/jni/edn/Gui/MainWindows.cpp b/jni/edn/Gui/MainWindows.cpp
index 6839cdd..3107760 100644
--- a/jni/edn/Gui/MainWindows.cpp
+++ b/jni/edn/Gui/MainWindows.cpp
@@ -69,7 +69,7 @@ MainWindows::MainWindows(void)
 			myMenu = new ewol::Menu();
 			mySizerHori->SubWidgetAdd(myMenu);
 			int32_t idMenuFile = myMenu->AddTitle("File");
-				(void)myMenu->Add(idMenuFile, "New",          "", ednMsgGuiNew);
+				(void)myMenu->Add(idMenuFile, "New",          "iconEdn.bmp", ednMsgGuiNew);
 				(void)myMenu->AddSpacer();
 				(void)myMenu->Add(idMenuFile, "Open",         "icon/Load.svg", ednMsgGuiOpen);
 				(void)myMenu->Add(idMenuFile, "Close",        "icon/Close.svg", ednMsgGuiClose, "current");
@@ -282,7 +282,13 @@ void MainWindows::OnReceiveMessage(ewol::EObject * CallerObject, const char * ev
 				return;
 			}
 			m_widgetLabelFileName->SetLabel(directName);
+			etk::UString windowsTitle = "edn - ";
+			windowsTitle += directName;
+			ewol::SetTitle(windowsTitle);
 			return;
+		} else {
+			m_widgetLabelFileName->SetLabel("");
+			ewol::SetTitle("edn");
 		}
 		return;
 		// TODO : Set the Title ....
diff --git a/jni/edn/init.cpp b/jni/edn/init.cpp
index 0834cb5..4c2f9d7 100644
--- a/jni/edn/init.cpp
+++ b/jni/edn/init.cpp
@@ -25,6 +25,7 @@
 
 #include <tools_debug.h>
 #include <tools_globals.h>
+#include <etk/File.h>
 #include <ewol/ewol.h>
 #include <Gui/MainWindows.h>
 #include <Display.h>
@@ -72,7 +73,6 @@ void APP_Init(void)
 		SetBaseFolderDataUser("~/."PROJECT_NAME"/");
 		SetBaseFolderCache("/tmp/"PROJECT_NAME"/");
 	#endif
-	
 	ewol::SetFontFolder("Font");
 	
 	#ifdef __PLATFORM__Android
@@ -143,7 +143,6 @@ void APP_Init(void)
 	ewol::shortCut::Add("ctrl+l",       ednMsgGuiGotoLine, "???");
 	
 	
-	
 	// add files
 	EDN_INFO("show list of files : ");
 	
@@ -157,6 +156,12 @@ void APP_Init(void)
 }
 
 
+etk::File APP_Icon(void)
+{
+	etk::File bitmapFile("iconEdn.bmp", etk::FILE_TYPE_DATA);
+	return bitmapFile;
+}
+
 /**
  * @brief main application function Un-Initialisation
  */