From 8a21fbf0cec3af9c9a7b957fdbffb19addb0b7df Mon Sep 17 00:00:00 2001 From: faketruth Date: Tue, 27 Dec 2011 17:59:08 +0000 Subject: I think I fixed the memory leaks in the converter Updated makefile for Unix I changed how the converter works, now you simply put the .exe in the folder you want to convert and run it, it'll output all the files in ./world git-svn-id: http://mc-server.googlecode.com/svn/trunk@132 0a769ca7-a7f5-676a-18bf-c427514a06d6 --- converter/makefile | 88 +++++++++++++++++++++++++++++------------------------- 1 file changed, 47 insertions(+), 41 deletions(-) (limited to 'converter/makefile') diff --git a/converter/makefile b/converter/makefile index 6cd7294b1..e5fd9e628 100644 --- a/converter/makefile +++ b/converter/makefile @@ -13,6 +13,7 @@ denotch: \ build/cNBTData.o\ build/cTimer.o\ build/cQuicksort.o\ + build/cMakeDir.o\ build/adler32.o\ build/compress.o\ build/crc32.o\ @@ -28,51 +29,54 @@ denotch: \ build/trees.o\ build/uncompr.o\ build/zutil.o - $(CC) $(LNK_OPTIONS) \ - build/main.o\ - build/cDeNotch.o\ - build/cNBTData.o\ - build/cTimer.o\ - build/cQuicksort.o\ - build/adler32.o\ - build/compress.o\ - build/crc32.o\ - build/deflate.o\ - build/gzclose.o\ - build/gzlib.o\ - build/gzread.o\ - build/gzwrite.o\ - build/infback.o\ - build/inffast.o\ - build/inflate.o\ - build/inftrees.o\ - build/trees.o\ - build/uncompr.o\ - build/zutil.o\ + + $(CC) $(LNK_OPTIONS) \ + build/main.o\ + build/cDeNotch.o\ + build/cNBTData.o\ + build/cTimer.o\ + build/cQuicksort.o\ + build/cMakeDir.o\ + build/adler32.o\ + build/compress.o\ + build/crc32.o\ + build/deflate.o\ + build/gzclose.o\ + build/gzlib.o\ + build/gzread.o\ + build/gzwrite.o\ + build/infback.o\ + build/inffast.o\ + build/inflate.o\ + build/inftrees.o\ + build/trees.o\ + build/uncompr.o\ + build/zutil.o\ -o denotch clean: rm \ - build/main.o\ - build/cDeNotch.o\ - build/cNBTData.o\ - build/cTimer.o\ - build/cQuicksort.o\ - build/adler32.o\ - build/compress.o\ - build/crc32.o\ - build/deflate.o\ - build/gzclose.o\ - build/gzlib.o\ - build/gzread.o\ - build/gzwrite.o\ - build/infback.o\ - build/inffast.o\ - build/inflate.o\ - build/inftrees.o\ - build/trees.o\ - build/uncompr.o\ - build/zutil.o\ + build/main.o\ + build/cDeNotch.o\ + build/cNBTData.o\ + build/cTimer.o\ + build/cQuicksort.o\ + build/cMakeDir.o\ + build/adler32.o\ + build/compress.o\ + build/crc32.o\ + build/deflate.o\ + build/gzclose.o\ + build/gzlib.o\ + build/gzread.o\ + build/gzwrite.o\ + build/infback.o\ + build/inffast.o\ + build/inflate.o\ + build/inftrees.o\ + build/trees.o\ + build/uncompr.o\ + build/zutil.o\ install : denotch cp denotch denotch @@ -96,6 +100,8 @@ build/cTimer.o : source/cTimer.cpp build/cQuicksort.o : source/cQuicksort.cpp $(CC) $(CC_OPTIONS) source/cQuicksort.cpp -c $(INCLUDE) -o build/cQuicksort.o +build/cMakeDir.o : source/cMakeDir.cpp + $(CC) $(CC_OPTIONS) source/cMakeDir.cpp -c $(INCLUDE) -o build/cMakeDir.o # Item # 104 -- adler32 -- build/adler32.o : ../zlib-1.2.5/adler32.c -- cgit v1.2.3