equal
deleted
inserted
replaced
150 set(CMAKE_CXX_FLAGS_RELEASE ${CMAKE_C_FLAGS_RELEASE}) |
150 set(CMAKE_CXX_FLAGS_RELEASE ${CMAKE_C_FLAGS_RELEASE}) |
151 set(CMAKE_CXX_FLAGS_DEBUG ${CMAKE_C_FLAGS_DEBUG}) |
151 set(CMAKE_CXX_FLAGS_DEBUG ${CMAKE_C_FLAGS_DEBUG}) |
152 |
152 |
153 separate_arguments(fpflags_full UNIX_COMMAND ${FPFLAGS}) |
153 separate_arguments(fpflags_full UNIX_COMMAND ${FPFLAGS}) |
154 set(pascal_flags ${fpflags_full} "-B" "-FE../bin" "-Cs2000000" "-vewn" ${pascal_flags}) |
154 set(pascal_flags ${fpflags_full} "-B" "-FE../bin" "-Cs2000000" "-vewn" ${pascal_flags}) |
155 set(haskell_flags "-O2" ${haskell_flags}) |
155 separate_arguments(ghflags_full UNIX_COMMAND ${GHFLAGS}) |
|
156 set(haskell_flags "-O2" ${haskell_flags} ${ghflags_full}) |
156 |
157 |
157 if(Optz) |
158 if(Optz) |
158 # set(pascal_flags "-O3" "-OpPENTIUM4" "-CfSSE3" "-Xs" "-Si" ${pascal_flags}) |
159 # set(pascal_flags "-O3" "-OpPENTIUM4" "-CfSSE3" "-Xs" "-Si" ${pascal_flags}) |
159 set(pascal_flags "-Os" "-Ooregvar" "-Xs" "-Si" ${pascal_flags}) |
160 set(pascal_flags "-Os" "-Ooregvar" "-Xs" "-Si" ${pascal_flags}) |
160 set(haskell_flags "-w" "-fno-warn-unused-do-bind" ${haskell_flags}) |
161 set(haskell_flags "-w" "-fno-warn-unused-do-bind" ${haskell_flags}) |
171 endif() |
172 endif() |
172 set(EXECUTABLE_OUTPUT_PATH ${PROJECT_BINARY_DIR}/bin) |
173 set(EXECUTABLE_OUTPUT_PATH ${PROJECT_BINARY_DIR}/bin) |
173 |
174 |
174 |
175 |
175 if(WITH_SERVER) |
176 if(WITH_SERVER) |
176 find_program(ghc_executable ghc) |
177 if(GHC) |
|
178 set(ghc_executable ${GHC}) |
|
179 else() |
|
180 find_program(ghc_executable ghc) |
|
181 endif() |
177 |
182 |
178 if(ghc_executable) |
183 if(ghc_executable) |
179 set(HAVE_NETSERVER true) |
184 set(HAVE_NETSERVER true) |
180 add_subdirectory(gameServer) |
185 add_subdirectory(gameServer) |
181 else() |
186 else() |