diff -r 8ab4ef8b70f6 -r 03d113d51062 hedgewars/CMakeLists.txt --- a/hedgewars/CMakeLists.txt Tue Mar 19 13:39:38 2013 +0100 +++ b/hedgewars/CMakeLists.txt Tue Mar 19 14:14:40 2013 +0100 @@ -21,13 +21,12 @@ configure_file(${CMAKE_CURRENT_SOURCE_DIR}/config.inc.in ${CMAKE_CURRENT_BINARY_DIR}/config.inc) #SOURCE AND PROGRAMS SECTION -#if(${BUILD_ENGINE_LIBRARY}) -# set(engine_output_name "${CMAKE_SHARED_LIBRARY_PREFIX}hwengine${CMAKE_SHARED_LIBRARY_SUFFIX}") -# set(hwengine_project hwLibrary.pas) -#else() -# set(engine_output_name "hwengine${CMAKE_EXECUTABLE_SUFFIX}") -# set(hwengine_project hwengine.pas) -#endif() +if(${BUILD_ENGINE_LIBRARY}) + set(engine_output_name "${CMAKE_SHARED_LIBRARY_PREFIX}hwengine${CMAKE_SHARED_LIBRARY_SUFFIX}") + set(hwengine_project hwLibrary.pas) +else() + set(engine_output_name "hwengine${CMAKE_EXECUTABLE_SUFFIX}") +endif() if (APPLE) set(required_fpc_version 2.6) @@ -176,8 +175,11 @@ endif() if(NOT LUA_FOUND) + add_flag_append(CMAKE_Pascal_FLAGS -k${EXECUTABLE_OUTPUT_PATH}/lib${LUA_LIBRARY}.a) #linking with liblua.a requires system readline - add_flag_append(CMAKE_Pascal_FLAGS "-k${EXECUTABLE_OUTPUT_PATH}/lib${LUA_LIBRARY}.a -k-lreadline") + if(UNIX) + add_flag_append(CMAKE_Pascal_FLAGS -k-lreadline) + endif(UNIX) endif() if(NOT PHYSFS_FOUND) @@ -223,4 +225,4 @@ # add_dependencies(hwengine ENGINECLEAN) #endif() -install(PROGRAMS "${EXECUTABLE_OUTPUT_PATH}/hwengine" DESTINATION ${destination_dir}) +install(PROGRAMS "${EXECUTABLE_OUTPUT_PATH}/${engine_output_name}" DESTINATION ${destination_dir})