Skip to content

Commit

Permalink
add jwlib and jwlink binaries
Browse files Browse the repository at this point in the history
  • Loading branch information
stsp committed Nov 30, 2017
1 parent eb5d608 commit d6d566a
Show file tree
Hide file tree
Showing 5 changed files with 5 additions and 4 deletions.
Binary file added contrib/JWlib
Binary file not shown.
Binary file added contrib/jwlink
Binary file not shown.
3 changes: 2 additions & 1 deletion drivers/makefile
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,8 @@
COMPILER = gcc
XNASM = nasm
XCPU = 386
LIBUTIL = ../contrib/JWlib
LIBFLAGS = -fo -n
include ../mkfiles/generic.mak


Expand Down Expand Up @@ -49,4 +51,3 @@ clean:
device.lib : $(OBJS)
-$(RM) device.lib
$(LIBUTIL) $(LIBFLAGS) $@ $(LIBOBJS) $(LIBTERM)

5 changes: 3 additions & 2 deletions kernel/makefile
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
COMPILER ?= gcc
XNASM ?= nasm
XCPU ?= 386
XLINK = ../contrib/jwlink
include ../mkfiles/generic.mak

LIBS=..$(DIRSEP)lib$(DIRSEP)device.lib
Expand Down Expand Up @@ -33,8 +34,8 @@ production: ../bin/libfdkernel.so ../bin/$(TARGET).sys ../bin/country.sys
kernel.sys: kernel.exe ../utils/exeflat.exe
..$(DIRSEP)utils$(DIRSEP)exeflat.exe kernel.exe kernel.sys $(LOADSEG) -S0x10 -S0x78 -S0x79 $(UPXOPT) $(XUPX)

kernel.exe: $(TARGET).lnk $(OBJS) $(LIBS)
$(LINK) @$(TARGET).lnk;
kernel.exe: $(OBJS) $(LIBS)
$(LINK) debug all op symfile format dos option map,statics,verbose F { $(OBJS) } L ../lib/device.lib N $@

../bin/country.sys: country.asm
$(NASM) -o $*.sys country.asm
Expand Down
1 change: 0 additions & 1 deletion mkfiles/gcc.mak
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,6 @@ CP=cp
ECHOTO=../utils/echoto
CC=gcc -c
CL=gcc
LIBUTIL=ar cr

TARGETOPT=
ifneq ($(XCPU),386)
Expand Down

0 comments on commit d6d566a

Please sign in to comment.