diff options
Diffstat (limited to 'tools/tmxcopy')
| -rw-r--r-- | tools/tmxcopy/Makefile | 18 | ||||
| -rw-r--r-- | tools/tmxcopy/base64.cpp | 1 | ||||
| -rw-r--r-- | tools/tmxcopy/base64.h | 1 | ||||
| -rw-r--r-- | tools/tmxcopy/map.cpp | 2 | ||||
| -rw-r--r-- | tools/tmxcopy/tmxcopy.cbp | 110 | ||||
| -rw-r--r-- | tools/tmxcopy/tostring.h | 2 | ||||
| -rw-r--r-- | tools/tmxcopy/xmlutils.cpp | 1 | ||||
| -rw-r--r-- | tools/tmxcopy/xmlutils.h | 1 |
8 files changed, 51 insertions, 85 deletions
diff --git a/tools/tmxcopy/Makefile b/tools/tmxcopy/Makefile new file mode 100644 index 00000000..84aa9fc6 --- /dev/null +++ b/tools/tmxcopy/Makefile @@ -0,0 +1,18 @@ +CC=g++ +CFLAGS=-c `pkg-config --cflags libxml-2.0` +LDFLAGS=`pkg-config --libs libxml-2.0` +SOURCES=base64.cpp main.cpp map.cpp xmlutils.cpp zlibutils.cpp +OBJECTS=$(SOURCES:.cpp=.o) +EXECUTABLE=tmxcopy + +all: $(SOURCES) $(EXECUTABLE) + make clean + +$(EXECUTABLE): $(OBJECTS) + $(CC) $(LDFLAGS) $(OBJECTS) -o $@ + +.cpp.o: + $(CC) $(CFLAGS) $< -o $@ + +clean: + rm -f *.o diff --git a/tools/tmxcopy/base64.cpp b/tools/tmxcopy/base64.cpp index 6b7a4ad9..8cea60f9 100644 --- a/tools/tmxcopy/base64.cpp +++ b/tools/tmxcopy/base64.cpp @@ -26,7 +26,6 @@ | Author: Jim Winstead (jimw@php.net) | +----------------------------------------------------------------------+ */ -/* $Id: base64.cpp 3773 2007-12-12 15:45:25Z crush_tmw $ */ #include <string.h> #include <stdlib.h> diff --git a/tools/tmxcopy/base64.h b/tools/tmxcopy/base64.h index 9e1193be..c802207b 100644 --- a/tools/tmxcopy/base64.h +++ b/tools/tmxcopy/base64.h @@ -26,7 +26,6 @@ | Author: Jim Winstead (jimw@php.net) | +----------------------------------------------------------------------+ */ -/* $Id: base64.h 3773 2007-12-12 15:45:25Z crush_tmw $ */ #ifndef _TMW_BASE64_H #define _TMW_BASE64_H 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> diff --git a/tools/tmxcopy/tostring.h b/tools/tmxcopy/tostring.h index b70882b0..d2dd941a 100644 --- a/tools/tmxcopy/tostring.h +++ b/tools/tmxcopy/tostring.h @@ -17,8 +17,6 @@ * You should have received a copy of the GNU General Public License * along with The Mana World; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - * - * $Id: tostring.h 3773 2007-12-12 15:45:25Z crush_tmw $ */ #ifndef _TMW_UTILS_TOSTRING_H diff --git a/tools/tmxcopy/xmlutils.cpp b/tools/tmxcopy/xmlutils.cpp index 47bff51a..8b1b62cf 100644 --- a/tools/tmxcopy/xmlutils.cpp +++ b/tools/tmxcopy/xmlutils.cpp @@ -17,7 +17,6 @@ * You should have received a copy of the GNU General Public License * along with The Mana World; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - * */ #include "xmlutils.h" diff --git a/tools/tmxcopy/xmlutils.h b/tools/tmxcopy/xmlutils.h index 32d1a960..60e8f3cd 100644 --- a/tools/tmxcopy/xmlutils.h +++ b/tools/tmxcopy/xmlutils.h @@ -17,7 +17,6 @@ * You should have received a copy of the GNU General Public License * along with The Mana World; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - * */ #ifndef _XMLUTILS_H |