* fixed win32 makefile

git-svn-id: trunk@2073 -
This commit is contained in:
florian 2005-12-29 14:48:19 +00:00
parent 051d8a1ceb
commit bbb39044ff
2 changed files with 3 additions and 11 deletions

View File

@ -1,5 +1,5 @@
#
# Don't edit, this file is generated by FPCMake Version 2.0.0 [2005/12/29]
# Don't edit, this file is generated by FPCMake Version 2.0.0 [2005/12/07]
#
default: all
MAKEFILETARGETS=i386-win32
@ -248,7 +248,7 @@ OBJPASDIR=$(RTL)/objpas
include $(WININC)/makefile.inc
WINDOWS_SOURCE_FILES=$(addprefix $(WININC)/,$(addsuffix .inc,$(WINDOWS_FILES)))
ifeq ($(FULL_TARGET),i386-win32)
override TARGET_UNITS+=$(SYSTEMUNIT) ctypes objpas macpas strings lineinfo heaptrc matrix windows winsock initc cmem dynlibs signals dos crt objects messages rtlconsts sysconst sysutils math types strutils convutils dateutils varutils variants typinfo classes cpu mmx charset ucomplex getopts wincrt winmouse winevent sockets printer video mouse keyboard winsysut fpmkunit
override TARGET_UNITS+=$(SYSTEMUNIT) ctypes objpas macpas strings lineinfo heaptrc matrix windows winsock initc cmem dynlibs signals dos crt objects messages rtlconsts sysconst sysutils math types strutils convutils dateutils varutils variants typinfo classes cpu mmx charset ucomplex getopts winevent sockets printer video mouse keyboard winsysut fpmkunit
endif
ifeq ($(FULL_TARGET),i386-win32)
override TARGET_LOADERS+=wprt0 wdllprt0 gprt0 wcygprt0
@ -1112,14 +1112,6 @@ override FPCEXTCMD:=$(FPCOPT)
override FPCOPT:=!FPCEXTCMD
export FPCEXTCMD
endif
override AFULL_TARGET=$(CPU_TARGET)-$(OS_TARGET)
override AFULL_SOURCE=$(CPU_SOURCE)-$(OS_SOURCE)
ifneq ($(AFULL_TARGET),$(AFULL_SOURCE))
override ACROSSCOMPILE=1
endif
ifdef ACROSSCOMPILE
override FPCOPT+=$(CROSSOPT)
endif
override COMPILER:=$(FPC) $(FPCOPT)
ifeq (,$(findstring -s ,$(COMPILER)))
EXECPPAS=

View File

@ -14,7 +14,7 @@ units=$(SYSTEMUNIT) ctypes objpas macpas strings \
rtlconsts sysconst sysutils math types \
strutils convutils dateutils varutils variants typinfo classes \
cpu mmx charset ucomplex getopts \
wincrt winmouse winevent sockets printer \
winevent sockets printer \
video mouse keyboard \
winsysut fpmkunit