--- a/CMakeLists.txt	Sun Jan 03 17:27:25 2010 +0000
+++ b/CMakeLists.txt	Sun Jan 03 22:58:19 2010 +0000
@@ -119,7 +119,7 @@
 	set(pascal_compiler_flags_cmn "-O2" "-Xs" "-Si" ${pascal_compiler_flags_cmn})
 	set(haskell_compiler_flags_cmn "-O2" "-w")
 else(Optz)
-	set(pascal_compiler_flags_cmn "-O-" "-gh" "-gl" "-dDEBUGFILE" "-pg" "-vv" ${pascal_compiler_flags_cmn})
+	set(pascal_compiler_flags_cmn "-O-" "-glh" "-dDEBUGFILE" "-pg" "-vv" ${pascal_compiler_flags_cmn})
 	set(haskell_compiler_flags_cmn "-Wall" "-debug" "-dcore-lint")
 endif(Optz)
 
@@ -139,7 +139,7 @@
 	add_subdirectory(gameServer)
 	if(APPLE)
 		#workaround for http://hackage.haskell.org/trac/ghc/ticket/3400
-		set(haskell_compiler_flags_cmn ${haskell_compiler_flags_cmn} "-optc-m32" "-opta-m32" "-optl-m32")
+		set(haskell_compiler_flags_cmn ${haskell_compiler_flags_cmn} "-optc-m32" "-opta-m32" "-optl-arch\ i386")
 	endif()
 else(WITH_SERVER)
 	set(HAVE_NETSERVER false)