| 修订版 | 7117a3d4c90007ba9a9e277c394506f82dd2336e (tree) |
|---|---|
| 时间 | 2019-03-20 20:35:08 |
| 作者 | Starg <starg@user...> |
| Commiter | Starg |
Merge dev41
CMakeLists.txt (diff)
timidity/playmidi.c (diff)| @@ -184,8 +184,8 @@ if(MSVC) | ||
| 184 | 184 | |
| 185 | 185 | if("${CMAKE_C_COMPILER_ID}" MATCHES "Clang") |
| 186 | 186 | string(REPLACE "/JMC" "" CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG}") |
| 187 | - set(CMAKE_C_FLAGS_RELEASE "${CMAKE_C_FLAGS_RELEASE} -flto=thin") | |
| 188 | - set(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} -flto=thin") | |
| 187 | + set(CMAKE_C_FLAGS_RELEASE "${CMAKE_C_FLAGS_RELEASE} -flto=thin /guard:cf") | |
| 188 | + set(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} -flto=thin /guard:cf") | |
| 189 | 189 | else() |
| 190 | 190 | set(CMAKE_C_FLAGS_RELEASE "${CMAKE_C_FLAGS_RELEASE} /GL /guard:cf") |
| 191 | 191 | set(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} /GL /guard:cf") |
| @@ -202,8 +202,8 @@ if(MSVC) | ||
| 202 | 202 | set(CMAKE_EXE_LINKER_FLAGS_DEBUG "${CMAKE_EXE_LINKER_FLAGS_DEBUG} /DEBUG") |
| 203 | 203 | set(CMAKE_SHARED_LINKER_FLAGS_DEBUG "${CMAKE_SHARED_LINKER_FLAGS_DEBUG} /DEBUG") |
| 204 | 204 | |
| 205 | - set(CMAKE_EXE_LINKER_FLAGS_RELEASE "${CMAKE_EXE_LINKER_FLAGS_RELEASE} /OPT:REF /OPT:ICF /DEBUG") | |
| 206 | - set(CMAKE_SHARED_LINKER_FLAGS_RELEASE "${CMAKE_SHARED_LINKER_FLAGS_RELEASE} /OPT:REF /OPT:ICF /DEBUG") | |
| 205 | + set(CMAKE_EXE_LINKER_FLAGS_RELEASE "${CMAKE_EXE_LINKER_FLAGS_RELEASE} /OPT:REF /OPT:ICF /DEBUG /GUARD:CF") | |
| 206 | + set(CMAKE_SHARED_LINKER_FLAGS_RELEASE "${CMAKE_SHARED_LINKER_FLAGS_RELEASE} /OPT:REF /OPT:ICF /DEBUG /GUARD:CF") | |
| 207 | 207 | |
| 208 | 208 | set(CMAKE_EXE_LINKER_FLAGS_RELWITHDEBINFO "${CMAKE_EXE_LINKER_FLAGS_RELWITHDEBINFO} /OPT:REF /DEBUG") |
| 209 | 209 | set(CMAKE_SHARED_LINKER_FLAGS_RELWITHDEBINFO "${CMAKE_SHARED_LINKER_FLAGS_RELWITHDEBINFO} /OPT:REF /DEBUG") |
| @@ -521,7 +521,6 @@ void init_voice_pointer(void) | ||
| 521 | 521 | int i, j, error = 0; |
| 522 | 522 | |
| 523 | 523 | voice = (Voice*) safe_calloc(max_voices, sizeof(Voice)); |
| 524 | - memset(voice, 0, sizeof(voice)); | |
| 525 | 524 | if (!voice) |
| 526 | 525 | return; |
| 527 | 526 | for(i = 0; i < max_voices; i++) { |
Fork