Merge branch 'master' into driverupdate2
# Conflicts: (taken: newer version) # Driver/baxnet/README.enc # Driver/baxnet/bin/enc624j6net.device # Driver/baxnet/bin/enc624j6net.device_68000 # Driver/baxnet/source/Makefile.enc # Driver/baxnet/source/device.c # Driver/baxnet/source/enc624j6net/enc624j6l.asm # Driver/baxnet/source/server.c # Driver/baxnet/source/version.h
This commit is contained in:
@@ -19,7 +19,7 @@
|
||||
#
|
||||
###############################################################################
|
||||
# debug = 1 will include string debugging for terminal/sushi/sashimi
|
||||
debug = 0
|
||||
debug = 1
|
||||
# compiler_vcc = 1 will trigger VBCC, else GCC
|
||||
compiler_vcc = 0
|
||||
|
||||
@@ -27,8 +27,8 @@ compiler_vcc = 0
|
||||
# prefix for system includes (ASM)
|
||||
# native AmigaOS compilation: set PREFX=GG: or PREFX=ADE:, depending on toolchain
|
||||
###############################################################################
|
||||
#PREFX = /opt/amigaos-68k/
|
||||
PREFX = gg:
|
||||
PREFX = /opt/amigaos-68k/
|
||||
#PREFX = gg:
|
||||
SYSINC = $(PREFX)os-include
|
||||
|
||||
###############################################################################
|
||||
|
||||
Reference in New Issue
Block a user