# HG changeset patch # User unc0rr # Date 1325098420 -10800 # Node ID 1df1f224f3e91c034ad18883da7de9b94c6cd4d3 # Parent 8a096836321cd7779ba6dca8c740261d824bb6ec Take koda's notice into account, also update list of source files diff -r 8a096836321c -r 1df1f224f3e9 CMakeLists.txt --- a/CMakeLists.txt Wed Dec 28 11:13:29 2011 -0500 +++ b/CMakeLists.txt Wed Dec 28 21:53:40 2011 +0300 @@ -163,7 +163,7 @@ else(Optz) # set(pascal_compiler_flags_cmn "-O-" "-g" "-gh" "-gl" "-dDEBUGFILE" ${pascal_compiler_flags_cmn}) set(pascal_compiler_flags_cmn "-O-" "-g" "-gl" "-dDEBUGFILE" ${pascal_compiler_flags_cmn}) - set(haskell_compiler_flags_cmn "-Wall" "-debug" "-dcore-lint" "-fno-warn-unused-do-bind") + set(haskell_compiler_flags_cmn "-O2" "-Wall" "-debug" "-dcore-lint" "-fno-warn-unused-do-bind") endif(Optz) diff -r 8a096836321c -r 1df1f224f3e9 gameServer/CMakeLists.txt --- a/gameServer/CMakeLists.txt Wed Dec 28 11:13:29 2011 -0500 +++ b/gameServer/CMakeLists.txt Wed Dec 28 21:53:40 2011 +0300 @@ -1,44 +1,50 @@ find_program(ghc_executable ghc) if(NOT ghc_executable) - message(FATAL_ERROR "Cannot find GHC") + message(FATAL_ERROR "Cannot find GHC") endif(NOT ghc_executable) set(hwserver_sources - OfficialServer/DBInteraction.hs - Actions.hs - ClientIO.hs - CoreTypes.hs - HWProtoCore.hs - HWProtoInRoomState.hs - HWProtoLobbyState.hs - HWProtoNEState.hs - NetRoutines.hs - Opts.hs - ServerCore.hs - Utils.hs - hedgewars-server.hs - ) + OfficialServer/DBInteraction.hs + Actions.hs + ClientIO.hs + ConfigFile.hs + Consts.hs + CoreTypes.hs + EngineInteraction.hs + HWProtoCore.hs + HWProtoInRoomState.hs + HWProtoLobbyState.hs + HWProtoNEState.hs + HandlerUtils.hs + NetRoutines.hs + Opts.hs + RoomsAndClients.hs + ServerCore.hs + ServerState.hs + Store.hs + Utils.hs + hedgewars-server.hs + ) set(hwserv_main ${hedgewars_SOURCE_DIR}/gameServer/hedgewars-server.hs) set(ghc_flags - -O2 - --make ${hwserv_main} - -i${hedgewars_SOURCE_DIR}/gameServer - -o ${EXECUTABLE_OUTPUT_PATH}/hedgewars-server${CMAKE_EXECUTABLE_SUFFIX} - -odir ${CMAKE_CURRENT_BINARY_DIR} - -hidir ${CMAKE_CURRENT_BINARY_DIR}) + --make ${hwserv_main} + -i${hedgewars_SOURCE_DIR}/gameServer + -o ${EXECUTABLE_OUTPUT_PATH}/hedgewars-server${CMAKE_EXECUTABLE_SUFFIX} + -odir ${CMAKE_CURRENT_BINARY_DIR} + -hidir ${CMAKE_CURRENT_BINARY_DIR}) set(ghc_flags ${haskell_compiler_flags_cmn} ${ghc_flags}) add_custom_command(OUTPUT "${EXECUTABLE_OUTPUT_PATH}/hedgewars-server${CMAKE_EXECUTABLE_SUFFIX}" - COMMAND "${ghc_executable}" - ARGS ${ghc_flags} - MAIN_DEPENDENCY ${hwserv_main} - DEPENDS ${hwserver_sources} - ) + COMMAND "${ghc_executable}" + ARGS ${ghc_flags} + MAIN_DEPENDENCY ${hwserv_main} + DEPENDS ${hwserver_sources} + ) add_custom_target(hedgewars-server ALL DEPENDS "${EXECUTABLE_OUTPUT_PATH}/hedgewars-server${CMAKE_EXECUTABLE_SUFFIX}")