From 908b7bdc0f599a45cbc2d1fb6a8f884ec9270e19 Mon Sep 17 00:00:00 2001
From: Dylan Simon <dylan@dylex.net>
Date: Mon, 27 Jan 2014 21:20:27 -0500
Subject: [PATCH] Allow separate compilation

---
 Makefile.bundle.in | 18 +++++++++---------
 Makefile.in        | 18 +++++++++---------
 Makefile.src.in    |  1 +
 config.lib         |  2 +-
 4 files changed, 20 insertions(+), 19 deletions(-)

diff --git a/Makefile.bundle.in b/Makefile.bundle.in
index 63edb62..d1e2f3a 100644
--- a/Makefile.bundle.in
+++ b/Makefile.bundle.in
@@ -61,13 +61,13 @@ ifeq ($(OS),UNIX)
 	$(Q)cp "$(ROOT_DIR)/media/openttd.32.bmp" "$(BASESET_DIR)/"
 endif
 	$(Q)cp "$(BIN_DIR)/$(TTD)"                "$(TTD_DIR)/"
-	$(Q)cp "$(BIN_DIR)/ai/"compat_*.nut       "$(AI_DIR)/"
-	$(Q)cp "$(BIN_DIR)/game/"compat_*.nut     "$(GAME_DIR)/"
-	$(Q)cp "$(BIN_DIR)/baseset/"*.grf         "$(BASESET_DIR)/"
-	$(Q)cp "$(BIN_DIR)/baseset/"*.obg         "$(BASESET_DIR)/"
-	$(Q)cp "$(BIN_DIR)/baseset/"*.obs         "$(BASESET_DIR)/"
-	$(Q)cp "$(BIN_DIR)/baseset/opntitle.dat"  "$(BASESET_DIR)/"
-	$(Q)cp "$(BIN_DIR)/baseset/"*.obm         "$(BASESET_DIR)/"
+	$(Q)cp "$(ROOT_DIR)/bin/ai/"compat_*.nut  "$(AI_DIR)/"
+	$(Q)cp "$(ROOT_DIR)/bin/game/"compat_*.nut "$(GAME_DIR)/"
+	$(Q)cp "$(ROOT_DIR)/bin/baseset/"*.grf    "$(BASESET_DIR)/"
+	$(Q)cp "$(ROOT_DIR)/bin/baseset/"*.obg    "$(BASESET_DIR)/"
+	$(Q)cp "$(ROOT_DIR)/bin/baseset/"*.obs    "$(BASESET_DIR)/"
+	$(Q)cp "$(ROOT_DIR)/bin/baseset/opntitle.dat" "$(BASESET_DIR)/"
+	$(Q)cp "$(ROOT_DIR)/bin/baseset/"*.obm    "$(BASESET_DIR)/"
 	$(Q)cp "$(BIN_DIR)/lang/"*.lng            "$(LANG_DIR)/"
 	$(Q)cp "$(ROOT_DIR)/readme.txt"           "$(BUNDLE_DIR)/"
 	$(Q)cp "$(ROOT_DIR)/COPYING"              "$(BUNDLE_DIR)/"
@@ -81,9 +81,9 @@ ifdef MAN_DIR
 endif
 	$(Q)cp "$(ROOT_DIR)/media/openttd.32.xpm" "$(BUNDLE_DIR)/media/"
 	$(Q)cp "$(ROOT_DIR)/media/openttd."*.png  "$(BUNDLE_DIR)/media/"
-	$(Q)cp "$(BIN_DIR)/scripts/"*             "$(BUNDLE_DIR)/scripts/"
+	$(Q)cp "$(ROOT_DIR)/bin/scripts/"*        "$(BUNDLE_DIR)/scripts/"
 ifdef MENU_DIR
-	$(Q)cp "$(ROOT_DIR)/media/openttd.desktop" "$(BUNDLE_DIR)/media/"
+	$(Q)cp "$(CURDIR)/media/openttd.desktop"  "$(BUNDLE_DIR)/media/"
 	$(Q)$(AWK) -f "$(ROOT_DIR)/media/openttd.desktop.translation.awk" "$(SRC_DIR)/lang/"*.txt | $(SORT) |  $(AWK) -f "$(ROOT_DIR)/media/openttd.desktop.filter.awk" >> "$(BUNDLE_DIR)/media/openttd.desktop"
 	$(Q)sed s/=openttd/=$(BINARY_NAME)/g "$(BUNDLE_DIR)/media/openttd.desktop" > "$(ROOT_DIR)/media/openttd.desktop.install"
 endif
diff --git a/Makefile.in b/Makefile.in
index 0d50fc1..e147fcc 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -22,16 +22,16 @@ MAN_DIR        = !!MAN_DIR!!
 MENU_DIR       = !!MENU_DIR!!
 SRC_DIR        = !!SRC_DIR!!
 ROOT_DIR       = !!ROOT_DIR!!
-BUNDLE_DIR     = "$(ROOT_DIR)/bundle"
-BUNDLES_DIR    = "$(ROOT_DIR)/bundles"
+BUNDLE_DIR     = $(CURDIR)/bundle
+BUNDLES_DIR    = $(CURDIR)/bundles
 INSTALL_DIR    = !!INSTALL_DIR!!
-INSTALL_BINARY_DIR     = "$(INSTALL_DIR)/"!!BINARY_DIR!!
-INSTALL_MAN_DIR        = "$(INSTALL_DIR)/$(MAN_DIR)"
-INSTALL_MENU_DIR       = "$(INSTALL_DIR)/$(MENU_DIR)"
-INSTALL_ICON_DIR       = "$(INSTALL_DIR)/"!!ICON_DIR!!
-INSTALL_ICON_THEME_DIR = "$(INSTALL_DIR)/$(ICON_THEME_DIR)"
-INSTALL_DATA_DIR       = "$(INSTALL_DIR)/"!!DATA_DIR!!
-INSTALL_DOC_DIR        = "$(INSTALL_DIR)/"!!DOC_DIR!!
+INSTALL_BINARY_DIR     = $(INSTALL_DIR)/!!BINARY_DIR!!
+INSTALL_MAN_DIR        = $(INSTALL_DIR)/$(MAN_DIR)
+INSTALL_MENU_DIR       = $(INSTALL_DIR)/$(MENU_DIR)
+INSTALL_ICON_DIR       = $(INSTALL_DIR)/!!ICON_DIR!!
+INSTALL_ICON_THEME_DIR = $(INSTALL_DIR)/$(ICON_THEME_DIR)
+INSTALL_DATA_DIR       = $(INSTALL_DIR)/!!DATA_DIR!!
+INSTALL_DOC_DIR        = $(INSTALL_DIR)/!!DOC_DIR!!
 SOURCE_LIST     = !!SOURCE_LIST!!
 CONFIGURE_FILES = !!CONFIGURE_FILES!!
 BINARY_NAME = !!BINARY_NAME!!
diff --git a/Makefile.src.in b/Makefile.src.in
index 1d654d2..bf6849a 100644
--- a/Makefile.src.in
+++ b/Makefile.src.in
@@ -255,6 +255,7 @@ $(OBJS_RC): %.o: $(SRC_DIR)/%.rc $(FILE_DEP)
 
 $(BIN_DIR)/$(TTD): $(TTD)
 	$(Q)cp $(TTD) $(BIN_DIR)/$(TTD)
+	$(Q)mkdir -p $(BIN_DIR)/baseset
 ifeq ($(OS), UNIX)
 	$(Q)cp $(MEDIA_DIR)/openttd.32.bmp $(BIN_DIR)/baseset/
 endif
diff --git a/config.lib b/config.lib
index 32fe479..5ee25ee 100644
--- a/config.lib
+++ b/config.lib
@@ -3323,7 +3323,7 @@ detect_cputype() {
 	echo "#include \"src/stdafx.h\"" >> tmp.64bit.cpp
 	echo "assert_compile(sizeof(size_t) == 8);" >> tmp.64bit.cpp
 	echo "int main() { return 0; }" >> tmp.64bit.cpp
-	execute="$cxx_host $CFLAGS tmp.64bit.cpp -o tmp.64bit -DTESTING 2>&1"
+	execute="$cxx_host -I$ROOT_DIR $CFLAGS tmp.64bit.cpp -o tmp.64bit -DTESTING 2>&1"
 	cpu_type="`eval $execute 2>/dev/null`"
 	ret=$?
 	log 2 "executing $execute"
-- 
1.8.5.2