|
@@ -1,5 +1,5 @@
|
|
|
#
|
|
#
|
|
|
-# Don't edit, this file is generated by FPCMake Version 1.1 [2004/01/05]
|
|
|
|
|
|
|
+# Don't edit, this file is generated by FPCMake Version 1.1 [2004/01/31]
|
|
|
#
|
|
#
|
|
|
default: allexectests
|
|
default: allexectests
|
|
|
MAKEFILETARGETS=linux go32v2 win32 os2 freebsd beos netbsd amiga atari sunos qnx netware openbsd wdosx palmos macos darwin emx watcom
|
|
MAKEFILETARGETS=linux go32v2 win32 os2 freebsd beos netbsd amiga atari sunos qnx netware openbsd wdosx palmos macos darwin emx watcom
|
|
@@ -184,11 +184,14 @@ override FPCDIR:=$(FPCDIR)/..
|
|
|
ifeq ($(wildcard $(addprefix $(FPCDIR)/,rtl units)),)
|
|
ifeq ($(wildcard $(addprefix $(FPCDIR)/,rtl units)),)
|
|
|
override FPCDIR:=$(FPCDIR)/..
|
|
override FPCDIR:=$(FPCDIR)/..
|
|
|
ifeq ($(wildcard $(addprefix $(FPCDIR)/,rtl units)),)
|
|
ifeq ($(wildcard $(addprefix $(FPCDIR)/,rtl units)),)
|
|
|
|
|
+override FPCDIR:=$(BASEDIR)
|
|
|
|
|
+ifeq ($(wildcard $(addprefix $(FPCDIR)/,rtl units)),)
|
|
|
override FPCDIR=c:/pp
|
|
override FPCDIR=c:/pp
|
|
|
endif
|
|
endif
|
|
|
endif
|
|
endif
|
|
|
endif
|
|
endif
|
|
|
endif
|
|
endif
|
|
|
|
|
+endif
|
|
|
ifndef CROSSDIR
|
|
ifndef CROSSDIR
|
|
|
CROSSDIR:=$(FPCDIR)/cross/$(FULL_TARGET)
|
|
CROSSDIR:=$(FPCDIR)/cross/$(FULL_TARGET)
|
|
|
endif
|
|
endif
|
|
@@ -408,7 +411,7 @@ CROSSBINDIR=
|
|
|
endif
|
|
endif
|
|
|
ifeq ($(OS_SOURCE),linux)
|
|
ifeq ($(OS_SOURCE),linux)
|
|
|
ifndef GCCLIBDIR
|
|
ifndef GCCLIBDIR
|
|
|
-GCCLIBDIR:=$(shell dirname `(gcc -v 2>&1)| head -n 1| awk '{ print $$4 } '`)
|
|
|
|
|
|
|
+GCCLIBDIR:=$(shell dirname `gcc -print-libgcc-file-name`)
|
|
|
endif
|
|
endif
|
|
|
ifndef OTHERLIBDIR
|
|
ifndef OTHERLIBDIR
|
|
|
OTHERLIBDIR:=$(shell grep -v "^\#" /etc/ld.so.conf | awk '{ ORS=" "; print $1 }')
|
|
OTHERLIBDIR:=$(shell grep -v "^\#" /etc/ld.so.conf | awk '{ ORS=" "; print $1 }')
|
florian