cmakeでdebugビルド時、_DEBUGをdefineするようにした。version_info.h内にbuild_typeを出力するようにした。
trunk/CMakeLists.txt (diff)
trunk/teraterm/teraterm/vtwin.cpp (diff) trunk/teraterm/ttpmacro/ttmacro.cpp (diff)
trunk/version_info.h.in (diff)| @@ -50,10 +50,12 @@ | ||
| 50 | 50 | set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} /SAFESEH:NO") |
| 51 | 51 | endif() |
| 52 | 52 | elseif(MINGW) |
| 53 | + set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -D_WIN32_WINNT=${_WIN32_WINNT}") | |
| 53 | 54 | set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -D_WIN32_WINNT=${_WIN32_WINNT}") |
| 54 | - set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -D_WIN32_WINNT=${_WIN32_WINNT}") | |
| 55 | 55 | set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wall -Wextra -Wno-unused-parameter -static -ffunction-sections -fdata-sections ${C_ONLY_FLAGS}") |
| 56 | 56 | set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -Wextra -Wno-unused-parameter -static -ffunction-sections -fdata-sections") |
| 57 | + set(CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG} -D_DEBUG") | |
| 58 | + set(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} -D_DEBUG") | |
| 57 | 59 | if (CMAKE_C_COMPILER_ID STREQUAL "GNU") |
| 58 | 60 | set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -static-libgcc -static-libstdc++") |
| 59 | 61 | set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -static-libgcc -static-libstdc++") |
| @@ -119,8 +119,10 @@ | ||
| 119 | 119 | #ifdef _DEBUG |
| 120 | 120 | #define malloc(l) _malloc_dbg((l), _NORMAL_BLOCK, __FILE__, __LINE__) |
| 121 | 121 | #define free(p) _free_dbg((p), _NORMAL_BLOCK) |
| 122 | +#if defined(_MSC_VER) | |
| 122 | 123 | #define new ::new(_NORMAL_BLOCK, __FILE__, __LINE__) |
| 123 | 124 | #endif |
| 125 | +#endif | |
| 124 | 126 | |
| 125 | 127 | // ウィンドウ最大化ボタンを有効にする (2005.1.15 yutaka) |
| 126 | 128 | #define WINDOW_MAXMIMUM_ENABLED 1 |
| @@ -49,7 +49,7 @@ | ||
| 49 | 49 | #include "ttmlib.h" |
| 50 | 50 | #include "ttlib.h" |
| 51 | 51 | |
| 52 | -#ifdef _DEBUG | |
| 52 | +#if defined(_MSC_VER) && defined(_DEBUG) | |
| 53 | 53 | #define new new(_NORMAL_BLOCK, __FILE__, __LINE__) |
| 54 | 54 | #endif |
| 55 | 55 |
| @@ -115,7 +115,7 @@ | ||
| 115 | 115 | DWORD SleepTick = 1; |
| 116 | 116 | |
| 117 | 117 | #ifdef _DEBUG |
| 118 | - ::_CrtSetDbgFlag(_CRTDBG_ALLOC_MEM_DF | _CRTDBG_LEAK_CHECK_DF); | |
| 118 | + _CrtSetDbgFlag(_CRTDBG_ALLOC_MEM_DF | _CRTDBG_LEAK_CHECK_DF); | |
| 119 | 119 | #endif |
| 120 | 120 | |
| 121 | 121 | init(); |
| @@ -158,10 +158,10 @@ | ||
| 158 | 158 | } |
| 159 | 159 | } |
| 160 | 160 | |
| 161 | - // TODO すでに閉じられている、この処理不要? | |
| 162 | - if (pCCtrlWindow) { | |
| 163 | - pCCtrlWindow->DestroyWindow(); | |
| 164 | - } | |
| 161 | + pCCtrlWindow->DestroyWindow(); | |
| 162 | + delete pCCtrlWindow; | |
| 165 | 163 | pCCtrlWindow = NULL; |
| 164 | + | |
| 165 | + DLLExit(); | |
| 166 | 166 | return ExitCode; |
| 167 | 167 | } |
| @@ -11,6 +11,8 @@ | ||
| 11 | 11 | // @CMAKE_GENERATOR@ |
| 12 | 12 | // CMAKE_GENERATOR_TOOLSET (VS 2010 and above) |
| 13 | 13 | // @CMAKE_GENERATOR_TOOLSET@ |
| 14 | +// CMAKE_BUILD_TYPE (single-configuration generator) | |
| 15 | +// @CMAKE_BUILD_TYPE@ | |
| 14 | 16 | // CMAKE_COMMAND |
| 15 | 17 | // @CMAKE_COMMAND@ |
| 16 | 18 | // CMAKE_C_COMPILER |
Tera Term