|
@@ -875,22 +875,26 @@ COMMON=$(RTL)/common
|
|
PROCINC=$(RTL)/$(CPU_TARGET)
|
|
PROCINC=$(RTL)/$(CPU_TARGET)
|
|
WININC=../win/wininc
|
|
WININC=../win/wininc
|
|
WINDIR=../win
|
|
WINDIR=../win
|
|
|
|
+OSDIR=win32
|
|
|
|
+NSOSDIR=$(NSDIR)/windows
|
|
UNITPREFIX=rtl
|
|
UNITPREFIX=rtl
|
|
SYSTEMUNIT=system
|
|
SYSTEMUNIT=system
|
|
DLLS=fpcmemdll
|
|
DLLS=fpcmemdll
|
|
-CPU_UNITS=cpu signals mmx
|
|
|
|
|
|
+CPU_UNITS=$(CPUUNIT) $(SIGNALSUNIT) $(MMXUNIT)
|
|
OBJPASDIR=$(RTL)/objpas
|
|
OBJPASDIR=$(RTL)/objpas
|
|
FPC_SYSTEM_OPT=-Fu../win
|
|
FPC_SYSTEM_OPT=-Fu../win
|
|
SYSUTILSDIR=$(WINDIR)
|
|
SYSUTILSDIR=$(WINDIR)
|
|
SYSUTILS_OPT=-Fi../win
|
|
SYSUTILS_OPT=-Fi../win
|
|
|
|
+SYSUTILS_DEPS_OS=$(WINDOWSUNIT)$(PPUEXT) $(WINDIRSUNIT)$(PPUEXT)
|
|
include $(WININC)/makefile.inc
|
|
include $(WININC)/makefile.inc
|
|
WINDOWS_SOURCE_FILES=$(addprefix $(WININC)/,$(addsuffix .inc,$(WINDOWS_FILES)))
|
|
WINDOWS_SOURCE_FILES=$(addprefix $(WININC)/,$(addsuffix .inc,$(WINDOWS_FILES)))
|
|
|
|
+EXEINFO_DEPS_OS=$(WINDOWSUNIT)$(PPUEXT)
|
|
EXTPAS_DEPS_OS=buildrtl$(PPUEXT)
|
|
EXTPAS_DEPS_OS=buildrtl$(PPUEXT)
|
|
ifeq ($(CPU_OS_TARGET),i386-win32)
|
|
ifeq ($(CPU_OS_TARGET),i386-win32)
|
|
-override TARGET_UNITS+=system uuchar objpas macpas $(ISO7185UNIT) buildrtl $(CPALLUNIT) $(LINEINFOUNIT) $(LNFODWRFUNIT)
|
|
|
|
|
|
+override TARGET_UNITS+=system uuchar objpas macpas $(ISO7185UNIT) $(WINDOWSUNIT) $(SYSUTILSUNIT) buildrtl $(CHARSETUNIT) $(CPALLUNIT) $(LINEINFOUNIT) $(LNFODWRFUNIT)
|
|
endif
|
|
endif
|
|
ifeq ($(CPU_OS_TARGET),i386-win32)
|
|
ifeq ($(CPU_OS_TARGET),i386-win32)
|
|
-override TARGET_IMPLICITUNITS+=sysinitpas sysinitcyg sysinitgprof initc extpas heaptrc winsysut $(CTYPESUNIT) $(STRINGSUNIT) $(DOSUNIT) $(MESSAGESUNIT) $(WINDOWSUNIT) $(CMEMUNIT) $(DYNLIBSUNIT) $(RTLCONSTSUNIT) $(SYSCONSTUNIT) $(SYSUTILSUNIT) $(MATHUNIT) $(TYPESUNIT) $(TYPINFOUNIT) $(SORTBASEUNIT) $(FGLUNIT) $(CLASSESUNIT) $(GETOPTSUNIT) $(CHARSETUNIT) $(CHARACTERUNIT) $(FPWIDESTRINGUNIT) $(SHAREMEMUNIT) $(EXEINFOUNIT) fpintres $(WINDIRSUNIT) $(SOFTFPUUNIT) $(SFPUX80UNIT) $(UFLOATX80UNIT) $(SFPU128UNIT) $(UFLOAT128UNIT) $(CP1250UNIT) $(CP1251UNIT) $(CP1252UNIT) $(CP1253UNIT) $(CP1254UNIT) $(CP1255UNIT) $(CP1256UNIT) $(CP1257UNIT) $(CP1258UNIT) $(CP437UNIT) $(CP646UNIT) $(CP737UNIT) $(CP775UNIT) $(CP850UNIT) $(CP852UNIT) $(CP855UNIT) $(CP856UNIT) $(CP857UNIT) $(CP860UNIT) $(CP861UNIT) $(CP862UNIT) $(CP863UNIT) $(CP864UNIT) $(CP865UNIT) $(CP866UNIT) $(CP869UNIT) $(CP874UNIT) $(CP3021UNIT) $(CP8859_1UNIT) $(CP8859_2UNIT) $(CP8859_3UNIT) $(CP8859_4UNIT) $(CP8859_5UNIT) $(CP8859_6UNIT) $(CP8859_7UNIT) $(CP8859_8UNIT) $(CP8859_9UNIT) $(CP8859_10UNIT) $(CP8859_11UNIT) $(CP8859_13UNIT) $(CP8859_14UNIT) $(CP8859_15UNIT) $(CP8859_16UNIT) $(CPKOI8_RUNIT) $(CPKOI8_UUNIT) $(UNICODEDATAUNIT) $(CPU_UNITS)
|
|
|
|
|
|
+override TARGET_IMPLICITUNITS+=sysinitpas sysinitcyg sysinitgprof initc extpas heaptrc $(WINSYSUTUNIT) $(CTYPESUNIT) $(STRINGSUNIT) $(DOSUNIT) $(MESSAGESUNIT) $(CMEMUNIT) $(DYNLIBSUNIT) $(RTLCONSTSUNIT) $(SYSCONSTUNIT) $(MATHUNIT) $(TYPESUNIT) $(TYPINFOUNIT) $(SORTBASEUNIT) $(FGLUNIT) $(CLASSESUNIT) $(GETOPTSUNIT) $(CHARACTERUNIT) $(FPWIDESTRINGUNIT) $(SHAREMEMUNIT) $(EXEINFOUNIT) fpintres $(WINDIRSUNIT) $(SOFTFPUUNIT) $(SFPUX80UNIT) $(UFLOATX80UNIT) $(SFPU128UNIT) $(UFLOAT128UNIT) $(CP1250UNIT) $(CP1251UNIT) $(CP1252UNIT) $(CP1253UNIT) $(CP1254UNIT) $(CP1255UNIT) $(CP1256UNIT) $(CP1257UNIT) $(CP1258UNIT) $(CP437UNIT) $(CP646UNIT) $(CP737UNIT) $(CP775UNIT) $(CP850UNIT) $(CP852UNIT) $(CP855UNIT) $(CP856UNIT) $(CP857UNIT) $(CP860UNIT) $(CP861UNIT) $(CP862UNIT) $(CP863UNIT) $(CP864UNIT) $(CP865UNIT) $(CP866UNIT) $(CP869UNIT) $(CP874UNIT) $(CP3021UNIT) $(CP8859_1UNIT) $(CP8859_2UNIT) $(CP8859_3UNIT) $(CP8859_4UNIT) $(CP8859_5UNIT) $(CP8859_6UNIT) $(CP8859_7UNIT) $(CP8859_8UNIT) $(CP8859_9UNIT) $(CP8859_10UNIT) $(CP8859_11UNIT) $(CP8859_13UNIT) $(CP8859_14UNIT) $(CP8859_15UNIT) $(CP8859_16UNIT) $(CPKOI8_RUNIT) $(CPKOI8_UUNIT) $(UNICODEDATAUNIT) $(CPU_UNITS)
|
|
endif
|
|
endif
|
|
ifeq ($(CPU_OS_TARGET),i386-win32)
|
|
ifeq ($(CPU_OS_TARGET),i386-win32)
|
|
override TARGET_LOADERS+=$(LOADERS)
|
|
override TARGET_LOADERS+=$(LOADERS)
|
|
@@ -2625,7 +2629,7 @@ BLOCKRTL_DEPS=$(INC)/blockrtl.pp \
|
|
$(BLOCKRTL_DEPS_OS) $(BLOCKRTL_DEPS_CPU)
|
|
$(BLOCKRTL_DEPS_OS) $(BLOCKRTL_DEPS_CPU)
|
|
blockrtl$(PPUEXT) : $(BLOCKRTL_DEPS)
|
|
blockrtl$(PPUEXT) : $(BLOCKRTL_DEPS)
|
|
$(COMPILER) $(BLOCKRTL_OPT) $<
|
|
$(COMPILER) $(BLOCKRTL_OPT) $<
|
|
-WINDOWS_DEPS=windows.pp $(SYSTEMUNIT)$(PPUEXT) \
|
|
|
|
|
|
+WINDOWS_DEPS=windows.pp $(SYSTEMUNIT)$(PPUEXT) objpas$(PPUEXT) \
|
|
$(WINDOWS_DEPS_OS) $(WINDOWS_DEPS_CPU)
|
|
$(WINDOWS_DEPS_OS) $(WINDOWS_DEPS_CPU)
|
|
windows$(PPUEXT): $(WINDOWS_DEPS)
|
|
windows$(PPUEXT): $(WINDOWS_DEPS)
|
|
$(COMPILER) $(WINDOWS_OPT) $<
|
|
$(COMPILER) $(WINDOWS_OPT) $<
|
|
@@ -2656,5 +2660,13 @@ SYSINCDEPS=$(addprefix $(INC)/,$(SYSINCNAMES))
|
|
include $(PROCINC)/makefile.cpu
|
|
include $(PROCINC)/makefile.cpu
|
|
SYSCPUDEPS=$(addprefix $(PROCINC)/,$(CPUINCNAMES))
|
|
SYSCPUDEPS=$(addprefix $(PROCINC)/,$(CPUINCNAMES))
|
|
SYSDEPS=$(SYSINCDEPS) $(SYSCPUDEPS)
|
|
SYSDEPS=$(SYSINCDEPS) $(SYSCPUDEPS)
|
|
-buildrtl$(PPUEXT): buildrtl.pp system$(PPUEXT) objpas$(PPUEXT) heaptrc$(PPUEXT)
|
|
|
|
- $(COMPILER) -Fi$(OBJPASDIR)/sysutils -Fi$(OBJPASDIR)/classes -Fu$(PROCINC) -I$(OBJPASDIR) -I$(WININC) -Fu$(WININC) -Fu$(WINDIR) -I$(INC) -Fu$(INC) -Fu$(OBJPASDIR) buildrtl
|
|
|
|
|
|
+BUILDINCLUDEPATHS= -Fi$(OBJPASDIR)/sysutils -Fi$(WINDIR) -Fi$(OBJPASDIR) \
|
|
|
|
+ -Fi$(OBJPASDIR)/classes -Fi$(WININC) -Fi$(INC)
|
|
|
|
+BUILDUNITPATHS=-Fu$(WININC) -Fu$(WINDIR) -Fu$(INC) -Fu$(OBJPASDIR) -Fu../$(ARCH)
|
|
|
|
+ifdef FPC_DOTTEDUNITS
|
|
|
|
+BUILDRTL_OPT:=$(BUILDRTL_OPT) -Fu$(NSINC) -Fu$(NSOSDIR) -dFPC_DOTTEDUNITS
|
|
|
|
+endif
|
|
|
|
+BUILDRTL_DEPS=buildrtl.pp system$(PPUEXT) objpas$(PPUEXT) $(WINDOWSUNIT)$(PPUEXT) $(SYSUTILSUNIT)$(PPUEXT) \
|
|
|
|
+ $(BUILDRTL_DEPS_OS) $(BUILDRTL_DEPS_CPU)
|
|
|
|
+buildrtl$(PPUEXT) : $(BUILDRTL_DEPS)
|
|
|
|
+ $(COMPILER) $(BUILDUNITPATHS) $(BUILDINCLUDEPATHS) $(BUILDRTL_OPT) $<
|