# HG changeset patch
# User koda
# Date 1266191451 0
# Node ID b8956af350c1f0367977a2b77fe251bcbcffed02
# Parent  8f48b538d5910b631e9f482190060a7025dd2f87
mac build supports lua

diff -r 8f48b538d591 -r b8956af350c1 CMakeLists.txt
--- a/CMakeLists.txt	Sun Feb 14 21:57:47 2010 +0000
+++ b/CMakeLists.txt	Sun Feb 14 23:50:51 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-" "-glh" "-dDEBUGFILE" "-pg" "-vv" ${pascal_compiler_flags_cmn})
+	set(pascal_compiler_flags_cmn "-O-" "-glh" "-dDEBUGFILE" "-vv" ${pascal_compiler_flags_cmn})
 	set(haskell_compiler_flags_cmn "-Wall" "-debug" "-dcore-lint")
 endif(Optz)
 
diff -r 8f48b538d591 -r b8956af350c1 hedgewars/CMakeLists.txt
--- a/hedgewars/CMakeLists.txt	Sun Feb 14 21:57:47 2010 +0000
+++ b/hedgewars/CMakeLists.txt	Sun Feb 14 23:50:51 2010 +0000
@@ -150,7 +150,11 @@
 	add_library (SDLmain STATIC SDLMain.m)
 #	set_target_properties(SDLmain PROPERTIES COMPILE_FLAGS "-mmacosx-version-min=${minimum_macosx} --sysroot=${CMAKE_OSX_SYSROOT} ")
 
-#these are the dependencies for building a universal binary on Mac OS X
+	#let's tell freepacal where to find libraries
+	message("${CMAKE_SOURCE_DIR}/misc")
+	set(pascal_compiler_flags "-k${CMAKE_SOURCE_DIR}/misc/liblua.a" ${pascal_compiler_flags})
+
+	#these are the dependencies for building a universal binary on Mac OS X
 	foreach (build_arch ${powerpc_build} ${i386_build} ${x86_64_build})
 		set(lipo_args_list "${EXECUTABLE_OUTPUT_PATH}/hwengine.${build_arch}" ${lipo_args_list})
 		add_custom_command(OUTPUT "${EXECUTABLE_OUTPUT_PATH}/hwengine.${build_arch}"
diff -r 8f48b538d591 -r b8956af350c1 hedgewars/LuaPas.pas
--- a/hedgewars/LuaPas.pas	Sun Feb 14 21:57:47 2010 +0000
+++ b/hedgewars/LuaPas.pas	Sun Feb 14 23:50:51 2010 +0000
@@ -21,10 +21,11 @@
 
 const
 {$IFDEF UNIX}
-  LuaLibName = 'lua5.1.so';
-{$IFDEF DARWIN}
-    LuaLibName = 'lua5.1.a';
-{$ENDIF}
+  {$IFDEF DARWIN}
+    LuaLibName = 'lua';
+  {$ELSE}
+    LuaLibName = 'lua5.1.so';
+  {$ENDIF}
 {$ELSE}
   LuaLibName = 'lua5.1.dll';
 {$ENDIF}
diff -r 8f48b538d591 -r b8956af350c1 misc/liblua.a
Binary file misc/liblua.a has changed