lclbase: updated Makefile.compiled and added Makefile_win.compiled for windows targets

git-svn-id: trunk@36657 -
This commit is contained in:
mattias 2012-04-07 12:39:26 +00:00
parent 8dfdbe1013
commit e4263b836a
5 changed files with 16 additions and 4 deletions

1
.gitattributes vendored
View File

@ -5139,6 +5139,7 @@ lazarus.app/Contents/Resources/startlazarus.app/Contents/MacOS/startlazarus -tex
lazarus.app/Contents/Resources/startlazarus.app/Contents/PkgInfo svneol=native#text/plain
lcl/LAYOUT.txt svneol=native#text/plain
lcl/Makefile.compiled svneol=native#text/plain
lcl/Makefile_win.compiled svneol=native#text/plain
lcl/actnlist.pas svneol=native#text/pascal
lcl/alllclunits.pp svneol=native#text/pascal
lcl/arrow.pp svneol=native#text/pascal

View File

@ -1,5 +1,5 @@
#
# Don't edit, this file is generated by FPCMake Version 2.0.0 [2012/03/14]
# Don't edit, this file is generated by FPCMake Version 2.0.0 [2012/03/28]
#
default: all
MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-haiku i386-netbsd i386-solaris i386-qnx i386-netware i386-openbsd i386-wdosx i386-darwin i386-emx i386-watcom i386-netwlibc i386-wince i386-embedded i386-symbian i386-nativent i386-iphonesim m68k-linux m68k-freebsd m68k-netbsd m68k-amiga m68k-atari m68k-openbsd m68k-palmos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos powerpc-darwin powerpc-morphos powerpc-embedded powerpc-wii sparc-linux sparc-netbsd sparc-solaris sparc-embedded x86_64-linux x86_64-freebsd x86_64-solaris x86_64-darwin x86_64-win64 x86_64-embedded arm-linux arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-darwin powerpc64-embedded avr-embedded armeb-linux armeb-embedded mips-linux mipsel-linux
@ -293,8 +293,11 @@ endif
endif
override PACKAGE_NAME=lcl
override PACKAGE_VERSION=0.9b
STATEFILE=Makefile.compiled
ifeq ($(findstring $(OS_TARGET),win32 win64 wince),)
NONWIN32=nonwin32
else
STATEFILE=Makefile_win.compiled
endif
ifeq ($(OS_TARGET),wince)
ifndef LCL_ENABLE_CHECKS
@ -3725,7 +3728,7 @@ cleartarget:
-$(DEL) $(COMPILER_UNITTARGETDIR)/alllclunits$(PPUEXT)
lclbase: cleartarget $(COMPILER_UNITTARGETDIR) alllclunits$(PPUEXT) compiled
compiled:
$(COPY) Makefile.compiled $(COMPILER_UNITTARGETDIR)/LCLBase.compiled
$(COPY) $(STATEFILE) $(COMPILER_UNITTARGETDIR)/LCLBase.compiled
intf: $(TARGET_DIRS)
cleanintf:
$(MAKE) -C interfaces clean

View File

@ -1,5 +1,5 @@
<?xml version="1.0"?>
<CONFIG>
<Makefile Value="True"/>
<Params Value=" -MObjFPC -Scghi -O1 -g -gl -vew -l -Fiinclude -Fuforms;widgetset;nonwin32;../packager/units/%(CPU_TARGET)-%(OS_TARGET);. -FUunits/%(CPU_TARGET)-%(OS_TARGET) alllclunits.pp"/>
<Params Value=" -MObjFPC -Scghi -O1 -g -gl -vew -l -Fuforms;widgetset;nonwin32;../components/lazutils/lib/%(CPU_TARGET)-%(OS_TARGET);../packager/units/%(CPU_TARGET)-%(OS_TARGET);. -Fiinclude alllclunits.pp"/>
</CONFIG>

View File

@ -72,8 +72,11 @@ rsts=lclstrconsts
packages=
[prerules]
STATEFILE=Makefile.compiled
ifeq ($(findstring $(OS_TARGET),win32 win64 wince),)
NONWIN32=nonwin32
else
STATEFILE=Makefile_win.compiled
endif
# disable checks on WinCE unless LCL_ENABLE_CHECKS
ifeq ($(OS_TARGET),wince)
@ -141,7 +144,7 @@ cleartarget:
lclbase: cleartarget $(COMPILER_UNITTARGETDIR) alllclunits$(PPUEXT) compiled
compiled:
$(COPY) Makefile.compiled $(COMPILER_UNITTARGETDIR)/LCLBase.compiled
$(COPY) $(STATEFILE) $(COMPILER_UNITTARGETDIR)/LCLBase.compiled
intf: $(TARGET_DIRS)

View File

@ -0,0 +1,5 @@
<?xml version="1.0"?>
<CONFIG>
<Makefile Value="True"/>
<Params Value=" -MObjFPC -Scghi -O1 -g -gl -vew -l -Fuforms;widgetset;../components/lazutils/lib/%(CPU_TARGET)-%(OS_TARGET);../packager/units/%(CPU_TARGET)-%(OS_TARGET);. -Fiinclude alllclunits.pp"/>
</CONFIG>