Portability redux.

Author: Elliott Hird

Makefile

@@ -1,24 +1 @@
-ifeq ($(origin objdir), undefined)
-	ifeq ($(origin OBJDIR), undefined)
-		objdir := $(if $(debug),_debug,_build)
-	endif
-endif
-
-include useful.make
-
-libs := gthread-2.0 sdl
-
-cc.flags := -Wall -Werror -std=gnu99
-cc.flags += $(shell pkg-config --cflags $(libs))
-ld.flags += $(shell pkg-config --libs $(libs)) -lz -lreadline
-
-# Fuck Apple.
-ifeq ($(shell uname),Darwin)
-	cc.flags += -fnested-functions
-endif
-
-cc.flags += $(if $(debug),-g,-O3)
-
-all: $(objdir)/mcmap
-
-$(call c-program, mcmap, cmd.c console.c main.c map.c nbt.c protocol.c world.c)
+include Makefile.posix

Makefile.common

@@ -0,0 +1,38 @@
+# mcmap/Makefile.common  -*- mode: makefile -*-
+
+sources += cmd.c console.c main.c map.c nbt.c protocol.c world.c
+
+ifdef debug
+	CFLAGS ?= -g
+	OBJDIR ?= build-debug
+else
+	CFLAGS ?= -O3
+	OBJDIR ?= build
+endif
+
+objs += $(sources:%.c=$(OBJDIR)/%.o)
+deps += $(sources:%.c=$(OBJDIR)/%.d)
+
+CFLAGS += -Wall -Werror -std=gnu99
+
+.PHONY: all clean
+
+all: $(OBJDIR)/mcmap$(EXE)
+
+$(OBJDIR)/mcmap$(EXE): $(objs)
+	$(CC) $(LDFLAGS) -o $@ $(objs)
+
+$(OBJDIR):
+	mkdir $@
+
+$(OBJDIR)/%.o: %.c $(OBJDIR)
+	$(CC) $(CFLAGS) -c -o $@ $<
+
+-include $(deps)
+
+clean:
+	rm -f $(OBJDIR)/mcmap$(EXE) $(objs) $(deps)
+	rmdir $(OBJDIR); true
+
+$(OBJDIR)/%.d: %.c $(OBJDIR)
+	@$(CC) -MM -MF $@ -MT $(@:.d=.o) -MT $@ $(CFLAGS) $<

Makefile.posix

@@ -0,0 +1,16 @@
+# mcmap/Makefile.posix  -*- mode: makefile -*-
+
+sources = posix.c
+libs := gthread-2.0 sdl
+
+include Makefile.common
+
+CFLAGS += -DPLATFORM=posix
+CFLAGS += $(shell pkg-config --cflags $(libs))
+
+# Apple's gcc is braindead by default.
+ifeq ($(shell uname),Darwin)
+        CFLAGS += -fnested-functions
+endif
+
+LDFLAGS ?= $(shell pkg-config --libs $(libs)) -lz -lreadline

Makefile.win

@@ -0,0 +1,22 @@
+# mcmap/Makefile.win32  -*- mode: makefile -*-
+
+sources = win32.c
+objs = win32-res.o
+
+include Makefile.common
+
+CC := i586-mingw32msvc-gcc
+WINDRES ?= i586-mingw32msvc-windres
+
+CFLAGS += -DWINVER=0x0501 -DPLATFORM=win32
+CFLAGS += -Iwin/glib/include -Iwin/glib/include/glib-2.0 -Iwin/glib/lib/glib-2.0/include
+CFLAGS += -Iwin/SDL-1.2.14/include/SDL
+
+LDFLAGS += -lws2_32 -Wl,--subsystem,console
+LDFLAGS += -Lwin/glib/lib -lglib-2.0 -lgobject-2.0 -lgthread-2.0 -lz
+LDFLAGS += -Lwin/SDL-1.2.14/lib -lSDL
+
+EXE := .exe
+
+win32-res.o: win32.rc win32-res.h
+	$(WINDRES) -O coff $< $@

Makefile.win32

@@ -1,6 +1,7 @@
 #ifndef MCMAP_COMMON_H
 #define MCMAP_COMMON_H
 
+#include "platform.h"
 #include "protocol.h"
 
 #include <glib.h>

common.h

@@ -5,56 +5,12 @@
 
 #include <glib.h>
 
-#ifndef WIN32
-#include <poll.h>
-#include <readline/readline.h>
-#include <readline/history.h>
-#endif
-
 #include "common.h"
 #include "console.h"
 #include "protocol.h"
 #include "world.h"
 
-static int console_outfd = 1;
-
-#ifndef WIN32
-static int console_readline = 0;
-static int opipe_read, opipe_write;
-#endif
-
-/* setting up */
-
-#ifndef WIN32
-static gpointer console_thread(gpointer userdata);
-static void console_cleanup(void);
-#endif
-
-void console_init(void)
-{
-#ifndef WIN32
-	if (isatty(0) && isatty(1))
-	{
-		int pipefd[2];
-		if (pipe(pipefd) != 0)
-			goto no_terminal;
-
-		opipe_read = pipefd[0];
-		opipe_write = pipefd[1];
-
-		rl_readline_name = "mcmap";
-
-		console_readline = 1;
-		console_outfd = opipe_write;
-		atexit(console_cleanup);
-
-		g_thread_create(console_thread, NULL, FALSE, 0);
-	}
-
-no_terminal:
-#endif
-	return;
-}
+int console_outfd = 1;
 
 /* log-printing methods in common.h */
 
@@ -90,10 +46,8 @@ void log_print(char *fmt, ...)
 
 void log_die(char *file, int line, int is_stop, char *fmt, ...)
 {
-#ifndef WIN32
-	if (console_readline && !is_stop)
+	if (!is_stop)
 		console_cleanup();
-#endif
 
 	GString *msg = tstamp();
 	g_string_append_printf(msg, "[DIED] %s: %d: ", file, line);
@@ -112,103 +66,3 @@ void log_die(char *file, int line, int is_stop, char *fmt, ...)
 
 	exit(1);
 }
-
-/* readline input and log output interlacing */
-
-#ifndef WIN32
-static void console_line_ready(char *line)
-{
-	if (line)
-	{
-		add_history(line);
-		inject_to_server(packet_new(PACKET_TO_SERVER, PACKET_CHAT, line));
-	}
-	else /* ^D */
-		exit(0);
-
-	free(line);
-
-	rl_callback_handler_install("> ", console_line_ready);
-}
-
-static gpointer console_thread(gpointer userdata)
-{
-	struct pollfd pfds[2] = {
-		{ .fd = opipe_read, .events = POLLIN },
-		{ .fd = 0, .events = POLLIN }
-	};
-
-	GIOChannel *och = g_io_channel_unix_new(opipe_read);
-	rl_callback_handler_install("> ", console_line_ready);
-
-	while (1)
-	{
-		/* wait for input (stdin) or output (pipe) */
-
-		int i = poll(pfds, 2, -1);
-		if (i < 0 && errno == EINTR)
-			continue;
-
-		if (pfds[0].revents & POLLIN)
-		{
-			/* clean up the prompt and its contents */
-
-			int old_point = rl_point, old_mark = rl_mark;
-			char *old_text = strdup(rl_line_buffer);
-
-			rl_replace_line("", 0);
-			rl_redisplay();
-
-			fputs("\r\x1b[K", stdout);
-
-			/* display pending output lines (TODO: more than one) */
-
-			gchar *line = 0;
-			gsize line_eol = 0;
-
-			g_io_channel_read_line(och, &line, 0, &line_eol, 0);
-			if (!line || !*line)
-			{
-				rl_callback_handler_remove();
-				console_cleanup();
-				return NULL;
-			}
-
-			fputs(line, stdout);
-
-			g_free(line);
-
-			/* restore the readline prompt and contents */
-
-			rl_insert_text(old_text);
-			rl_point = old_point;
-			rl_mark = old_mark;
-			free(old_text);
-
-			rl_forced_update_display();
-		}
-
-		if (pfds[1].revents & POLLIN)
-		{
-			/* let readline eat from stdin */
-			rl_callback_read_char();
-		}
-	}
-
-	exit(0);
-}
-
-static void console_cleanup(void)
-{
-	if (console_readline)
-	{
-		rl_deprep_terminal();
-		putchar('\n');
-
-		close(opipe_write);
-	}
-
-	console_readline = 0;
-	console_outfd = 1;
-}
-#endif

console.c

@@ -2,5 +2,6 @@
 #define MCMAP_CONSOLE_H 1
 
 void console_init(void);
+int console_outfd;
 
 #endif /* MCMAP_CONSOLE_H */