diff --git a/build/bakefile/nana.bkl b/build/bakefile/nana.bkl
new file mode 100644
index 00000000..89efd513
--- /dev/null
+++ b/build/bakefile/nana.bkl
@@ -0,0 +1,107 @@
+srcdir ../../source;
+
+toolsets = gnu vs2013;
+
+gnu.makefile = ../build/makefile/makefile;
+vs2013.solutionfile = ../build/vc2013/nana.sln;
+
+library nana {
+    includedirs = ../include;
+
+    if ($(toolset) == gnu)
+        cxx-compiler-options = "-std=c++0x `pkg-config --cflags freetype2`";
+
+    sources {
+        any.cpp
+        basic_types.cpp
+        charset.cpp
+        datetime.cpp
+        deploy.cpp
+        exceptions.cpp
+        internationalization.cpp
+        traits.cpp
+        unicode_bidi.cpp
+        filesystem/file_iterator.cpp
+        filesystem/fs_utility.cpp
+        audio/player.cpp
+        audio/detail/audio_device.cpp
+        audio/detail/audio_stream.cpp
+        audio/detail/buffer_preparation.cpp
+        gui/animation.cpp
+        gui/basis.cpp
+        gui/dragger.cpp
+        gui/drawing.cpp
+        gui/effects.cpp
+        gui/element.cpp
+        gui/filebox.cpp
+        gui/layout_utility.cpp
+        gui/msgbox.cpp
+        gui/notifier.cpp
+        gui/place.cpp
+        gui/programming_interface.cpp
+        gui/screen.cpp
+        gui/state_cursor.cpp
+        gui/timer.cpp
+        gui/tooltip.cpp
+        gui/wvl.cpp
+        gui/detail/basic_window.cpp
+        gui/detail/bedrock_pi.cpp
+        gui/detail/color_schemes.cpp
+        gui/detail/drawer.cpp
+        gui/detail/element_store.cpp
+        gui/detail/events_operation.cpp
+        gui/detail/native_window_interface.cpp
+        gui/detail/window_layout.cpp
+        gui/detail/window_manager.cpp
+        gui/widgets/button.cpp
+        gui/widgets/categorize.cpp
+        gui/widgets/checkbox.cpp
+        gui/widgets/combox.cpp
+        gui/widgets/date_chooser.cpp
+        gui/widgets/float_listbox.cpp
+        gui/widgets/form.cpp
+        gui/widgets/frame.cpp
+        gui/widgets/label.cpp
+        gui/widgets/listbox.cpp
+        gui/widgets/menubar.cpp
+        gui/widgets/menu.cpp
+        gui/widgets/panel.cpp
+        gui/widgets/picture.cpp
+        gui/widgets/progress.cpp
+        gui/widgets/scroll.cpp
+        gui/widgets/slider.cpp
+        gui/widgets/spinbox.cpp
+        gui/widgets/tabbar.cpp
+        gui/widgets/textbox.cpp
+        gui/widgets/toolbar.cpp
+        gui/widgets/treebox.cpp
+        gui/widgets/widget.cpp
+        gui/widgets/skeletons/text_editor.cpp
+        paint/gadget.cpp
+        paint/graphics.cpp
+        paint/image.cpp
+        paint/image_process_selector.cpp
+        paint/pixel_buffer.cpp
+        paint/text_renderer.cpp
+        paint/detail/image_process_provider.cpp
+        paint/detail/native_paint_interface.cpp
+        system/dataexch.cpp
+        system/platform.cpp
+        system/shared_wrapper.cpp
+        system/timepiece.cpp
+        threads/pool.cpp
+    }
+
+    if ($(toolset) == gnu)
+        sources {
+            detail/platform_spec_selector.cpp
+            gui/detail/bedrock_selector.cpp
+        }
+
+    if ($(toolset) == vs2013) {
+        sources {
+            detail/win32/platform_spec.cpp
+            gui/detail/win32/bedrock.cpp
+        }
+    }
+}
diff --git a/build/makefile/makefile b/build/makefile/makefile
index 2a473da7..03225611 100644
--- a/build/makefile/makefile
+++ b/build/makefile/makefile
@@ -1,42 +1,305 @@
-#Nana C++ Library
+# This file was automatically generated by bakefile.
 #
-#Makefile created by Jinhao(cnjinhao@hotmail.com)
+# Any manual changes will be lost if it is regenerated,
+# modify the source .bkl file instead if possible.
 
-GCC	= g++
-INCROOT	= ../../include
-SRCROOT	= ../../source
-NANA_INC= $(INCROOT)/nana
+# You may define standard make variables such as CFLAGS or
+# CXXFLAGS to affect the build. For example, you could use:
+#
+#      make CXXFLAGS=-g
+#
+# to build with debug information. The full list of variables
+# that can be used by this makefile is:
+# AR, CC, CFLAGS, CPPFLAGS, CXX, CXXFLAGS, LD, LDFLAGS, MAKE, RANLIB.
 
-INCS	= -I$(INCROOT) -I/usr/include/freetype2
+# You may also specify config=Debug|Release
+# or their corresponding lower case variants on make command line to select
+# the corresponding default flags values.
+ifeq ($(config),debug)
+override config := Debug
+endif
+ifeq ($(config),release)
+override config := Release
+endif
+ifeq ($(config),Debug)
+override CPPFLAGS += -DDEBUG
+override CFLAGS += -g -O0
+override CXXFLAGS += -g -O0
+override LDFLAGS += -g
+else ifeq ($(config),Release)
+override CPPFLAGS += -DNDEBUG
+override CFLAGS += -O2
+override CXXFLAGS += -O2
+else ifneq (,$(config))
+$(warning Unknown configuration "$(config)")
+endif
 
-BIN	= libnana.a
+# Use "make RANLIB=''" for platforms without ranlib.
+RANLIB ?= ranlib
 
-SRC_NANA = $(wildcard $(SRCROOT)/*.cpp)
-SRC_DETAIL = $(wildcard $(SRCROOT)/detail/*.cpp)
-SRC_FILESYSTEM = $(wildcard $(SRCROOT)/filesystem/*.cpp)
-SRC_AUDIO = $(wildcard $(SRCROOT)/audio/*.cpp)
-SRC_AUDIO_DETAIL = $(wildcard $(SRCROOT)/audio/detail/*.cpp)
-SRC_GUI = $(wildcard $(SRCROOT)/gui/*.cpp)
-SRC_GUI_DETAIL = $(wildcard $(SRCROOT)/gui/detail/*.cpp)
-SRC_GUI_WIDGETS = $(wildcard $(SRCROOT)/gui/widgets/*.cpp)
-SRC_GUI_WIDGETS_SKELETONS = $(wildcard $(SRCROOT)/gui/widgets/skeletons/*.cpp)
-SRC_PAINT = $(wildcard $(SRCROOT)/paint/*.cpp)
-SRC_PAINT_DETAIL = $(wildcard $(SRCROOT)/paint/detail/*.cpp)
-SRC_SYSTEM = $(wildcard $(SRCROOT)/system/*.cpp)
-SRC_THREADS= $(wildcard $(SRCROOT)/threads/*.cpp)
+CC := cc
+CXX := c++
 
-SOURCES = $(SRC_NANA) $(SRC_DETAIL) $(SRC_FILESYSTEM) $(SRC_AUDIO) $(SRC_AUDIO_DETAIL) $(SRC_GUI) $(SRC_GUI_DETAIL) $(SRC_GUI_WIDGETS) $(SRC_GUI_WIDGETS_SKELETONS) $(SRC_PAINT) $(SRC_PAINT_DETAIL) $(SRC_SYSTEM) $(SRC_THREADS)
+# The directory for the build files, may be overridden on make command line.
+builddir = .
 
-LINKOBJ	= $(SOURCES:.cpp=.o)
+ifneq ($(builddir),.)
+_builddir := $(if $(findstring $(abspath $(builddir)),$(builddir)),,../../../)$(builddir)/../build/makefile/
+_builddir_error := $(shell mkdir -p $(_builddir) 2>&1)
+$(if $(_builddir_error),$(error Failed to create build directory: $(_builddir_error)))
+endif
+all: $(_builddir)libnana.a
 
-$(BIN): $(LINKOBJ)
-	ar r ../bin/$(BIN) $(LINKOBJ)
-	ranlib ../bin/$(BIN)
+$(_builddir)libnana.a: $(_builddir)nana_any.o $(_builddir)nana_basic_types.o $(_builddir)nana_charset.o $(_builddir)nana_datetime.o $(_builddir)nana_deploy.o $(_builddir)nana_exceptions.o $(_builddir)nana_internationalization.o $(_builddir)nana_traits.o $(_builddir)nana_unicode_bidi.o $(_builddir)nana_file_iterator.o $(_builddir)nana_fs_utility.o $(_builddir)nana_player.o $(_builddir)nana_audio_device.o $(_builddir)nana_audio_stream.o $(_builddir)nana_buffer_preparation.o $(_builddir)nana_animation.o $(_builddir)nana_basis.o $(_builddir)nana_dragger.o $(_builddir)nana_drawing.o $(_builddir)nana_effects.o $(_builddir)nana_element.o $(_builddir)nana_filebox.o $(_builddir)nana_layout_utility.o $(_builddir)nana_msgbox.o $(_builddir)nana_notifier.o $(_builddir)nana_place.o $(_builddir)nana_programming_interface.o $(_builddir)nana_screen.o $(_builddir)nana_state_cursor.o $(_builddir)nana_timer.o $(_builddir)nana_tooltip.o $(_builddir)nana_wvl.o $(_builddir)nana_basic_window.o $(_builddir)nana_bedrock_pi.o $(_builddir)nana_color_schemes.o $(_builddir)nana_drawer.o $(_builddir)nana_element_store.o $(_builddir)nana_events_operation.o $(_builddir)nana_native_window_interface.o $(_builddir)nana_window_layout.o $(_builddir)nana_window_manager.o $(_builddir)nana_button.o $(_builddir)nana_categorize.o $(_builddir)nana_checkbox.o $(_builddir)nana_combox.o $(_builddir)nana_date_chooser.o $(_builddir)nana_float_listbox.o $(_builddir)nana_form.o $(_builddir)nana_frame.o $(_builddir)nana_label.o $(_builddir)nana_listbox.o $(_builddir)nana_menubar.o $(_builddir)nana_menu.o $(_builddir)nana_panel.o $(_builddir)nana_picture.o $(_builddir)nana_progress.o $(_builddir)nana_scroll.o $(_builddir)nana_slider.o $(_builddir)nana_spinbox.o $(_builddir)nana_tabbar.o $(_builddir)nana_textbox.o $(_builddir)nana_toolbar.o $(_builddir)nana_treebox.o $(_builddir)nana_widget.o $(_builddir)nana_text_editor.o $(_builddir)nana_gadget.o $(_builddir)nana_graphics.o $(_builddir)nana_image.o $(_builddir)nana_image_process_selector.o $(_builddir)nana_pixel_buffer.o $(_builddir)nana_text_renderer.o $(_builddir)nana_image_process_provider.o $(_builddir)nana_native_paint_interface.o $(_builddir)nana_dataexch.o $(_builddir)nana_platform.o $(_builddir)nana_shared_wrapper.o $(_builddir)nana_timepiece.o $(_builddir)nana_pool.o $(_builddir)nana_platform_spec_selector.o $(_builddir)nana_bedrock_selector.o
+	$(AR) rcu $@ $(_builddir)nana_any.o $(_builddir)nana_basic_types.o $(_builddir)nana_charset.o $(_builddir)nana_datetime.o $(_builddir)nana_deploy.o $(_builddir)nana_exceptions.o $(_builddir)nana_internationalization.o $(_builddir)nana_traits.o $(_builddir)nana_unicode_bidi.o $(_builddir)nana_file_iterator.o $(_builddir)nana_fs_utility.o $(_builddir)nana_player.o $(_builddir)nana_audio_device.o $(_builddir)nana_audio_stream.o $(_builddir)nana_buffer_preparation.o $(_builddir)nana_animation.o $(_builddir)nana_basis.o $(_builddir)nana_dragger.o $(_builddir)nana_drawing.o $(_builddir)nana_effects.o $(_builddir)nana_element.o $(_builddir)nana_filebox.o $(_builddir)nana_layout_utility.o $(_builddir)nana_msgbox.o $(_builddir)nana_notifier.o $(_builddir)nana_place.o $(_builddir)nana_programming_interface.o $(_builddir)nana_screen.o $(_builddir)nana_state_cursor.o $(_builddir)nana_timer.o $(_builddir)nana_tooltip.o $(_builddir)nana_wvl.o $(_builddir)nana_basic_window.o $(_builddir)nana_bedrock_pi.o $(_builddir)nana_color_schemes.o $(_builddir)nana_drawer.o $(_builddir)nana_element_store.o $(_builddir)nana_events_operation.o $(_builddir)nana_native_window_interface.o $(_builddir)nana_window_layout.o $(_builddir)nana_window_manager.o $(_builddir)nana_button.o $(_builddir)nana_categorize.o $(_builddir)nana_checkbox.o $(_builddir)nana_combox.o $(_builddir)nana_date_chooser.o $(_builddir)nana_float_listbox.o $(_builddir)nana_form.o $(_builddir)nana_frame.o $(_builddir)nana_label.o $(_builddir)nana_listbox.o $(_builddir)nana_menubar.o $(_builddir)nana_menu.o $(_builddir)nana_panel.o $(_builddir)nana_picture.o $(_builddir)nana_progress.o $(_builddir)nana_scroll.o $(_builddir)nana_slider.o $(_builddir)nana_spinbox.o $(_builddir)nana_tabbar.o $(_builddir)nana_textbox.o $(_builddir)nana_toolbar.o $(_builddir)nana_treebox.o $(_builddir)nana_widget.o $(_builddir)nana_text_editor.o $(_builddir)nana_gadget.o $(_builddir)nana_graphics.o $(_builddir)nana_image.o $(_builddir)nana_image_process_selector.o $(_builddir)nana_pixel_buffer.o $(_builddir)nana_text_renderer.o $(_builddir)nana_image_process_provider.o $(_builddir)nana_native_paint_interface.o $(_builddir)nana_dataexch.o $(_builddir)nana_platform.o $(_builddir)nana_shared_wrapper.o $(_builddir)nana_timepiece.o $(_builddir)nana_pool.o $(_builddir)nana_platform_spec_selector.o $(_builddir)nana_bedrock_selector.o
+	$(RANLIB) $@
 
-.cpp.o:
-	$(GCC) -g -c $< -o $@ $(INCS) -std=c++0x -Wall
+$(_builddir)nana_any.o: ../../source/any.cpp
+	$(CXX) -c -o $@ $(CPPFLAGS) $(CXXFLAGS) -MD -MP -fPIC -DPIC -pthread -I../../include -std=c++0x `pkg-config --cflags freetype2` ../../source/any.cpp
+
+$(_builddir)nana_basic_types.o: ../../source/basic_types.cpp
+	$(CXX) -c -o $@ $(CPPFLAGS) $(CXXFLAGS) -MD -MP -fPIC -DPIC -pthread -I../../include -std=c++0x `pkg-config --cflags freetype2` ../../source/basic_types.cpp
+
+$(_builddir)nana_charset.o: ../../source/charset.cpp
+	$(CXX) -c -o $@ $(CPPFLAGS) $(CXXFLAGS) -MD -MP -fPIC -DPIC -pthread -I../../include -std=c++0x `pkg-config --cflags freetype2` ../../source/charset.cpp
+
+$(_builddir)nana_datetime.o: ../../source/datetime.cpp
+	$(CXX) -c -o $@ $(CPPFLAGS) $(CXXFLAGS) -MD -MP -fPIC -DPIC -pthread -I../../include -std=c++0x `pkg-config --cflags freetype2` ../../source/datetime.cpp
+
+$(_builddir)nana_deploy.o: ../../source/deploy.cpp
+	$(CXX) -c -o $@ $(CPPFLAGS) $(CXXFLAGS) -MD -MP -fPIC -DPIC -pthread -I../../include -std=c++0x `pkg-config --cflags freetype2` ../../source/deploy.cpp
+
+$(_builddir)nana_exceptions.o: ../../source/exceptions.cpp
+	$(CXX) -c -o $@ $(CPPFLAGS) $(CXXFLAGS) -MD -MP -fPIC -DPIC -pthread -I../../include -std=c++0x `pkg-config --cflags freetype2` ../../source/exceptions.cpp
+
+$(_builddir)nana_internationalization.o: ../../source/internationalization.cpp
+	$(CXX) -c -o $@ $(CPPFLAGS) $(CXXFLAGS) -MD -MP -fPIC -DPIC -pthread -I../../include -std=c++0x `pkg-config --cflags freetype2` ../../source/internationalization.cpp
+
+$(_builddir)nana_traits.o: ../../source/traits.cpp
+	$(CXX) -c -o $@ $(CPPFLAGS) $(CXXFLAGS) -MD -MP -fPIC -DPIC -pthread -I../../include -std=c++0x `pkg-config --cflags freetype2` ../../source/traits.cpp
+
+$(_builddir)nana_unicode_bidi.o: ../../source/unicode_bidi.cpp
+	$(CXX) -c -o $@ $(CPPFLAGS) $(CXXFLAGS) -MD -MP -fPIC -DPIC -pthread -I../../include -std=c++0x `pkg-config --cflags freetype2` ../../source/unicode_bidi.cpp
+
+$(_builddir)nana_file_iterator.o: ../../source/filesystem/file_iterator.cpp
+	$(CXX) -c -o $@ $(CPPFLAGS) $(CXXFLAGS) -MD -MP -fPIC -DPIC -pthread -I../../include -std=c++0x `pkg-config --cflags freetype2` ../../source/filesystem/file_iterator.cpp
+
+$(_builddir)nana_fs_utility.o: ../../source/filesystem/fs_utility.cpp
+	$(CXX) -c -o $@ $(CPPFLAGS) $(CXXFLAGS) -MD -MP -fPIC -DPIC -pthread -I../../include -std=c++0x `pkg-config --cflags freetype2` ../../source/filesystem/fs_utility.cpp
+
+$(_builddir)nana_player.o: ../../source/audio/player.cpp
+	$(CXX) -c -o $@ $(CPPFLAGS) $(CXXFLAGS) -MD -MP -fPIC -DPIC -pthread -I../../include -std=c++0x `pkg-config --cflags freetype2` ../../source/audio/player.cpp
+
+$(_builddir)nana_audio_device.o: ../../source/audio/detail/audio_device.cpp
+	$(CXX) -c -o $@ $(CPPFLAGS) $(CXXFLAGS) -MD -MP -fPIC -DPIC -pthread -I../../include -std=c++0x `pkg-config --cflags freetype2` ../../source/audio/detail/audio_device.cpp
+
+$(_builddir)nana_audio_stream.o: ../../source/audio/detail/audio_stream.cpp
+	$(CXX) -c -o $@ $(CPPFLAGS) $(CXXFLAGS) -MD -MP -fPIC -DPIC -pthread -I../../include -std=c++0x `pkg-config --cflags freetype2` ../../source/audio/detail/audio_stream.cpp
+
+$(_builddir)nana_buffer_preparation.o: ../../source/audio/detail/buffer_preparation.cpp
+	$(CXX) -c -o $@ $(CPPFLAGS) $(CXXFLAGS) -MD -MP -fPIC -DPIC -pthread -I../../include -std=c++0x `pkg-config --cflags freetype2` ../../source/audio/detail/buffer_preparation.cpp
+
+$(_builddir)nana_animation.o: ../../source/gui/animation.cpp
+	$(CXX) -c -o $@ $(CPPFLAGS) $(CXXFLAGS) -MD -MP -fPIC -DPIC -pthread -I../../include -std=c++0x `pkg-config --cflags freetype2` ../../source/gui/animation.cpp
+
+$(_builddir)nana_basis.o: ../../source/gui/basis.cpp
+	$(CXX) -c -o $@ $(CPPFLAGS) $(CXXFLAGS) -MD -MP -fPIC -DPIC -pthread -I../../include -std=c++0x `pkg-config --cflags freetype2` ../../source/gui/basis.cpp
+
+$(_builddir)nana_dragger.o: ../../source/gui/dragger.cpp
+	$(CXX) -c -o $@ $(CPPFLAGS) $(CXXFLAGS) -MD -MP -fPIC -DPIC -pthread -I../../include -std=c++0x `pkg-config --cflags freetype2` ../../source/gui/dragger.cpp
+
+$(_builddir)nana_drawing.o: ../../source/gui/drawing.cpp
+	$(CXX) -c -o $@ $(CPPFLAGS) $(CXXFLAGS) -MD -MP -fPIC -DPIC -pthread -I../../include -std=c++0x `pkg-config --cflags freetype2` ../../source/gui/drawing.cpp
+
+$(_builddir)nana_effects.o: ../../source/gui/effects.cpp
+	$(CXX) -c -o $@ $(CPPFLAGS) $(CXXFLAGS) -MD -MP -fPIC -DPIC -pthread -I../../include -std=c++0x `pkg-config --cflags freetype2` ../../source/gui/effects.cpp
+
+$(_builddir)nana_element.o: ../../source/gui/element.cpp
+	$(CXX) -c -o $@ $(CPPFLAGS) $(CXXFLAGS) -MD -MP -fPIC -DPIC -pthread -I../../include -std=c++0x `pkg-config --cflags freetype2` ../../source/gui/element.cpp
+
+$(_builddir)nana_filebox.o: ../../source/gui/filebox.cpp
+	$(CXX) -c -o $@ $(CPPFLAGS) $(CXXFLAGS) -MD -MP -fPIC -DPIC -pthread -I../../include -std=c++0x `pkg-config --cflags freetype2` ../../source/gui/filebox.cpp
+
+$(_builddir)nana_layout_utility.o: ../../source/gui/layout_utility.cpp
+	$(CXX) -c -o $@ $(CPPFLAGS) $(CXXFLAGS) -MD -MP -fPIC -DPIC -pthread -I../../include -std=c++0x `pkg-config --cflags freetype2` ../../source/gui/layout_utility.cpp
+
+$(_builddir)nana_msgbox.o: ../../source/gui/msgbox.cpp
+	$(CXX) -c -o $@ $(CPPFLAGS) $(CXXFLAGS) -MD -MP -fPIC -DPIC -pthread -I../../include -std=c++0x `pkg-config --cflags freetype2` ../../source/gui/msgbox.cpp
+
+$(_builddir)nana_notifier.o: ../../source/gui/notifier.cpp
+	$(CXX) -c -o $@ $(CPPFLAGS) $(CXXFLAGS) -MD -MP -fPIC -DPIC -pthread -I../../include -std=c++0x `pkg-config --cflags freetype2` ../../source/gui/notifier.cpp
+
+$(_builddir)nana_place.o: ../../source/gui/place.cpp
+	$(CXX) -c -o $@ $(CPPFLAGS) $(CXXFLAGS) -MD -MP -fPIC -DPIC -pthread -I../../include -std=c++0x `pkg-config --cflags freetype2` ../../source/gui/place.cpp
+
+$(_builddir)nana_programming_interface.o: ../../source/gui/programming_interface.cpp
+	$(CXX) -c -o $@ $(CPPFLAGS) $(CXXFLAGS) -MD -MP -fPIC -DPIC -pthread -I../../include -std=c++0x `pkg-config --cflags freetype2` ../../source/gui/programming_interface.cpp
+
+$(_builddir)nana_screen.o: ../../source/gui/screen.cpp
+	$(CXX) -c -o $@ $(CPPFLAGS) $(CXXFLAGS) -MD -MP -fPIC -DPIC -pthread -I../../include -std=c++0x `pkg-config --cflags freetype2` ../../source/gui/screen.cpp
+
+$(_builddir)nana_state_cursor.o: ../../source/gui/state_cursor.cpp
+	$(CXX) -c -o $@ $(CPPFLAGS) $(CXXFLAGS) -MD -MP -fPIC -DPIC -pthread -I../../include -std=c++0x `pkg-config --cflags freetype2` ../../source/gui/state_cursor.cpp
+
+$(_builddir)nana_timer.o: ../../source/gui/timer.cpp
+	$(CXX) -c -o $@ $(CPPFLAGS) $(CXXFLAGS) -MD -MP -fPIC -DPIC -pthread -I../../include -std=c++0x `pkg-config --cflags freetype2` ../../source/gui/timer.cpp
+
+$(_builddir)nana_tooltip.o: ../../source/gui/tooltip.cpp
+	$(CXX) -c -o $@ $(CPPFLAGS) $(CXXFLAGS) -MD -MP -fPIC -DPIC -pthread -I../../include -std=c++0x `pkg-config --cflags freetype2` ../../source/gui/tooltip.cpp
+
+$(_builddir)nana_wvl.o: ../../source/gui/wvl.cpp
+	$(CXX) -c -o $@ $(CPPFLAGS) $(CXXFLAGS) -MD -MP -fPIC -DPIC -pthread -I../../include -std=c++0x `pkg-config --cflags freetype2` ../../source/gui/wvl.cpp
+
+$(_builddir)nana_basic_window.o: ../../source/gui/detail/basic_window.cpp
+	$(CXX) -c -o $@ $(CPPFLAGS) $(CXXFLAGS) -MD -MP -fPIC -DPIC -pthread -I../../include -std=c++0x `pkg-config --cflags freetype2` ../../source/gui/detail/basic_window.cpp
+
+$(_builddir)nana_bedrock_pi.o: ../../source/gui/detail/bedrock_pi.cpp
+	$(CXX) -c -o $@ $(CPPFLAGS) $(CXXFLAGS) -MD -MP -fPIC -DPIC -pthread -I../../include -std=c++0x `pkg-config --cflags freetype2` ../../source/gui/detail/bedrock_pi.cpp
+
+$(_builddir)nana_color_schemes.o: ../../source/gui/detail/color_schemes.cpp
+	$(CXX) -c -o $@ $(CPPFLAGS) $(CXXFLAGS) -MD -MP -fPIC -DPIC -pthread -I../../include -std=c++0x `pkg-config --cflags freetype2` ../../source/gui/detail/color_schemes.cpp
+
+$(_builddir)nana_drawer.o: ../../source/gui/detail/drawer.cpp
+	$(CXX) -c -o $@ $(CPPFLAGS) $(CXXFLAGS) -MD -MP -fPIC -DPIC -pthread -I../../include -std=c++0x `pkg-config --cflags freetype2` ../../source/gui/detail/drawer.cpp
+
+$(_builddir)nana_element_store.o: ../../source/gui/detail/element_store.cpp
+	$(CXX) -c -o $@ $(CPPFLAGS) $(CXXFLAGS) -MD -MP -fPIC -DPIC -pthread -I../../include -std=c++0x `pkg-config --cflags freetype2` ../../source/gui/detail/element_store.cpp
+
+$(_builddir)nana_events_operation.o: ../../source/gui/detail/events_operation.cpp
+	$(CXX) -c -o $@ $(CPPFLAGS) $(CXXFLAGS) -MD -MP -fPIC -DPIC -pthread -I../../include -std=c++0x `pkg-config --cflags freetype2` ../../source/gui/detail/events_operation.cpp
+
+$(_builddir)nana_native_window_interface.o: ../../source/gui/detail/native_window_interface.cpp
+	$(CXX) -c -o $@ $(CPPFLAGS) $(CXXFLAGS) -MD -MP -fPIC -DPIC -pthread -I../../include -std=c++0x `pkg-config --cflags freetype2` ../../source/gui/detail/native_window_interface.cpp
+
+$(_builddir)nana_window_layout.o: ../../source/gui/detail/window_layout.cpp
+	$(CXX) -c -o $@ $(CPPFLAGS) $(CXXFLAGS) -MD -MP -fPIC -DPIC -pthread -I../../include -std=c++0x `pkg-config --cflags freetype2` ../../source/gui/detail/window_layout.cpp
+
+$(_builddir)nana_window_manager.o: ../../source/gui/detail/window_manager.cpp
+	$(CXX) -c -o $@ $(CPPFLAGS) $(CXXFLAGS) -MD -MP -fPIC -DPIC -pthread -I../../include -std=c++0x `pkg-config --cflags freetype2` ../../source/gui/detail/window_manager.cpp
+
+$(_builddir)nana_button.o: ../../source/gui/widgets/button.cpp
+	$(CXX) -c -o $@ $(CPPFLAGS) $(CXXFLAGS) -MD -MP -fPIC -DPIC -pthread -I../../include -std=c++0x `pkg-config --cflags freetype2` ../../source/gui/widgets/button.cpp
+
+$(_builddir)nana_categorize.o: ../../source/gui/widgets/categorize.cpp
+	$(CXX) -c -o $@ $(CPPFLAGS) $(CXXFLAGS) -MD -MP -fPIC -DPIC -pthread -I../../include -std=c++0x `pkg-config --cflags freetype2` ../../source/gui/widgets/categorize.cpp
+
+$(_builddir)nana_checkbox.o: ../../source/gui/widgets/checkbox.cpp
+	$(CXX) -c -o $@ $(CPPFLAGS) $(CXXFLAGS) -MD -MP -fPIC -DPIC -pthread -I../../include -std=c++0x `pkg-config --cflags freetype2` ../../source/gui/widgets/checkbox.cpp
+
+$(_builddir)nana_combox.o: ../../source/gui/widgets/combox.cpp
+	$(CXX) -c -o $@ $(CPPFLAGS) $(CXXFLAGS) -MD -MP -fPIC -DPIC -pthread -I../../include -std=c++0x `pkg-config --cflags freetype2` ../../source/gui/widgets/combox.cpp
+
+$(_builddir)nana_date_chooser.o: ../../source/gui/widgets/date_chooser.cpp
+	$(CXX) -c -o $@ $(CPPFLAGS) $(CXXFLAGS) -MD -MP -fPIC -DPIC -pthread -I../../include -std=c++0x `pkg-config --cflags freetype2` ../../source/gui/widgets/date_chooser.cpp
+
+$(_builddir)nana_float_listbox.o: ../../source/gui/widgets/float_listbox.cpp
+	$(CXX) -c -o $@ $(CPPFLAGS) $(CXXFLAGS) -MD -MP -fPIC -DPIC -pthread -I../../include -std=c++0x `pkg-config --cflags freetype2` ../../source/gui/widgets/float_listbox.cpp
+
+$(_builddir)nana_form.o: ../../source/gui/widgets/form.cpp
+	$(CXX) -c -o $@ $(CPPFLAGS) $(CXXFLAGS) -MD -MP -fPIC -DPIC -pthread -I../../include -std=c++0x `pkg-config --cflags freetype2` ../../source/gui/widgets/form.cpp
+
+$(_builddir)nana_frame.o: ../../source/gui/widgets/frame.cpp
+	$(CXX) -c -o $@ $(CPPFLAGS) $(CXXFLAGS) -MD -MP -fPIC -DPIC -pthread -I../../include -std=c++0x `pkg-config --cflags freetype2` ../../source/gui/widgets/frame.cpp
+
+$(_builddir)nana_label.o: ../../source/gui/widgets/label.cpp
+	$(CXX) -c -o $@ $(CPPFLAGS) $(CXXFLAGS) -MD -MP -fPIC -DPIC -pthread -I../../include -std=c++0x `pkg-config --cflags freetype2` ../../source/gui/widgets/label.cpp
+
+$(_builddir)nana_listbox.o: ../../source/gui/widgets/listbox.cpp
+	$(CXX) -c -o $@ $(CPPFLAGS) $(CXXFLAGS) -MD -MP -fPIC -DPIC -pthread -I../../include -std=c++0x `pkg-config --cflags freetype2` ../../source/gui/widgets/listbox.cpp
+
+$(_builddir)nana_menubar.o: ../../source/gui/widgets/menubar.cpp
+	$(CXX) -c -o $@ $(CPPFLAGS) $(CXXFLAGS) -MD -MP -fPIC -DPIC -pthread -I../../include -std=c++0x `pkg-config --cflags freetype2` ../../source/gui/widgets/menubar.cpp
+
+$(_builddir)nana_menu.o: ../../source/gui/widgets/menu.cpp
+	$(CXX) -c -o $@ $(CPPFLAGS) $(CXXFLAGS) -MD -MP -fPIC -DPIC -pthread -I../../include -std=c++0x `pkg-config --cflags freetype2` ../../source/gui/widgets/menu.cpp
+
+$(_builddir)nana_panel.o: ../../source/gui/widgets/panel.cpp
+	$(CXX) -c -o $@ $(CPPFLAGS) $(CXXFLAGS) -MD -MP -fPIC -DPIC -pthread -I../../include -std=c++0x `pkg-config --cflags freetype2` ../../source/gui/widgets/panel.cpp
+
+$(_builddir)nana_picture.o: ../../source/gui/widgets/picture.cpp
+	$(CXX) -c -o $@ $(CPPFLAGS) $(CXXFLAGS) -MD -MP -fPIC -DPIC -pthread -I../../include -std=c++0x `pkg-config --cflags freetype2` ../../source/gui/widgets/picture.cpp
+
+$(_builddir)nana_progress.o: ../../source/gui/widgets/progress.cpp
+	$(CXX) -c -o $@ $(CPPFLAGS) $(CXXFLAGS) -MD -MP -fPIC -DPIC -pthread -I../../include -std=c++0x `pkg-config --cflags freetype2` ../../source/gui/widgets/progress.cpp
+
+$(_builddir)nana_scroll.o: ../../source/gui/widgets/scroll.cpp
+	$(CXX) -c -o $@ $(CPPFLAGS) $(CXXFLAGS) -MD -MP -fPIC -DPIC -pthread -I../../include -std=c++0x `pkg-config --cflags freetype2` ../../source/gui/widgets/scroll.cpp
+
+$(_builddir)nana_slider.o: ../../source/gui/widgets/slider.cpp
+	$(CXX) -c -o $@ $(CPPFLAGS) $(CXXFLAGS) -MD -MP -fPIC -DPIC -pthread -I../../include -std=c++0x `pkg-config --cflags freetype2` ../../source/gui/widgets/slider.cpp
+
+$(_builddir)nana_spinbox.o: ../../source/gui/widgets/spinbox.cpp
+	$(CXX) -c -o $@ $(CPPFLAGS) $(CXXFLAGS) -MD -MP -fPIC -DPIC -pthread -I../../include -std=c++0x `pkg-config --cflags freetype2` ../../source/gui/widgets/spinbox.cpp
+
+$(_builddir)nana_tabbar.o: ../../source/gui/widgets/tabbar.cpp
+	$(CXX) -c -o $@ $(CPPFLAGS) $(CXXFLAGS) -MD -MP -fPIC -DPIC -pthread -I../../include -std=c++0x `pkg-config --cflags freetype2` ../../source/gui/widgets/tabbar.cpp
+
+$(_builddir)nana_textbox.o: ../../source/gui/widgets/textbox.cpp
+	$(CXX) -c -o $@ $(CPPFLAGS) $(CXXFLAGS) -MD -MP -fPIC -DPIC -pthread -I../../include -std=c++0x `pkg-config --cflags freetype2` ../../source/gui/widgets/textbox.cpp
+
+$(_builddir)nana_toolbar.o: ../../source/gui/widgets/toolbar.cpp
+	$(CXX) -c -o $@ $(CPPFLAGS) $(CXXFLAGS) -MD -MP -fPIC -DPIC -pthread -I../../include -std=c++0x `pkg-config --cflags freetype2` ../../source/gui/widgets/toolbar.cpp
+
+$(_builddir)nana_treebox.o: ../../source/gui/widgets/treebox.cpp
+	$(CXX) -c -o $@ $(CPPFLAGS) $(CXXFLAGS) -MD -MP -fPIC -DPIC -pthread -I../../include -std=c++0x `pkg-config --cflags freetype2` ../../source/gui/widgets/treebox.cpp
+
+$(_builddir)nana_widget.o: ../../source/gui/widgets/widget.cpp
+	$(CXX) -c -o $@ $(CPPFLAGS) $(CXXFLAGS) -MD -MP -fPIC -DPIC -pthread -I../../include -std=c++0x `pkg-config --cflags freetype2` ../../source/gui/widgets/widget.cpp
+
+$(_builddir)nana_text_editor.o: ../../source/gui/widgets/skeletons/text_editor.cpp
+	$(CXX) -c -o $@ $(CPPFLAGS) $(CXXFLAGS) -MD -MP -fPIC -DPIC -pthread -I../../include -std=c++0x `pkg-config --cflags freetype2` ../../source/gui/widgets/skeletons/text_editor.cpp
+
+$(_builddir)nana_gadget.o: ../../source/paint/gadget.cpp
+	$(CXX) -c -o $@ $(CPPFLAGS) $(CXXFLAGS) -MD -MP -fPIC -DPIC -pthread -I../../include -std=c++0x `pkg-config --cflags freetype2` ../../source/paint/gadget.cpp
+
+$(_builddir)nana_graphics.o: ../../source/paint/graphics.cpp
+	$(CXX) -c -o $@ $(CPPFLAGS) $(CXXFLAGS) -MD -MP -fPIC -DPIC -pthread -I../../include -std=c++0x `pkg-config --cflags freetype2` ../../source/paint/graphics.cpp
+
+$(_builddir)nana_image.o: ../../source/paint/image.cpp
+	$(CXX) -c -o $@ $(CPPFLAGS) $(CXXFLAGS) -MD -MP -fPIC -DPIC -pthread -I../../include -std=c++0x `pkg-config --cflags freetype2` ../../source/paint/image.cpp
+
+$(_builddir)nana_image_process_selector.o: ../../source/paint/image_process_selector.cpp
+	$(CXX) -c -o $@ $(CPPFLAGS) $(CXXFLAGS) -MD -MP -fPIC -DPIC -pthread -I../../include -std=c++0x `pkg-config --cflags freetype2` ../../source/paint/image_process_selector.cpp
+
+$(_builddir)nana_pixel_buffer.o: ../../source/paint/pixel_buffer.cpp
+	$(CXX) -c -o $@ $(CPPFLAGS) $(CXXFLAGS) -MD -MP -fPIC -DPIC -pthread -I../../include -std=c++0x `pkg-config --cflags freetype2` ../../source/paint/pixel_buffer.cpp
+
+$(_builddir)nana_text_renderer.o: ../../source/paint/text_renderer.cpp
+	$(CXX) -c -o $@ $(CPPFLAGS) $(CXXFLAGS) -MD -MP -fPIC -DPIC -pthread -I../../include -std=c++0x `pkg-config --cflags freetype2` ../../source/paint/text_renderer.cpp
+
+$(_builddir)nana_image_process_provider.o: ../../source/paint/detail/image_process_provider.cpp
+	$(CXX) -c -o $@ $(CPPFLAGS) $(CXXFLAGS) -MD -MP -fPIC -DPIC -pthread -I../../include -std=c++0x `pkg-config --cflags freetype2` ../../source/paint/detail/image_process_provider.cpp
+
+$(_builddir)nana_native_paint_interface.o: ../../source/paint/detail/native_paint_interface.cpp
+	$(CXX) -c -o $@ $(CPPFLAGS) $(CXXFLAGS) -MD -MP -fPIC -DPIC -pthread -I../../include -std=c++0x `pkg-config --cflags freetype2` ../../source/paint/detail/native_paint_interface.cpp
+
+$(_builddir)nana_dataexch.o: ../../source/system/dataexch.cpp
+	$(CXX) -c -o $@ $(CPPFLAGS) $(CXXFLAGS) -MD -MP -fPIC -DPIC -pthread -I../../include -std=c++0x `pkg-config --cflags freetype2` ../../source/system/dataexch.cpp
+
+$(_builddir)nana_platform.o: ../../source/system/platform.cpp
+	$(CXX) -c -o $@ $(CPPFLAGS) $(CXXFLAGS) -MD -MP -fPIC -DPIC -pthread -I../../include -std=c++0x `pkg-config --cflags freetype2` ../../source/system/platform.cpp
+
+$(_builddir)nana_shared_wrapper.o: ../../source/system/shared_wrapper.cpp
+	$(CXX) -c -o $@ $(CPPFLAGS) $(CXXFLAGS) -MD -MP -fPIC -DPIC -pthread -I../../include -std=c++0x `pkg-config --cflags freetype2` ../../source/system/shared_wrapper.cpp
+
+$(_builddir)nana_timepiece.o: ../../source/system/timepiece.cpp
+	$(CXX) -c -o $@ $(CPPFLAGS) $(CXXFLAGS) -MD -MP -fPIC -DPIC -pthread -I../../include -std=c++0x `pkg-config --cflags freetype2` ../../source/system/timepiece.cpp
+
+$(_builddir)nana_pool.o: ../../source/threads/pool.cpp
+	$(CXX) -c -o $@ $(CPPFLAGS) $(CXXFLAGS) -MD -MP -fPIC -DPIC -pthread -I../../include -std=c++0x `pkg-config --cflags freetype2` ../../source/threads/pool.cpp
+
+$(_builddir)nana_platform_spec_selector.o: ../../source/detail/platform_spec_selector.cpp
+	$(CXX) -c -o $@ $(CPPFLAGS) $(CXXFLAGS) -MD -MP -fPIC -DPIC -pthread -I../../include -std=c++0x `pkg-config --cflags freetype2` ../../source/detail/platform_spec_selector.cpp
+
+$(_builddir)nana_bedrock_selector.o: ../../source/gui/detail/bedrock_selector.cpp
+	$(CXX) -c -o $@ $(CPPFLAGS) $(CXXFLAGS) -MD -MP -fPIC -DPIC -pthread -I../../include -std=c++0x `pkg-config --cflags freetype2` ../../source/gui/detail/bedrock_selector.cpp
 
 clean:
-	rm -f $(LINKOBJ)
-	rm -f ../bin/$(BIN)
+	rm -f $(_builddir)*.o
+	rm -f $(_builddir)*.d
+	rm -f $(_builddir)libnana.a
 
+.PHONY: all clean
+
+# Dependencies tracking:
+-include *.d
diff --git a/build/vc2013/nana.sln b/build/vc2013/nana.sln
index 6baefd4a..8f49cc71 100644
--- a/build/vc2013/nana.sln
+++ b/build/vc2013/nana.sln
@@ -1,22 +1,22 @@
-
-Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio Express 2013 for Windows Desktop
-VisualStudioVersion = 12.0.21005.1
-MinimumVisualStudioVersion = 10.0.40219.1
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "nana", "nana.vcxproj", "{25B21068-491B-4A9F-B99F-6C27BF31BAAD}"
-EndProject
-Global
-	GlobalSection(SolutionConfigurationPlatforms) = preSolution
-		Debug|Win32 = Debug|Win32
-		Release|Win32 = Release|Win32
-	EndGlobalSection
-	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{25B21068-491B-4A9F-B99F-6C27BF31BAAD}.Debug|Win32.ActiveCfg = Debug|Win32
-		{25B21068-491B-4A9F-B99F-6C27BF31BAAD}.Debug|Win32.Build.0 = Debug|Win32
-		{25B21068-491B-4A9F-B99F-6C27BF31BAAD}.Release|Win32.ActiveCfg = Release|Win32
-		{25B21068-491B-4A9F-B99F-6C27BF31BAAD}.Release|Win32.Build.0 = Release|Win32
-	EndGlobalSection
-	GlobalSection(SolutionProperties) = preSolution
-		HideSolutionNode = FALSE
-	EndGlobalSection
-EndGlobal
+
+Microsoft Visual Studio Solution File, Format Version 12.00
+# Visual Studio 2013
+VisualStudioVersion = 12.0.21005.1
+MinimumVisualStudioVersion = 10.0.40219.1
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "nana", "nana.vcxproj", "{78487472-4F43-5A69-93CC-4FDC4D124241}"
+EndProject
+Global
+	GlobalSection(SolutionConfigurationPlatforms) = preSolution
+		Debug|Win32 = Debug|Win32
+		Release|Win32 = Release|Win32
+	EndGlobalSection
+	GlobalSection(ProjectConfigurationPlatforms) = postSolution
+		{78487472-4F43-5A69-93CC-4FDC4D124241}.Debug|Win32.ActiveCfg = Debug|Win32
+		{78487472-4F43-5A69-93CC-4FDC4D124241}.Debug|Win32.Build.0 = Debug|Win32
+		{78487472-4F43-5A69-93CC-4FDC4D124241}.Release|Win32.ActiveCfg = Release|Win32
+		{78487472-4F43-5A69-93CC-4FDC4D124241}.Release|Win32.Build.0 = Release|Win32
+	EndGlobalSection
+	GlobalSection(SolutionProperties) = preSolution
+		HideSolutionNode = FALSE
+	EndGlobalSection
+EndGlobal
diff --git a/build/vc2013/nana.vcxproj b/build/vc2013/nana.vcxproj
index d6b6e976..c3b2d3ac 100644
--- a/build/vc2013/nana.vcxproj
+++ b/build/vc2013/nana.vcxproj
@@ -1,169 +1,163 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup Label="ProjectConfigurations">
-    <ProjectConfiguration Include="Debug|Win32">
-      <Configuration>Debug</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|Win32">
-      <Configuration>Release</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-  </ItemGroup>
-  <PropertyGroup Label="Globals">
-    <ProjectGuid>{25B21068-491B-4A9F-B99F-6C27BF31BAAD}</ProjectGuid>
-    <Keyword>Win32Proj</Keyword>
-    <RootNamespace>nana</RootNamespace>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
-    <ConfigurationType>StaticLibrary</ConfigurationType>
-    <UseDebugLibraries>true</UseDebugLibraries>
-    <PlatformToolset>v120</PlatformToolset>
-    <CharacterSet>Unicode</CharacterSet>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
-    <ConfigurationType>StaticLibrary</ConfigurationType>
-    <UseDebugLibraries>false</UseDebugLibraries>
-    <PlatformToolset>v120</PlatformToolset>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-    <CharacterSet>Unicode</CharacterSet>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-  <ImportGroup Label="ExtensionSettings">
-  </ImportGroup>
-  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <PropertyGroup Label="UserMacros" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <OutDir>../bin/vc2013/</OutDir>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <OutDir>../bin/vc2013/</OutDir>
-  </PropertyGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <ClCompile>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <WarningLevel>Level3</WarningLevel>
-      <Optimization>Disabled</Optimization>
-      <PreprocessorDefinitions>WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-    </ClCompile>
-    <Link>
-      <SubSystem>Windows</SubSystem>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-    </Link>
-    <Lib>
-      <OutputFile>$(OutDir)\nana_debug.lib</OutputFile>
-    </Lib>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <ClCompile>
-      <WarningLevel>Level3</WarningLevel>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <Optimization>MaxSpeed</Optimization>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <IntrinsicFunctions>true</IntrinsicFunctions>
-      <PreprocessorDefinitions>WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-    </ClCompile>
-    <Link>
-      <SubSystem>Windows</SubSystem>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <OptimizeReferences>true</OptimizeReferences>
-    </Link>
-    <Lib>
-      <OutputFile>$(OutDir)\nana_release.lib</OutputFile>
-    </Lib>
-  </ItemDefinitionGroup>
-  <ItemGroup>
-    <ClCompile Include="..\..\source\any.cpp" />
-    <ClCompile Include="..\..\source\audio\detail\audio_device.cpp" />
-    <ClCompile Include="..\..\source\audio\detail\audio_stream.cpp" />
-    <ClCompile Include="..\..\source\audio\detail\buffer_preparation.cpp" />
-    <ClCompile Include="..\..\source\audio\player.cpp" />
-    <ClCompile Include="..\..\source\basic_types.cpp" />
-    <ClCompile Include="..\..\source\charset.cpp" />
-    <ClCompile Include="..\..\source\datetime.cpp" />
-    <ClCompile Include="..\..\source\deploy.cpp" />
-    <ClCompile Include="..\..\source\detail\win32\platform_spec.cpp" />
-    <ClCompile Include="..\..\source\exceptions.cpp" />
-    <ClCompile Include="..\..\source\filesystem\file_iterator.cpp" />
-    <ClCompile Include="..\..\source\filesystem\fs_utility.cpp" />
-    <ClCompile Include="..\..\source\gui\animation.cpp" />
-    <ClCompile Include="..\..\source\gui\basis.cpp" />
-    <ClCompile Include="..\..\source\gui\detail\basic_window.cpp" />
-    <ClCompile Include="..\..\source\gui\detail\bedrock_pi.cpp" />
-    <ClCompile Include="..\..\source\gui\detail\color_schemes.cpp" />
-    <ClCompile Include="..\..\source\gui\detail\drawer.cpp" />
-    <ClCompile Include="..\..\source\gui\detail\element_store.cpp" />
-    <ClCompile Include="..\..\source\gui\detail\events_operation.cpp" />
-    <ClCompile Include="..\..\source\gui\detail\native_window_interface.cpp" />
-    <ClCompile Include="..\..\source\gui\detail\win32\bedrock.cpp" />
-    <ClCompile Include="..\..\source\gui\detail\window_layout.cpp" />
-    <ClCompile Include="..\..\source\gui\detail\window_manager.cpp" />
-    <ClCompile Include="..\..\source\gui\dragger.cpp" />
-    <ClCompile Include="..\..\source\gui\drawing.cpp" />
-    <ClCompile Include="..\..\source\gui\effects.cpp" />
-    <ClCompile Include="..\..\source\gui\element.cpp" />
-    <ClCompile Include="..\..\source\gui\filebox.cpp" />
-    <ClCompile Include="..\..\source\gui\layout_utility.cpp" />
-    <ClCompile Include="..\..\source\gui\msgbox.cpp" />
-    <ClCompile Include="..\..\source\gui\notifier.cpp" />
-    <ClCompile Include="..\..\source\gui\place.cpp" />
-    <ClCompile Include="..\..\source\gui\programming_interface.cpp" />
-    <ClCompile Include="..\..\source\gui\screen.cpp" />
-    <ClCompile Include="..\..\source\gui\state_cursor.cpp" />
-    <ClCompile Include="..\..\source\gui\timer.cpp" />
-    <ClCompile Include="..\..\source\gui\tooltip.cpp" />
-    <ClCompile Include="..\..\source\gui\widgets\button.cpp" />
-    <ClCompile Include="..\..\source\gui\widgets\categorize.cpp" />
-    <ClCompile Include="..\..\source\gui\widgets\checkbox.cpp" />
-    <ClCompile Include="..\..\source\gui\widgets\combox.cpp" />
-    <ClCompile Include="..\..\source\gui\widgets\date_chooser.cpp" />
-    <ClCompile Include="..\..\source\gui\widgets\float_listbox.cpp" />
-    <ClCompile Include="..\..\source\gui\widgets\form.cpp" />
-    <ClCompile Include="..\..\source\gui\widgets\frame.cpp" />
-    <ClCompile Include="..\..\source\gui\widgets\label.cpp" />
-    <ClCompile Include="..\..\source\gui\widgets\listbox.cpp" />
-    <ClCompile Include="..\..\source\gui\widgets\menu.cpp" />
-    <ClCompile Include="..\..\source\gui\widgets\menubar.cpp" />
-    <ClCompile Include="..\..\source\gui\widgets\panel.cpp" />
-    <ClCompile Include="..\..\source\gui\widgets\picture.cpp" />
-    <ClCompile Include="..\..\source\gui\widgets\progress.cpp" />
-    <ClCompile Include="..\..\source\gui\widgets\scroll.cpp" />
-    <ClCompile Include="..\..\source\gui\widgets\skeletons\text_editor.cpp" />
-    <ClCompile Include="..\..\source\gui\widgets\slider.cpp" />
-    <ClCompile Include="..\..\source\gui\widgets\spinbox.cpp" />
-    <ClCompile Include="..\..\source\gui\widgets\tabbar.cpp" />
-    <ClCompile Include="..\..\source\gui\widgets\textbox.cpp" />
-    <ClCompile Include="..\..\source\gui\widgets\toolbar.cpp" />
-    <ClCompile Include="..\..\source\gui\widgets\treebox.cpp" />
-    <ClCompile Include="..\..\source\gui\widgets\widget.cpp" />
-    <ClCompile Include="..\..\source\gui\wvl.cpp" />
-    <ClCompile Include="..\..\source\internationalization.cpp" />
-    <ClCompile Include="..\..\source\paint\detail\image_process_provider.cpp" />
-    <ClCompile Include="..\..\source\paint\detail\native_paint_interface.cpp" />
-    <ClCompile Include="..\..\source\paint\gadget.cpp" />
-    <ClCompile Include="..\..\source\paint\graphics.cpp" />
-    <ClCompile Include="..\..\source\paint\image.cpp" />
-    <ClCompile Include="..\..\source\paint\image_process_selector.cpp" />
-    <ClCompile Include="..\..\source\paint\pixel_buffer.cpp" />
-    <ClCompile Include="..\..\source\paint\text_renderer.cpp" />
-    <ClCompile Include="..\..\source\system\dataexch.cpp" />
-    <ClCompile Include="..\..\source\system\platform.cpp" />
-    <ClCompile Include="..\..\source\system\shared_wrapper.cpp" />
-    <ClCompile Include="..\..\source\system\timepiece.cpp" />
-    <ClCompile Include="..\..\source\threads\pool.cpp" />
-    <ClCompile Include="..\..\source\traits.cpp" />
-    <ClCompile Include="..\..\source\unicode_bidi.cpp" />
-  </ItemGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ImportGroup Label="ExtensionTargets">
-  </ImportGroup>
-</Project>
\ No newline at end of file
+<?xml version="1.0" encoding="utf-8"?>
+<!-- This file was generated by Bakefile (http://bakefile.org).
+     Do not modify, all changes will be overwritten! -->
+<Project DefaultTargets="Build" ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup Label="ProjectConfigurations">
+    <ProjectConfiguration Include="Debug|Win32">
+      <Configuration>Debug</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|Win32">
+      <Configuration>Release</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+  </ItemGroup>
+  <PropertyGroup Label="Globals">
+    <ProjectGuid>{78487472-4F43-5A69-93CC-4FDC4D124241}</ProjectGuid>
+    <Keyword>Win32Proj</Keyword>
+    <RootNamespace>nana</RootNamespace>
+    <ProjectName>nana</ProjectName>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
+  <PropertyGroup Label="Configuration" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <ConfigurationType>StaticLibrary</ConfigurationType>
+    <UseDebugLibraries>true</UseDebugLibraries>
+    <CharacterSet>Unicode</CharacterSet>
+    <PlatformToolset>v120</PlatformToolset>
+  </PropertyGroup>
+  <PropertyGroup Label="Configuration" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <ConfigurationType>StaticLibrary</ConfigurationType>
+    <UseDebugLibraries>false</UseDebugLibraries>
+    <CharacterSet>Unicode</CharacterSet>
+    <PlatformToolset>v120</PlatformToolset>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
+  <ImportGroup Label="ExtensionSettings" />
+  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <Import Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" />
+  </ImportGroup>
+  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <Import Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" />
+  </ImportGroup>
+  <PropertyGroup Label="UserMacros" />
+  <PropertyGroup />
+  <PropertyGroup />
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <ClCompile>
+      <WarningLevel>Level3</WarningLevel>
+      <Optimization>Disabled</Optimization>
+      <PreprocessorDefinitions>WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <MultiProcessorCompilation>true</MultiProcessorCompilation>
+      <MinimalRebuild>false</MinimalRebuild>
+      <AdditionalIncludeDirectories>..\..\include</AdditionalIncludeDirectories>
+      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
+    </ClCompile>
+    <Link>
+      <SubSystem>Windows</SubSystem>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <ClCompile>
+      <WarningLevel>Level3</WarningLevel>
+      <Optimization>MaxSpeed</Optimization>
+      <FunctionLevelLinking>true</FunctionLevelLinking>
+      <IntrinsicFunctions>true</IntrinsicFunctions>
+      <PreprocessorDefinitions>WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <MultiProcessorCompilation>true</MultiProcessorCompilation>
+      <MinimalRebuild>false</MinimalRebuild>
+      <AdditionalIncludeDirectories>..\..\include</AdditionalIncludeDirectories>
+      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
+    </ClCompile>
+    <Link>
+      <SubSystem>Windows</SubSystem>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <EnableCOMDATFolding>true</EnableCOMDATFolding>
+      <OptimizeReferences>true</OptimizeReferences>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemGroup>
+    <ClCompile Include="..\..\source\any.cpp" />
+    <ClCompile Include="..\..\source\basic_types.cpp" />
+    <ClCompile Include="..\..\source\charset.cpp" />
+    <ClCompile Include="..\..\source\datetime.cpp" />
+    <ClCompile Include="..\..\source\deploy.cpp" />
+    <ClCompile Include="..\..\source\exceptions.cpp" />
+    <ClCompile Include="..\..\source\internationalization.cpp" />
+    <ClCompile Include="..\..\source\traits.cpp" />
+    <ClCompile Include="..\..\source\unicode_bidi.cpp" />
+    <ClCompile Include="..\..\source\filesystem\file_iterator.cpp" />
+    <ClCompile Include="..\..\source\filesystem\fs_utility.cpp" />
+    <ClCompile Include="..\..\source\audio\player.cpp" />
+    <ClCompile Include="..\..\source\audio\detail\audio_device.cpp" />
+    <ClCompile Include="..\..\source\audio\detail\audio_stream.cpp" />
+    <ClCompile Include="..\..\source\audio\detail\buffer_preparation.cpp" />
+    <ClCompile Include="..\..\source\gui\animation.cpp" />
+    <ClCompile Include="..\..\source\gui\basis.cpp" />
+    <ClCompile Include="..\..\source\gui\dragger.cpp" />
+    <ClCompile Include="..\..\source\gui\drawing.cpp" />
+    <ClCompile Include="..\..\source\gui\effects.cpp" />
+    <ClCompile Include="..\..\source\gui\element.cpp" />
+    <ClCompile Include="..\..\source\gui\filebox.cpp" />
+    <ClCompile Include="..\..\source\gui\layout_utility.cpp" />
+    <ClCompile Include="..\..\source\gui\msgbox.cpp" />
+    <ClCompile Include="..\..\source\gui\notifier.cpp" />
+    <ClCompile Include="..\..\source\gui\place.cpp" />
+    <ClCompile Include="..\..\source\gui\programming_interface.cpp" />
+    <ClCompile Include="..\..\source\gui\screen.cpp" />
+    <ClCompile Include="..\..\source\gui\state_cursor.cpp" />
+    <ClCompile Include="..\..\source\gui\timer.cpp" />
+    <ClCompile Include="..\..\source\gui\tooltip.cpp" />
+    <ClCompile Include="..\..\source\gui\wvl.cpp" />
+    <ClCompile Include="..\..\source\gui\detail\basic_window.cpp" />
+    <ClCompile Include="..\..\source\gui\detail\bedrock_pi.cpp" />
+    <ClCompile Include="..\..\source\gui\detail\color_schemes.cpp" />
+    <ClCompile Include="..\..\source\gui\detail\drawer.cpp" />
+    <ClCompile Include="..\..\source\gui\detail\element_store.cpp" />
+    <ClCompile Include="..\..\source\gui\detail\events_operation.cpp" />
+    <ClCompile Include="..\..\source\gui\detail\native_window_interface.cpp" />
+    <ClCompile Include="..\..\source\gui\detail\window_layout.cpp" />
+    <ClCompile Include="..\..\source\gui\detail\window_manager.cpp" />
+    <ClCompile Include="..\..\source\gui\widgets\button.cpp" />
+    <ClCompile Include="..\..\source\gui\widgets\categorize.cpp" />
+    <ClCompile Include="..\..\source\gui\widgets\checkbox.cpp" />
+    <ClCompile Include="..\..\source\gui\widgets\combox.cpp" />
+    <ClCompile Include="..\..\source\gui\widgets\date_chooser.cpp" />
+    <ClCompile Include="..\..\source\gui\widgets\float_listbox.cpp" />
+    <ClCompile Include="..\..\source\gui\widgets\form.cpp" />
+    <ClCompile Include="..\..\source\gui\widgets\frame.cpp" />
+    <ClCompile Include="..\..\source\gui\widgets\label.cpp" />
+    <ClCompile Include="..\..\source\gui\widgets\listbox.cpp" />
+    <ClCompile Include="..\..\source\gui\widgets\menubar.cpp" />
+    <ClCompile Include="..\..\source\gui\widgets\menu.cpp" />
+    <ClCompile Include="..\..\source\gui\widgets\panel.cpp" />
+    <ClCompile Include="..\..\source\gui\widgets\picture.cpp" />
+    <ClCompile Include="..\..\source\gui\widgets\progress.cpp" />
+    <ClCompile Include="..\..\source\gui\widgets\scroll.cpp" />
+    <ClCompile Include="..\..\source\gui\widgets\slider.cpp" />
+    <ClCompile Include="..\..\source\gui\widgets\spinbox.cpp" />
+    <ClCompile Include="..\..\source\gui\widgets\tabbar.cpp" />
+    <ClCompile Include="..\..\source\gui\widgets\textbox.cpp" />
+    <ClCompile Include="..\..\source\gui\widgets\toolbar.cpp" />
+    <ClCompile Include="..\..\source\gui\widgets\treebox.cpp" />
+    <ClCompile Include="..\..\source\gui\widgets\widget.cpp" />
+    <ClCompile Include="..\..\source\gui\widgets\skeletons\text_editor.cpp" />
+    <ClCompile Include="..\..\source\paint\gadget.cpp" />
+    <ClCompile Include="..\..\source\paint\graphics.cpp" />
+    <ClCompile Include="..\..\source\paint\image.cpp" />
+    <ClCompile Include="..\..\source\paint\image_process_selector.cpp" />
+    <ClCompile Include="..\..\source\paint\pixel_buffer.cpp" />
+    <ClCompile Include="..\..\source\paint\text_renderer.cpp" />
+    <ClCompile Include="..\..\source\paint\detail\image_process_provider.cpp" />
+    <ClCompile Include="..\..\source\paint\detail\native_paint_interface.cpp" />
+    <ClCompile Include="..\..\source\system\dataexch.cpp" />
+    <ClCompile Include="..\..\source\system\platform.cpp" />
+    <ClCompile Include="..\..\source\system\shared_wrapper.cpp" />
+    <ClCompile Include="..\..\source\system\timepiece.cpp" />
+    <ClCompile Include="..\..\source\threads\pool.cpp" />
+    <ClCompile Include="..\..\source\detail\win32\platform_spec.cpp" />
+    <ClCompile Include="..\..\source\gui\detail\win32\bedrock.cpp" />
+  </ItemGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
+  <ImportGroup Label="ExtensionTargets" />
+</Project>
diff --git a/build/vc2013/nana.vcxproj.filters b/build/vc2013/nana.vcxproj.filters
index f0f82981..2858b8fa 100644
--- a/build/vc2013/nana.vcxproj.filters
+++ b/build/vc2013/nana.vcxproj.filters
@@ -1,304 +1,261 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup>
-    <Filter Include="Source Files">
-      <UniqueIdentifier>{4FC737F1-C7A5-4376-A066-2A32D752A2FF}</UniqueIdentifier>
-      <Extensions>cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx</Extensions>
-    </Filter>
-    <Filter Include="Header Files">
-      <UniqueIdentifier>{93995380-89BD-4b04-88EB-625FBE52EBFB}</UniqueIdentifier>
-      <Extensions>h;hh;hpp;hxx;hm;inl;inc;xsd</Extensions>
-    </Filter>
-    <Filter Include="Resource Files">
-      <UniqueIdentifier>{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}</UniqueIdentifier>
-      <Extensions>rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav;mfcribbon-ms</Extensions>
-    </Filter>
-    <Filter Include="Source Files\nana">
-      <UniqueIdentifier>{b0bd11b1-bcbb-4e05-885e-44295bc1a7bb}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="Source Files\nana\audio">
-      <UniqueIdentifier>{aab16aa3-c8d4-4495-8606-1b21ae739ee5}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="Source Files\nana\audio\detail">
-      <UniqueIdentifier>{c395f107-7102-415b-a019-54e7cf3575af}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="Source Files\nana\detail">
-      <UniqueIdentifier>{e2569be2-9e68-477d-8b59-e248595de6c7}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="Source Files\nana\detail\win32">
-      <UniqueIdentifier>{52ed7f8e-fa48-495e-af1f-4df013205a35}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="Source Files\nana\filesystem">
-      <UniqueIdentifier>{87d14798-9015-4162-b9ab-72c741cff063}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="Source Files\nana\gui">
-      <UniqueIdentifier>{4f8e7d23-9fe1-4409-bb03-2bd0809e606b}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="Source Files\nana\gui\detail">
-      <UniqueIdentifier>{85c9c1bb-d87b-4481-bf3c-7425f680a12d}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="Source Files\nana\gui\detail\win32">
-      <UniqueIdentifier>{8058b530-86ec-4d72-890d-345aa30db056}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="Source Files\nana\gui\widgets">
-      <UniqueIdentifier>{87b124cb-408d-460b-a81b-8a788bbae0d9}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="Source Files\nana\gui\widgets\skeletons">
-      <UniqueIdentifier>{b10db2f1-0542-421a-9e1d-4357e3be5f68}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="Source Files\nana\paint">
-      <UniqueIdentifier>{59f186c8-f5f8-4499-8e19-f278d4754220}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="Source Files\nana\paint\detail">
-      <UniqueIdentifier>{5acf1733-47b2-4872-a105-66c7ad15cd39}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="Source Files\nana\system">
-      <UniqueIdentifier>{a81fa10e-1274-44e0-92a0-434fa28f89ae}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="Source Files\nana\threads">
-      <UniqueIdentifier>{e95b4a72-643f-4416-af95-b0bbaf7f0c57}</UniqueIdentifier>
-    </Filter>
-  </ItemGroup>
-  <ItemGroup>
-    <ClCompile Include="..\..\source\audio\detail\audio_device.cpp">
-      <Filter>Source Files\nana\audio\detail</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\source\audio\detail\audio_stream.cpp">
-      <Filter>Source Files\nana\audio\detail</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\source\audio\detail\buffer_preparation.cpp">
-      <Filter>Source Files\nana\audio\detail</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\source\audio\player.cpp">
-      <Filter>Source Files\nana\audio</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\source\detail\win32\platform_spec.cpp">
-      <Filter>Source Files\nana\detail\win32</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\source\filesystem\file_iterator.cpp">
-      <Filter>Source Files\nana\filesystem</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\source\filesystem\fs_utility.cpp">
-      <Filter>Source Files\nana\filesystem</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\source\gui\detail\win32\bedrock.cpp">
-      <Filter>Source Files\nana\gui\detail\win32</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\source\gui\detail\basic_window.cpp">
-      <Filter>Source Files\nana\gui\detail</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\source\gui\detail\drawer.cpp">
-      <Filter>Source Files\nana\gui\detail</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\source\gui\detail\native_window_interface.cpp">
-      <Filter>Source Files\nana\gui\detail</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\source\gui\detail\window_manager.cpp">
-      <Filter>Source Files\nana\gui\detail</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\source\gui\widgets\skeletons\text_editor.cpp">
-      <Filter>Source Files\nana\gui\widgets\skeletons</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\source\gui\widgets\button.cpp">
-      <Filter>Source Files\nana\gui\widgets</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\source\gui\widgets\categorize.cpp">
-      <Filter>Source Files\nana\gui\widgets</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\source\gui\widgets\checkbox.cpp">
-      <Filter>Source Files\nana\gui\widgets</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\source\gui\widgets\combox.cpp">
-      <Filter>Source Files\nana\gui\widgets</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\source\gui\widgets\date_chooser.cpp">
-      <Filter>Source Files\nana\gui\widgets</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\source\gui\widgets\float_listbox.cpp">
-      <Filter>Source Files\nana\gui\widgets</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\source\gui\widgets\form.cpp">
-      <Filter>Source Files\nana\gui\widgets</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\source\gui\widgets\frame.cpp">
-      <Filter>Source Files\nana\gui\widgets</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\source\gui\widgets\label.cpp">
-      <Filter>Source Files\nana\gui\widgets</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\source\gui\widgets\listbox.cpp">
-      <Filter>Source Files\nana\gui\widgets</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\source\gui\widgets\menu.cpp">
-      <Filter>Source Files\nana\gui\widgets</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\source\gui\widgets\menubar.cpp">
-      <Filter>Source Files\nana\gui\widgets</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\source\gui\widgets\panel.cpp">
-      <Filter>Source Files\nana\gui\widgets</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\source\gui\widgets\picture.cpp">
-      <Filter>Source Files\nana\gui\widgets</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\source\gui\widgets\progress.cpp">
-      <Filter>Source Files\nana\gui\widgets</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\source\gui\widgets\scroll.cpp">
-      <Filter>Source Files\nana\gui\widgets</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\source\gui\widgets\slider.cpp">
-      <Filter>Source Files\nana\gui\widgets</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\source\gui\widgets\tabbar.cpp">
-      <Filter>Source Files\nana\gui\widgets</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\source\gui\widgets\textbox.cpp">
-      <Filter>Source Files\nana\gui\widgets</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\source\gui\widgets\toolbar.cpp">
-      <Filter>Source Files\nana\gui\widgets</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\source\gui\widgets\treebox.cpp">
-      <Filter>Source Files\nana\gui\widgets</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\source\gui\widgets\widget.cpp">
-      <Filter>Source Files\nana\gui\widgets</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\source\gui\animation.cpp">
-      <Filter>Source Files\nana\gui</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\source\gui\basis.cpp">
-      <Filter>Source Files\nana\gui</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\source\gui\dragger.cpp">
-      <Filter>Source Files\nana\gui</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\source\gui\drawing.cpp">
-      <Filter>Source Files\nana\gui</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\source\gui\effects.cpp">
-      <Filter>Source Files\nana\gui</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\source\gui\element.cpp">
-      <Filter>Source Files\nana\gui</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\source\gui\filebox.cpp">
-      <Filter>Source Files\nana\gui</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\source\gui\layout_utility.cpp">
-      <Filter>Source Files\nana\gui</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\source\gui\msgbox.cpp">
-      <Filter>Source Files\nana\gui</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\source\gui\place.cpp">
-      <Filter>Source Files\nana\gui</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\source\gui\programming_interface.cpp">
-      <Filter>Source Files\nana\gui</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\source\gui\timer.cpp">
-      <Filter>Source Files\nana\gui</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\source\gui\tooltip.cpp">
-      <Filter>Source Files\nana\gui</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\source\gui\wvl.cpp">
-      <Filter>Source Files\nana\gui</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\source\paint\detail\image_process_provider.cpp">
-      <Filter>Source Files\nana\paint\detail</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\source\paint\detail\native_paint_interface.cpp">
-      <Filter>Source Files\nana\paint\detail</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\source\paint\gadget.cpp">
-      <Filter>Source Files\nana\paint</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\source\paint\graphics.cpp">
-      <Filter>Source Files\nana\paint</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\source\paint\image.cpp">
-      <Filter>Source Files\nana\paint</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\source\paint\image_process_selector.cpp">
-      <Filter>Source Files\nana\paint</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\source\paint\pixel_buffer.cpp">
-      <Filter>Source Files\nana\paint</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\source\paint\text_renderer.cpp">
-      <Filter>Source Files\nana\paint</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\source\system\dataexch.cpp">
-      <Filter>Source Files\nana\system</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\source\system\platform.cpp">
-      <Filter>Source Files\nana\system</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\source\system\shared_wrapper.cpp">
-      <Filter>Source Files\nana\system</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\source\system\timepiece.cpp">
-      <Filter>Source Files\nana\system</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\source\threads\pool.cpp">
-      <Filter>Source Files\nana\threads</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\source\any.cpp">
-      <Filter>Source Files\nana</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\source\basic_types.cpp">
-      <Filter>Source Files\nana</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\source\charset.cpp">
-      <Filter>Source Files\nana</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\source\datetime.cpp">
-      <Filter>Source Files\nana</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\source\deploy.cpp">
-      <Filter>Source Files\nana</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\source\exceptions.cpp">
-      <Filter>Source Files\nana</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\source\traits.cpp">
-      <Filter>Source Files\nana</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\source\unicode_bidi.cpp">
-      <Filter>Source Files\nana</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\source\gui\detail\window_layout.cpp">
-      <Filter>Source Files\nana\gui\detail</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\source\gui\detail\element_store.cpp">
-      <Filter>Source Files\nana\gui\detail</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\source\gui\detail\bedrock_pi.cpp">
-      <Filter>Source Files\nana\gui\detail</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\source\gui\detail\events_operation.cpp">
-      <Filter>Source Files\nana\gui\detail</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\source\gui\notifier.cpp">
-      <Filter>Source Files\nana\gui</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\source\gui\state_cursor.cpp">
-      <Filter>Source Files\nana\gui</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\source\internationalization.cpp">
-      <Filter>Source Files\nana</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\source\gui\detail\color_schemes.cpp">
-      <Filter>Source Files\nana\gui\detail</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\source\gui\screen.cpp">
-      <Filter>Source Files\nana\gui</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\source\gui\widgets\spinbox.cpp">
-      <Filter>Source Files\nana\gui\widgets</Filter>
-    </ClCompile>
-  </ItemGroup>
-</Project>
\ No newline at end of file
+<?xml version="1.0" encoding="utf-8"?>
+<!-- This file was generated by Bakefile (http://bakefile.org).
+     Do not modify, all changes will be overwritten! -->
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup>
+    <Filter Include="Source Files">
+      <UniqueIdentifier>{4FC737F1-C7A5-4376-A066-2A32D752A2FF}</UniqueIdentifier>
+      <Extensions>cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx</Extensions>
+    </Filter>
+    <Filter Include="Header Files">
+      <UniqueIdentifier>{93995380-89BD-4b04-88EB-625FBE52EBFB}</UniqueIdentifier>
+      <Extensions>h;hpp;hxx;hm;inl;inc;xsd</Extensions>
+    </Filter>
+    <Filter Include="Resource Files">
+      <UniqueIdentifier>{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}</UniqueIdentifier>
+      <Extensions>rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav;mfcribbon-ms</Extensions>
+    </Filter>
+  </ItemGroup>
+  <ItemGroup>
+    <ClCompile Include="..\..\source\any.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\source\basic_types.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\source\charset.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\source\datetime.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\source\deploy.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\source\exceptions.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\source\internationalization.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\source\traits.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\source\unicode_bidi.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\source\filesystem\file_iterator.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\source\filesystem\fs_utility.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\source\audio\player.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\source\audio\detail\audio_device.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\source\audio\detail\audio_stream.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\source\audio\detail\buffer_preparation.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\source\gui\animation.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\source\gui\basis.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\source\gui\dragger.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\source\gui\drawing.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\source\gui\effects.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\source\gui\element.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\source\gui\filebox.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\source\gui\layout_utility.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\source\gui\msgbox.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\source\gui\notifier.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\source\gui\place.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\source\gui\programming_interface.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\source\gui\screen.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\source\gui\state_cursor.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\source\gui\timer.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\source\gui\tooltip.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\source\gui\wvl.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\source\gui\detail\basic_window.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\source\gui\detail\bedrock_pi.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\source\gui\detail\color_schemes.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\source\gui\detail\drawer.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\source\gui\detail\element_store.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\source\gui\detail\events_operation.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\source\gui\detail\native_window_interface.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\source\gui\detail\window_layout.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\source\gui\detail\window_manager.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\source\gui\widgets\button.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\source\gui\widgets\categorize.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\source\gui\widgets\checkbox.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\source\gui\widgets\combox.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\source\gui\widgets\date_chooser.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\source\gui\widgets\float_listbox.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\source\gui\widgets\form.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\source\gui\widgets\frame.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\source\gui\widgets\label.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\source\gui\widgets\listbox.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\source\gui\widgets\menubar.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\source\gui\widgets\menu.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\source\gui\widgets\panel.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\source\gui\widgets\picture.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\source\gui\widgets\progress.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\source\gui\widgets\scroll.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\source\gui\widgets\slider.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\source\gui\widgets\spinbox.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\source\gui\widgets\tabbar.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\source\gui\widgets\textbox.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\source\gui\widgets\toolbar.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\source\gui\widgets\treebox.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\source\gui\widgets\widget.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\source\gui\widgets\skeletons\text_editor.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\source\paint\gadget.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\source\paint\graphics.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\source\paint\image.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\source\paint\image_process_selector.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\source\paint\pixel_buffer.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\source\paint\text_renderer.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\source\paint\detail\image_process_provider.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\source\paint\detail\native_paint_interface.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\source\system\dataexch.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\source\system\platform.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\source\system\shared_wrapper.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\source\system\timepiece.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\source\threads\pool.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\source\detail\win32\platform_spec.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\source\gui\detail\win32\bedrock.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+  </ItemGroup>
+</Project>