better tb build, no tests needed.

This commit is contained in:
michael tesch 2017-09-28 15:34:48 +02:00
parent 4fcfac88de
commit 1a49a644ed
3 changed files with 80 additions and 19 deletions

View File

@ -1,20 +1,81 @@
cmake_minimum_required(VERSION 2.8)
set(LOCAL_SRCS "")
aux_source_directory(. LOCAL_SRCS)
aux_source_directory(image LOCAL_SRCS)
aux_source_directory(animation LOCAL_SRCS)
aux_source_directory(parser LOCAL_SRCS)
aux_source_directory(renderers LOCAL_SRCS)
aux_source_directory(tests LOCAL_SRCS)
aux_source_directory(utf8 LOCAL_SRCS)
if ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "GNU")
set_property(SOURCE tb_image_loader_stb.cpp APPEND_STRING PROPERTY COMPILE_FLAGS " -Wno-unused-function")
endif ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "GNU")
add_library(TurboBadgerLib ${LOCAL_SRCS})
set (LOCAL_SRCS
tb_bitmap_fragment.cpp
tb_clipboard_dummy.cpp
tb_clipboard_glfw.cpp
tb_clipboard_sdl2.cpp
tb_clipboard_win.cpp
tb_color.cpp
tb_core.cpp
tb_debug.cpp
tb_dimension.cpp
tb_editfield.cpp
tb_file_posix.cpp
tb_font_renderer.cpp
tb_font_renderer_freetype.cpp
tb_font_renderer_stb.cpp
tb_font_renderer_tbbf.cpp
tb_geometry.cpp
tb_hash.cpp
tb_hashtable.cpp
tb_id.cpp
tb_image_loader_stb.cpp
tb_inline_select.cpp
tb_language.cpp
tb_layout.cpp
tb_linklist.cpp
tb_list.cpp
tb_menu_window.cpp
tb_message_window.cpp
tb_msg.cpp
tb_node_ref_tree.cpp
tb_node_tree.cpp
tb_object.cpp
tb_popup_window.cpp
tb_renderer.cpp
tb_scroll_container.cpp
tb_scroller.cpp
tb_select.cpp
tb_select_item.cpp
tb_skin.cpp
tb_skin_util.cpp
tb_str.cpp
tb_style_edit.cpp
tb_style_edit_content.cpp
tb_system_android.cpp
tb_system_linux.cpp
tb_system_sdl.cpp
tb_system_win.cpp
tb_tab_container.cpp
tb_tempbuffer.cpp
tb_toggle_container.cpp
tb_value.cpp
tb_widget_skin_condition_context.cpp
tb_widget_value.cpp
tb_widgets.cpp
tb_widgets_common.cpp
tb_widgets_listener.cpp
tb_widgets_reader.cpp
tb_window.cpp
image/tb_image_manager.cpp
image/tb_image_widget.cpp
animation/tb_animation.cpp
animation/tb_widget_animation.cpp
image/tb_image_manager.cpp
image/tb_image_widget.cpp
parser/tb_parser.cpp
renderers/tb_renderer_batcher.cpp
renderers/tb_renderer_gl.cpp
utf8/utf8.cpp
)
#install(TARGETS TurboBadgerLib
# RUNTIME DESTINATION bin
# LIBRARY DESTINATION lib
# ARCHIVE DESTINATION lib)
if ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "GNU")
set_property(SOURCE tb_image_loader_stb.cpp APPEND_STRING PROPERTY COMPILE_FLAGS " -Wno-unused-function")
endif ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "GNU")
add_library(TurboBadgerLib STATIC ${LOCAL_SRCS})
install(TARGETS TurboBadgerLib
RUNTIME DESTINATION bin
LIBRARY DESTINATION lib
ARCHIVE DESTINATION lib)

View File

@ -71,7 +71,7 @@ double TBSystem::GetTimeMS()
}
static SDL_TimerID tb_sdl_timer_id = 0;
static Uint32 tb_sdl_timer_callback(Uint32 interval, void *param)
static Uint32 tb_sdl_timer_callback(Uint32 /*interval*/, void * /*param*/)
{
double next_fire_time = TBMessageHandler::GetNextMessageFireTime();
double now = TBSystem::GetTimeMS();

View File

@ -670,7 +670,7 @@ public:
virtual void OnProcessAfterChildren() {}
/** Callback for doing state updates that depend on your application state.
F.ex setting the disabled state on a widget which action is currently not
F.ex setting the disabled state on a widget whose action is currently not
available. This callback is called for all widgets before OnProcess if
something has called InvalidateStates().*/
virtual void OnProcessStates() {}