diff --git a/examples/Makefile b/examples/Makefile index 8166e41..d51884a 100644 --- a/examples/Makefile +++ b/examples/Makefile @@ -1,16 +1,16 @@ -CC = m68k-amigaos-gcc -s -CXX = m68k-amigaos-g++ -s +CC = m68k-amigaos-gcc -g +CXX = m68k-amigaos-g++ -g CFLAGS = -Os -Wall -fomit-frame-pointer CXXFLAGS = -Os -Wall -fomit-frame-pointer BINS = hello-ks13 hello-ks20 hello-ks20.clib2 hello-stdio hello-stdio.clib2 \ - hello-iostream hello-mui test-mmu \ + hello-stdio.nix13 hello-iostream hello-mui test-mmu \ simple.library simple.library_r simple.device all: $(BINS) $(OBJS) hello-ks13: hello-ks13.c - $(CC) -noixemul -fbaserel -m68000 -msmall-code $(CFLAGS) -o $@ $< -lnix13 + $(CC) -mcrt=nix13 -fbaserel -m68000 -msmall-code $(CFLAGS) -o $@ $< hello-ks20: hello-ks20.c $(CC) -noixemul -fbaserel32 -m68020 -msmall-code $(CFLAGS) -o $@ $< @@ -21,6 +21,9 @@ hello-ks20.clib2: hello-ks20.c hello-stdio: hello-stdio.c $(CC) -noixemul -m68020 $(CFLAGS) -o $@ $< +hello-stdio.nix13: hello-stdio-ks13.c + $(CC) -mcrt=nix13 -m68000 $(CFLAGS) -o $@ $< + hello-stdio.clib2: hello-stdio.c $(CC) -mcrt=clib2 -m68020 $(CFLAGS) -o $@ $< diff --git a/examples/hello-stdio-ks13.c b/examples/hello-stdio-ks13.c new file mode 100644 index 0000000..c96b3d0 --- /dev/null +++ b/examples/hello-stdio-ks13.c @@ -0,0 +1,10 @@ +#include + +int __nocommandline = 1; +int __oslibversion = 34; + +int main() +{ + printf("hello world!\n"); + return 0; +} diff --git a/submodules/libnix b/submodules/libnix index b529583..b1c9ff1 160000 --- a/submodules/libnix +++ b/submodules/libnix @@ -1 +1 @@ -Subproject commit b52958380d26e6957e6bf64e33e8928d5a0d3a15 +Subproject commit b1c9ff1a739e5726416f73b9e528f639df9a2717