Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Build tweaks for GCCSDK autobuilder, bump to v0.2050b for new libssh2 build #2

Merged
merged 3 commits into from
Jul 28, 2023
Merged

Build tweaks for GCCSDK autobuilder, bump to v0.2050b for new libssh2 build #2

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
ffd80ee
Don't override CC / NATIVE_CC in GNUmakefile if already defined
tmarkettos Jul 27, 2023
9cbb3a1
Link extra libs, conditional path to elf2air
tmarkettos Jul 27, 2023
e009f7b
Speculatively bump version to 0.2050b, so no clash with previous builds
tmarkettos Jul 27, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions nettle/!Nettle/Resources/France/Messages
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@

AppName:Nettle
AppPurpose:Client telnet arachnéen
AppAuthor:© Développeurs de Nettle, 2000-2010
AppVersion:v0.2043b (11 Avril 2010)
AppAuthor:© Développeurs de Nettle, 2000-2023
AppVersion:v0.2050b (28 Juillet 2023)

Info:Info>
Choices:Préférences...
Expand Down
4 changes: 2 additions & 2 deletions nettle/!Nettle/Resources/Germany/Messages
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@

AppName:Nettle
AppPurpose:Telnet client
AppAuthor:© Nettle Entwickler, 2000-2010
AppVersion:v0.2043b (11 April 2010)
AppAuthor:© Nettle Entwickler, 2000-2023
AppVersion:v0.2050b (27 Juli 2023)

Info:Info>
Choices:Einstellungen...
Expand Down
4 changes: 2 additions & 2 deletions nettle/!Nettle/Resources/UK/Messages
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@

AppName:Nettle
AppPurpose:Telnet client
AppAuthor:© Nettle developers, 2000-2010
AppVersion:v0.2043b (11 April 2010)
AppAuthor:© Nettle developers, 2000-2023
AppVersion:v0.2050b (27 July 2023)

Info:Info>
Choices:Choices...
Expand Down
2 changes: 1 addition & 1 deletion nettle/!RelSrc,fd7
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@

Set RelVer 0-2043b
Set RelVer 0-2050b

Echo Releasing Nettle <RelVer> *SOURCE CODE* ...

Expand Down
2 changes: 1 addition & 1 deletion nettle/!Release,feb
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@

Set RelVer 0-2043b
Set RelVer 0-2050b

Echo Releasing Nettle <RelVer> ...

Expand Down
9 changes: 6 additions & 3 deletions nettle/GNUmakefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,12 +2,15 @@
# Makefile for cross-compiling Nettle
#

CC = /home/riscos/gccsdk/cross/bin/arm-unknown-riscos-gcc
NATIVE_CC = /usr/bin/gcc
CC ?= /home/riscos/gccsdk/cross/bin/arm-unknown-riscos-gcc
NATIVE_CC ?= /usr/bin/gcc
CFLAGS = -c -D_BSD_SOURCE -std=c9x -Wall -mpoke-function-name -I/home/riscos/gccsdk/env/include
CONFIG = -DWITH_SSH
ELF2AIF ?= /home/riscos/gccsdk/cross/bin/elf2aif

LIBS = -L/home/riscos/gccsdk/env/lib -lssh2 -lgcrypt -lgpg-error -lcrypto
LIBS += -lz -ldl

OBJS = chardefn.o choices.o dnslib.o globals.o init.o keyboard.o lineedit.o \
main.o misc.o hotlist.o nettle.o process.o socket.o quit.o seln.o \
wimp.o zapgen.o fortify.o sockwatch.o messages.o termlist.o url.o \
Expand All @@ -24,7 +27,7 @@ all: !Nettle/!RunImage,ff8

!Nettle/!RunImage,ff8: !Nettle/!RunImage,e1f
@echo " ELF2AIF:" $@
@/home/riscos/gccsdk/cross/bin/elf2aif $< $@
@$(ELF2AIF) $< $@
@rm !Nettle/!RunImage,e1f

!Nettle/!RunImage,e1f: $(OBJS)
Expand Down
Loading