avoid having architecture-specific things in GmshConfig.h, to make it easier...

avoid having architecture-specific things in GmshConfig.h, to make it easier to cross-compile for several archs at once

CMakeLists.txt

@@ -269,7 +269,7 @@ endmacro(set_config_option)
 # machines)
 check_type_size("void*" SIZEOF_VOID_P)
 if(SIZEOF_VOID_P EQUAL 8)
-  set_config_option(HAVE_64BIT_SIZE_T "64Bit")
+  set(HAVE_64BIT_SIZE_T TRUE)
 endif(SIZEOF_VOID_P EQUAL 8)
 
 if(ENABLE_BLAS_LAPACK)

Common/GmshConfig.h.in

@@ -7,7 +7,6 @@
 #define _GMSH_CONFIG_H_
 
 #cmakedefine HAVE_3M
-#cmakedefine HAVE_64BIT_SIZE_T
 #cmakedefine HAVE_ACIS
 #cmakedefine HAVE_ANN
 #cmakedefine HAVE_BAMG

Common/Hash.h

@@ -6,8 +6,6 @@
 #ifndef _HASH_H_
 #define _HASH_H_
 
-#include "GmshConfig.h"
-
 //--FNV hashing parameters
 
 #if defined(HAVE_64BIT_SIZE_T)
@@ -48,7 +46,7 @@ template <> struct Hash1FNV1a<1> {
 
 // Entry point
 template <int N> struct HashFNV1a {
-  static size_t eval(const void *const key) 
+  static size_t eval(const void *const key)
   {
     size_t hash = FNV_OFFSET_BASIS;
     return Hash1FNV1a<N>::eval(hash, static_cast<const unsigned char*>(key));

contrib/mobile/utils/make_icon_ios.sh

 #!/bin/sh
 
-icon_source=../../../utils/icons/gmsh_mobile_master.png
-launch_source=../../../utils/icons/gmsh_mobile_master.png
+icon_source=../../../utils/icons/gmsh_mobile_1024x1024.png
+launch_source=../../../utils/icons/gmsh_mobile_1024x1024.png
 
-icon_source=$HOME/tex/proposals/bbemg/bbemg-logo-twitter-white.png
-launch_source=$HOME/tex/proposals/bbemg/bbemg-logo-color-rgb.png
+#icon_source=$HOME/tex/proposals/bbemg/bbemg-logo-twitter-white.png
+#launch_source=$HOME/tex/proposals/bbemg/bbemg-logo-color-rgb.png
 
 mkdir -p AppIcon.appiconset
 # App icons (iPad)