From 77c6d99b840e340cc62c48144b5f265260ac92d6 Mon Sep 17 00:00:00 2001
From: Philipp Sehmisch <tmw@crushnet.org>
Date: Sun, 10 Aug 2008 15:54:48 +0000
Subject: fixed some compilation problems reported by Jaxad, updated project
 file to new code::blocks format.

---
 tools/tmxcopy/map.cpp     |   2 +
 tools/tmxcopy/tmxcopy.cbp | 110 +++++++++++++---------------------------------
 2 files changed, 33 insertions(+), 79 deletions(-)

(limited to 'tools')

diff --git a/tools/tmxcopy/map.cpp b/tools/tmxcopy/map.cpp
index c60409c6..82fe0f8f 100644
--- a/tools/tmxcopy/map.cpp
+++ b/tools/tmxcopy/map.cpp
@@ -18,6 +18,7 @@
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
+#include <cstring>
 #include <iostream>
 #include <map>
 #include <list>
@@ -251,6 +252,7 @@ bool Map::overwrite(  Map* srcMap,
     }
 
     std::clog<<"copying successful!"<<std::endl;
+    return true;
 }
 
 int Map::save(std::string filename)
diff --git a/tools/tmxcopy/tmxcopy.cbp b/tools/tmxcopy/tmxcopy.cbp
index 90105493..237f6fde 100644
--- a/tools/tmxcopy/tmxcopy.cbp
+++ b/tools/tmxcopy/tmxcopy.cbp
@@ -1,87 +1,39 @@
-<?xml version="1.0"?>
-<!DOCTYPE CodeBlocks_project_file>
+<?xml version="1.0" encoding="UTF-8" standalone="yes" ?>
 <CodeBlocks_project_file>
-	<FileVersion major="1" minor="1"/>
+	<FileVersion major="1" minor="6" />
 	<Project>
-		<Option title="tmxcopy"/>
-		<Option makefile="Makefile"/>
-		<Option makefile_is_custom="0"/>
-		<Option active_target="0"/>
-		<Option compiler="0"/>
+		<Option title="untitled" />
+		<Option pch_mode="0" />
+		<Option compiler="gcc" />
 		<Build>
 			<Target title="default">
-				<Option output="tmxcopy.exe"/>
-				<Option working_dir="."/>
-				<Option object_output=".objs"/>
-				<Option deps_output=".deps"/>
-				<Option type="1"/>
-				<Option compiler="0"/>
-				<Option projectResourceIncludeDirsRelation="1"/>
+				<Option output="TMXCopy.exe" prefix_auto="0" extension_auto="0" />
+				<Option type="1" />
+				<Option compiler="gcc" />
+				<Option projectResourceIncludeDirsRelation="1" />
+				<Linker>
+					<Add library="libxml2" />
+					<Add library="z" />
+				</Linker>
 			</Target>
 		</Build>
-		<Linker>
-			<Add library="libxml2"/>
-			<Add library="libz"/>
-		</Linker>
-		<Unit filename="base64.cpp">
-			<Option compilerVar="CPP"/>
-			<Option target="default"/>
-			<Option target="release"/>
-		</Unit>
-		<Unit filename="base64.h">
-			<Option compilerVar=""/>
-			<Option compile="0"/>
-			<Option link="0"/>
-			<Option target="default"/>
-			<Option target="release"/>
-		</Unit>
-		<Unit filename="main.cpp">
-			<Option compilerVar="CPP"/>
-			<Option target="default"/>
-			<Option target="release"/>
-		</Unit>
-		<Unit filename="map.cpp">
-			<Option compilerVar="CPP"/>
-			<Option target="default"/>
-			<Option target="release"/>
-		</Unit>
-		<Unit filename="map.hpp">
-			<Option compilerVar=""/>
-			<Option compile="0"/>
-			<Option link="0"/>
-			<Option target="default"/>
-			<Option target="release"/>
-		</Unit>
-		<Unit filename="tostring.h">
-			<Option compilerVar=""/>
-			<Option compile="0"/>
-			<Option link="0"/>
-			<Option target="default"/>
-			<Option target="release"/>
-		</Unit>
-		<Unit filename="xmlutils.cpp">
-			<Option compilerVar="CPP"/>
-			<Option target="default"/>
-			<Option target="release"/>
-		</Unit>
-		<Unit filename="xmlutils.h">
-			<Option compilerVar=""/>
-			<Option compile="0"/>
-			<Option link="0"/>
-			<Option target="default"/>
-			<Option target="release"/>
-		</Unit>
-		<Unit filename="zlibutils.cpp">
-			<Option compilerVar="CPP"/>
-			<Option target="default"/>
-			<Option target="release"/>
-		</Unit>
-		<Unit filename="zlibutils.h">
-			<Option compilerVar=""/>
-			<Option compile="0"/>
-			<Option link="0"/>
-			<Option target="default"/>
-			<Option target="release"/>
-		</Unit>
+		<VirtualTargets>
+			<Add alias="All" targets="default;" />
+		</VirtualTargets>
+		<Unit filename="base64.cpp" />
+		<Unit filename="base64.h" />
+		<Unit filename="main.cpp" />
+		<Unit filename="map.cpp" />
+		<Unit filename="map.hpp" />
+		<Unit filename="tostring.h" />
+		<Unit filename="xmlutils.cpp" />
+		<Unit filename="xmlutils.h" />
+		<Unit filename="zlibutils.cpp" />
+		<Unit filename="zlibutils.h" />
+		<Extensions>
+			<code_completion />
+			<envvars />
+			<debugger />
+		</Extensions>
 	</Project>
 </CodeBlocks_project_file>
-- 
cgit v1.2.3-70-g09d2