From: Harley Laue Date: Thu, 13 May 2010 13:37:53 +0000 (-0500) Subject: Kill Windows line endings in the middle of the file X-Git-Url: https://git.jsancho.org/?a=commitdiff_plain;h=83dd4aeb0f3deef28f2bbda315a6fb7add8c79e9;hp=abf8445c6bae263c5a931e3c5693b7879e19df8e;p=lugaru.git Kill Windows line endings in the middle of the file --- diff --git a/Source/CMakeLists.txt b/Source/CMakeLists.txt index b62b4b7..f48fdbe 100644 --- a/Source/CMakeLists.txt +++ b/Source/CMakeLists.txt @@ -105,23 +105,23 @@ if(CMAKE_HOST_APPLE) endif(CMAKE_HOST_APPLE) if(WIN32) - if(CMAKE_CROSSCOMPILING) - ADD_CUSTOM_COMMAND( OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/lugaru_resource.obj - COMMAND i686-pc-mingw32-windres - -I${CMAKE_CURRENT_SOURCE_DIR}/res - -o ${CMAKE_CURRENT_BINARY_DIR}/lugaru_resource.obj - -i${CMAKE_CURRENT_SOURCE_DIR}/res/lugaru.rc - DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/res/lugaru.rc - ) - endif(CMAKE_CROSSCOMPILING) - if(NOT CMAKE_CROSSCOMPILING) - ADD_CUSTOM_COMMAND( OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/lugaru_resource.obj - COMMAND windres - -I${CMAKE_CURRENT_SOURCE_DIR}/res - -o ${CMAKE_CURRENT_BINARY_DIR}/lugaru_resource.obj - -i${CMAKE_CURRENT_SOURCE_DIR}/res/lugaru.rc - DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/res/lugaru.rc - ) + if(CMAKE_CROSSCOMPILING) + ADD_CUSTOM_COMMAND( OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/lugaru_resource.obj + COMMAND i686-pc-mingw32-windres + -I${CMAKE_CURRENT_SOURCE_DIR}/res + -o ${CMAKE_CURRENT_BINARY_DIR}/lugaru_resource.obj + -i${CMAKE_CURRENT_SOURCE_DIR}/res/lugaru.rc + DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/res/lugaru.rc + ) + endif(CMAKE_CROSSCOMPILING) + if(NOT CMAKE_CROSSCOMPILING) + ADD_CUSTOM_COMMAND( OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/lugaru_resource.obj + COMMAND windres + -I${CMAKE_CURRENT_SOURCE_DIR}/res + -o ${CMAKE_CURRENT_BINARY_DIR}/lugaru_resource.obj + -i${CMAKE_CURRENT_SOURCE_DIR}/res/lugaru.rc + DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/res/lugaru.rc + ) endif(NOT CMAKE_CROSSCOMPILING) set(LUGARU_SRCS