From b0b929ce4258e70fd0482a4bf9b1fac8330edcfe Mon Sep 17 00:00:00 2001
From: glx <glx@openttd.org>
Date: Tue, 12 Feb 2008 02:39:22 +0000
Subject: [PATCH] (svn r12117) -Fix (r12115): strgen compilation was broken

---
 Makefile.lang.in            |  8 ++++++--
 projects/strgen_vs80.vcproj | 18 +++++++++++++++++-
 projects/strgen_vs90.vcproj | 18 +++++++++++++++++-
 3 files changed, 40 insertions(+), 4 deletions(-)

diff --git a/Makefile.lang.in b/Makefile.lang.in
index 1ba5c90480..11b12ddd24 100644
--- a/Makefile.lang.in
+++ b/Makefile.lang.in
@@ -44,13 +44,17 @@ string.o: $(SRC_DIR)/string.cpp endian_host.h
 	$(E) '$(STAGE) Compiling $(<:$(SRC_DIR)/%.cpp=%.cpp)'
 	$(Q)$(CXX_BUILD) $(CFLAGS_BUILD) -DSTRGEN -c -o $@ $<
 
+alloc_func.o: $(SRC_DIR)/core/alloc_func.cpp endian_host.h
+	$(E) '$(STAGE) Compiling $(<:$(SRC_DIR)/%.cpp=%.cpp)'
+	$(Q)$(CXX_BUILD) $(CFLAGS_BUILD) -DSTRGEN -c -o $@ $<
+
 lang/english.txt: $(LANG_DIR)/english.txt
 	$(Q)mkdir -p lang
 	$(Q)cp $(LANG_DIR)/english.txt lang/english.txt
 
-$(STRGEN): string.o strgen.o
+$(STRGEN): alloc_func.o string.o strgen.o
 	$(E) '$(STAGE) Compiling and Linking $@'
-	$(Q)$(CXX_BUILD) string.o strgen.o -o $@
+	$(Q)$(CXX_BUILD) $^ -o $@
 
 table/strings.h: lang/english.txt $(STRGEN)
 	$(E) '$(STAGE) Generating $@'
diff --git a/projects/strgen_vs80.vcproj b/projects/strgen_vs80.vcproj
index 7dc56f9e2f..69304cb35f 100644
--- a/projects/strgen_vs80.vcproj
+++ b/projects/strgen_vs80.vcproj
@@ -112,6 +112,10 @@
 			Name="Source Files"
 			Filter="cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
 			>
+			<File
+				RelativePath="..\src\core\alloc_func.cpp"
+				>
+			</File>
 			<File
 				RelativePath="..\src\strgen\strgen.cpp"
 				>
@@ -122,7 +126,19 @@
 			</File>
 		</Filter>
 		<File
-			RelativePath="..\src\macros.h"
+			RelativePath="..\src\core\alloc_func.hpp"
+			>
+		</File>
+		<File
+			RelativePath="..\src\table\control_codes.h"
+			>
+		</File>
+		<File
+			RelativePath="..\src\debug.h"
+			>
+		</File>
+		<File
+			RelativePath="..\src\core\endian_func.hpp"
 			>
 		</File>
 		<File
diff --git a/projects/strgen_vs90.vcproj b/projects/strgen_vs90.vcproj
index cf8bc5b82d..e28cd7d70f 100644
--- a/projects/strgen_vs90.vcproj
+++ b/projects/strgen_vs90.vcproj
@@ -112,6 +112,10 @@
 			Name="Source Files"
 			Filter="cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
 			>
+			<File
+				RelativePath="..\src\core\alloc_func.cpp"
+				>
+			</File>
 			<File
 				RelativePath="..\src\strgen\strgen.cpp"
 				>
@@ -122,7 +126,19 @@
 			</File>
 		</Filter>
 		<File
-			RelativePath="..\src\macros.h"
+			RelativePath="..\src\core\alloc_func.hpp"
+			>
+		</File>
+		<File
+			RelativePath="..\src\table\control_codes.h"
+			>
+		</File>
+		<File
+			RelativePath="..\src\debug.h"
+			>
+		</File>
+		<File
+			RelativePath="..\src\core\endian_func.hpp"
 			>
 		</File>
 		<File