Browse Source

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

Pierre Muller 1 year ago
parent
commit
848c3a252e
2 changed files with 17 additions and 4 deletions
  1. 8 2
      packages/fpmkunit/Makefile
  2. 9 2
      packages/fpmkunit/Makefile.fpc

+ 8 - 2
packages/fpmkunit/Makefile

@@ -386,16 +386,22 @@ ifdef NO_UNIT_PROCESS
 UNIT_PROCESS=-dNO_UNIT_PROCESS
 else
 UNIT_PROCESS=
+USE_PROCESS_DUMMY_DIR=1
 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
 ifneq ($(findstring $(OS_SOURCE),linux freebsd darwin iphonesim netbsd openbsd solaris haiku aix android dragonfly),)
 UNIT_PROCESS+=-Fi../fcl-process/src/unix
+USE_PROCESS_DUMMY_DIR=0
 endif
 ifneq ($(findstring $(OS_SOURCE),os2 emx),)
 UNIT_PROCESS+=-Fi../fcl-process/src/os2
 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
 ifdef NO_UNIT_ZIPPER
 UNIT_ZIPPER=-dNO_UNIT_ZIPPER

+ 9 - 2
packages/fpmkunit/Makefile.fpc

@@ -36,16 +36,23 @@ ifdef NO_UNIT_PROCESS
 UNIT_PROCESS=-dNO_UNIT_PROCESS
 else
 UNIT_PROCESS=
+USE_PROCESS_DUMMY_DIR=1
 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
 ifneq ($(findstring $(OS_SOURCE),linux freebsd darwin iphonesim netbsd openbsd solaris haiku aix android dragonfly),)
 UNIT_PROCESS+=-Fi../fcl-process/src/unix
+USE_PROCESS_DUMMY_DIR=0
 endif
 ifneq ($(findstring $(OS_SOURCE),os2 emx),)
 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
-UNIT_PROCESS+=-Fu../fcl-process/src -Fi../fcl-process/src/$(OS_SOURCE) -Fi../fcl-process/src/dummy
 endif
 ifdef NO_UNIT_ZIPPER
 UNIT_ZIPPER=-dNO_UNIT_ZIPPER