gronod/OpenTTD
1
0
Fork 0
mirror of https://github.com/OpenTTD/OpenTTD.git synced 2025-03-06 06:15:04 +00:00
Code Issues Packages Projects Releases Wiki Activity

(svn r12117) -Fix (r12115): strgen compilation was broken

Browse Source
This commit is contained in:
glx 2008-02-12 02:39:22 +00:00
parent 42b305661b
commit b0b929ce42
3 changed files with 40 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
Makefile.lang.in
View File

@ -44,13 +44,17 @@ string.o: $(SRC_DIR)/string.cpp endian_host.h
$(E) '$(STAGE) Compiling $(<:$(SRC_DIR)/%.cpp=%.cpp)' $(E) '$(STAGE) Compiling $(<:$(SRC_DIR)/%.cpp=%.cpp)'
$(Q)$(CXX_BUILD) $(CFLAGS_BUILD) -DSTRGEN -c -o $@ $< $(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 lang/english.txt: $(LANG_DIR)/english.txt
$(Q)mkdir -p lang $(Q)mkdir -p lang
$(Q)cp $(LANG_DIR)/english.txt lang/english.txt $(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 $@' $(E) '$(STAGE) Compiling and Linking $@'
$(Q)$(CXX_BUILD) string.o strgen.o -o $@ $(Q)$(CXX_BUILD) $^ -o $@
table/strings.h: lang/english.txt $(STRGEN) table/strings.h: lang/english.txt $(STRGEN)
$(E) '$(STAGE) Generating $@' $(E) '$(STAGE) Generating $@'

18
projects/strgen_vs80.vcproj
View File

@ -112,6 +112,10 @@
Name="Source Files" Name="Source Files"
Filter="cpp;c;cxx;rc;def;r;odl;idl;hpj;bat" Filter="cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
> >
<File
RelativePath="..\src\core\alloc_func.cpp"
>
</File>
<File <File
RelativePath="..\src\strgen\strgen.cpp" RelativePath="..\src\strgen\strgen.cpp"
> >
@ -122,7 +126,19 @@
</File> </File>
</Filter> </Filter>
<File <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>
<File <File

18
projects/strgen_vs90.vcproj
View File

@ -112,6 +112,10 @@
Name="Source Files" Name="Source Files"
Filter="cpp;c;cxx;rc;def;r;odl;idl;hpj;bat" Filter="cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
> >
<File
RelativePath="..\src\core\alloc_func.cpp"
>
</File>
<File <File
RelativePath="..\src\strgen\strgen.cpp" RelativePath="..\src\strgen\strgen.cpp"
> >
@ -122,7 +126,19 @@
</File> </File>
</Filter> </Filter>
<File <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>
<File <File