From 5a36956f75959887f75fda90c39d56181cd1f196 Mon Sep 17 00:00:00 2001 From: Perttu Ahola Date: Mon, 20 Dec 2010 14:04:31 +0200 Subject: working time-of-day sending from server to client --- Makefile | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) (limited to 'Makefile') diff --git a/Makefile b/Makefile index 08107718c..38a59c2de 100644 --- a/Makefile +++ b/Makefile @@ -2,18 +2,18 @@ # It's usually sufficient to change just the target name and source file list # and be sure that CXX is set to a valid compiler TARGET = test -SOURCE_FILES = guiPauseMenu.cpp mapnode.cpp tile.cpp voxel.cpp mapblockobject.cpp inventory.cpp debug.cpp serialization.cpp light.cpp filesys.cpp connection.cpp environment.cpp client.cpp server.cpp socket.cpp mapblock.cpp mapsector.cpp heightmap.cpp map.cpp player.cpp utility.cpp main.cpp test.cpp +SOURCE_FILES = guiPauseMenu.cpp defaultsettings.cpp mapnode.cpp tile.cpp voxel.cpp mapblockobject.cpp inventory.cpp debug.cpp serialization.cpp light.cpp filesys.cpp connection.cpp environment.cpp client.cpp server.cpp socket.cpp mapblock.cpp mapsector.cpp heightmap.cpp map.cpp player.cpp utility.cpp main.cpp test.cpp SOURCES = $(addprefix src/, $(SOURCE_FILES)) -BUILD_DIR = build +BUILD_DIR = build/ OBJECTS = $(addprefix $(BUILD_DIR)/, $(SOURCE_FILES:.cpp=.o)) #OBJECTS = $(SOURCES:.cpp=.o) FAST_TARGET = fasttest SERVER_TARGET = server -SERVER_SOURCE_FILES = 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_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_BUILD_DIR = serverbuild/ SERVER_OBJECTS = $(addprefix $(SERVER_BUILD_DIR)/, $(SERVER_SOURCE_FILES:.cpp=.o)) #SERVER_OBJECTS = $(SERVER_SOURCES:.cpp=.o) @@ -57,13 +57,13 @@ SERVER_DESTPATH = bin/$(SERVER_TARGET)$(SUF) # Build commands -all_linux all_win32: make_build_dir $(DESTPATH) -fast_linux: make_build_dir $(FAST_DESTPATH) -server_linux: make_server_build_dir $(SERVER_DESTPATH) +all_linux all_win32: $(BUILD_DIR) $(DESTPATH) +fast_linux: $(BUILD_DIR) $(FAST_DESTPATH) +server_linux: $(SERVER_BUILD_DIR) $(SERVER_DESTPATH) -make_build_dir: +$(BUILD_DIR): mkdir -p $(BUILD_DIR) -make_server_build_dir: +$(SERVER_BUILD_DIR): mkdir -p $(SERVER_BUILD_DIR) $(DESTPATH): $(OBJECTS) -- cgit v1.2.3