paweld/lazarus
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/lazarus/lazarus.git synced 2025-04-13 17:03:01 +02:00
Code Issues Packages Projects Releases Wiki Activity

lazbuild: don't set apptype gui on windows

Browse Source 
git-svn-id: trunk@9936 -
This commit is contained in:
vincents 2006-09-19 09:18:32 +00:00
parent f1aabcf1e1
commit 9ac129d1e1
2 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
ide/Makefile
View File

@ -1,5 +1,5 @@
#
# Don't edit, this file is generated by FPCMake Version 2.0.0 [2006/08/20]
# Don't edit, this file is generated by FPCMake Version 2.0.0 [2006/09/18]
#
default: all
MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-netbsd i386-solaris i386-qnx i386-netware i386-openbsd i386-wdosx i386-darwin i386-emx i386-watcom i386-netwlibc i386-wince m68k-linux m68k-freebsd m68k-netbsd m68k-amiga m68k-atari m68k-openbsd m68k-palmos powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos powerpc-darwin powerpc-morphos sparc-linux sparc-netbsd sparc-solaris x86_64-linux x86_64-freebsd x86_64-win64 arm-linux arm-palmos arm-wince arm-gba powerpc64-linux
@ -267,6 +267,7 @@ BIG_IDE_OPTIONS=-dBigIDE $(LAZARUS_LIBPATHS) \
-Fu../components/sqldb/lib/$(CPU_TARGET)-$(OS_TARGET) \
-Fu../components/sdf/lib/$(CPU_TARGET)-$(OS_TARGET) \
-Fu../components/memds/lib/$(CPU_TARGET)-$(OS_TARGET)
LAZBUILD_OPT=$(LAZARUS_LIBPATHS)
ifeq ($(OS_TARGET),win32)
LAZARUS_OPT+= -WG
BIG_IDE_OPTIONS+= -WG
@ -2874,7 +2875,7 @@ ifeq ($(CPU_TARGET),powerpc)
FPCCPUOPT:=-O1r
endif
else
FPCCPUOPT:=-O1r
FPCCPUOPT:=-O2
endif
override FPCOPT+=-Ur -Xs $(FPCCPUOPT) -n
override FPCOPTDEF+=RELEASE
@ -3450,10 +3451,10 @@ else
$(MAKE) --assume-new=startlazarus.lpr startlazarus$(EXEEXT) OPT='$(LAZARUS_OPT) $(OPT)'
endif
lazbuilder:
ifeq ($(LAZARUS_OPT),)
ifeq ($(LAZBUILD_OPT),)
$(MAKE) --assume-new=lazbuild.lpr lazbuild$(EXEEXT)
else
$(MAKE) --assume-new=lazbuild.lpr lazbuild$(EXEEXT) OPT='$(LAZARUS_OPT) $(OPT)'
$(MAKE) --assume-new=lazbuild.lpr lazbuild$(EXEEXT) OPT='$(LAZBUILD_OPT) $(OPT)'
endif
all: ide starter lazbuilder
cleanide:

6
ide/Makefile.fpc
View File

@ -102,6 +102,8 @@ BIG_IDE_OPTIONS=-dBigIDE $(LAZARUS_LIBPATHS) \
-Fu../components/sqldb/lib/$(CPU_TARGET)-$(OS_TARGET) \
-Fu../components/sdf/lib/$(CPU_TARGET)-$(OS_TARGET) \
-Fu../components/memds/lib/$(CPU_TARGET)-$(OS_TARGET)
LAZBUILD_OPT=$(LAZARUS_LIBPATHS)
#
# apptype gui
@ -160,10 +162,10 @@ endif
#-----------------------------------------------------------------------------
lazbuilder:
ifeq ($(LAZARUS_OPT),)
ifeq ($(LAZBUILD_OPT),)
$(MAKE) --assume-new=lazbuild.lpr lazbuild$(EXEEXT)
else
$(MAKE) --assume-new=lazbuild.lpr lazbuild$(EXEEXT) OPT='$(LAZARUS_OPT) $(OPT)'
$(MAKE) --assume-new=lazbuild.lpr lazbuild$(EXEEXT) OPT='$(LAZBUILD_OPT) $(OPT)'
endif
#-----------------------------------------------------------------------------