From 9ecfd485a14e65c2049d33a81087474f4c54fbe0 Mon Sep 17 00:00:00 2001 From: Nicolas Date: Sun, 7 Oct 2018 20:08:10 -0300 Subject: [PATCH] Update CMakeLists.txt --- src/CMakeLists.txt | 39 ++++++++++++--------------------------- 1 file changed, 12 insertions(+), 27 deletions(-) diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 88c1033ae7..7a95d4cd62 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -151,33 +151,18 @@ set_target_properties("${SM_EXE_NAME}" PROPERTIES OUTPUT_NAME_RELWITHDEBINFO "${SM_NAME_RELWITHDEBINFO}" ) -if("${CMAKE_GENERATOR}" MATCHES "(Win64|IA64|amd64)") - list(APPEND SM_WINDOWS_PROGRAM_DLLS - "${SM_PROGRAM_DIR}/avcodec-55.dll" - "${SM_PROGRAM_DIR}/avformat-55.dll" - "${SM_PROGRAM_DIR}/avutil-52.dll" - "${SM_PROGRAM_DIR}/parallel_lights_io.dll" - "${SM_PROGRAM_DIR}/swscale-2.dll" - "${SM_PROGRAM_DIR}/uWS.dll" - "${SM_PROGRAM_DIR}/libuv.dll" - "${SM_PROGRAM_DIR}/SSLEAY32.dll" - "${SM_PROGRAM_DIR}/LIBEAY32.dll" - "${SM_PROGRAM_DIR}/zlib1.dll" - ) -else() - list(APPEND SM_WINDOWS_PROGRAM_DLLS - "${SM_PROGRAM_DIR}/avcodec-55_x86.dll" - "${SM_PROGRAM_DIR}/avformat-55_x86.dll" - "${SM_PROGRAM_DIR}/avutil-52_x86.dll" - "${SM_PROGRAM_DIR}/parallel_lights_io.dll" - "${SM_PROGRAM_DIR}/swscale-2.dll" - "${SM_PROGRAM_DIR}/uWS_x86.dll" - "${SM_PROGRAM_DIR}/libuv_x86.dll" - "${SM_PROGRAM_DIR}/SSLEAY32_x86.dll" - "${SM_PROGRAM_DIR}/LIBEAY32_x86.dll" - "${SM_PROGRAM_DIR}/zlib1_x86.dll" - ) -endif() +list(APPEND SM_WINDOWS_PROGRAM_DLLS + "${SM_PROGRAM_DIR}/avcodec-55.dll" + "${SM_PROGRAM_DIR}/avformat-55.dll" + "${SM_PROGRAM_DIR}/avutil-52.dll" + "${SM_PROGRAM_DIR}/parallel_lights_io.dll" + "${SM_PROGRAM_DIR}/swscale-2.dll" + "${SM_PROGRAM_DIR}/uWS.dll" + "${SM_PROGRAM_DIR}/libuv.dll" + "${SM_PROGRAM_DIR}/SSLEAY32.dll" + "${SM_PROGRAM_DIR}/LIBEAY32.dll" + "${SM_PROGRAM_DIR}/zlib1.dll" +) if(WIN32) sm_add_compile_definition("${SM_EXE_NAME}" WINDOWS)