equal
deleted
inserted
replaced
117 |
117 |
118 if(Optz) |
118 if(Optz) |
119 set(pascal_compiler_flags_cmn "-O2" "-Xs" "-Si" ${pascal_compiler_flags_cmn}) |
119 set(pascal_compiler_flags_cmn "-O2" "-Xs" "-Si" ${pascal_compiler_flags_cmn}) |
120 set(haskell_compiler_flags_cmn "-O2" "-w") |
120 set(haskell_compiler_flags_cmn "-O2" "-w") |
121 else(Optz) |
121 else(Optz) |
122 set(pascal_compiler_flags_cmn "-O-" "-gh" "-gl" "-dDEBUGFILE" "-pg" "-vv" ${pascal_compiler_flags_cmn}) |
122 set(pascal_compiler_flags_cmn "-O-" "-glh" "-dDEBUGFILE" "-pg" "-vv" ${pascal_compiler_flags_cmn}) |
123 set(haskell_compiler_flags_cmn "-Wall" "-debug" "-dcore-lint") |
123 set(haskell_compiler_flags_cmn "-Wall" "-debug" "-dcore-lint") |
124 endif(Optz) |
124 endif(Optz) |
125 |
125 |
126 |
126 |
127 if(DEFINED DATA_INSTALL_DIR) |
127 if(DEFINED DATA_INSTALL_DIR) |
137 if(WITH_SERVER) |
137 if(WITH_SERVER) |
138 set(HAVE_NETSERVER true) |
138 set(HAVE_NETSERVER true) |
139 add_subdirectory(gameServer) |
139 add_subdirectory(gameServer) |
140 if(APPLE) |
140 if(APPLE) |
141 #workaround for http://hackage.haskell.org/trac/ghc/ticket/3400 |
141 #workaround for http://hackage.haskell.org/trac/ghc/ticket/3400 |
142 set(haskell_compiler_flags_cmn ${haskell_compiler_flags_cmn} "-optc-m32" "-opta-m32" "-optl-m32") |
142 set(haskell_compiler_flags_cmn ${haskell_compiler_flags_cmn} "-optc-m32" "-opta-m32" "-optl-arch\ i386") |
143 endif() |
143 endif() |
144 else(WITH_SERVER) |
144 else(WITH_SERVER) |
145 set(HAVE_NETSERVER false) |
145 set(HAVE_NETSERVER false) |
146 endif(WITH_SERVER) |
146 endif(WITH_SERVER) |
147 |
147 |