paweld/fpc
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/fpc/source.git synced 2025-06-26 21:28:16 +02:00
Code Issues Packages Projects Releases Wiki Activity

+ comobj unit added

Browse Source
This commit is contained in:
florian 2002-10-10 16:11:09 +00:00
parent e91a14b6ea
commit 28a044c57c
2 changed files with 13 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
rtl/win32/Makefile
View File

@ -1,8 +1,8 @@
# #
# Don't edit, this file is generated by FPCMake Version 1.1 [2002/08/24] # Don't edit, this file is generated by FPCMake Version 1.1 [2002/04/23]
# #
default: all default: all
MAKEFILETARGETS=linux go32v2 win32 os2 freebsd beos netbsd amiga atari sunos qnx netware openbsd wdosx MAKEFILETARGETS=win32
override PATH:=$(subst \,/,$(PATH)) override PATH:=$(subst \,/,$(PATH))
ifeq ($(findstring ;,$(PATH)),) ifeq ($(findstring ;,$(PATH)),)
inUnix=1 inUnix=1
@ -42,9 +42,6 @@ endif
ifeq ($(OS_TARGET),netbsd) ifeq ($(OS_TARGET),netbsd)
BSDhier=1 BSDhier=1
endif endif
ifeq ($(OS_TARGET),openbsd)
BSDhier=1
endif
ifdef inUnix ifdef inUnix
BATCHEXT=.sh BATCHEXT=.sh
else else
@ -220,7 +217,7 @@ OBJPASDIR=$(RTL)/objpas
GRAPHDIR=$(INC)/graph GRAPHDIR=$(INC)/graph
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)))
override TARGET_UNITS+=$(SYSTEMUNIT) objpas strings windows ole2 activex opengl32 winsock initc dos crt objects graph messages sysutils typinfo math varutils cpu mmx charset ucomplex getopts heaptrc lineinfo wincrt winmouse winevent sockets printer dynlibs video mouse keyboard variants types override TARGET_UNITS+=$(SYSTEMUNIT) objpas strings windows ole2 activex opengl32 winsock initc dos crt objects graph messages sysutils typinfo math varutils cpu mmx charset ucomplex getopts heaptrc lineinfo wincrt winmouse winevent sockets printer dynlibs video mouse keyboard variants types comobj
override TARGET_LOADERS+=wprt0 wdllprt0 override TARGET_LOADERS+=wprt0 wdllprt0
override TARGET_RSTS+=math varutils typinfo override TARGET_RSTS+=math varutils typinfo
override INSTALL_FPCPACKAGE=y override INSTALL_FPCPACKAGE=y
@ -243,15 +240,9 @@ endif
ifeq ($(OS_TARGET),netbsd) ifeq ($(OS_TARGET),netbsd)
UNIXINSTALLDIR=1 UNIXINSTALLDIR=1
endif endif
ifeq ($(OS_TARGET),openbsd)
UNIXINSTALLDIR=1
endif
ifeq ($(OS_TARGET),sunos) ifeq ($(OS_TARGET),sunos)
UNIXINSTALLDIR=1 UNIXINSTALLDIR=1
endif endif
ifeq ($(OS_TARGET),qnx)
UNIXINSTALLDIR=1
endif
else else
ifeq ($(OS_SOURCE),linux) ifeq ($(OS_SOURCE),linux)
UNIXINSTALLDIR=1 UNIXINSTALLDIR=1
@ -262,15 +253,9 @@ endif
ifeq ($(OS_SOURCE),netbsd) ifeq ($(OS_SOURCE),netbsd)
UNIXINSTALLDIR=1 UNIXINSTALLDIR=1
endif endif
ifeq ($(OS_SOURCE),openbsd)
UNIXINSTALLDIR=1
endif
ifeq ($(OS_TARGET),sunos) ifeq ($(OS_TARGET),sunos)
UNIXINSTALLDIR=1 UNIXINSTALLDIR=1
endif endif
ifeq ($(OS_TARGET),qnx)
UNIXINSTALLDIR=1
endif
endif endif
ifndef INSTALL_PREFIX ifndef INSTALL_PREFIX
ifdef PREFIX ifdef PREFIX
@ -466,12 +451,6 @@ HASSHAREDLIB=1
FPCMADE=fpcmade.netbsd FPCMADE=fpcmade.netbsd
ZIPSUFFIX=netbsd ZIPSUFFIX=netbsd
endif endif
ifeq ($(OS_TARGET),openbsd)
EXEEXT=
HASSHAREDLIB=1
FPCMADE=fpcmade.openbsd
ZIPSUFFIX=openbsd
endif
ifeq ($(OS_TARGET),win32) ifeq ($(OS_TARGET),win32)
PPUEXT=.ppw PPUEXT=.ppw
OEXT=.ow OEXT=.ow
@ -497,7 +476,7 @@ ECHO=echo
endif endif
ifeq ($(OS_TARGET),amiga) ifeq ($(OS_TARGET),amiga)
EXEEXT= EXEEXT=
PPUEXT=.ppu PPUEXT=.ppa
ASMEXT=.asm ASMEXT=.asm
OEXT=.o OEXT=.o
SMARTEXT=.sl SMARTEXT=.sl
@ -506,7 +485,7 @@ SHAREDLIBEXT=.library
FPCMADE=fpcmade.amg FPCMADE=fpcmade.amg
endif endif
ifeq ($(OS_TARGET),atari) ifeq ($(OS_TARGET),atari)
PPUEXT=.ppu PPUEXT=.ppt
ASMEXT=.s ASMEXT=.s
OEXT=.o OEXT=.o
SMARTEXT=.sl SMARTEXT=.sl
@ -783,9 +762,6 @@ endif
ifneq ($(OS_TARGET),$(OS_SOURCE)) ifneq ($(OS_TARGET),$(OS_SOURCE))
override FPCOPT+=-T$(OS_TARGET) override FPCOPT+=-T$(OS_TARGET)
endif endif
ifeq ($(OS_SOURCE),openbsd)
override FPCOPT+=-FD$(NEW_BINUTILS_PATH)
endif
ifdef UNITDIR ifdef UNITDIR
override FPCOPT+=$(addprefix -Fu,$(UNITDIR)) override FPCOPT+=$(addprefix -Fu,$(UNITDIR))
endif endif
@ -1203,7 +1179,7 @@ windows$(PPUEXT) : windows.pp $(WINDOWS_SOURCE_FILES) $(SYSTEMUNIT)$(PPUEXT)
messages$(PPUEXT): messages.pp $(SYSTEMUNIT)$(PPUEXT) messages$(PPUEXT): messages.pp $(SYSTEMUNIT)$(PPUEXT)
$(COMPILER) -I$(WININC) messages.pp $(COMPILER) -I$(WININC) messages.pp
ole2$(PPUEXT) : ole2.pp windows$(PPUEXT) $(SYSTEMUNIT)$(PPUEXT) ole2$(PPUEXT) : ole2.pp windows$(PPUEXT) $(SYSTEMUNIT)$(PPUEXT)
activex$(PPUEXT) : activex.pp windows$(PPUEXT) $(SYSTEMUNIT)$(PPUEXT) activex$(PPUEXT) : activex.pp $(WININC)/objbase.inc windows$(PPUEXT) $(SYSTEMUNIT)$(PPUEXT)
opengl32$(PPUEXT) : opengl32.pp windows$(PPUEXT) $(SYSTEMUNIT)$(PPUEXT) opengl32$(PPUEXT) : opengl32.pp windows$(PPUEXT) $(SYSTEMUNIT)$(PPUEXT)
winsock$(PPUEXT) : winsock.pp windows$(PPUEXT) $(SYSTEMUNIT)$(PPUEXT) winsock$(PPUEXT) : winsock.pp windows$(PPUEXT) $(SYSTEMUNIT)$(PPUEXT)
sockets$(PPUEXT) : sockets.pp windows$(PPUEXT) winsock$(PPUEXT) $(SYSTEMUNIT)$(PPUEXT) \ sockets$(PPUEXT) : sockets.pp windows$(PPUEXT) winsock$(PPUEXT) $(SYSTEMUNIT)$(PPUEXT) \
@ -1232,6 +1208,8 @@ varutils$(PPUEXT) : varutils.pp $(OBJPASDIR)/cvarutil.inc \
$(COMPILER) -I$(OBJPASDIR) varutils.pp $(COMPILER) -I$(OBJPASDIR) varutils.pp
types$(PPUEXT) : $(OBJPASDIR/types.pp objpas$(PPUEXT) $(SYSTEMUNIT)$(PPUEXT) types$(PPUEXT) : $(OBJPASDIR/types.pp objpas$(PPUEXT) $(SYSTEMUNIT)$(PPUEXT)
$(COMPILER) $(OBJPASDIR)/types.pp $(COMPILER) $(OBJPASDIR)/types.pp
comobj$(PPUEXT) : comobj.pp activex$(PPUEXT) sysutils$(PPUEXT) $(SYSTEMUNIT)$(PPUEXT) $(OBJPASDIR)/comobjh.inc $(OBJPASDIR)/comobj.inc
$(COMPILER) -I$(OBJPASDIR) comobj.pp
cpu$(PPUEXT) : $(PROCINC)/cpu.pp $(SYSTEMUNIT)$(PPUEXT) cpu$(PPUEXT) : $(PROCINC)/cpu.pp $(SYSTEMUNIT)$(PPUEXT)
mmx$(PPUEXT) : $(PROCINC)/mmx.pp cpu$(PPUEXT) $(SYSTEMUNIT)$(PPUEXT) mmx$(PPUEXT) : $(PROCINC)/mmx.pp cpu$(PPUEXT) $(SYSTEMUNIT)$(PPUEXT)
getopts$(PPUEXT) : $(INC)/getopts.pp $(SYSTEMUNIT)$(PPUEXT) getopts$(PPUEXT) : $(INC)/getopts.pp $(SYSTEMUNIT)$(PPUEXT)

7
rtl/win32/Makefile.fpc
View File

@ -13,7 +13,7 @@ units=$(SYSTEMUNIT) objpas strings \
sysutils typinfo math varutils \ sysutils typinfo math varutils \
cpu mmx charset ucomplex getopts heaptrc lineinfo \ cpu mmx charset ucomplex getopts heaptrc lineinfo \
wincrt winmouse winevent sockets printer dynlibs \ wincrt winmouse winevent sockets printer dynlibs \
video mouse keyboard variants types video mouse keyboard variants types comobj
rsts=math varutils typinfo rsts=math varutils typinfo
[require] [require]
@ -121,7 +121,7 @@ messages$(PPUEXT): messages.pp $(SYSTEMUNIT)$(PPUEXT)
ole2$(PPUEXT) : ole2.pp windows$(PPUEXT) $(SYSTEMUNIT)$(PPUEXT) ole2$(PPUEXT) : ole2.pp windows$(PPUEXT) $(SYSTEMUNIT)$(PPUEXT)
activex$(PPUEXT) : activex.pp windows$(PPUEXT) $(SYSTEMUNIT)$(PPUEXT) activex$(PPUEXT) : activex.pp $(WININC)/objbase.inc windows$(PPUEXT) $(SYSTEMUNIT)$(PPUEXT)
opengl32$(PPUEXT) : opengl32.pp windows$(PPUEXT) $(SYSTEMUNIT)$(PPUEXT) opengl32$(PPUEXT) : opengl32.pp windows$(PPUEXT) $(SYSTEMUNIT)$(PPUEXT)
@ -181,6 +181,9 @@ varutils$(PPUEXT) : varutils.pp $(OBJPASDIR)/cvarutil.inc \
types$(PPUEXT) : $(OBJPASDIR/types.pp objpas$(PPUEXT) $(SYSTEMUNIT)$(PPUEXT) types$(PPUEXT) : $(OBJPASDIR/types.pp objpas$(PPUEXT) $(SYSTEMUNIT)$(PPUEXT)
$(COMPILER) $(OBJPASDIR)/types.pp $(COMPILER) $(OBJPASDIR)/types.pp
comobj$(PPUEXT) : comobj.pp activex$(PPUEXT) sysutils$(PPUEXT) $(SYSTEMUNIT)$(PPUEXT) $(OBJPASDIR)/comobjh.inc $(OBJPASDIR)/comobj.inc
$(COMPILER) -I$(OBJPASDIR) comobj.pp
# #
# Other system-independent RTL Units # Other system-independent RTL Units
# #