From b8106ada6e520f7a78e8d21513d6a16e329f3bdc Mon Sep 17 00:00:00 2001 From: vincents Date: Mon, 30 Oct 2006 12:20:40 +0000 Subject: [PATCH] add -WG for lazarus on win64 git-svn-id: trunk@10133 - --- ide/Makefile | 7 ++++--- ide/Makefile.fpc | 5 +++-- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/ide/Makefile b/ide/Makefile index f475184413..fe39d6800a 100644 --- a/ide/Makefile +++ b/ide/Makefile @@ -1,5 +1,5 @@ # -# Don't edit, this file is generated by FPCMake Version 2.0.0 [2006/09/18] +# Don't edit, this file is generated by FPCMake Version 2.0.0 [2006/10/11] # 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 @@ -244,7 +244,7 @@ ifeq ($(OS_TARGET),darwin) LAZARUS_LIBPATHS=-Fl/usr/X11R6/lib -Fl/sw/lib endif ifndef LAZARUS_CONFIG_DIR -ifeq ($(OS_TARGET),win32) +ifneq ($(findstring $(OS_TARGET),win32 win64),) LAZARUS_CONFIG_DIR=.. else LAZARUS_CONFIG_DIR=$(HOME)/.lazarus @@ -268,7 +268,8 @@ BIG_IDE_OPTIONS=-dBigIDE $(LAZARUS_LIBPATHS) \ -Fu../components/sdf/lib/$(CPU_TARGET)-$(OS_TARGET) \ -Fu../components/memds/lib/$(CPU_TARGET)-$(OS_TARGET) LAZBUILD_OPT=$(LAZARUS_LIBPATHS) -ifeq ($(OS_TARGET),win32) +ifneq ($(findstring $(OS_TARGET),win32 win64),) +LCL_PLATFORM=win32 LAZARUS_OPT+= -WG BIG_IDE_OPTIONS+= -WG endif diff --git a/ide/Makefile.fpc b/ide/Makefile.fpc index ee92a13518..d2e02e0898 100644 --- a/ide/Makefile.fpc +++ b/ide/Makefile.fpc @@ -73,7 +73,7 @@ endif # # user config ifndef LAZARUS_CONFIG_DIR -ifeq ($(OS_TARGET),win32) +ifneq ($(findstring $(OS_TARGET),win32 win64),) LAZARUS_CONFIG_DIR=.. else LAZARUS_CONFIG_DIR=$(HOME)/.lazarus @@ -107,7 +107,8 @@ LAZBUILD_OPT=$(LAZARUS_LIBPATHS) # # apptype gui -ifeq ($(OS_TARGET),win32) +ifneq ($(findstring $(OS_TARGET),win32 win64),) +LCL_PLATFORM=win32 LAZARUS_OPT+= -WG BIG_IDE_OPTIONS+= -WG endif