Skip to content

Commit ca8a4a7

Browse files
committed
Make libnix work with Kickstart 1.3 (partially).
1 parent 8a7eeb3 commit ca8a4a7

File tree

3 files changed

+18
-5
lines changed

3 files changed

+18
-5
lines changed

examples/Makefile

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,16 @@
1-
CC = m68k-amigaos-gcc -s
2-
CXX = m68k-amigaos-g++ -s
1+
CC = m68k-amigaos-gcc -g
2+
CXX = m68k-amigaos-g++ -g
33
CFLAGS = -Os -Wall -fomit-frame-pointer
44
CXXFLAGS = -Os -Wall -fomit-frame-pointer
55

66
BINS = hello-ks13 hello-ks20 hello-ks20.clib2 hello-stdio hello-stdio.clib2 \
7-
hello-iostream hello-mui test-mmu \
7+
hello-stdio.nix13 hello-iostream hello-mui test-mmu \
88
simple.library simple.library_r simple.device
99

1010
all: $(BINS) $(OBJS)
1111

1212
hello-ks13: hello-ks13.c
13-
$(CC) -noixemul -fbaserel -m68000 -msmall-code $(CFLAGS) -o $@ $< -lnix13
13+
$(CC) -mcrt=nix13 -fbaserel -m68000 -msmall-code $(CFLAGS) -o $@ $<
1414

1515
hello-ks20: hello-ks20.c
1616
$(CC) -noixemul -fbaserel32 -m68020 -msmall-code $(CFLAGS) -o $@ $<
@@ -21,6 +21,9 @@ hello-ks20.clib2: hello-ks20.c
2121
hello-stdio: hello-stdio.c
2222
$(CC) -noixemul -m68020 $(CFLAGS) -o $@ $<
2323

24+
hello-stdio.nix13: hello-stdio-ks13.c
25+
$(CC) -mcrt=nix13 -m68000 $(CFLAGS) -o $@ $<
26+
2427
hello-stdio.clib2: hello-stdio.c
2528
$(CC) -mcrt=clib2 -m68020 $(CFLAGS) -o $@ $<
2629

examples/hello-stdio-ks13.c

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
#include <stdio.h>
2+
3+
int __nocommandline = 1;
4+
int __oslibversion = 34;
5+
6+
int main()
7+
{
8+
printf("hello world!\n");
9+
return 0;
10+
}

submodules/libnix

Submodule libnix updated from b529583 to b1c9ff1

0 commit comments

Comments
 (0)