Mercurial > hg > openttd
changeset 8539:0b2342e9671b draft
(svn r12117) -Fix (r12115): strgen compilation was broken
author | glx <glx@openttd.org> |
---|---|
date | Tue, 12 Feb 2008 02:39:22 +0000 |
parents | 2a216fae50ca |
children | 5de93bf73609 |
files | Makefile.lang.in projects/strgen_vs80.vcproj projects/strgen_vs90.vcproj |
diffstat | 3 files changed, 40 insertions(+), 4 deletions(-) [+] |
line wrap: on
line diff
--- a/Makefile.lang.in +++ b/Makefile.lang.in @@ -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 $@'
--- 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
--- 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