From d021b82631da8c12a14838bf097eb0d5e87157a5 Mon Sep 17 00:00:00 2001
From: Edouard DUPIN <yui.heero@gmail.com>
Date: Fri, 11 Jan 2013 07:30:30 +0100
Subject: [PATCH] [BUILD] Windows compile correctly

---
 README.md                                 |  4 ++++
 build                                     |  2 +-
 external/parsersvg                        |  2 +-
 sources/Windows.mk                        |  2 +-
 sources/ewol/renderer/os/eSystemInput.cpp | 14 ++++++++++----
 sources/ewol/widget/WidgetManager.cpp     |  2 +-
 sources/ewol/widget/WidgetScrolled.cpp    |  2 +-
 7 files changed, 19 insertions(+), 9 deletions(-)

diff --git a/README.md b/README.md
index 8234563f..05a5cca7 100644
--- a/README.md
+++ b/README.md
@@ -24,8 +24,12 @@ Dependency packages
 	sudo apt-get install g++ libgl1-mesa-dev zlib1g-dev libasound2-dev
 	# if you want to compile with clang :
 	sudo apt-get install clang
+	# For andoid compilation (jdk 7 does not work...)
+	sudo apt-get install javacc openjdk-6-jdk
 	# if you want to compile for windows :
 	sudo apt-get install mingw32
+	# on 64 bits processor for compatibility
+	sudo apt-get install ia32-libs
 
 Copyright (c)
 =============
diff --git a/build b/build
index 94dbc0b4..b6377e04 160000
--- a/build
+++ b/build
@@ -1 +1 @@
-Subproject commit 94dbc0b4755f2e28b96c8cfea013037665a2d278
+Subproject commit b6377e0477014e8dbec14d73e7be86e062fb8065
diff --git a/external/parsersvg b/external/parsersvg
index 8d360abd..c305574c 160000
--- a/external/parsersvg
+++ b/external/parsersvg
@@ -1 +1 @@
-Subproject commit 8d360abdaef587b4eaf880467cb71eb122c1d9d1
+Subproject commit c305574cfd83c494b3207339330cdf6feda269be
diff --git a/sources/Windows.mk b/sources/Windows.mk
index dbf1884a..3c6c4f35 100644
--- a/sources/Windows.mk
+++ b/sources/Windows.mk
@@ -12,7 +12,7 @@ LOCAL_VERSION=$(shell cat $(LOCAL_PATH)/tag)
 $(info [TAG:$(LOCAL_MODULE)] $(LOCAL_VERSION))
 
 # name of the dependency
-LOCAL_LIBRARIES := etk freetype tinyxml libzip libpng parsersvg lua zlib glew
+LOCAL_LIBRARIES := etk freetype tinyxml libzip libpng parsersvg lua zlib glew bullet
 
 LOCAL_C_INCLUDES := 
 
diff --git a/sources/ewol/renderer/os/eSystemInput.cpp b/sources/ewol/renderer/os/eSystemInput.cpp
index 70c2d459..ce0ed5fc 100644
--- a/sources/ewol/renderer/os/eSystemInput.cpp
+++ b/sources/ewol/renderer/os/eSystemInput.cpp
@@ -47,6 +47,10 @@ void ewol::eSystemInput::SetDpi(int32_t newDPI)
 
 void ewol::eSystemInput::CleanElement(InputPoperty_ts *eventTable, int32_t idInput)
 {
+	if (NULL==eventTable) {
+		return;
+	}
+	//EWOL_INFO("CleanElement[" << idInput << "] = @" << (int64_t)eventTable);
 	eventTable[idInput].isUsed = false;
 	eventTable[idInput].destinationInputId = 0;
 	eventTable[idInput].lastTimeEvent = 0;
@@ -156,18 +160,20 @@ void ewol::eSystemInput::Reset(void)
 	}
 }
 
-ewol::eSystemInput::eSystemInput(void)
+ewol::eSystemInput::eSystemInput(void) :
+	m_grabWidget(NULL)
 {
-	m_grabWidget = NULL;
 	SetDpi(200);
-	EWOL_INFO("Init");
+	EWOL_INFO("Init (start)");
 	Reset();
+	EWOL_INFO("Init (end)");
 }
 
 ewol::eSystemInput::~eSystemInput(void)
 {
-	EWOL_INFO("Un-Init");
+	EWOL_INFO("Un-Init (start)");
 	Reset();
+	EWOL_INFO("Un-Init (end)");
 }
 
 
diff --git a/sources/ewol/widget/WidgetManager.cpp b/sources/ewol/widget/WidgetManager.cpp
index 538c7b2d..51ef8d71 100644
--- a/sources/ewol/widget/WidgetManager.cpp
+++ b/sources/ewol/widget/WidgetManager.cpp
@@ -68,7 +68,7 @@ void ewol::widgetManager::FocusKeep(ewol::Widget * newWidget)
 		return;
 	}
 	if (false == newWidget->CanHaveFocus()) {
-		EWOL_VERBOSE("Widget can not have Focus, id=" << ewol::widgetManager::Get(newWidget));
+		EWOL_VERBOSE("Widget can not have Focus, id=" << 9999999999.999);
 		return;
 	}
 	if (newWidget == m_focusWidgetCurrent) {
diff --git a/sources/ewol/widget/WidgetScrolled.cpp b/sources/ewol/widget/WidgetScrolled.cpp
index 7c865cf1..b8ea1e53 100644
--- a/sources/ewol/widget/WidgetScrolled.cpp
+++ b/sources/ewol/widget/WidgetScrolled.cpp
@@ -230,7 +230,7 @@ bool widget::WidgetScrooled::OnEventInput(ewol::keyEvent::type_te type, int32_t
 			}
 		} else if (ewol::keyEvent::typeFinger==type && ( ewol::keyEvent::typeUnknow==m_highSpeedType || ewol::keyEvent::typeFinger==m_highSpeedType )) {
 			if (1 == IdInput) {
-				EWOL_VERBOSE("event 1  << " << (int32_t)typeEvent << "(" << x << "," << y << ")");
+				//EWOL_VERBOSE("event 1  << " << (int32_t)typeEvent << "(" << x << "," << y << ")");
 				if (ewol::keyEvent::statusDown == typeEvent) {
 					m_highSpeedMode = widget::SCROLL_INIT;
 					m_highSpeedType = ewol::keyEvent::typeFinger;