修复CMAKE编译不通过的问题

360SafeDemo/CMakeLists.txt

@@ -7,9 +7,9 @@ include_directories(${CMAKE_CURRENT_SOURCE_DIR})
 
 set(EXECUTABLE_OUTPUT_PATH ${PROJECT_BINARY_DIR}/bin)
 add_executable(360safedemo ${source_files})
-target_link_libraries(360safedemo duilib)
 set_target_properties(360safedemo PROPERTIES LINK_FLAGS "/SUBSYSTEM:WINDOWS")
-
+add_dependencies(360safedemo duilib)
+target_link_libraries(360safedemo duilib)
 add_custom_command(TARGET 360safedemo POST_BUILD
   COMMAND ${CMAKE_COMMAND} -E copy_if_different
   ${PROJECT_BINARY_DIR}/bin/360safedemo.exe ${PROJECT_SOURCE_DIR}/bin/360safedemo.exe)

360SafeDemo/StdAfx.h

@@ -15,20 +15,6 @@
 
 using namespace DuiLib;
 
-#ifdef _DEBUG
-#   ifdef _UNICODE
-#       pragma comment(lib, "..\\Lib\\DuiLib_ud.lib")
-#   else
-#       pragma comment(lib, "..\\Lib\\DuiLib_d.lib")
-#   endif
-#else
-#   ifdef _UNICODE
-#       pragma comment(lib, "..\\Lib\\DuiLib_u.lib")
-#   else
-#       pragma comment(lib, "..\\Lib\\DuiLib.lib")
-#   endif
-#endif
-
 //{{AFX_INSERT_LOCATION}}
 // Microsoft Visual C++ will insert additional declarations immediately before the previous line.
 

CMakeLists.txt

@@ -21,6 +21,6 @@ add_subdirectory(360SafeDemo)
 add_subdirectory(FlashDemo)
 add_subdirectory(GameDemo)
 add_subdirectory(ListDemo)
-add_subdirectory(MenuDemo)
+# add_subdirectory(MenuDemo) the sources in this project has error
 add_subdirectory(QQDemo)
 add_subdirectory(RichListDemo)

FlashDemo/CMakeLists.txt

@@ -7,6 +7,7 @@ include_directories(${CMAKE_CURRENT_SOURCE_DIR})
 
 set(EXECUTABLE_OUTPUT_PATH ${PROJECT_BINARY_DIR}/bin)
 add_executable(FlashDemo ${source_files})
+add_dependencies(FlashDemo duilib)
 target_link_libraries(FlashDemo duilib)
 set_target_properties(FlashDemo PROPERTIES LINK_FLAGS "/SUBSYSTEM:WINDOWS")
 

FlashDemo/StdAfx.h

@@ -14,20 +14,6 @@
 
 using namespace DuiLib;
 
-#ifdef _DEBUG
-#   ifdef _UNICODE
-#       pragma comment(lib, "..\\Lib\\DuiLib_ud.lib")
-#   else
-#       pragma comment(lib, "..\\Lib\\DuiLib_d.lib")
-#   endif
-#else
-#   ifdef _UNICODE
-#       pragma comment(lib, "..\\Lib\\DuiLib_u.lib")
-#   else
-#       pragma comment(lib, "..\\Lib\\DuiLib.lib")
-#   endif
-#endif
-
 
 //{{AFX_INSERT_LOCATION}}
 // Microsoft Visual C++ will insert additional declarations immediately before the previous line.

GameDemo/CMakeLists.txt

@@ -7,6 +7,7 @@ include_directories(${CMAKE_CURRENT_SOURCE_DIR})
 
 set(EXECUTABLE_OUTPUT_PATH ${PROJECT_BINARY_DIR}/bin)
 add_executable(GameDemo ${source_files})
+add_dependencies(GameDemo duilib)
 target_link_libraries(GameDemo duilib)
 set_target_properties(GameDemo PROPERTIES LINK_FLAGS "/SUBSYSTEM:WINDOWS")
 

GameDemo/StdAfx.h

@@ -19,20 +19,6 @@
 
 using namespace DuiLib;
 
-#ifdef _DEBUG
-#   ifdef _UNICODE
-#       pragma comment(lib, "..\\Lib\\DuiLib_ud.lib")
-#   else
-#       pragma comment(lib, "..\\Lib\\DuiLib_d.lib")
-#   endif
-#else
-#   ifdef _UNICODE
-#       pragma comment(lib, "..\\Lib\\DuiLib_u.lib")
-#   else
-#       pragma comment(lib, "..\\Lib\\DuiLib.lib")
-#   endif
-#endif
-
 #include "resource.h"
 
 //{{AFX_INSERT_LOCATION}}

ListDemo/CMakeLists.txt

@@ -7,6 +7,7 @@ include_directories(${CMAKE_CURRENT_SOURCE_DIR})
 
 set(EXECUTABLE_OUTPUT_PATH ${PROJECT_BINARY_DIR}/bin)
 add_executable(ListDemo ${source_files})
+add_dependencies(ListDemo duilib)
 target_link_libraries(ListDemo duilib)
 set_target_properties(ListDemo PROPERTIES LINK_FLAGS "/SUBSYSTEM:WINDOWS")
 

ListDemo/Main.cpp

@@ -13,20 +13,6 @@
 
 using namespace DuiLib;
 
-#ifdef _DEBUG
-#   ifdef _UNICODE
-#       pragma comment(lib, "..\\Lib\\DuiLib_ud.lib")
-#   else
-#       pragma comment(lib, "..\\Lib\\DuiLib_d.lib")
-#   endif
-#else
-#   ifdef _UNICODE
-#       pragma comment(lib, "..\\Lib\\DuiLib_u.lib")
-#   else
-#       pragma comment(lib, "..\\Lib\\DuiLib.lib")
-#   endif
-#endif
-
 #define WM_ADDLISTITEM WM_USER + 50
 /*
 * 存放第二列数据

MenuDemo/About.cpp

@@ -1,4 +1,5 @@
 #include "StdAfx.h"
+#include "SkinSetting.h"
 #include "About.h"
 
 const TCHAR* const kSysBtnControlName = _T("SysButton");

MenuDemo/About.h

@@ -1,6 +1,6 @@
 #pragma once
 
-class CAbout : public WindowImplBase,CSkinSetting
+class CAbout : public WindowImplBase,DuiLib::CSkinSetting
 {
 public:
 	bool m_bModal;

QQDemo/StdAfx.h

@@ -46,21 +46,6 @@
 
 #include "debug.hpp"
 
-
-#ifdef _DEBUG
-#   ifdef _UNICODE
-#       pragma comment(lib, "..\\Lib\\DuiLib_ud.lib")
-#   else
-#       pragma comment(lib, "..\\Lib\\DuiLib_d.lib")
-#   endif
-#else
-#   ifdef _UNICODE
-#       pragma comment(lib, "..\\Lib\\DuiLib_u.lib")
-#   else
-#       pragma comment(lib, "..\\Lib\\DuiLib.lib")
-#   endif
-#endif
-
 #define MESSAGE_RICHEDIT_MAX  1024
 
 //{{AFX_INSERT_LOCATION}}

RichListDemo/stdafx.h

@@ -41,17 +41,3 @@
 #include "..\DuiLib\UIlib.h"
 
 using namespace DuiLib;
-
-#ifdef _DEBUG
-#   ifdef _UNICODE
-#       pragma comment(lib, "..\\Lib\\DuiLib_ud.lib")
-#   else
-#       pragma comment(lib, "..\\Lib\\DuiLib_d.lib")
-#   endif
-#else
-#   ifdef _UNICODE
-#       pragma comment(lib, "..\\Lib\\DuiLib_u.lib")
-#   else
-#       pragma comment(lib, "..\\Lib\\DuiLib.lib")
-#   endif
-#endif