diff options
| author | madmaxoft@gmail.com <madmaxoft@gmail.com@0a769ca7-a7f5-676a-18bf-c427514a06d6> | 2012-02-21 13:07:08 +0100 |
|---|---|---|
| committer | madmaxoft@gmail.com <madmaxoft@gmail.com@0a769ca7-a7f5-676a-18bf-c427514a06d6> | 2012-02-21 13:07:08 +0100 |
| commit | f07251625db80833714a856d5e374fbdbcbc4bd1 (patch) | |
| tree | b1aa65546f88f5a6834e28d9c2e66c5e9e2759f3 | |
| parent | VC2008: Temporarily reset compiler warnings to Level 3 due to the new ASSERT() (diff) | |
| download | cuberite-f07251625db80833714a856d5e374fbdbcbc4bd1.tar cuberite-f07251625db80833714a856d5e374fbdbcbc4bd1.tar.gz cuberite-f07251625db80833714a856d5e374fbdbcbc4bd1.tar.bz2 cuberite-f07251625db80833714a856d5e374fbdbcbc4bd1.tar.lz cuberite-f07251625db80833714a856d5e374fbdbcbc4bd1.tar.xz cuberite-f07251625db80833714a856d5e374fbdbcbc4bd1.tar.zst cuberite-f07251625db80833714a856d5e374fbdbcbc4bd1.zip | |
| -rw-r--r-- | GNUmakefile | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/GNUmakefile b/GNUmakefile index b7aa7ea9b..5353f19a0 100644 --- a/GNUmakefile +++ b/GNUmakefile @@ -1,8 +1,7 @@ ###################################################
#
# Makefile for MCServer
-# Creator ZFalt
-# Created: [Thu Feb 24 19:53:17 2011]
+# Creator: tedik
#
###################################################
#
@@ -64,7 +63,7 @@ SOURCES := $(filter-out %minigzip.c %lua.c %tolua.c %toluabind.c %LeakFinder.cpp OBJECTS := $(patsubst %.c,$(BUILDDIR)%.o,$(SOURCES))
OBJECTS := $(patsubst %.cpp,$(BUILDDIR)%.o,$(OBJECTS))
--include $(OBJECTS:.o=.d)
+-include $(patsubst %.o,%.d,$(OBJECTS))
MCServer : $(OBJECTS)
$(CC) $(LNK_OPTIONS) $(OBJECTS) -o MCServer
@@ -84,7 +83,7 @@ $(BUILDDIR)%.o: %.c $(CC) $(CCE_OPTIONS) -c $(INCLUDE) $< -o $@
@$(CC) $(CC_OPTIONS) -MM $(INCLUDE) $< > $(patsubst %.o,%.d,$@)
@mv -f $(patsubst %.o,%.d,$@) $(patsubst %.o,%.d,$@).tmp
- @sed -e 's|.*:|$*.o:|' < $(patsubst %.o,%.d,$@).tmp > $(patsubst %.o,%.d,$@)
+ @sed -e "s|.*:|$(BUILDDIR)$*.o:|" < $(patsubst %.o,%.d,$@).tmp > $(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
@@ -93,6 +92,6 @@ $(BUILDDIR)%.o: %.cpp $(CC) $(CC_OPTIONS) -c $(INCLUDE) $< -o $@
@$(CC) $(CC_OPTIONS) -MM $(INCLUDE) $< > $(patsubst %.o,%.d,$@)
@mv -f $(patsubst %.o,%.d,$@) $(patsubst %.o,%.d,$@).tmp
- @sed -e 's|.*:|$*.o:|' < $(patsubst %.o,%.d,$@).tmp > $(patsubst %.o,%.d,$@)
+ @sed -e "s|.*:|$(BUILDDIR)$*.o:|" < $(patsubst %.o,%.d,$@).tmp > $(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
|