summaryrefslogtreecommitdiffstats
path: root/Tools/BlockZapper/GNUmakefile
diff options
context:
space:
mode:
authormadmaxoft <github@xoft.cz>2013-11-28 13:48:52 +0100
committermadmaxoft <github@xoft.cz>2013-11-28 13:48:52 +0100
commitbb37271f306507f8d0161bc655913c69412ba16a (patch)
tree468080dd6a28ebb4071262b8cfad8616a786ba84 /Tools/BlockZapper/GNUmakefile
parentFixed BiomeVisualiser after folder move. (diff)
downloadcuberite-bb37271f306507f8d0161bc655913c69412ba16a.tar
cuberite-bb37271f306507f8d0161bc655913c69412ba16a.tar.gz
cuberite-bb37271f306507f8d0161bc655913c69412ba16a.tar.bz2
cuberite-bb37271f306507f8d0161bc655913c69412ba16a.tar.lz
cuberite-bb37271f306507f8d0161bc655913c69412ba16a.tar.xz
cuberite-bb37271f306507f8d0161bc655913c69412ba16a.tar.zst
cuberite-bb37271f306507f8d0161bc655913c69412ba16a.zip
Diffstat (limited to 'Tools/BlockZapper/GNUmakefile')
-rw-r--r--Tools/BlockZapper/GNUmakefile28
1 files changed, 13 insertions, 15 deletions
diff --git a/Tools/BlockZapper/GNUmakefile b/Tools/BlockZapper/GNUmakefile
index edd5f9009..0ef5eb3cc 100644
--- a/Tools/BlockZapper/GNUmakefile
+++ b/Tools/BlockZapper/GNUmakefile
@@ -100,8 +100,8 @@ endif
#
INCLUDE = -I.\
- -I../../source\
- -I../../zlib-1.2.7\
+ -I../../src\
+ -I../../lib\
@@ -114,16 +114,16 @@ INCLUDE = -I.\
SOURCES := $(shell find . '(' -name '*.cpp' -o -name '*.c' ')')
SHAREDSOURCES := \
- source/Log.cpp \
- source/MCLogger.cpp \
- source/Noise.cpp \
- source/StringCompression.cpp \
- source/StringUtils.cpp \
- source/OSSupport/CriticalSection.cpp \
- source/OSSupport/File.cpp \
- source/OSSupport/IsThread.cpp \
- source/OSSupport/MakeDir.cpp \
- source/WorldStorage/FastNBT.cpp
+ src/Log.cpp \
+ src/MCLogger.cpp \
+ src/Noise.cpp \
+ src/StringCompression.cpp \
+ src/StringUtils.cpp \
+ src/OSSupport/CriticalSection.cpp \
+ src/OSSupport/File.cpp \
+ src/OSSupport/IsThread.cpp \
+ src/OSSupport/MakeDir.cpp \
+ src/WorldStorage/FastNBT.cpp
SHAREDSOURCES := $(filter-out %minigzip.c,$(SHAREDSOURCES))
@@ -142,8 +142,6 @@ BlockZapper : $(OBJECTS) $(SHAREDOBJECTS)
clean :
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,$@)
@rm -f $(patsubst %.o,%.d,$@).tmp
-$(BUILDDIR)source/%.o: ../../source/%.cpp
+$(BUILDDIR)src/%.o: ../../src/%.cpp
@mkdir -p $(dir $@)
$(CC) $(CXX_OPTIONS) -c $(INCLUDE) $< -o $@
@$(CC) $(CXX_OPTIONS) -MM $(INCLUDE) $< > $(patsubst %.o,%.d,$@)