diff --git a/CMakeLists.txt b/CMakeLists.txt
index a0671e66..040b3d89 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -23,6 +23,9 @@ message("  --->    Running cmake .... ")
 	message ( "CMAKE_CXX_COMPILER_ID= " ${CMAKE_CXX_COMPILER_ID})
 	message ( "COMPILER_IS_CLANG= " ${COMPILER_IS_CLANG})
 	message ( "CMAKE_CXX_FLAGS= "  ${CMAKE_CXX_FLAGS})
+	
+set(NANA_LINKS)
+set(NANA_SOURCES)
 
 project(nana)
 cmake_minimum_required(VERSION 2.8)
@@ -59,6 +62,7 @@ endif(WIN32)
 if(APPLE)
     add_definitions(-DAPPLE)
     include_directories(/opt/X11/include/)
+	list(APPEND NANA_LINKS -L/opt/X11/lib/  -liconv)
 elseif(UNIX)
     add_definitions(-Dlinux)
 	message("added -D linux")
@@ -67,16 +71,19 @@ endif(APPLE)
 
 
 if(UNIX)
+    list(APPEND NANA_LINKS -lX11  )
     find_package(Freetype)
     if (FREETYPE_FOUND)
         include_directories( ${FREETYPE_INCLUDE_DIRS})
+		list(APPEND NANA_LINKS  -lXft )
     endif(FREETYPE_FOUND)
 endif(UNIX)
 
 #Find PNG
 if(ENABLE_PNG)
     add_definitions(-DNANA_ENABLE_PNG)
-    set(NANA_PNG_LIB "png")
+    #set(NANA_PNG_LIB "png")
+	list(APPEND NANA_LINKS   -lpng )	
     if(LIBPNG_FROM_OS)
         find_package(PNG)
         if (PNG_FOUND)
@@ -84,14 +91,15 @@ if(ENABLE_PNG)
             add_definitions(-DUSE_LIBPNG_FROM_OS)
         endif(PNG_FOUND)
     endif(LIBPNG_FROM_OS)
-else(ENABLE_PNG)
-    set(NANA_PNG_LIB "")
+#else(ENABLE_PNG)
+ #   set(NANA_PNG_LIB "")
 endif(ENABLE_PNG)
 
 #Find JPEG
 if(ENABLE_JPEG)
     add_definitions(-DNANA_ENABLE_JPEG)
-    set(NANA_JPEG_LIB "jpeg")
+    #set(NANA_JPEG_LIB "jpeg")
+	list(APPEND NANA_LINKS   -ljpeg )	
     if(LIBJPEG_FROM_OS)
         find_package(JPEG)
         if (JPEG_FOUND)
@@ -99,8 +107,8 @@ if(ENABLE_JPEG)
             add_definitions(-DUSE_LIBJPEG_FROM_OS)
         endif(JPEG_FOUND)
     endif(LIBJPEG_FROM_OS)
-else(ENABLE_JPEG)
-    set(NANA_JPEG_LIB "")
+#else(ENABLE_JPEG)
+#    set(NANA_JPEG_LIB "")
 endif(ENABLE_JPEG)
 
 if(ENABLE_AUDIO)
@@ -109,6 +117,7 @@ if(ENABLE_AUDIO)
         find_package(asound)
         if (ASOUND_FOUND)
             include_directories( ${ASOUND_INCLUDE_DIRS})
+	        list(APPEND NANA_LINKS   -lasound )				
         else(ASOUND_FOUND)
             message(FATAL_ERROR "libasound is not found")
         endif(ASOUND_FOUND)
@@ -175,11 +184,12 @@ add_library(${PROJECT_NAME} ${NANA_SOURCE}
                             ${NANA_PAINT_DETAIL_SOURCE}
                             ${NANA_SYSTEM_SOURCE}
                             ${NANA_THREADS_SOURCE})    
+endif(APPLE)
+							
     #Headers: use INCLUDE_DIRECTORIES
     #   Libraries: use FIND_LIBRARY and link with the result of it (try to avoid LINK_DIRECTORIES
-    target_link_libraries(${PROJECT_NAME} -L/opt/X11/lib/ -lX11 -lXft -lpng -liconv)
+    target_link_libraries(${PROJECT_NAME} ${NANA_LINKS})
 
-endif(APPLE)
                  
 install(TARGETS ${PROJECT_NAME}
             ARCHIVE DESTINATION lib
@@ -197,52 +207,52 @@ if (BUILD_NANA_DEMOS)
     set(CMAKE_INSTALL_PREFIX )
     add_executable(file_explorer ../nana-demo/file_explorer.cpp)
     set_property( TARGET file_explorer PROPERTY CXX_STANDARD 14 )
-    target_link_libraries(file_explorer ${PROJECT_NAME} X11 Xft ${NANA_JPEG_LIB} ${NANA_PNG_LIB})
+    target_link_libraries(file_explorer ${PROJECT_NAME} )         #X11 Xft ${NANA_JPEG_LIB} ${NANA_PNG_LIB}
     install(TARGETS file_explorer RUNTIME DESTINATION &{DEMO_BIN})
 
     add_executable(calculator ../nana-demo/calculator.cpp)
     set_property( TARGET calculator PROPERTY CXX_STANDARD 14 )
-    target_link_libraries(calculator ${PROJECT_NAME} X11 Xft ${NANA_JPEG_LIB} ${NANA_PNG_LIB})
+    target_link_libraries(calculator ${PROJECT_NAME}  )
     install(TARGETS calculator RUNTIME DESTINATION &{DEMO_BIN})
 
     if (BUILD_FreeMe)
         add_executable(FreeMe ../nana-demo/FreeMe.cpp)
         set_property( TARGET FreeMe PROPERTY CXX_STANDARD 14 )
-        target_link_libraries(FreeMe ${PROJECT_NAME} X11 Xft ${NANA_JPEG_LIB} ${NANA_PNG_LIB})
+        target_link_libraries(FreeMe ${PROJECT_NAME}  )
         install(TARGETS FreeMe RUNTIME DESTINATION &{DEMO_BIN})
     endif (BUILD_FreeMe)     
 
     add_executable(notepad ../nana-demo/notepad.cpp)
     set_property( TARGET notepad PROPERTY CXX_STANDARD 14 )
-    target_link_libraries(notepad ${PROJECT_NAME} X11 Xft ${NANA_JPEG_LIB} ${NANA_PNG_LIB})
+    target_link_libraries(notepad ${PROJECT_NAME} #) X11 Xft ${NANA_JPEG_LIB} ${NANA_PNG_LIB})
     install(TARGETS notepad RUNTIME DESTINATION &{DEMO_BIN})
 
     add_executable(widget_show ../nana-demo/widget_show.cpp)
     set_property( TARGET widget_show PROPERTY CXX_STANDARD 14 )
-    target_link_libraries(widget_show ${PROJECT_NAME} X11 Xft ${NANA_JPEG_LIB} ${NANA_PNG_LIB})
+    target_link_libraries(widget_show ${PROJECT_NAME}#)  X11 Xft ${NANA_JPEG_LIB} ${NANA_PNG_LIB})
     install(TARGETS widget_show RUNTIME DESTINATION &{DEMO_BIN})
 
     add_executable(widget_show2 ../nana-demo/widget_show2.cpp)
     set_property( TARGET widget_show2 PROPERTY CXX_STANDARD 14 )
-    target_link_libraries(widget_show2 ${PROJECT_NAME} X11 Xft ${NANA_JPEG_LIB} ${NANA_PNG_LIB})
+    target_link_libraries(widget_show2 ${PROJECT_NAME}#)  X11 Xft ${NANA_JPEG_LIB} ${NANA_PNG_LIB})
     install(TARGETS widget_show2 RUNTIME DESTINATION &{DEMO_BIN})
 
     add_executable(a_group_impl ../nana-demo/Examples/a_group_impl.cpp)
     set_property( TARGET a_group_impl PROPERTY CXX_STANDARD 14 )
-    target_link_libraries(a_group_impl ${PROJECT_NAME} X11 Xft ${NANA_JPEG_LIB} ${NANA_PNG_LIB})
+    target_link_libraries(a_group_impl ${PROJECT_NAME}#)  X11 Xft ${NANA_JPEG_LIB} ${NANA_PNG_LIB})
 
     add_executable(animate-bmp ../nana-demo/Examples/animate-bmp.cpp)
     set_property( TARGET animate-bmp PROPERTY CXX_STANDARD 14 )
-    target_link_libraries(animate-bmp ${PROJECT_NAME} X11 Xft ${NANA_JPEG_LIB} ${NANA_PNG_LIB})
+    target_link_libraries(animate-bmp ${PROJECT_NAME}#)  X11 Xft ${NANA_JPEG_LIB} ${NANA_PNG_LIB})
 
     add_executable(audio_player ../nana-demo/Examples/audio_player.cpp)
     set_property( TARGET audio_player PROPERTY CXX_STANDARD 14 )
-    target_link_libraries(audio_player ${PROJECT_NAME} X11 Xft ${NANA_JPEG_LIB} ${NANA_PNG_LIB})
+    target_link_libraries(audio_player ${PROJECT_NAME} #) X11 Xft ${NANA_JPEG_LIB} ${NANA_PNG_LIB})
 
 
     #add_executable(nana_test test.cpp)
     #set_property( TARGET nana_test PROPERTY CXX_STANDARD 14 )
-    #target_link_libraries(nana_test ${PROJECT_NAME} X11 Xft ${NANA_JPEG_LIB} ${NANA_PNG_LIB})
+    #target_link_libraries(nana_test ${PROJECT_NAME}#)  X11 Xft ${NANA_JPEG_LIB} ${NANA_PNG_LIB})
 
    #set(NANA_DEMOS_DIR ${CMAKE_SOURCE_DIR}/../nana-demo)
    #set(NANA_EXAMPLES_DIR ${CMAKE_SOURCE_DIR}/../Examples/nana-demo/)
@@ -253,7 +263,7 @@ if (BUILD_NANA_DEMOS)
    #    string( REPLACE ".cpp" "" demoname ${demofile} )
    #    add_executable( ${demoname} ${demofile} )
    #    set_property( TARGET ${demoname} PROPERTY CXX_STANDARD 14 )
-   #    target_link_libraries(${demoname} ${PROJECT_NAME} X11 Xft ${NANA_JPEG_LIB} ${NANA_PNG_LIB})
+   #    target_link_libraries(${demoname} ${PROJECT_NAME} #) X11 Xft ${NANA_JPEG_LIB} ${NANA_PNG_LIB})
    #endforeach( demofile ${DEMO_SOURCES} )
 endif(BUILD_NANA_DEMOS)
 
@@ -283,4 +293,5 @@ message ( "CMAKE_CXX_COMPILER_ID= " ${CMAKE_CXX_COMPILER_ID})
 message ( "COMPILER_IS_CLANG= " ${COMPILER_IS_CLANG})
 message ( "CMAKE_CXX_FLAGS= "  ${CMAKE_CXX_FLAGS})
 message ( "CMAKE_COMPILER_IS_GNUCXX= "  ${CMAKE_COMPILER_IS_GNUCXX})
-message ( "CMAKE_EXE_LINKER_FLAGS= "  ${CMAKE_EXE_LINKER_FLAGS})
\ No newline at end of file
+message ( "CMAKE_EXE_LINKER_FLAGS= "  ${CMAKE_EXE_LINKER_FLAGS})
+message ( "NANA_LINKS= "  ${NANA_LINKS})