# HG changeset patch
# User glx
# Date 1202783962 0
# Node ID 698b437c569a04b872ce9bdcd084dca8ac429c41
# Parent  d9fb59b453e50f70cd0654bbbe3e21a125fd58cb
(svn r12117) -Fix (r12115): strgen compilation was broken

diff -r d9fb59b453e5 -r 698b437c569a Makefile.lang.in
--- a/Makefile.lang.in	Mon Feb 11 21:01:43 2008 +0000
+++ b/Makefile.lang.in	Tue Feb 12 02:39:22 2008 +0000
@@ -44,13 +44,17 @@
 	$(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 -r d9fb59b453e5 -r 698b437c569a projects/strgen_vs80.vcproj
--- a/projects/strgen_vs80.vcproj	Mon Feb 11 21:01:43 2008 +0000
+++ b/projects/strgen_vs80.vcproj	Tue Feb 12 02:39:22 2008 +0000
@@ -113,6 +113,10 @@
 			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"
 				>
 			</File>
@@ -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 -r d9fb59b453e5 -r 698b437c569a projects/strgen_vs90.vcproj
--- a/projects/strgen_vs90.vcproj	Mon Feb 11 21:01:43 2008 +0000
+++ b/projects/strgen_vs90.vcproj	Tue Feb 12 02:39:22 2008 +0000
@@ -113,6 +113,10 @@
 			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"
 				>
 			</File>
@@ -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