[Performous-commit] Daniel Lemper : fixed some bugs for Mac OS X

[Jack_MD <ja...@us...>]

Module: performous
Branch: master
Commit: e6b1b3b9dde59f7c23d7116fc29d307977a35a06

Author: Daniel Lemper <da...@Ma...>
Date:   Wed Dec 16 22:46:51 2009 +0100

fixed some bugs for Mac OS X

---

 cmake/Modules/FindGettext.cmake |   14 ++++++++++++++
 osx-utils/performous-mac_script |    5 +----
 2 files changed, 15 insertions(+), 4 deletions(-)

diff --git a/cmake/Modules/FindGettext.cmake b/cmake/Modules/FindGettext.cmake
index b25512c..78a62a6 100644
--- a/cmake/Modules/FindGettext.cmake
+++ b/cmake/Modules/FindGettext.cmake
@@ -21,6 +21,20 @@ if(WIN32)
 	set(Gettext_PROCESS_LIBS Gettext_LIBRARY)
 endif()
 
+if(APPLE)
+  set(Gettext_LIBRARY_SEARCH_DIRS
+    /opt/local/lib
+    /sw/local/lib
+  )
+  
+  find_library(Gettext_LIBRARY
+    NAMES intl
+    PATHS ${Gettext_LIBRARY_SEARCH_DIRS}
+  )
+
+  set(Gettext_PROCESS_LIBS Gettext_LIBRARY)
+endif()
+
 find_path(Gettext_INCLUDE_DIR
   NAMES libintl.h
   PATHS ${Gettext_PKGCONF_INCLUDE_DIRS}
diff --git a/osx-utils/performous-mac_script b/osx-utils/performous-mac_script
index 087484d..348fad8 100755
--- a/osx-utils/performous-mac_script
+++ b/osx-utils/performous-mac_script
@@ -1,7 +1,4 @@
 #!/bin/bash
 
-export PATH="$(dirname "$0")/../Resources/performous/bin":$PATH
-export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:"$(dirname "$0")/../Resources/performous/lib"
-export PERFORMOUS_DEFAULT_CONFIG_FILE="$(dirname "$0")/../Resources/performous/share/games/performous/config/performous.xml"
-export PERFORMOUS_THEME_PATH="$(dirname "$0")/../Resources/performous/share/games/performous/themes"
+export PERFORMOUS_ROOT="$(dirname "$0")/../Resources/performous"
 "$(dirname "$0")/../Resources/performous/bin/performous"