diff options
| author | rubidium <rubidium@openttd.org> | 2011-03-03 21:43:24 +0000 |
|---|---|---|
| committer | rubidium <rubidium@openttd.org> | 2011-03-03 21:43:24 +0000 |
| commit | 59e42ea17823d5ab1a46808965d74a2b27a04ea4 (patch) | |
| tree | d9a7c204fb555f5b39020f5e1a37bd34d75f12be /Makefile.setting.in | |
| parent | 25c7bdde662fc757be58d7dec52112439db67469 (diff) | |
| download | openttd-59e42ea17823d5ab1a46808965d74a2b27a04ea4.tar.xz | |
(svn r22177) -Fix: make sure the right endianness is chosen with cross-compiling, and strndup is available in the binary for more exotic platforms
Diffstat (limited to 'Makefile.setting.in')
| -rw-r--r-- | Makefile.setting.in | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/Makefile.setting.in b/Makefile.setting.in index 607baccb6..7f70bb37a 100644 --- a/Makefile.setting.in +++ b/Makefile.setting.in @@ -39,11 +39,15 @@ getoptdata.o: $(SRC_DIR)/misc/getoptdata.cpp $(SRC_DIR)/misc/getoptdata.h $(E) '$(STAGE) Compiling $(<:$(SRC_DIR)/misc/%.cpp=%.cpp)' $(Q)$(CXX_BUILD) $(CFLAGS_BUILD) -DSETTINGSGEN -c -o $@ $< +string.o: $(SRC_DIR)/string.cpp endian_host.h + $(E) '$(STAGE) Compiling $(<:$(SRC_DIR)/%.cpp=%.cpp)' + $(Q)$(CXX_BUILD) $(CFLAGS_BUILD) -DSETTINGSGEN -c -o $@ $< + ini_load.o: $(SRC_DIR)/ini_load.cpp $(SRC_DIR)/core/alloc_func.hpp $(SRC_DIR)/core/mem_func.hpp $(SRC_DIR)/ini_type.h $(SRC_DIR)/string_func.h $(E) '$(STAGE) Compiling $(<:$(SRC_DIR)/misc/%.cpp=%.cpp)' $(Q)$(CXX_BUILD) $(CFLAGS_BUILD) -DSETTINGSGEN -c -o $@ $< -$(SETTINGSGEN): alloc_func.o ini_load.o settingsgen.o getoptdata.o +$(SETTINGSGEN): alloc_func.o ini_load.o settingsgen.o getoptdata.o string.o $(E) '$(STAGE) Compiling and Linking $@' $(Q)$(CXX_BUILD) $(LDFLAGS_BUILD) $^ -o $@ |