From 4cf98f3f11956af32cbdb9cf156cc3d50077c21d Mon Sep 17 00:00:00 2001 From: Arthas Lucifer Date: Fri, 25 Mar 2016 09:14:13 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8DCMAKE=E7=BC=96=E8=AF=91?= =?UTF-8?q?=E4=B8=8D=E9=80=9A=E8=BF=87=E7=9A=84=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- 360SafeDemo/CMakeLists.txt | 4 ++-- 360SafeDemo/StdAfx.h | 14 -------------- CMakeLists.txt | 2 +- FlashDemo/CMakeLists.txt | 1 + FlashDemo/StdAfx.h | 14 -------------- GameDemo/CMakeLists.txt | 1 + GameDemo/StdAfx.h | 14 -------------- ListDemo/CMakeLists.txt | 1 + ListDemo/Main.cpp | 14 -------------- MenuDemo/About.cpp | 1 + MenuDemo/About.h | 2 +- QQDemo/StdAfx.h | 15 --------------- RichListDemo/stdafx.h | 14 -------------- 13 files changed, 8 insertions(+), 89 deletions(-) diff --git a/360SafeDemo/CMakeLists.txt b/360SafeDemo/CMakeLists.txt index 066e83f..7dc3389 100644 --- a/360SafeDemo/CMakeLists.txt +++ b/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) diff --git a/360SafeDemo/StdAfx.h b/360SafeDemo/StdAfx.h index a141747..901806d 100644 --- a/360SafeDemo/StdAfx.h +++ b/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. diff --git a/CMakeLists.txt b/CMakeLists.txt index e3fd75e..c41eff6 100644 --- a/CMakeLists.txt +++ b/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) diff --git a/FlashDemo/CMakeLists.txt b/FlashDemo/CMakeLists.txt index e9b4f9b..325229b 100644 --- a/FlashDemo/CMakeLists.txt +++ b/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") diff --git a/FlashDemo/StdAfx.h b/FlashDemo/StdAfx.h index 86a16a0..cdd931c 100644 --- a/FlashDemo/StdAfx.h +++ b/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. diff --git a/GameDemo/CMakeLists.txt b/GameDemo/CMakeLists.txt index 55d86d1..4306624 100644 --- a/GameDemo/CMakeLists.txt +++ b/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") diff --git a/GameDemo/StdAfx.h b/GameDemo/StdAfx.h index ccec31b..3acd257 100644 --- a/GameDemo/StdAfx.h +++ b/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}} diff --git a/ListDemo/CMakeLists.txt b/ListDemo/CMakeLists.txt index 857017b..1e41906 100644 --- a/ListDemo/CMakeLists.txt +++ b/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") diff --git a/ListDemo/Main.cpp b/ListDemo/Main.cpp index bc9fe6a..b046736 100644 --- a/ListDemo/Main.cpp +++ b/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 /* * 存放第二列数据 diff --git a/MenuDemo/About.cpp b/MenuDemo/About.cpp index 594d8ad..cc8deda 100644 --- a/MenuDemo/About.cpp +++ b/MenuDemo/About.cpp @@ -1,4 +1,5 @@ #include "StdAfx.h" +#include "SkinSetting.h" #include "About.h" const TCHAR* const kSysBtnControlName = _T("SysButton"); diff --git a/MenuDemo/About.h b/MenuDemo/About.h index c9bf32e..2a2b837 100644 --- a/MenuDemo/About.h +++ b/MenuDemo/About.h @@ -1,6 +1,6 @@ #pragma once -class CAbout : public WindowImplBase,CSkinSetting +class CAbout : public WindowImplBase,DuiLib::CSkinSetting { public: bool m_bModal; diff --git a/QQDemo/StdAfx.h b/QQDemo/StdAfx.h index d67c15b..a136935 100644 --- a/QQDemo/StdAfx.h +++ b/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}} diff --git a/RichListDemo/stdafx.h b/RichListDemo/stdafx.h index 29dec67..8275dc5 100644 --- a/RichListDemo/stdafx.h +++ b/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 \ No newline at end of file