Fix ZenUtils compilation

git-svn-id: svn://svn.rockbox.org/rockbox/trunk@21242 a1c6a512-1295-4272-9138-f99709370657

utils/zenutils/CMakeLists.txt

@@ -6,7 +6,7 @@ SUBDIRS(source libraries)
 
 INCLUDE_DIRECTORIES(
   ${zenutils_SOURCE_DIR}/libraries/beecrypt-4.1.2
-  ${zenutils_SOURCE_DIR}/libraries/getpot-c++-1.1.17
+  ${zenutils_SOURCE_DIR}/libraries/getpot-c++-1.1.18
   ${zenutils_SOURCE_DIR}/libraries/pelib-0.9
   ${zenutils_SOURCE_DIR}/libraries/zlib123
   ${zenutils_SOURCE_DIR}/source/shared

utils/zenutils/libraries/getpot-c++-1.1.18/getpot/LPGL.txt

@@ -1,5 +1,5 @@
-		  GNU LESSER GENERAL PUBLIC LICENSE
+          GNU LESSER GENERAL PUBLIC LICENSE
-		       Version 2.1, February 1999
+               Version 2.1, February 1999
 
  Copyright (C) 1991, 1999 Free Software Foundation, Inc.
      59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
@@ -10,7 +10,7 @@
  as the successor of the GNU Library Public License, version 2, hence
  the version number 2.1.]
 
-			    Preamble
+                Preamble
 
   The licenses for most software are designed to take away your
 freedom to share and change it.  By contrast, the GNU General Public
@@ -112,7 +112,7 @@ modification follow.  Pay close attention to the difference between a
 former contains code derived from the library, whereas the latter must
 be combined with the library in order to run.
 
-		  GNU LESSER GENERAL PUBLIC LICENSE
+          GNU LESSER GENERAL PUBLIC LICENSE
    TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
 
   0. This License Agreement applies to any software library or other
@@ -432,7 +432,7 @@ decision will be guided by the two goals of preserving the free status
 of all derivatives of our free software and of promoting the sharing
 and reuse of software generally.
 
-			    NO WARRANTY
+                NO WARRANTY
 
   15. BECAUSE THE LIBRARY IS LICENSED FREE OF CHARGE, THERE IS NO
 WARRANTY FOR THE LIBRARY, TO THE EXTENT PERMITTED BY APPLICABLE LAW.
@@ -455,7 +455,7 @@ FAILURE OF THE LIBRARY TO OPERATE WITH ANY OTHER SOFTWARE), EVEN IF
 SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH
 DAMAGES.
 
-		     END OF TERMS AND CONDITIONS
+             END OF TERMS AND CONDITIONS
 
            How to Apply These Terms to Your New Libraries
 
@@ -501,4 +501,3 @@ necessary.  Here is a sample; alter the names:
 
 That's all there is to it!
 
-

utils/zenutils/libraries/getpot-c++-1.1.18/getpot/README

@@ -5,10 +5,10 @@ Attention: This version contains a couple of beautiful
 ---------- new features, that are not documented yet. 
  
            E.g.: -- automated ufo detection
-	         -- arbitrary comment delimiters
+             -- arbitrary comment delimiters
-		 -- arbitrary vector field separators
+         -- arbitrary vector field separators
-		 -- tails, i.e. easy access to all tails
+         -- tails, i.e. easy access to all tails
-		    of options such as '-L' or '-I'.
+            of options such as '-L' or '-I'.
 
           Please, refere to the example/ directory
           for usage descriptions.
@@ -47,4 +47,3 @@ Enjoy !
 
 Juli 2005, 
 Frank R. Schaefer
-

utils/zenutils/libraries/pelib-0.9/pelib/PeHeader.h

@@ -14,6 +14,7 @@
 #define PEHEADER_H
 
 #include "PeLibAux.h"
+#include <string.h>
 
 namespace PeLib
 {

utils/zenutils/source/firmware_extract/main.cpp

@@ -18,7 +18,7 @@
 
 #include <iostream>
 #include <ctime>
-#include <getpot/getpot.hpp>
+#include <getpot/GetPot>
 #include <utils.h>
 #include <firmware.h>
 

utils/zenutils/source/firmware_make/main.cpp

@@ -18,7 +18,7 @@
 
 #include <iostream>
 #include <sstream>
-#include <getpot/getpot.hpp>
+#include <getpot/GetPot>
 #include <file.h>
 #include <firmware.h>
 #include <utils.h>

utils/zenutils/source/update_extract/main.cpp

@@ -19,7 +19,7 @@
 #include <iostream>
 #include <iomanip>
 #include <ctime>
-#include <getpot/getpot.hpp>
+#include <getpot/GetPot>
 #include <file.h>
 #include <updater.h>
 #include <utils.h>

utils/zenutils/source/update_patch/main.cpp

@@ -19,7 +19,7 @@
 #include <iostream>
 #include <iomanip>
 #include <cstdio>
-#include <getpot/getpot.hpp>
+#include <getpot/GetPot>
 #include <file.h>
 #include <updater.h>
 #include <utils.h>

utils/zenutils/source/zen_crypt/main.cpp

@@ -17,7 +17,7 @@
  */
 
 #include <iostream>
-#include <getpot/getpot.hpp>
+#include <getpot/GetPot>
 #include <cenc.h>
 #include <crypt.h>
 #include <file.h>