# HG changeset patch
# User koda
# Date 1351070617 -3600
# Node ID 49ab679cb38492b595495df9ce9d7e4340f6c2db
# Parent  da60e6b6baa3d2bce9ba62003a030dd5e97c811e
hgignore and skip one config file for win32

diff -r da60e6b6baa3 -r 49ab679cb384 .hgignore
--- a/.hgignore	Wed Oct 24 10:18:42 2012 +0100
+++ b/.hgignore	Wed Oct 24 10:23:37 2012 +0100
@@ -53,3 +53,6 @@
 glob:project_files/Android-build/Makefile.android
 glob:hedgewars-build-desktop-Qt_4_7_4_for_Desktop_-_MinGW_4_4__Qt_SDK__Debug
 glob:hedgewars-build-desktop-Qt_4_7_4_for_Desktop_-_MinGW_4_4__Qt_SDK__Release
+glob:*.depends
+glob:tools/build_windows_koda.bat
+
diff -r da60e6b6baa3 -r 49ab679cb384 share/hedgewars/Data/misc/CMakeLists.txt
--- a/share/hedgewars/Data/misc/CMakeLists.txt	Wed Oct 24 10:18:42 2012 +0100
+++ b/share/hedgewars/Data/misc/CMakeLists.txt	Wed Oct 24 10:23:37 2012 +0100
@@ -1,9 +1,13 @@
-if(DEFINED DATA_INSTALL_DIR)                                                                                                            
-    set(HEDGEWARS_DATADIR ${DATA_INSTALL_DIR})                                                                                          
-else()                                                                                                                                  
-    set(HEDGEWARS_DATADIR ${CMAKE_INSTALL_PREFIX}/share/)                                                                               
+if(DEFINED DATA_INSTALL_DIR)
+    set(HEDGEWARS_DATADIR ${DATA_INSTALL_DIR}
+)
+else()
+    set(HEDGEWARS_DATADIR ${CMAKE_INSTALL_PREFIX}/share/)
 endif()  
+
+if(UNIX AND NOT APPLE)
 configure_file(hwengine.desktop.in hwengine.desktop)
+endif()
 
 file(GLOB miscfiles *.xml *.desktop)