+ Fixed fpcdir

This commit is contained in:
michael 2002-10-11 16:41:53 +00:00
parent b5f091d0cb
commit 0e66f248ca
4 changed files with 8 additions and 146 deletions

View File

@ -1,8 +1,8 @@
# #
# Don't edit, this file is generated by FPCMake Version 1.1 [2002/10/07] # Don't edit, this file is generated by FPCMake Version 1.1 [2002/10/05]
# #
default: all default: all
MAKEFILETARGETS=linux go32v2 win32 os2 freebsd beos netbsd amiga atari sunos qnx netware openbsd wdosx MAKEFILETARGETS=linux win32
override PATH:=$(subst \,/,$(PATH)) override PATH:=$(subst \,/,$(PATH))
ifeq ($(findstring ;,$(PATH)),) ifeq ($(findstring ;,$(PATH)),)
inUnix=1 inUnix=1
@ -90,7 +90,7 @@ endif
endif endif
export ECHO export ECHO
endif endif
override DEFAULT_FPCDIR=../../.. override DEFAULT_FPCDIR=../../../..
ifndef FPC ifndef FPC
ifdef PP ifdef PP
FPC=$(PP) FPC=$(PP)
@ -790,74 +790,11 @@ REQUIRE_PACKAGES_GTK=1
REQUIRE_PACKAGES_X11=1 REQUIRE_PACKAGES_X11=1
REQUIRE_PACKAGES_OPENGL=1 REQUIRE_PACKAGES_OPENGL=1
endif endif
ifeq ($(OS_TARGET),go32v2)
REQUIRE_PACKAGES_RTL=1
REQUIRE_PACKAGES_GTK=1
REQUIRE_PACKAGES_OPENGL=1
endif
ifeq ($(OS_TARGET),win32) ifeq ($(OS_TARGET),win32)
REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_RTL=1
REQUIRE_PACKAGES_GTK=1 REQUIRE_PACKAGES_GTK=1
REQUIRE_PACKAGES_OPENGL=1 REQUIRE_PACKAGES_OPENGL=1
endif endif
ifeq ($(OS_TARGET),os2)
REQUIRE_PACKAGES_RTL=1
REQUIRE_PACKAGES_GTK=1
REQUIRE_PACKAGES_OPENGL=1
endif
ifeq ($(OS_TARGET),freebsd)
REQUIRE_PACKAGES_RTL=1
REQUIRE_PACKAGES_GTK=1
REQUIRE_PACKAGES_X11=1
REQUIRE_PACKAGES_OPENGL=1
endif
ifeq ($(OS_TARGET),beos)
REQUIRE_PACKAGES_RTL=1
REQUIRE_PACKAGES_GTK=1
REQUIRE_PACKAGES_OPENGL=1
endif
ifeq ($(OS_TARGET),netbsd)
REQUIRE_PACKAGES_RTL=1
REQUIRE_PACKAGES_GTK=1
REQUIRE_PACKAGES_X11=1
REQUIRE_PACKAGES_OPENGL=1
endif
ifeq ($(OS_TARGET),amiga)
REQUIRE_PACKAGES_RTL=1
REQUIRE_PACKAGES_GTK=1
REQUIRE_PACKAGES_OPENGL=1
endif
ifeq ($(OS_TARGET),atari)
REQUIRE_PACKAGES_RTL=1
REQUIRE_PACKAGES_GTK=1
REQUIRE_PACKAGES_OPENGL=1
endif
ifeq ($(OS_TARGET),sunos)
REQUIRE_PACKAGES_RTL=1
REQUIRE_PACKAGES_GTK=1
REQUIRE_PACKAGES_OPENGL=1
endif
ifeq ($(OS_TARGET),qnx)
REQUIRE_PACKAGES_RTL=1
REQUIRE_PACKAGES_GTK=1
REQUIRE_PACKAGES_OPENGL=1
endif
ifeq ($(OS_TARGET),netware)
REQUIRE_PACKAGES_RTL=1
REQUIRE_PACKAGES_GTK=1
REQUIRE_PACKAGES_OPENGL=1
endif
ifeq ($(OS_TARGET),openbsd)
REQUIRE_PACKAGES_RTL=1
REQUIRE_PACKAGES_GTK=1
REQUIRE_PACKAGES_X11=1
REQUIRE_PACKAGES_OPENGL=1
endif
ifeq ($(OS_TARGET),wdosx)
REQUIRE_PACKAGES_RTL=1
REQUIRE_PACKAGES_GTK=1
REQUIRE_PACKAGES_OPENGL=1
endif
ifdef REQUIRE_PACKAGES_RTL ifdef REQUIRE_PACKAGES_RTL
PACKAGEDIR_RTL:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /rtl/$(OS_TARGET)/Makefile.fpc,$(PACKAGESDIR)))))) PACKAGEDIR_RTL:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /rtl/$(OS_TARGET)/Makefile.fpc,$(PACKAGESDIR))))))
ifneq ($(PACKAGEDIR_RTL),) ifneq ($(PACKAGEDIR_RTL),)

View File

@ -26,7 +26,7 @@ libversion=1.0
fpcpackage=y fpcpackage=y
[default] [default]
fpcdir=../../.. fpcdir=../../../..
[rules] [rules]

View File

@ -1,8 +1,8 @@
# #
# Don't edit, this file is generated by FPCMake Version 1.1 [2002/10/07] # Don't edit, this file is generated by FPCMake Version 1.1 [2002/10/05]
# #
default: all default: all
MAKEFILETARGETS=linux go32v2 win32 os2 freebsd beos netbsd amiga atari sunos qnx netware openbsd wdosx MAKEFILETARGETS=linux win32
override PATH:=$(subst \,/,$(PATH)) override PATH:=$(subst \,/,$(PATH))
ifeq ($(findstring ;,$(PATH)),) ifeq ($(findstring ;,$(PATH)),)
inUnix=1 inUnix=1
@ -90,7 +90,7 @@ endif
endif endif
export ECHO export ECHO
endif endif
override DEFAULT_FPCDIR=../../.. override DEFAULT_FPCDIR=../../../..
ifndef FPC ifndef FPC
ifdef PP ifdef PP
FPC=$(PP) FPC=$(PP)
@ -790,87 +790,12 @@ REQUIRE_PACKAGES_IMLIB=1
REQUIRE_PACKAGES_X11=1 REQUIRE_PACKAGES_X11=1
REQUIRE_PACKAGES_OPENGL=1 REQUIRE_PACKAGES_OPENGL=1
endif endif
ifeq ($(OS_TARGET),go32v2)
REQUIRE_PACKAGES_RTL=1
REQUIRE_PACKAGES_GTK=1
REQUIRE_PACKAGES_IMLIB=1
REQUIRE_PACKAGES_OPENGL=1
endif
ifeq ($(OS_TARGET),win32) ifeq ($(OS_TARGET),win32)
REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_RTL=1
REQUIRE_PACKAGES_GTK=1 REQUIRE_PACKAGES_GTK=1
REQUIRE_PACKAGES_IMLIB=1 REQUIRE_PACKAGES_IMLIB=1
REQUIRE_PACKAGES_OPENGL=1 REQUIRE_PACKAGES_OPENGL=1
endif endif
ifeq ($(OS_TARGET),os2)
REQUIRE_PACKAGES_RTL=1
REQUIRE_PACKAGES_GTK=1
REQUIRE_PACKAGES_IMLIB=1
REQUIRE_PACKAGES_OPENGL=1
endif
ifeq ($(OS_TARGET),freebsd)
REQUIRE_PACKAGES_RTL=1
REQUIRE_PACKAGES_GTK=1
REQUIRE_PACKAGES_IMLIB=1
REQUIRE_PACKAGES_X11=1
REQUIRE_PACKAGES_OPENGL=1
endif
ifeq ($(OS_TARGET),beos)
REQUIRE_PACKAGES_RTL=1
REQUIRE_PACKAGES_GTK=1
REQUIRE_PACKAGES_IMLIB=1
REQUIRE_PACKAGES_OPENGL=1
endif
ifeq ($(OS_TARGET),netbsd)
REQUIRE_PACKAGES_RTL=1
REQUIRE_PACKAGES_GTK=1
REQUIRE_PACKAGES_IMLIB=1
REQUIRE_PACKAGES_X11=1
REQUIRE_PACKAGES_OPENGL=1
endif
ifeq ($(OS_TARGET),amiga)
REQUIRE_PACKAGES_RTL=1
REQUIRE_PACKAGES_GTK=1
REQUIRE_PACKAGES_IMLIB=1
REQUIRE_PACKAGES_OPENGL=1
endif
ifeq ($(OS_TARGET),atari)
REQUIRE_PACKAGES_RTL=1
REQUIRE_PACKAGES_GTK=1
REQUIRE_PACKAGES_IMLIB=1
REQUIRE_PACKAGES_OPENGL=1
endif
ifeq ($(OS_TARGET),sunos)
REQUIRE_PACKAGES_RTL=1
REQUIRE_PACKAGES_GTK=1
REQUIRE_PACKAGES_IMLIB=1
REQUIRE_PACKAGES_OPENGL=1
endif
ifeq ($(OS_TARGET),qnx)
REQUIRE_PACKAGES_RTL=1
REQUIRE_PACKAGES_GTK=1
REQUIRE_PACKAGES_IMLIB=1
REQUIRE_PACKAGES_OPENGL=1
endif
ifeq ($(OS_TARGET),netware)
REQUIRE_PACKAGES_RTL=1
REQUIRE_PACKAGES_GTK=1
REQUIRE_PACKAGES_IMLIB=1
REQUIRE_PACKAGES_OPENGL=1
endif
ifeq ($(OS_TARGET),openbsd)
REQUIRE_PACKAGES_RTL=1
REQUIRE_PACKAGES_GTK=1
REQUIRE_PACKAGES_IMLIB=1
REQUIRE_PACKAGES_X11=1
REQUIRE_PACKAGES_OPENGL=1
endif
ifeq ($(OS_TARGET),wdosx)
REQUIRE_PACKAGES_RTL=1
REQUIRE_PACKAGES_GTK=1
REQUIRE_PACKAGES_IMLIB=1
REQUIRE_PACKAGES_OPENGL=1
endif
ifdef REQUIRE_PACKAGES_RTL ifdef REQUIRE_PACKAGES_RTL
PACKAGEDIR_RTL:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /rtl/$(OS_TARGET)/Makefile.fpc,$(PACKAGESDIR)))))) PACKAGEDIR_RTL:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /rtl/$(OS_TARGET)/Makefile.fpc,$(PACKAGESDIR))))))
ifneq ($(PACKAGEDIR_RTL),) ifneq ($(PACKAGEDIR_RTL),)

View File

@ -25,7 +25,7 @@ libversion=1.0
fpcpackage=y fpcpackage=y
[default] [default]
fpcdir=../../.. fpcdir=../../../..
[rules] [rules]