mirrors/netsurf
1
0
Fork 0
mirror of https://github.com/netsurf-browser/netsurf synced 2024-12-23 04:26:50 +03:00
Code Issues Packages Projects Releases Wiki Activity

use g++ to link on riscos

Browse Source
This commit is contained in:
Vincent Sanders 2012-12-10 11:38:52 +00:00
parent a1876073ad
commit 8698245ad2
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Makefile
View File

@ -153,6 +153,7 @@ ifeq ($(TARGET),riscos)
SQUEEZE := squeeze SQUEEZE := squeeze
RUNEXT := RUNEXT :=
CC := gcc CC := gcc
CXX := g++
EXEEXT := EXEEXT :=
PKG_CONFIG := PKG_CONFIG :=
else else
@ -188,6 +189,7 @@ ifeq ($(TARGET),riscos)
SUBTARGET := -aof SUBTARGET := -aof
EXEEXT := ,ff8 EXEEXT := ,ff8
endif endif
CXX := $(wildcard $(GCCSDK_INSTALL_CROSSBIN)/*g++)
PKG_CONFIG := $(GCCSDK_INSTALL_ENV)/ro-pkg-config PKG_CONFIG := $(GCCSDK_INSTALL_ENV)/ro-pkg-config
endif endif
else else
@ -432,7 +434,7 @@ $(EXETARGET): $(OBJECTS) $(RESOURCES)
ifneq ($(TARGET)$(SUBTARGET),riscos-elf) ifneq ($(TARGET)$(SUBTARGET),riscos-elf)
$(Q)$(CC) -o $(EXETARGET) $(OBJECTS) $(LDFLAGS) $(Q)$(CC) -o $(EXETARGET) $(OBJECTS) $(LDFLAGS)
else else
$(Q)$(CC) -o $(EXETARGET:,ff8=,e1f) $(OBJECTS) $(LDFLAGS) $(Q)$(CXX) -o $(EXETARGET:,ff8=,e1f) $(OBJECTS) $(LDFLAGS)
$(Q)$(ELF2AIF) $(EXETARGET:,ff8=,e1f) $(EXETARGET) $(Q)$(ELF2AIF) $(EXETARGET:,ff8=,e1f) $(EXETARGET)
$(Q)$(RM) $(EXETARGET:,ff8=,e1f) $(Q)$(RM) $(EXETARGET:,ff8=,e1f)
endif endif