fixed compiling jitfom to IDE units directory

git-svn-id: trunk@7864 -
This commit is contained in:
mattias 2005-09-30 23:13:59 +00:00
parent 4a15b32072
commit 8bc3506c00
5 changed files with 109 additions and 38 deletions

1
.gitattributes vendored
View File

@ -438,6 +438,7 @@ designer/designer.pp svneol=native#text/pascal
designer/designermenu.pp svneol=native#text/pascal
designer/designerprocs.pas svneol=native#text/pascal
designer/filesystem.pp svneol=native#text/pascal
designer/jitform/README.TXT svneol=native#text/plain
designer/jitform/jitform.pas svneol=native#text/pascal
designer/jitforms.pp svneol=native#text/pascal
designer/menueditorform.pas svneol=native#text/pascal

View File

@ -1,8 +1,8 @@
#
# Don't edit, this file is generated by FPCMake Version 2.0.0 [2005/05/09]
# Don't edit, this file is generated by FPCMake Version 2.0.0 [2005/09/23]
#
default: all
MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-netbsd i386-solaris i386-qnx i386-netware i386-openbsd i386-wdosx i386-emx i386-watcom i386-netwlibc m68k-linux m68k-freebsd m68k-netbsd m68k-amiga m68k-atari m68k-openbsd m68k-palmos powerpc-linux powerpc-netbsd powerpc-macos powerpc-darwin powerpc-morphos sparc-linux sparc-netbsd sparc-solaris x86_64-linux x86_64-freebsd arm-linux
MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-netbsd i386-solaris i386-qnx i386-netware i386-openbsd i386-wdosx i386-emx i386-watcom i386-netwlibc i386-wince m68k-linux m68k-freebsd m68k-netbsd m68k-amiga m68k-atari m68k-openbsd m68k-palmos powerpc-linux powerpc-netbsd powerpc-macos powerpc-darwin powerpc-morphos sparc-linux sparc-netbsd sparc-solaris x86_64-linux x86_64-freebsd x86_64-win64 arm-linux arm-wince
BSDs = freebsd netbsd openbsd darwin
UNIXs = linux $(BSDs) solaris qnx
LIMIT83fs = go32v2 os2 emx watcom
@ -276,6 +276,9 @@ endif
ifeq ($(FULL_TARGET),i386-netwlibc)
override TARGET_UNITS+=jitform
endif
ifeq ($(FULL_TARGET),i386-wince)
override TARGET_UNITS+=jitform
endif
ifeq ($(FULL_TARGET),m68k-linux)
override TARGET_UNITS+=jitform
endif
@ -327,9 +330,15 @@ endif
ifeq ($(FULL_TARGET),x86_64-freebsd)
override TARGET_UNITS+=jitform
endif
ifeq ($(FULL_TARGET),x86_64-win64)
override TARGET_UNITS+=jitform
endif
ifeq ($(FULL_TARGET),arm-linux)
override TARGET_UNITS+=jitform
endif
ifeq ($(FULL_TARGET),arm-wince)
override TARGET_UNITS+=jitform
endif
ifeq ($(FULL_TARGET),i386-linux)
override CLEAN_FILES+=$(wildcard *$(OEXT)) $(wildcard *$(PPUEXT)) $(wildcard *$(RSTEXT))
endif
@ -375,6 +384,9 @@ endif
ifeq ($(FULL_TARGET),i386-netwlibc)
override CLEAN_FILES+=$(wildcard *$(OEXT)) $(wildcard *$(PPUEXT)) $(wildcard *$(RSTEXT))
endif
ifeq ($(FULL_TARGET),i386-wince)
override CLEAN_FILES+=$(wildcard *$(OEXT)) $(wildcard *$(PPUEXT)) $(wildcard *$(RSTEXT))
endif
ifeq ($(FULL_TARGET),m68k-linux)
override CLEAN_FILES+=$(wildcard *$(OEXT)) $(wildcard *$(PPUEXT)) $(wildcard *$(RSTEXT))
endif
@ -426,9 +438,15 @@ endif
ifeq ($(FULL_TARGET),x86_64-freebsd)
override CLEAN_FILES+=$(wildcard *$(OEXT)) $(wildcard *$(PPUEXT)) $(wildcard *$(RSTEXT))
endif
ifeq ($(FULL_TARGET),x86_64-win64)
override CLEAN_FILES+=$(wildcard *$(OEXT)) $(wildcard *$(PPUEXT)) $(wildcard *$(RSTEXT))
endif
ifeq ($(FULL_TARGET),arm-linux)
override CLEAN_FILES+=$(wildcard *$(OEXT)) $(wildcard *$(PPUEXT)) $(wildcard *$(RSTEXT))
endif
ifeq ($(FULL_TARGET),arm-wince)
override CLEAN_FILES+=$(wildcard *$(OEXT)) $(wildcard *$(PPUEXT)) $(wildcard *$(RSTEXT))
endif
ifeq ($(FULL_TARGET),i386-linux)
override COMPILER_OPTIONS+=-gl
endif
@ -474,6 +492,9 @@ endif
ifeq ($(FULL_TARGET),i386-netwlibc)
override COMPILER_OPTIONS+=-gl
endif
ifeq ($(FULL_TARGET),i386-wince)
override COMPILER_OPTIONS+=-gl
endif
ifeq ($(FULL_TARGET),m68k-linux)
override COMPILER_OPTIONS+=-gl
endif
@ -525,9 +546,15 @@ endif
ifeq ($(FULL_TARGET),x86_64-freebsd)
override COMPILER_OPTIONS+=-gl
endif
ifeq ($(FULL_TARGET),x86_64-win64)
override COMPILER_OPTIONS+=-gl
endif
ifeq ($(FULL_TARGET),arm-linux)
override COMPILER_OPTIONS+=-gl
endif
ifeq ($(FULL_TARGET),arm-wince)
override COMPILER_OPTIONS+=-gl
endif
ifeq ($(FULL_TARGET),i386-linux)
override COMPILER_UNITDIR+=../../lcl/units/$(CPU_TARGET)-$(OS_TARGET) .
endif
@ -573,6 +600,9 @@ endif
ifeq ($(FULL_TARGET),i386-netwlibc)
override COMPILER_UNITDIR+=../../lcl/units/$(CPU_TARGET)-$(OS_TARGET) .
endif
ifeq ($(FULL_TARGET),i386-wince)
override COMPILER_UNITDIR+=../../lcl/units/$(CPU_TARGET)-$(OS_TARGET) .
endif
ifeq ($(FULL_TARGET),m68k-linux)
override COMPILER_UNITDIR+=../../lcl/units/$(CPU_TARGET)-$(OS_TARGET) .
endif
@ -624,107 +654,122 @@ endif
ifeq ($(FULL_TARGET),x86_64-freebsd)
override COMPILER_UNITDIR+=../../lcl/units/$(CPU_TARGET)-$(OS_TARGET) .
endif
ifeq ($(FULL_TARGET),x86_64-win64)
override COMPILER_UNITDIR+=../../lcl/units/$(CPU_TARGET)-$(OS_TARGET) .
endif
ifeq ($(FULL_TARGET),arm-linux)
override COMPILER_UNITDIR+=../../lcl/units/$(CPU_TARGET)-$(OS_TARGET) .
endif
ifeq ($(FULL_TARGET),arm-wince)
override COMPILER_UNITDIR+=../../lcl/units/$(CPU_TARGET)-$(OS_TARGET) .
endif
ifeq ($(FULL_TARGET),i386-linux)
override COMPILER_UNITTARGETDIR+=../units
override COMPILER_UNITTARGETDIR+=../../units/$(CPU_TARGET)-$(OS_TARGET)
endif
ifeq ($(FULL_TARGET),i386-go32v2)
override COMPILER_UNITTARGETDIR+=../units
override COMPILER_UNITTARGETDIR+=../../units/$(CPU_TARGET)-$(OS_TARGET)
endif
ifeq ($(FULL_TARGET),i386-win32)
override COMPILER_UNITTARGETDIR+=../units
override COMPILER_UNITTARGETDIR+=../../units/$(CPU_TARGET)-$(OS_TARGET)
endif
ifeq ($(FULL_TARGET),i386-os2)
override COMPILER_UNITTARGETDIR+=../units
override COMPILER_UNITTARGETDIR+=../../units/$(CPU_TARGET)-$(OS_TARGET)
endif
ifeq ($(FULL_TARGET),i386-freebsd)
override COMPILER_UNITTARGETDIR+=../units
override COMPILER_UNITTARGETDIR+=../../units/$(CPU_TARGET)-$(OS_TARGET)
endif
ifeq ($(FULL_TARGET),i386-beos)
override COMPILER_UNITTARGETDIR+=../units
override COMPILER_UNITTARGETDIR+=../../units/$(CPU_TARGET)-$(OS_TARGET)
endif
ifeq ($(FULL_TARGET),i386-netbsd)
override COMPILER_UNITTARGETDIR+=../units
override COMPILER_UNITTARGETDIR+=../../units/$(CPU_TARGET)-$(OS_TARGET)
endif
ifeq ($(FULL_TARGET),i386-solaris)
override COMPILER_UNITTARGETDIR+=../units
override COMPILER_UNITTARGETDIR+=../../units/$(CPU_TARGET)-$(OS_TARGET)
endif
ifeq ($(FULL_TARGET),i386-qnx)
override COMPILER_UNITTARGETDIR+=../units
override COMPILER_UNITTARGETDIR+=../../units/$(CPU_TARGET)-$(OS_TARGET)
endif
ifeq ($(FULL_TARGET),i386-netware)
override COMPILER_UNITTARGETDIR+=../units
override COMPILER_UNITTARGETDIR+=../../units/$(CPU_TARGET)-$(OS_TARGET)
endif
ifeq ($(FULL_TARGET),i386-openbsd)
override COMPILER_UNITTARGETDIR+=../units
override COMPILER_UNITTARGETDIR+=../../units/$(CPU_TARGET)-$(OS_TARGET)
endif
ifeq ($(FULL_TARGET),i386-wdosx)
override COMPILER_UNITTARGETDIR+=../units
override COMPILER_UNITTARGETDIR+=../../units/$(CPU_TARGET)-$(OS_TARGET)
endif
ifeq ($(FULL_TARGET),i386-emx)
override COMPILER_UNITTARGETDIR+=../units
override COMPILER_UNITTARGETDIR+=../../units/$(CPU_TARGET)-$(OS_TARGET)
endif
ifeq ($(FULL_TARGET),i386-watcom)
override COMPILER_UNITTARGETDIR+=../units
override COMPILER_UNITTARGETDIR+=../../units/$(CPU_TARGET)-$(OS_TARGET)
endif
ifeq ($(FULL_TARGET),i386-netwlibc)
override COMPILER_UNITTARGETDIR+=../units
override COMPILER_UNITTARGETDIR+=../../units/$(CPU_TARGET)-$(OS_TARGET)
endif
ifeq ($(FULL_TARGET),i386-wince)
override COMPILER_UNITTARGETDIR+=../../units/$(CPU_TARGET)-$(OS_TARGET)
endif
ifeq ($(FULL_TARGET),m68k-linux)
override COMPILER_UNITTARGETDIR+=../units
override COMPILER_UNITTARGETDIR+=../../units/$(CPU_TARGET)-$(OS_TARGET)
endif
ifeq ($(FULL_TARGET),m68k-freebsd)
override COMPILER_UNITTARGETDIR+=../units
override COMPILER_UNITTARGETDIR+=../../units/$(CPU_TARGET)-$(OS_TARGET)
endif
ifeq ($(FULL_TARGET),m68k-netbsd)
override COMPILER_UNITTARGETDIR+=../units
override COMPILER_UNITTARGETDIR+=../../units/$(CPU_TARGET)-$(OS_TARGET)
endif
ifeq ($(FULL_TARGET),m68k-amiga)
override COMPILER_UNITTARGETDIR+=../units
override COMPILER_UNITTARGETDIR+=../../units/$(CPU_TARGET)-$(OS_TARGET)
endif
ifeq ($(FULL_TARGET),m68k-atari)
override COMPILER_UNITTARGETDIR+=../units
override COMPILER_UNITTARGETDIR+=../../units/$(CPU_TARGET)-$(OS_TARGET)
endif
ifeq ($(FULL_TARGET),m68k-openbsd)
override COMPILER_UNITTARGETDIR+=../units
override COMPILER_UNITTARGETDIR+=../../units/$(CPU_TARGET)-$(OS_TARGET)
endif
ifeq ($(FULL_TARGET),m68k-palmos)
override COMPILER_UNITTARGETDIR+=../units
override COMPILER_UNITTARGETDIR+=../../units/$(CPU_TARGET)-$(OS_TARGET)
endif
ifeq ($(FULL_TARGET),powerpc-linux)
override COMPILER_UNITTARGETDIR+=../units
override COMPILER_UNITTARGETDIR+=../../units/$(CPU_TARGET)-$(OS_TARGET)
endif
ifeq ($(FULL_TARGET),powerpc-netbsd)
override COMPILER_UNITTARGETDIR+=../units
override COMPILER_UNITTARGETDIR+=../../units/$(CPU_TARGET)-$(OS_TARGET)
endif
ifeq ($(FULL_TARGET),powerpc-macos)
override COMPILER_UNITTARGETDIR+=../units
override COMPILER_UNITTARGETDIR+=../../units/$(CPU_TARGET)-$(OS_TARGET)
endif
ifeq ($(FULL_TARGET),powerpc-darwin)
override COMPILER_UNITTARGETDIR+=../units
override COMPILER_UNITTARGETDIR+=../../units/$(CPU_TARGET)-$(OS_TARGET)
endif
ifeq ($(FULL_TARGET),powerpc-morphos)
override COMPILER_UNITTARGETDIR+=../units
override COMPILER_UNITTARGETDIR+=../../units/$(CPU_TARGET)-$(OS_TARGET)
endif
ifeq ($(FULL_TARGET),sparc-linux)
override COMPILER_UNITTARGETDIR+=../units
override COMPILER_UNITTARGETDIR+=../../units/$(CPU_TARGET)-$(OS_TARGET)
endif
ifeq ($(FULL_TARGET),sparc-netbsd)
override COMPILER_UNITTARGETDIR+=../units
override COMPILER_UNITTARGETDIR+=../../units/$(CPU_TARGET)-$(OS_TARGET)
endif
ifeq ($(FULL_TARGET),sparc-solaris)
override COMPILER_UNITTARGETDIR+=../units
override COMPILER_UNITTARGETDIR+=../../units/$(CPU_TARGET)-$(OS_TARGET)
endif
ifeq ($(FULL_TARGET),x86_64-linux)
override COMPILER_UNITTARGETDIR+=../units
override COMPILER_UNITTARGETDIR+=../../units/$(CPU_TARGET)-$(OS_TARGET)
endif
ifeq ($(FULL_TARGET),x86_64-freebsd)
override COMPILER_UNITTARGETDIR+=../units
override COMPILER_UNITTARGETDIR+=../../units/$(CPU_TARGET)-$(OS_TARGET)
endif
ifeq ($(FULL_TARGET),x86_64-win64)
override COMPILER_UNITTARGETDIR+=../../units/$(CPU_TARGET)-$(OS_TARGET)
endif
ifeq ($(FULL_TARGET),arm-linux)
override COMPILER_UNITTARGETDIR+=../units
override COMPILER_UNITTARGETDIR+=../../units/$(CPU_TARGET)-$(OS_TARGET)
endif
ifeq ($(FULL_TARGET),arm-wince)
override COMPILER_UNITTARGETDIR+=../../units/$(CPU_TARGET)-$(OS_TARGET)
endif
ifdef REQUIRE_UNITSDIR
override UNITSDIR+=$(REQUIRE_UNITSDIR)
@ -1623,6 +1668,14 @@ REQUIRE_PACKAGES_PASJPEG=1
REQUIRE_PACKAGES_NETDB=1
REQUIRE_PACKAGES_LIBASYNC=1
endif
ifeq ($(FULL_TARGET),i386-wince)
REQUIRE_PACKAGES_RTL=1
REQUIRE_PACKAGES_PASZLIB=1
REQUIRE_PACKAGES_FCL=1
REQUIRE_PACKAGES_PASJPEG=1
REQUIRE_PACKAGES_NETDB=1
REQUIRE_PACKAGES_LIBASYNC=1
endif
ifeq ($(FULL_TARGET),m68k-linux)
REQUIRE_PACKAGES_RTL=1
REQUIRE_PACKAGES_PASZLIB=1
@ -1810,6 +1863,14 @@ REQUIRE_PACKAGES_POSTGRES=1
REQUIRE_PACKAGES_MYSQL=1
REQUIRE_PACKAGES_SQLITE=1
endif
ifeq ($(FULL_TARGET),x86_64-win64)
REQUIRE_PACKAGES_RTL=1
REQUIRE_PACKAGES_PASZLIB=1
REQUIRE_PACKAGES_FCL=1
REQUIRE_PACKAGES_PASJPEG=1
REQUIRE_PACKAGES_NETDB=1
REQUIRE_PACKAGES_LIBASYNC=1
endif
ifeq ($(FULL_TARGET),arm-linux)
REQUIRE_PACKAGES_RTL=1
REQUIRE_PACKAGES_PASZLIB=1
@ -1823,6 +1884,14 @@ REQUIRE_PACKAGES_POSTGRES=1
REQUIRE_PACKAGES_MYSQL=1
REQUIRE_PACKAGES_SQLITE=1
endif
ifeq ($(FULL_TARGET),arm-wince)
REQUIRE_PACKAGES_RTL=1
REQUIRE_PACKAGES_PASZLIB=1
REQUIRE_PACKAGES_FCL=1
REQUIRE_PACKAGES_PASJPEG=1
REQUIRE_PACKAGES_NETDB=1
REQUIRE_PACKAGES_LIBASYNC=1
endif
ifdef REQUIRE_PACKAGES_RTL
PACKAGEDIR_RTL:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /rtl/Makefile.fpc,$(PACKAGESDIR))))))
ifneq ($(PACKAGEDIR_RTL),)
@ -2158,7 +2227,7 @@ else
FPCCPUOPT:=
endif
endif
override FPCOPT+=-Xs $(FPCCPUOPT) -n
override FPCOPT+=-Ur -Xs $(FPCCPUOPT) -n
override FPCOPTDEF+=RELEASE
endif
ifdef STRIP

View File

@ -9,7 +9,7 @@ version=0.9b
[compiler]
unitdir=../../lcl/units/$(CPU_TARGET)-$(OS_TARGET) .
unittargetdir=../units
unittargetdir=../../units/$(CPU_TARGET)-$(OS_TARGET)
options=-gl
[target]

View File

@ -0,0 +1,2 @@
jitform.pas is a very special unit. See the unit header.

View File

@ -1 +0,0 @@
jitform unit files