--- a/CMakeLists.txt	Wed Dec 16 14:58:45 2009 +0000
+++ b/CMakeLists.txt	Fri Dec 18 02:33:45 2009 +0000
@@ -42,10 +42,11 @@
 
 	#create universal binaries only when it's time to bundle the application
 	IF(BUNDLE)
+		set(WITH_SERVER false)
 		if(current_macosx_version MATCHES "10.6")
-			set(CMAKE_OSX_ARCHITECTURES "x86_64;i386;ppc7400")	
+			set(CMAKE_OSX_ARCHITECTURES "x86_64;i386")	#;ppc7400
 		else()
-			set(CMAKE_OSX_ARCHITECTURES "i386;ppc7400")
+			set(CMAKE_OSX_ARCHITECTURES "i386")	#;ppc7400
 		endif()
 	ENDIF()	
 
@@ -88,14 +89,14 @@
 set(CMAKE_CXX_FLAGS_RELEASE ${CMAKE_C_FLAGS_RELEASE})
 set(CMAKE_CXX_FLAGS_DEBUG ${CMAKE_C_FLAGS_DEBUG})
 
-set(pascal_compiler_flags_cmn "-B" "-FE../bin" "-Fl../bin/" "-Cs2000000" "-vwi")
+set(pascal_compiler_flags_cmn "-B" "-FE../bin" "-Fl../bin/" "-Cs2000000" "-vwi" "/Users/vittorio/hedge.build/trunk/SDLMain.o")
 if(LOWRES)
 	set(pascal_compiler_flags_cmn "-dLOWRES" ${pascal_compiler_flags_cmn})
 	add_definitions(-DLOWRES)
 endif(LOWRES)
 
 if(Optz)
-	set(pascal_compiler_flags_cmn "-O2" "-Xs" "-Si" "-Or" ${pascal_compiler_flags_cmn})
+	set(pascal_compiler_flags_cmn "-O2" "-Xs" "-Si" ${pascal_compiler_flags_cmn})
 	set(haskell_compiler_flags_cmn "-w" "-O2")
 else(Optz)
 	set(pascal_compiler_flags_cmn "-O-" "-gl" "-dDEBUGFILE" "-pg" "-vv" ${pascal_compiler_flags_cmn})
@@ -116,6 +117,10 @@
 if(WITH_SERVER)
 	set(HAVE_NETSERVER true)
 	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")
+	endif()
 else(WITH_SERVER)
 	set(HAVE_NETSERVER false)
 endif(WITH_SERVER)