crafting system!

1 files changed, 11 insertions, 5 deletions

diff --git a/Makefile b/Makefile
index aaeb9d7e3..6da2e64d1 100644
--- a/Makefile
+++ b/Makefile
@@ -6,16 +6,17 @@ SOURCE_FILES = guiInventoryMenu.cpp irrlichtwrapper.cpp guiPauseMenu.cpp default
 SOURCES = $(addprefix src/, $(SOURCE_FILES))

 BUILD_DIR = build

 OBJECTS = $(addprefix $(BUILD_DIR)/, $(SOURCE_FILES:.cpp=.o))

-#OBJECTS = $(SOURCES:.cpp=.o)

 

 FAST_TARGET = fasttest

+FAST_SOURCES = $(addprefix src/, $(SOURCE_FILES))

+FAST_BUILD_DIR = fastbuild

+FAST_OBJECTS = $(addprefix $(FAST_BUILD_DIR)/, $(SOURCE_FILES:.cpp=.o))

 

 SERVER_TARGET = server

 SERVER_SOURCE_FILES = defaultsettings.cpp mapnode.cpp voxel.cpp mapblockobject.cpp inventory.cpp debug.cpp serialization.cpp light.cpp filesys.cpp connection.cpp environment.cpp server.cpp socket.cpp mapblock.cpp mapsector.cpp heightmap.cpp map.cpp player.cpp utility.cpp servermain.cpp test.cpp

 SERVER_SOURCES = $(addprefix src/, $(SERVER_SOURCE_FILES))

 SERVER_BUILD_DIR = serverbuild

 SERVER_OBJECTS = $(addprefix $(SERVER_BUILD_DIR)/, $(SERVER_SOURCE_FILES:.cpp=.o))

-#SERVER_OBJECTS = $(SERVER_SOURCES:.cpp=.o)

 

 IRRLICHTPATH = ../irrlicht/irrlicht-1.7.1

 JTHREADPATH = ../jthread/jthread-1.2.1

@@ -58,19 +59,21 @@ SERVER_DESTPATH = bin/$(SERVER_TARGET)$(SUF)
 # Build commands

 

 all_linux all_win32: $(BUILD_DIR) $(DESTPATH)

-fast_linux: $(BUILD_DIR) $(FAST_DESTPATH)

+fast_linux: $(FAST_BUILD_DIR) $(FAST_DESTPATH)

 server_linux: $(SERVER_BUILD_DIR) $(SERVER_DESTPATH)

 

 $(BUILD_DIR):

 	mkdir -p $(BUILD_DIR)

+$(FAST_BUILD_DIR):

+	mkdir -p $(FAST_BUILD_DIR)

 $(SERVER_BUILD_DIR):

 	mkdir -p $(SERVER_BUILD_DIR)

 

 $(DESTPATH): $(OBJECTS)

 	$(CXX) -o $@ $(OBJECTS) $(LDFLAGS)

 

-$(FAST_DESTPATH): $(OBJECTS)

-	$(CXX) -o $@ $(OBJECTS) $(LDFLAGS) -DUNITTEST_DISABLE

+$(FAST_DESTPATH): $(FAST_OBJECTS)

+	$(CXX) -o $@ $(FAST_OBJECTS) $(LDFLAGS) -DUNITTEST_DISABLE

 

 $(SERVER_DESTPATH): $(SERVER_OBJECTS)

 	$(CXX) -o $@ $(SERVER_OBJECTS) $(LDFLAGS) -DSERVER -DUNITTEST_DISABLE

@@ -78,6 +81,9 @@ $(SERVER_DESTPATH): $(SERVER_OBJECTS)
 $(BUILD_DIR)/%.o: src/%.cpp

 	$(CXX) -c -o $@ $< $(CPPFLAGS) $(CXXFLAGS)

 

+$(FAST_BUILD_DIR)/%.o: src/%.cpp

+	$(CXX) -c -o $@ $< $(CPPFLAGS) $(CXXFLAGS)

+

 $(SERVER_BUILD_DIR)/%.o: src/%.cpp

 	$(CXX) -c -o $@ $< $(CPPFLAGS) $(CXXFLAGS)