Browse Source

Add missing watcom directory entry

git-svn-id: trunk@37324 -
pierre 8 years ago
parent
commit
96066f5c89
2 changed files with 57 additions and 1 deletions
  1. 56 1
      rtl/Makefile
  2. 1 0
      rtl/Makefile.fpc

+ 56 - 1
rtl/Makefile

@@ -1,5 +1,5 @@
 #
-# Don't edit, this file is generated by FPCMake Version 2.0.0 [2017-08-22 rev 37024]
+# Don't edit, this file is generated by FPCMake Version 2.0.0 [2017-09-21 rev 37286]
 #
 default: all
 MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-haiku i386-netbsd i386-solaris i386-netware i386-openbsd i386-wdosx i386-darwin i386-emx i386-watcom i386-netwlibc i386-wince i386-embedded i386-symbian i386-nativent i386-iphonesim i386-android i386-aros m68k-linux m68k-netbsd m68k-amiga m68k-atari m68k-palmos m68k-macos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos powerpc-darwin powerpc-morphos powerpc-embedded powerpc-wii powerpc-aix sparc-linux sparc-netbsd sparc-solaris sparc-embedded x86_64-linux x86_64-freebsd x86_64-netbsd x86_64-solaris x86_64-openbsd x86_64-darwin x86_64-win64 x86_64-embedded x86_64-iphonesim x86_64-aros x86_64-dragonfly arm-linux arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian arm-android arm-aros powerpc64-linux powerpc64-darwin powerpc64-embedded powerpc64-aix avr-embedded armeb-linux armeb-embedded mips-linux mipsel-linux mipsel-embedded mipsel-android jvm-java jvm-android i8086-embedded i8086-msdos i8086-win16 aarch64-linux aarch64-darwin wasm-wasm sparc64-linux
@@ -372,6 +372,9 @@ endif
 ifeq ($(FULL_TARGET),i386-emx)
 override TARGET_DIRS+=emx
 endif
+ifeq ($(FULL_TARGET),i386-watcom)
+override TARGET_DIRS+=watcom
+endif
 ifeq ($(FULL_TARGET),i386-netwlibc)
 override TARGET_DIRS+=netwlibc
 endif
@@ -1419,7 +1422,11 @@ ifdef INSTALL_BUILDUNIT
 override INSTALLPPUFILES:=$(filter-out $(INSTALL_BUILDUNIT)$(PPUEXT),$(INSTALLPPUFILES))
 endif
 ifdef INSTALLPPUFILES
+ifneq ($(IMPORTLIBPREFIX)-$(STATICLIBEXT),$(STATICLIBPREFIX)-$(STATICLIBEXT))
 override INSTALLPPULINKFILES:=$(subst $(PPUEXT),$(OEXT),$(INSTALLPPUFILES)) $(addprefix $(STATICLIBPREFIX),$(subst $(PPUEXT),$(STATICLIBEXT),$(INSTALLPPUFILES))) $(addprefix $(IMPORTLIBPREFIX),$(subst $(PPUEXT),$(STATICLIBEXT),$(INSTALLPPUFILES)))
+else
+override INSTALLPPULINKFILES:=$(subst $(PPUEXT),$(OEXT),$(INSTALLPPUFILES)) $(addprefix $(STATICLIBPREFIX),$(subst $(PPUEXT),$(STATICLIBEXT),$(INSTALLPPUFILES)))
+endif
 ifneq ($(UNITTARGETDIRPREFIX),)
 override INSTALLPPUFILES:=$(addprefix $(UNITTARGETDIRPREFIX),$(notdir $(INSTALLPPUFILES)))
 override INSTALLPPULINKFILES:=$(wildcard $(addprefix $(UNITTARGETDIRPREFIX),$(notdir $(INSTALLPPULINKFILES))))
@@ -1791,6 +1798,9 @@ endif
 ifeq ($(FULL_TARGET),i386-emx)
 TARGET_DIRS_EMX=1
 endif
+ifeq ($(FULL_TARGET),i386-watcom)
+TARGET_DIRS_WATCOM=1
+endif
 ifeq ($(FULL_TARGET),i386-netwlibc)
 TARGET_DIRS_NETWLIBC=1
 endif
@@ -2580,6 +2590,51 @@ emx:
 	$(MAKE) -C emx all
 .PHONY: emx_all emx_debug emx_smart emx_release emx_units emx_examples emx_shared emx_install emx_sourceinstall emx_exampleinstall emx_distinstall emx_zipinstall emx_zipsourceinstall emx_zipexampleinstall emx_zipdistinstall emx_clean emx_distclean emx_cleanall emx_info emx_makefiles emx
 endif
+ifdef TARGET_DIRS_WATCOM
+watcom_all:
+	$(MAKE) -C watcom all
+watcom_debug:
+	$(MAKE) -C watcom debug
+watcom_smart:
+	$(MAKE) -C watcom smart
+watcom_release:
+	$(MAKE) -C watcom release
+watcom_units:
+	$(MAKE) -C watcom units
+watcom_examples:
+	$(MAKE) -C watcom examples
+watcom_shared:
+	$(MAKE) -C watcom shared
+watcom_install:
+	$(MAKE) -C watcom install
+watcom_sourceinstall:
+	$(MAKE) -C watcom sourceinstall
+watcom_exampleinstall:
+	$(MAKE) -C watcom exampleinstall
+watcom_distinstall:
+	$(MAKE) -C watcom distinstall
+watcom_zipinstall:
+	$(MAKE) -C watcom zipinstall
+watcom_zipsourceinstall:
+	$(MAKE) -C watcom zipsourceinstall
+watcom_zipexampleinstall:
+	$(MAKE) -C watcom zipexampleinstall
+watcom_zipdistinstall:
+	$(MAKE) -C watcom zipdistinstall
+watcom_clean:
+	$(MAKE) -C watcom clean
+watcom_distclean:
+	$(MAKE) -C watcom distclean
+watcom_cleanall:
+	$(MAKE) -C watcom cleanall
+watcom_info:
+	$(MAKE) -C watcom info
+watcom_makefiles:
+	$(MAKE) -C watcom makefiles
+watcom:
+	$(MAKE) -C watcom all
+.PHONY: watcom_all watcom_debug watcom_smart watcom_release watcom_units watcom_examples watcom_shared watcom_install watcom_sourceinstall watcom_exampleinstall watcom_distinstall watcom_zipinstall watcom_zipsourceinstall watcom_zipexampleinstall watcom_zipdistinstall watcom_clean watcom_distclean watcom_cleanall watcom_info watcom_makefiles watcom
+endif
 ifdef TARGET_DIRS_NETWLIBC
 netwlibc_all:
 	$(MAKE) -C netwlibc all

+ 1 - 0
rtl/Makefile.fpc

@@ -46,6 +46,7 @@ dirs_msdos=msdos
 dirs_aros=aros
 dirs_atari=atari
 dirs_win16=win16
+dirs_watcom=watcom
 
 [install]
 fpcpackage=y