summaryrefslogtreecommitdiff
path: root/tools
diff options
context:
space:
mode:
authorLloyd Bryant <lloyd_bryant@netzero.net>2008-07-18 00:48:14 +0000
committerLloyd Bryant <lloyd_bryant@netzero.net>2008-07-18 00:48:14 +0000
commit159285c5aa24611ceee7e3847a87bf9ea5f7fb7a (patch)
treefa48eb8bb8ed1e62ede1e7a2f95632c2243facab /tools
parent4dbc9b7af344d3ff006a40e3e0c06ce160f365f9 (diff)
downloadmana-159285c5aa24611ceee7e3847a87bf9ea5f7fb7a.tar.gz
mana-159285c5aa24611ceee7e3847a87bf9ea5f7fb7a.tar.bz2
mana-159285c5aa24611ceee7e3847a87bf9ea5f7fb7a.tar.xz
mana-159285c5aa24611ceee7e3847a87bf9ea5f7fb7a.zip
Import of client tree
Diffstat (limited to 'tools')
-rw-r--r--tools/adler32.c2
-rw-r--r--tools/tmxcopy/Makefile18
-rw-r--r--tools/tmxcopy/base64.cpp2
-rw-r--r--tools/tmxcopy/base64.h2
-rw-r--r--tools/tmxcopy/tostring.h2
5 files changed, 4 insertions, 22 deletions
diff --git a/tools/adler32.c b/tools/adler32.c
index 4e851713..cd85d58e 100644
--- a/tools/adler32.c
+++ b/tools/adler32.c
@@ -7,9 +7,9 @@
* Usage: adler32 [file]...
*/
+#include <stdlib.h>
#include <stdio.h>
#include <zlib.h>
-
/**
* Calculates the Adler-32 checksum for the given file.
*/
diff --git a/tools/tmxcopy/Makefile b/tools/tmxcopy/Makefile
deleted file mode 100644
index 732dec36..00000000
--- a/tools/tmxcopy/Makefile
+++ /dev/null
@@ -1,18 +0,0 @@
-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 9a8f6356..6b7a4ad9 100644
--- a/tools/tmxcopy/base64.cpp
+++ b/tools/tmxcopy/base64.cpp
@@ -26,7 +26,7 @@
| Author: Jim Winstead (jimw@php.net) |
+----------------------------------------------------------------------+
*/
-/* $Id$ */
+/* $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 ff20ac53..9e1193be 100644
--- a/tools/tmxcopy/base64.h
+++ b/tools/tmxcopy/base64.h
@@ -26,7 +26,7 @@
| Author: Jim Winstead (jimw@php.net) |
+----------------------------------------------------------------------+
*/
-/* $Id$ */
+/* $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/tostring.h b/tools/tmxcopy/tostring.h
index 95b8985f..b70882b0 100644
--- a/tools/tmxcopy/tostring.h
+++ b/tools/tmxcopy/tostring.h
@@ -18,7 +18,7 @@
* 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$
+ * $Id: tostring.h 3773 2007-12-12 15:45:25Z crush_tmw $
*/
#ifndef _TMW_UTILS_TOSTRING_H