paweld/fpc
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/fpc/source.git synced 2025-08-14 02:59:33 +02:00
Code Issues Packages Projects Releases Wiki Activity

Add fcl-process/src/winall include directory for Windows targets

Browse Source
This commit is contained in:
Pierre Muller 2024-01-08 17:08:20 +01:00
parent 66520ad5ab
commit 848c3a252e
2 changed files with 17 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
packages/fpmkunit/Makefile
View File

@ -386,16 +386,22 @@ ifdef NO_UNIT_PROCESS
UNIT_PROCESS=-dNO_UNIT_PROCESS UNIT_PROCESS=-dNO_UNIT_PROCESS
else else
UNIT_PROCESS= UNIT_PROCESS=
USE_PROCESS_DUMMY_DIR=1
ifneq ($(findstring $(OS_SOURCE),win32 win64),) ifneq ($(findstring $(OS_SOURCE),win32 win64),)
UNIT_PROCESS+=-Fi../fcl-process/src/win UNIT_PROCESS+=-Fi../fcl-process/src/win -Fi../fcl-process/src/winall
USE_PROCESS_DUMMY_DIR=0
endif endif
ifneq ($(findstring $(OS_SOURCE),linux freebsd darwin iphonesim netbsd openbsd solaris haiku aix android dragonfly),) ifneq ($(findstring $(OS_SOURCE),linux freebsd darwin iphonesim netbsd openbsd solaris haiku aix android dragonfly),)
UNIT_PROCESS+=-Fi../fcl-process/src/unix UNIT_PROCESS+=-Fi../fcl-process/src/unix
USE_PROCESS_DUMMY_DIR=0
endif endif
ifneq ($(findstring $(OS_SOURCE),os2 emx),) ifneq ($(findstring $(OS_SOURCE),os2 emx),)
UNIT_PROCESS+=-Fi../fcl-process/src/os2 UNIT_PROCESS+=-Fi../fcl-process/src/os2
endif endif
UNIT_PROCESS+=-Fu../fcl-process/src -Fi../fcl-process/src/$(OS_SOURCE) -Fi../fcl-process/src/dummy UNIT_PROCESS+=-Fu../fcl-process/src -Fi../fcl-process/src/$(OS_SOURCE)
ifeq ($(USE_PROCESS_DUMMY_DIR),1)
UNIT_PROCESS+=-Fi../fcl-process/src/dummy
endif
endif endif
ifdef NO_UNIT_ZIPPER ifdef NO_UNIT_ZIPPER
UNIT_ZIPPER=-dNO_UNIT_ZIPPER UNIT_ZIPPER=-dNO_UNIT_ZIPPER

11
packages/fpmkunit/Makefile.fpc
View File

@ -36,16 +36,23 @@ ifdef NO_UNIT_PROCESS
UNIT_PROCESS=-dNO_UNIT_PROCESS UNIT_PROCESS=-dNO_UNIT_PROCESS
else else
UNIT_PROCESS= UNIT_PROCESS=
USE_PROCESS_DUMMY_DIR=1
ifneq ($(findstring $(OS_SOURCE),win32 win64),) ifneq ($(findstring $(OS_SOURCE),win32 win64),)
UNIT_PROCESS+=-Fi../fcl-process/src/win UNIT_PROCESS+=-Fi../fcl-process/src/win -Fi../fcl-process/src/winall
USE_PROCESS_DUMMY_DIR=0
endif endif
ifneq ($(findstring $(OS_SOURCE),linux freebsd darwin iphonesim netbsd openbsd solaris haiku aix android dragonfly),) ifneq ($(findstring $(OS_SOURCE),linux freebsd darwin iphonesim netbsd openbsd solaris haiku aix android dragonfly),)
UNIT_PROCESS+=-Fi../fcl-process/src/unix UNIT_PROCESS+=-Fi../fcl-process/src/unix
USE_PROCESS_DUMMY_DIR=0
endif endif
ifneq ($(findstring $(OS_SOURCE),os2 emx),) ifneq ($(findstring $(OS_SOURCE),os2 emx),)
UNIT_PROCESS+=-Fi../fcl-process/src/os2 UNIT_PROCESS+=-Fi../fcl-process/src/os2
#USE_PROCESS_DUMMY_DIR=0 (still uses dummy/process.inc)
endif
UNIT_PROCESS+=-Fu../fcl-process/src -Fi../fcl-process/src/$(OS_SOURCE)
ifeq ($(USE_PROCESS_DUMMY_DIR),1)
UNIT_PROCESS+=-Fi../fcl-process/src/dummy
endif endif
UNIT_PROCESS+=-Fu../fcl-process/src -Fi../fcl-process/src/$(OS_SOURCE) -Fi../fcl-process/src/dummy
endif endif
ifdef NO_UNIT_ZIPPER ifdef NO_UNIT_ZIPPER
UNIT_ZIPPER=-dNO_UNIT_ZIPPER UNIT_ZIPPER=-dNO_UNIT_ZIPPER