summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorglx <glx@openttd.org>2008-02-12 02:39:22 +0000
committerglx <glx@openttd.org>2008-02-12 02:39:22 +0000
commit7d88f6688e2762f7b77cda44c70142422df1cb42 (patch)
tree3c7f10274a47297987ebfe5b65bbebeee6c37826
parentf20cf510e4dffce9dec109089e41038d553852a1 (diff)
downloadopenttd-7d88f6688e2762f7b77cda44c70142422df1cb42.tar.xz
(svn r12117) -Fix (r12115): strgen compilation was broken
-rw-r--r--Makefile.lang.in8
-rw-r--r--projects/strgen_vs80.vcproj18
-rw-r--r--projects/strgen_vs90.vcproj18
3 files changed, 40 insertions, 4 deletions
diff --git a/Makefile.lang.in b/Makefile.lang.in
index 1ba5c9048..11b12ddd2 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 7dc56f9e2..69304cb35 100644
--- a/projects/strgen_vs80.vcproj
+++ b/projects/strgen_vs80.vcproj
@@ -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 --git a/projects/strgen_vs90.vcproj b/projects/strgen_vs90.vcproj
index cf8bc5b82..e28cd7d70 100644
--- a/projects/strgen_vs90.vcproj
+++ b/projects/strgen_vs90.vcproj
@@ -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