mirror of https://github.com/OpenTTD/OpenTTD
(svn r4993) -Fix: if 1 file is C++, link the whole project with g++
parent
ff791261de
commit
d446915a45
2
Makefile
2
Makefile
|
@ -857,7 +857,7 @@ ifndef MACOSX_BUILD
|
||||||
# OSX links in os/macosx/Makefile to handle universal binaries better
|
# OSX links in os/macosx/Makefile to handle universal binaries better
|
||||||
$(TTD): $(OBJS) $(MAKE_CONFIG)
|
$(TTD): $(OBJS) $(MAKE_CONFIG)
|
||||||
@echo '===> Linking $@'
|
@echo '===> Linking $@'
|
||||||
$(Q)$(CC) $(LDFLAGS) $(TTDLDFLAGS) $(OBJS) $(LIBS) -o $@
|
$(Q)$(CXX) $(LDFLAGS) $(TTDLDFLAGS) $(OBJS) $(LIBS) -o $@
|
||||||
endif
|
endif
|
||||||
|
|
||||||
$(STRGEN): strgen/strgen.c endian_host.h
|
$(STRGEN): strgen/strgen.c endian_host.h
|
||||||
|
|
Loading…
Reference in New Issue