[DEV] add basic cmake generator (not work)
This commit is contained in:
parent
0b3f7b2124
commit
b055156aa6
2
external/CMakeLists.txt
vendored
Normal file
2
external/CMakeLists.txt
vendored
Normal file
@ -0,0 +1,2 @@
|
|||||||
|
#SUBDIRS(bullet/bullet/src z/zlib/ etk png )
|
||||||
|
SUBDIRS(bullet z/zlib/ etk png )
|
27
external/bullet/CMakeLists.txt
vendored
Normal file
27
external/bullet/CMakeLists.txt
vendored
Normal file
@ -0,0 +1,27 @@
|
|||||||
|
cmake_minimum_required(VERSION 2.6)
|
||||||
|
|
||||||
|
# Declare the project
|
||||||
|
project(bulletlib)
|
||||||
|
|
||||||
|
# set output path:
|
||||||
|
set(LIBRARY_OUTPUT_PATH lib/${CMAKE_BUILD_TYPE})
|
||||||
|
|
||||||
|
include_directories(bullet/src)
|
||||||
|
|
||||||
|
#Create src file list
|
||||||
|
set(src_files
|
||||||
|
bullet/src/LinearMath/btQuickprof.cpp
|
||||||
|
bullet/src/LinearMath/btGeometryUtil.cpp
|
||||||
|
bullet/src/LinearMath/btAlignedAllocator.cpp
|
||||||
|
bullet/src/LinearMath/btSerializer.cpp
|
||||||
|
bullet/src/LinearMath/btConvexHull.cpp
|
||||||
|
bullet/src/LinearMath/btPolarDecomposition.cpp
|
||||||
|
bullet/src/LinearMath/btVector3.cpp
|
||||||
|
bullet/src/LinearMath/btConvexHullComputer.cpp
|
||||||
|
)
|
||||||
|
|
||||||
|
#add_definitions( -DDEBUG_LEVEL=3 )
|
||||||
|
|
||||||
|
#Create a static Lib:
|
||||||
|
add_library(linearmath STATIC ${src_files} )
|
||||||
|
|
2
external/bullet/bullet
vendored
2
external/bullet/bullet
vendored
@ -1 +1 @@
|
|||||||
Subproject commit 5a7a38c1824799bbd5030f0d7ed784895802cd1c
|
Subproject commit 99f638245307b977c7926e373d01b73c2cf3b4b3
|
2
external/etk
vendored
2
external/etk
vendored
@ -1 +1 @@
|
|||||||
Subproject commit 89d9bc87ad5570400a54be781b6750dabcbafd35
|
Subproject commit 48448f465dcdda58a94bd0a373244465c21e70dd
|
2
external/png
vendored
2
external/png
vendored
@ -1 +1 @@
|
|||||||
Subproject commit 2b5aabe60cad2b53a2a4f8808f50860e918c638b
|
Subproject commit 6e0a9a2e2d428f3270a59010a5241db0e46d1196
|
@ -21,8 +21,11 @@
|
|||||||
|
|
||||||
#undef __class__
|
#undef __class__
|
||||||
#define __class__ "resource::DistanceFieldFont"
|
#define __class__ "resource::DistanceFieldFont"
|
||||||
|
#ifdef __TARGET_OS__Android
|
||||||
#define SIZE_GENERATION (30)
|
#define SIZE_GENERATION (20)
|
||||||
|
#else
|
||||||
|
#define SIZE_GENERATION (30)
|
||||||
|
#endif
|
||||||
|
|
||||||
ewol::resource::DistanceFieldFont::DistanceFieldFont(const std::string& _fontName) :
|
ewol::resource::DistanceFieldFont::DistanceFieldFont(const std::string& _fontName) :
|
||||||
ewol::resource::Texture(_fontName),
|
ewol::resource::Texture(_fontName),
|
||||||
|
@ -230,10 +230,7 @@ bool ewol::widget::Button::onEventInput(const ewol::event::Input& _event) {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
if( m_mouseHover != previousHoverState
|
CheckStatus();
|
||||||
|| m_buttonPressed != previousPressed) {
|
|
||||||
CheckStatus();
|
|
||||||
}
|
|
||||||
return m_mouseHover;
|
return m_mouseHover;
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -249,6 +246,12 @@ bool ewol::widget::Button::onEventEntry(const ewol::event::Entry& _event) {
|
|||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
void ewol::widget::Button::onLostFocus(void) {
|
||||||
|
m_buttonPressed = false;
|
||||||
|
EWOL_VERBOSE(getName() << " : Remove Focus ...");
|
||||||
|
CheckStatus();
|
||||||
|
}
|
||||||
|
|
||||||
void ewol::widget::Button::CheckStatus(void) {
|
void ewol::widget::Button::CheckStatus(void) {
|
||||||
if (true == m_buttonPressed) {
|
if (true == m_buttonPressed) {
|
||||||
changeStatusIn(STATUS_PRESSED);
|
changeStatusIn(STATUS_PRESSED);
|
||||||
|
@ -142,6 +142,7 @@ namespace ewol {
|
|||||||
}
|
}
|
||||||
private: // derived function
|
private: // derived function
|
||||||
virtual void periodicCall(const ewol::event::Time& _event);
|
virtual void periodicCall(const ewol::event::Time& _event);
|
||||||
|
virtual void onLostFocus(void);
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
Loading…
x
Reference in New Issue
Block a user