atria-soft/ewol
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

[BUILD] Windows compile correctly

Browse Source
This commit is contained in:
Edouard DUPIN 2013-01-11 07:30:30 +01:00
parent 0dffbae44d
commit d021b82631
7 changed files with 19 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
README.md
View File

@ -24,8 +24,12 @@ Dependency packages
sudo apt-get install g++ libgl1-mesa-dev zlib1g-dev libasound2-dev sudo apt-get install g++ libgl1-mesa-dev zlib1g-dev libasound2-dev
# if you want to compile with clang : # if you want to compile with clang :
sudo apt-get install 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 : # if you want to compile for windows :
sudo apt-get install mingw32 sudo apt-get install mingw32
# on 64 bits processor for compatibility
sudo apt-get install ia32-libs
Copyright (c) Copyright (c)
============= =============

2
build

@ -1 +1 @@
Subproject commit 94dbc0b4755f2e28b96c8cfea013037665a2d278 Subproject commit b6377e0477014e8dbec14d73e7be86e062fb8065

2
external/parsersvg vendored

@ -1 +1 @@
Subproject commit 8d360abdaef587b4eaf880467cb71eb122c1d9d1 Subproject commit c305574cfd83c494b3207339330cdf6feda269be

2
sources/Windows.mk
View File

@ -12,7 +12,7 @@ LOCAL_VERSION=$(shell cat $(LOCAL_PATH)/tag)
$(info [TAG:$(LOCAL_MODULE)] $(LOCAL_VERSION)) $(info [TAG:$(LOCAL_MODULE)] $(LOCAL_VERSION))
# name of the dependency # 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 := LOCAL_C_INCLUDES :=

14
sources/ewol/renderer/os/eSystemInput.cpp
View File

@ -47,6 +47,10 @@ void ewol::eSystemInput::SetDpi(int32_t newDPI)
void ewol::eSystemInput::CleanElement(InputPoperty_ts *eventTable, int32_t idInput) 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].isUsed = false;
eventTable[idInput].destinationInputId = 0; eventTable[idInput].destinationInputId = 0;
eventTable[idInput].lastTimeEvent = 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); SetDpi(200);
EWOL_INFO("Init"); EWOL_INFO("Init (start)");
Reset(); Reset();
EWOL_INFO("Init (end)");
} }
ewol::eSystemInput::~eSystemInput(void) ewol::eSystemInput::~eSystemInput(void)
{ {
EWOL_INFO("Un-Init"); EWOL_INFO("Un-Init (start)");
Reset(); Reset();
EWOL_INFO("Un-Init (end)");
} }

2
sources/ewol/widget/WidgetManager.cpp
View File

@ -68,7 +68,7 @@ void ewol::widgetManager::FocusKeep(ewol::Widget * newWidget)
return; return;
} }
if (false == newWidget->CanHaveFocus()) { 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; return;
} }
if (newWidget == m_focusWidgetCurrent) { if (newWidget == m_focusWidgetCurrent) {

2
sources/ewol/widget/WidgetScrolled.cpp
View File

@ -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 )) { } else if (ewol::keyEvent::typeFinger==type && ( ewol::keyEvent::typeUnknow==m_highSpeedType || ewol::keyEvent::typeFinger==m_highSpeedType )) {
if (1 == IdInput) { 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) { if (ewol::keyEvent::statusDown == typeEvent) {
m_highSpeedMode = widget::SCROLL_INIT; m_highSpeedMode = widget::SCROLL_INIT;
m_highSpeedType = ewol::keyEvent::typeFinger; m_highSpeedType = ewol::keyEvent::typeFinger;