Browse Source

* removed DEBUG_MT

armin 20 years ago
parent
commit
78afd53d22
2 changed files with 10 additions and 22 deletions
  1. 5 10
      rtl/netwlibc/Makefile
  2. 5 12
      rtl/netwlibc/Makefile.fpc

+ 5 - 10
rtl/netwlibc/Makefile

@@ -1,8 +1,8 @@
 #
 #
-# Don't edit, this file is generated by FPCMake Version 1.1 [2004/12/20]
+# Don't edit, this file is generated by FPCMake Version 1.1 [2004/12/30]
 #
 #
 default: all
 default: all
-MAKEFILETARGETS=linux go32v2 win32 os2 freebsd beos netbsd amiga atari sunos qnx netware openbsd wdosx palmos macos darwin emx watcom morphos netwlibc
+MAKEFILETARGETS=netwlibc
 BSDs = freebsd netbsd openbsd darwin
 BSDs = freebsd netbsd openbsd darwin
 UNIXs = linux $(BSDs) sunos qnx
 UNIXs = linux $(BSDs) sunos qnx
 LIMIT83fs = go32v2 os2 emx watcom
 LIMIT83fs = go32v2 os2 emx watcom
@@ -228,16 +228,12 @@ PROCINC=$(RTL)/$(CPU_TARGET)
 UNITPREFIX=rtl
 UNITPREFIX=rtl
 IMPFILES=nwsnut.imp ws2_32.imp ws2nlm.imp libc.imp netware.imp \
 IMPFILES=nwsnut.imp ws2_32.imp ws2nlm.imp libc.imp netware.imp \
 libcclib.imp nwplibc.o
 libcclib.imp nwplibc.o
-ifeq ($(findstring 1.0.,$(FPC_VERSION)),)
 SYSTEMUNIT=system
 SYSTEMUNIT=system
-else
-SYSTEMUNIT=sysnetwa
-endif
 override FPCOPT+=-Ur
 override FPCOPT+=-Ur
-override FPCOPT+=-dMT -dDEBUG_MT
-CREATESMART=0
-BINUTILSPREFIX=i386-netware-
+override FPCOPT+=-dMT
+CREATESMART=1
 OBJPASDIR=$(RTL)/objpas
 OBJPASDIR=$(RTL)/objpas
+override BINUTILSPREFIX=$(CPU_TARGET)-netware-
 override TARGET_UNITS+=$(SYSTEMUNIT) objpas macpas strings lineinfo winsock heaptrc matrix nwsnut libc dos crt objects sysconst dynlibs initc sysutils types typinfo systhrds classes cpu mmx getopts dateutils strutils convutils charset ucomplex variants rtlconst math varutils freebidi utf8bidi mouse video keyboard cmem sockets
 override TARGET_UNITS+=$(SYSTEMUNIT) objpas macpas strings lineinfo winsock heaptrc matrix nwsnut libc dos crt objects sysconst dynlibs initc sysutils types typinfo systhrds classes cpu mmx getopts dateutils strutils convutils charset ucomplex variants rtlconst math varutils freebidi utf8bidi mouse video keyboard cmem sockets
 override TARGET_LOADERS+=nwplibc nwl_main nwl_dlle
 override TARGET_LOADERS+=nwplibc nwl_main nwl_dlle
 override TARGET_RSTS+=math varutils variants convutils typinfo systhrds classes dateutils sysconst rtlconst
 override TARGET_RSTS+=math varutils variants convutils typinfo systhrds classes dateutils sysconst rtlconst
@@ -1451,7 +1447,6 @@ SYSCPUDEPS=$(addprefix $(PROCINC)/,$(CPUINCNAMES))
 SYSDEPS=$(SYSINCDEPS) $(SYSCPUDEPS)
 SYSDEPS=$(SYSINCDEPS) $(SYSCPUDEPS)
 copyimpfiles:
 copyimpfiles:
 	$(COPY) $(IMPFILES) $(COMPILER_UNITTARGETDIR)
 	$(COPY) $(IMPFILES) $(COMPILER_UNITTARGETDIR)
-override BINUTILSPREFIX=$(CPU_TARGET)-netware-
 nwplibc$(OEXT) :
 nwplibc$(OEXT) :
 	cp pre/libcpre.gcc.o nwplibc.o
 	cp pre/libcpre.gcc.o nwplibc.o
 nwl_main$(OEXT) : nwl_main.as
 nwl_main$(OEXT) : nwl_main.as

+ 5 - 12
rtl/netwlibc/Makefile.fpc

@@ -44,11 +44,7 @@ UNITPREFIX=rtl
 IMPFILES=nwsnut.imp ws2_32.imp ws2nlm.imp libc.imp netware.imp \
 IMPFILES=nwsnut.imp ws2_32.imp ws2nlm.imp libc.imp netware.imp \
 libcclib.imp nwplibc.o
 libcclib.imp nwplibc.o
 
 
-ifeq ($(findstring 1.0.,$(FPC_VERSION)),)
 SYSTEMUNIT=system
 SYSTEMUNIT=system
-else
-SYSTEMUNIT=sysnetwa
-endif
 
 
 # Use new feature from 1.0.5 version
 # Use new feature from 1.0.5 version
 # that generates release PPU files
 # that generates release PPU files
@@ -63,18 +59,16 @@ override FPCOPT+=-Ur
 
 
 
 
 # for netware always use multithread
 # for netware always use multithread
-override FPCOPT+=-dMT -dDEBUG_MT
+override FPCOPT+=-dMT
 
 
 # and alway use smartlinking
 # and alway use smartlinking
-#CREATESMART=1
-CREATESMART=0
-
-# always use i386-netware- as the prefix for binutils (they are the same for netware and netwlibc)
-BINUTILSPREFIX=i386-netware-
+CREATESMART=1
 
 
 # Paths
 # Paths
 OBJPASDIR=$(RTL)/objpas
 OBJPASDIR=$(RTL)/objpas
 
 
+# binutils are the same for targets netware and netwlibc
+override BINUTILSPREFIX=$(CPU_TARGET)-netware-
 
 
 [rules]
 [rules]
 SYSTEMPPU=$(addsuffix $(PPUEXT),$(SYSTEMUNIT))
 SYSTEMPPU=$(addsuffix $(PPUEXT),$(SYSTEMUNIT))
@@ -97,8 +91,7 @@ SYSDEPS=$(SYSINCDEPS) $(SYSCPUDEPS)
 copyimpfiles:
 copyimpfiles:
 	$(COPY) $(IMPFILES) $(COMPILER_UNITTARGETDIR)
 	$(COPY) $(IMPFILES) $(COMPILER_UNITTARGETDIR)
 
 
-# binutils are the same for tragets netware and netwlibc
-override BINUTILSPREFIX=$(CPU_TARGET)-netware-
+
 
 
 #
 #
 # Loaders
 # Loaders