From 744267c63b52d191f88fb8f804f5269235a6b321 Mon Sep 17 00:00:00 2001
From: StudioEtrange <nomorgan@gmail.com>
Date: Wed, 24 Jul 2013 20:53:33 +0000
Subject: [PATCH 1/3] Fix some probleme with spaces in path on windows

PCHSupport.cmake edited online with Bitbucket

--HG--
branch : StudioEtrange/fix-some-probleme-with-spaces-in-path-on-1374699208398
---
 code/CMakeModules/PCHSupport.cmake | 15 ++++++++++-----
 1 file changed, 10 insertions(+), 5 deletions(-)

diff --git a/code/CMakeModules/PCHSupport.cmake b/code/CMakeModules/PCHSupport.cmake
index d444bfa3d..0e33df4dc 100644
--- a/code/CMakeModules/PCHSupport.cmake
+++ b/code/CMakeModules/PCHSupport.cmake
@@ -33,9 +33,9 @@ ENDIF(MSVC)
 # Set PCH_FLAGS for common flags, PCH_ARCH_XXX_FLAGS for specific archs flags and PCH_ARCHS for archs
 MACRO(PCH_SET_COMPILE_FLAGS _target)
   SET(PCH_FLAGS)
-  SET(PCH_ARCHS)
-
+  SET(PCH_ARCHS) 
   SET(FLAGS)
+  
   LIST(APPEND _FLAGS ${CMAKE_CXX_FLAGS})
 
   STRING(TOUPPER "${CMAKE_BUILD_TYPE}" _UPPER_BUILD)
@@ -81,10 +81,15 @@ MACRO(PCH_SET_COMPILE_FLAGS _target)
   LIST(APPEND _FLAGS " ${_directory_flags}")
   LIST(APPEND _FLAGS " ${_directory_definitions}")
 
-  STRING(REGEX REPLACE " +" " " _FLAGS ${_FLAGS})
-
   # Format definitions
-  SEPARATE_ARGUMENTS(_FLAGS)
+  IF(MSVC)
+    # Fix path with space
+    SEPARATE_ARGUMENTS(_FLAGS UNIX_COMMAND "${_FLAGS}")
+  ELSE(MSVC)
+    STRING(REGEX REPLACE " +" " " _FLAGS ${_FLAGS})
+    SEPARATE_ARGUMENTS(_FLAGS)
+  ENDIF(MSVC)
+
 
   IF(CLANG)
     # Determining all architectures and get common flags

From 0efa7c8aeeb0229f02fe5435adef70d3c4302dc5 Mon Sep 17 00:00:00 2001
From: StudioEtrange <nomorgan@gmail.com>
Date: Wed, 24 Jul 2013 21:57:52 +0000
Subject: [PATCH 2/3] PCHSupport.cmake edited online with Bitbucket

--HG--
branch : StudioEtrange/fix-some-probleme-with-spaces-in-path-on-1374699208398
---
 code/CMakeModules/PCHSupport.cmake | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/code/CMakeModules/PCHSupport.cmake b/code/CMakeModules/PCHSupport.cmake
index 0e33df4dc..042f6b0cc 100644
--- a/code/CMakeModules/PCHSupport.cmake
+++ b/code/CMakeModules/PCHSupport.cmake
@@ -34,7 +34,7 @@ ENDIF(MSVC)
 MACRO(PCH_SET_COMPILE_FLAGS _target)
   SET(PCH_FLAGS)
   SET(PCH_ARCHS) 
-  SET(FLAGS)
+  SET(_FLAGS)
   
   LIST(APPEND _FLAGS ${CMAKE_CXX_FLAGS})
 

From 8577277bfd366a1c8c8d9b92146a7519a18791fc Mon Sep 17 00:00:00 2001
From: kervala <none@none>
Date: Fri, 26 Jul 2013 09:33:32 +0200
Subject: [PATCH 3/3] Fixed: prtab function not compiling with VC++ (define
 DEBUG_CRYPT if you want to debug crypt() method)

---
 code/ryzom/common/src/game_share/crypt.cpp | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/code/ryzom/common/src/game_share/crypt.cpp b/code/ryzom/common/src/game_share/crypt.cpp
index fa0f1252f..0da908817 100644
--- a/code/ryzom/common/src/game_share/crypt.cpp
+++ b/code/ryzom/common/src/game_share/crypt.cpp
@@ -79,6 +79,10 @@ static char rz_sccsid[] = "@(#)crypt.c	8.1 (Berkeley) 6/4/93";
 #include <limits.h>
 #define RZ__PASSWORD_EFMT1 '-'
 
+#if DEBUG_CRYPT
+void prtab(char *s, unsigned char *t, int num_rows);
+#endif
+
 /*
  * UNIX password, and DES, encryption.
  * By Tom Truscott, trt@rti.rti.org,
@@ -785,7 +789,7 @@ int rz_des_cipher(const char *in, char *out, long salt, int num_iter) {
 		}
 		perm[i] = (unsigned char) k;
 	}
-#ifdef DEBUG
+#ifdef DEBUG_CRYPT
 	prtab("pc1tab", perm, 8);
 #endif
 	rz_init_perm(PC1ROT, perm, 8, 8);
@@ -809,7 +813,7 @@ int rz_des_cipher(const char *in, char *out, long salt, int num_iter) {
 			if ((k%28) <= j) k -= 28;
 			perm[i] = pc2inv[k];
 		}
-#ifdef DEBUG
+#ifdef DEBUG_CRYPT
 		prtab("pc2tab", perm, 8);
 #endif
 		rz_init_perm(PC2ROT[j], perm, 8, 8);
@@ -833,7 +837,7 @@ int rz_des_cipher(const char *in, char *out, long salt, int num_iter) {
 			perm[i*8+j] = (unsigned char) k;
 		}
 	}
-#ifdef DEBUG
+#ifdef DEBUG_CRYPT
 	prtab("ietab", perm, 8);
 #endif
 	rz_init_perm(IE3264, perm, 4, 8);
@@ -850,7 +854,7 @@ int rz_des_cipher(const char *in, char *out, long salt, int num_iter) {
 		}
 		perm[k-1] = i+1;
 	}
-#ifdef DEBUG
+#ifdef DEBUG_CRYPT
 	prtab("cftab", perm, 8);
 #endif
 	rz_init_perm(CF6464, perm, 8, 8);
@@ -959,12 +963,8 @@ int rz_encrypt(register char *block, int flag) {
 	return (0);
 }
 
-#ifdef DEBUG
-STATIC
-prtab(s, t, num_rows)
-	char *s;
-	unsigned char *t;
-	int num_rows;
+#ifdef DEBUG_CRYPT
+void prtab(char *s, unsigned char *t, int num_rows)
 {
 	register int i, j;