flewkey
/
cuberite-2a
1
0
Fork 0
Code Releases Activity

Fixed BlockZapper after folder move.

This commit is contained in:
madmaxoft 2013-11-28 13:48:52 +01:00
parent afd94a0b11
commit bb37271f30
6 changed files with 37 additions and 44 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
Tools/BlockZapper/.gitignore vendored Normal file
View File

@ -0,0 +1,3 @@
Debug/
logs/
Release/

2
Tools/BlockZapper/BlockZapper.sln
View File

@ -6,7 +6,7 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "BlockZapper", "BlockZapper.
{EA9D50FD-937A-4EF5-8C37-5F4175AF4FEA} = {EA9D50FD-937A-4EF5-8C37-5F4175AF4FEA} {EA9D50FD-937A-4EF5-8C37-5F4175AF4FEA} = {EA9D50FD-937A-4EF5-8C37-5F4175AF4FEA}
EndProjectSection EndProjectSection
EndProject EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "zlib", "..\..\..\mc-server.clean\VC2008\zlib.vcproj", "{EA9D50FD-937A-4EF5-8C37-5F4175AF4FEA}" Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "zlib", "..\..\VC2008\zlib.vcproj", "{EA9D50FD-937A-4EF5-8C37-5F4175AF4FEA}"
EndProject EndProject
Global Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution GlobalSection(SolutionConfigurationPlatforms) = preSolution

44
Tools/BlockZapper/BlockZapper.vcproj
View File

@ -41,7 +41,7 @@
<Tool <Tool
Name="VCCLCompilerTool" Name="VCCLCompilerTool"
Optimization="0" Optimization="0"
AdditionalIncludeDirectories="../../source;../../zlib-1.2.7" AdditionalIncludeDirectories="../../src;../../lib"
PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE" PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE"
MinimalRebuild="true" MinimalRebuild="true"
BasicRuntimeChecks="3" BasicRuntimeChecks="3"
@ -116,7 +116,7 @@
Name="VCCLCompilerTool" Name="VCCLCompilerTool"
Optimization="2" Optimization="2"
EnableIntrinsicFunctions="true" EnableIntrinsicFunctions="true"
AdditionalIncludeDirectories="../../source;../../zlib-1.2.7" AdditionalIncludeDirectories="../../src;../../lib"
PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE" PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE"
RuntimeLibrary="0" RuntimeLibrary="0"
EnableFunctionLevelLinking="true" EnableFunctionLevelLinking="true"
@ -222,70 +222,62 @@
Name="shared" Name="shared"
> >
<File <File
RelativePath="..\..\source\Log.cpp" RelativePath="..\..\src\Log.cpp"
> >
</File> </File>
<File <File
RelativePath="..\..\source\Log.h" RelativePath="..\..\src\Log.h"
> >
</File> </File>
<File <File
RelativePath="..\..\source\MCLogger.cpp" RelativePath="..\..\src\MCLogger.cpp"
> >
</File> </File>
<File <File
RelativePath="..\..\source\MCLogger.h" RelativePath="..\..\src\MCLogger.h"
> >
</File> </File>
<File <File
RelativePath="..\..\source\StringCompression.cpp" RelativePath="..\..\src\StringCompression.cpp"
> >
</File> </File>
<File <File
RelativePath="..\..\source\StringCompression.h" RelativePath="..\..\src\StringCompression.h"
> >
</File> </File>
<File <File
RelativePath="..\..\source\StringUtils.cpp" RelativePath="..\..\src\StringUtils.cpp"
> >
</File> </File>
<File <File
RelativePath="..\..\source\StringUtils.h" RelativePath="..\..\src\StringUtils.h"
> >
</File> </File>
<Filter <Filter
Name="OSSupport" Name="OSSupport"
> >
<File <File
RelativePath="..\..\source\OSSupport\CriticalSection.cpp" RelativePath="..\..\src\OSSupport\CriticalSection.cpp"
> >
</File> </File>
<File <File
RelativePath="..\..\source\OSSupport\CriticalSection.h" RelativePath="..\..\src\OSSupport\CriticalSection.h"
> >
</File> </File>
<File <File
RelativePath="..\..\source\OSSupport\File.cpp" RelativePath="..\..\src\OSSupport\File.cpp"
> >
</File> </File>
<File <File
RelativePath="..\..\source\OSSupport\File.h" RelativePath="..\..\src\OSSupport\File.h"
> >
</File> </File>
<File <File
RelativePath="..\..\source\OSSupport\IsThread.cpp" RelativePath="..\..\src\OSSupport\IsThread.cpp"
> >
</File> </File>
<File <File
RelativePath="..\..\source\OSSupport\IsThread.h" RelativePath="..\..\src\OSSupport\IsThread.h"
>
</File>
<File
RelativePath="..\..\source\OSSupport\MakeDir.cpp"
>
</File>
<File
RelativePath="..\..\source\OSSupport\MakeDir.h"
> >
</File> </File>
</Filter> </Filter>
@ -293,11 +285,11 @@
Name="WorldStorage" Name="WorldStorage"
> >
<File <File
RelativePath="..\..\source\WorldStorage\FastNBT.cpp" RelativePath="..\..\src\WorldStorage\FastNBT.cpp"
> >
</File> </File>
<File <File
RelativePath="..\..\source\WorldStorage\FastNBT.h" RelativePath="..\..\src\WorldStorage\FastNBT.h"
> >
</File> </File>
</Filter> </Filter>

28
Tools/BlockZapper/GNUmakefile
View File

@ -100,8 +100,8 @@ endif
# #
INCLUDE = -I.\ INCLUDE = -I.\
-I../../source\ -I../../src\
-I../../zlib-1.2.7\ -I../../lib\
@ -114,16 +114,16 @@ INCLUDE = -I.\
SOURCES := $(shell find . '(' -name '*.cpp' -o -name '*.c' ')') SOURCES := $(shell find . '(' -name '*.cpp' -o -name '*.c' ')')
SHAREDSOURCES := \ SHAREDSOURCES := \
source/Log.cpp \ src/Log.cpp \
source/MCLogger.cpp \ src/MCLogger.cpp \
source/Noise.cpp \ src/Noise.cpp \
source/StringCompression.cpp \ src/StringCompression.cpp \
source/StringUtils.cpp \ src/StringUtils.cpp \
source/OSSupport/CriticalSection.cpp \ src/OSSupport/CriticalSection.cpp \
source/OSSupport/File.cpp \ src/OSSupport/File.cpp \
source/OSSupport/IsThread.cpp \ src/OSSupport/IsThread.cpp \
source/OSSupport/MakeDir.cpp \ src/OSSupport/MakeDir.cpp \
source/WorldStorage/FastNBT.cpp src/WorldStorage/FastNBT.cpp
SHAREDSOURCES := $(filter-out %minigzip.c,$(SHAREDSOURCES)) SHAREDSOURCES := $(filter-out %minigzip.c,$(SHAREDSOURCES))
@ -142,8 +142,6 @@ BlockZapper : $(OBJECTS) $(SHAREDOBJECTS)
clean : clean :
rm -rf $(BUILDDIR) BlockZapper rm -rf $(BUILDDIR) BlockZapper
install : MCServer
cp MCServer MCServer
@ -175,7 +173,7 @@ $(BUILDDIR)%.o: %.cpp
@sed -e 's/.*://' -e 's/\\$$//' < $(patsubst %.o,%.d,$@).tmp | fmt -1 | sed -e 's/^ *//' -e 's/$$/:/' >> $(patsubst %.o,%.d,$@) @sed -e 's/.*://' -e 's/\\$$//' < $(patsubst %.o,%.d,$@).tmp | fmt -1 | sed -e 's/^ *//' -e 's/$$/:/' >> $(patsubst %.o,%.d,$@)
@rm -f $(patsubst %.o,%.d,$@).tmp @rm -f $(patsubst %.o,%.d,$@).tmp
$(BUILDDIR)source/%.o: ../../source/%.cpp $(BUILDDIR)src/%.o: ../../src/%.cpp
@mkdir -p $(dir $@) @mkdir -p $(dir $@)
$(CC) $(CXX_OPTIONS) -c $(INCLUDE) $< -o $@ $(CC) $(CXX_OPTIONS) -c $(INCLUDE) $< -o $@
@$(CC) $(CXX_OPTIONS) -MM $(INCLUDE) $< > $(patsubst %.o,%.d,$@) @$(CC) $(CXX_OPTIONS) -MM $(INCLUDE) $< > $(patsubst %.o,%.d,$@)

2
Tools/BlockZapper/Globals.h
View File

@ -7,7 +7,7 @@
#include "../../source/Globals.h" #include "../../src/Globals.h"

2
Tools/BlockZapper/Zapper.cpp
View File

@ -7,7 +7,7 @@
#include "WorldStorage/FastNBT.h" #include "WorldStorage/FastNBT.h"
#include "StringCompression.h" #include "StringCompression.h"
#include "zlib.h" #include "zlib/zlib.h"
#include "Zapper.h" #include "Zapper.h"