summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPhilipp Sehmisch <tmw@crushnet.org>2008-08-10 15:54:48 +0000
committerPhilipp Sehmisch <tmw@crushnet.org>2008-08-10 15:54:48 +0000
commit8493ae0b217435977d917976c5c1b959953b895c (patch)
treed061ad9875a78b2f420f0c0fce09abeb5c48c41c
parent1df0f995cbcafa24a9312c25aa7c24fe910ed54c (diff)
downloadmana-client-8493ae0b217435977d917976c5c1b959953b895c.tar.gz
mana-client-8493ae0b217435977d917976c5c1b959953b895c.tar.bz2
mana-client-8493ae0b217435977d917976c5c1b959953b895c.tar.xz
mana-client-8493ae0b217435977d917976c5c1b959953b895c.zip
fixed some compilation problems reported by Jaxad, updated project file to new code::blocks format.
-rw-r--r--tools/tmxcopy/map.cpp2
-rw-r--r--tools/tmxcopy/tmxcopy.cbp110
2 files changed, 33 insertions, 79 deletions
diff --git a/tools/tmxcopy/map.cpp b/tools/tmxcopy/map.cpp
index e0212e37..b554aac2 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>
@@ -250,6 +251,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>