marco 22 vuotta sitten
vanhempi
commit
4c771c1b8e
2 muutettua tiedostoa jossa 24 lisäystä ja 12 poistoa
  1. 22 10
      rtl/freebsd/Makefile
  2. 2 2
      rtl/freebsd/Makefile.fpc

+ 22 - 10
rtl/freebsd/Makefile

@@ -1,8 +1,8 @@
 #
-# Don't edit, this file is generated by FPCMake Version 1.1 [2003/10/09]
+# Don't edit, this file is generated by FPCMake Version 1.1 [2003/10/23]
 #
 default: all
-MAKEFILETARGETS=linux go32v2 win32 os2 freebsd beos netbsd amiga atari sunos qnx netware openbsd wdosx palmos macos darwin emx watcom
+MAKEFILETARGETS=freebsd
 override PATH:=$(subst \,/,$(PATH))
 ifeq ($(findstring ;,$(PATH)),)
 inUnix=1
@@ -10,6 +10,7 @@ SEARCHPATH:=$(filter-out .,$(subst :, ,$(PATH)))
 else
 SEARCHPATH:=$(subst ;, ,$(PATH))
 endif
+SEARCHPATH+=$(patsubst %/,%,$(dir $(MAKE)))
 PWD:=$(strip $(wildcard $(addsuffix /pwd.exe,$(SEARCHPATH))))
 ifeq ($(PWD),)
 PWD:=$(strip $(wildcard $(addsuffix /pwd,$(SEARCHPATH))))
@@ -219,11 +220,11 @@ PRT0=prt0
 else
 SYSTEMUNIT=sysbsd
 LINUXUNIT=linux
-override FPCOPT+=-dUNIX
+override FPCOPT+=-dUNIX -dNOMOUSE
 PRT0=prt0_10
 endif
 ifdef RELEASE
-override FPCOPT+=-Ur
+override FPCOPT+=-Ur 
 endif
 OBJPASDIR=$(RTL)/objpas
 GRAPHDIR=$(INC)/graph
@@ -319,9 +320,17 @@ endif
 endif
 ifndef INSTALL_BINDIR
 ifdef UNIXINSTALLDIR
+ifdef CROSSCOMPILE
+INSTALL_BINDIR:=$(INSTALL_BASEDIR)/cross/$(FULL_TARGET)/bin
+else
 INSTALL_BINDIR:=$(INSTALL_PREFIX)/bin
+endif
+else
+ifdef CROSSCOMPILE
+INSTALL_BINDIR:=$(INSTALL_BASEDIR)/cross/$(FULL_TARGET)/bin
 else
 INSTALL_BINDIR:=$(INSTALL_BASEDIR)/bin
+endif
 ifdef INSTALL_FPCPACKAGE
 INSTALL_BINDIR:=$(INSTALL_BINDIR)/$(OS_TARGET)
 endif
@@ -455,8 +464,11 @@ ZIPSUFFIX=go32
 endif
 ifeq ($(OS_TARGET),watcom)
 STATICLIBPREFIX=
-FPCMADE=fpcmade.dos
-ZIPSUFFIX=watcom
+FPCMADE=fpcmade.wat
+ZIPSUFFIX=watc
+OEXT=.obj
+ASMEXT=.asm
+SHAREDLIBEXT=.dll
 endif
 ifeq ($(OS_TARGET),linux)
 EXEEXT=
@@ -828,11 +840,11 @@ ASNAME=$(BINUTILSPREFIX)as
 LDNAME=$(BINUTILSPREFIX)ld
 ARNAME=$(BINUTILSPREFIX)ar
 RCNAME=$(BINUTILSPREFIX)rc
-ifeq ($(findstring 1.0.,$(FPC_VERSION)),)
+ifneq ($(findstring 1.0.,$(FPC_VERSION)),)
 ifeq ($(OS_TARGET),win32)
-ASNAME=asw
-LDNAME=ldw
-ARNAME=arw
+ASNAME=as
+LDNAME=ld
+ARNAME=ar
 endif
 endif
 ifndef ASPROG

+ 2 - 2
rtl/freebsd/Makefile.fpc

@@ -60,7 +60,7 @@ PRT0=prt0
 else
 SYSTEMUNIT=sysbsd
 LINUXUNIT=linux
-override FPCOPT+=-dUNIX
+override FPCOPT+=-dUNIX -dNOMOUSE
 PRT0=prt0_10
 endif
 
@@ -68,7 +68,7 @@ endif
 # that generates release PPU files
 # which will not be recompiled
 ifdef RELEASE
-override FPCOPT+=-Ur
+override FPCOPT+=-Ur 
 endif
 
 # Paths